ソースを参照

Pulling in -pThread commandline arg so anyone using 3rdParty::AWSGameLiftServerSDK will pull in -pThread

Signed-off-by: Gene Walters <[email protected]>
Gene Walters 1 年間 前
コミット
bf1f0c7582

+ 6 - 0
package-system/AWSGameLiftServerSDK/FindAWSGameLiftServerSDK.cmake.Linux

@@ -48,6 +48,12 @@ ly_target_include_system_directories(TARGET ${TARGET_WITH_NAMESPACE} INTERFACE $
 if (LY_MONOLITHIC_GAME)
     target_link_libraries(${TARGET_WITH_NAMESPACE} INTERFACE ${AWSGAMELIFTSERVERSDK_LIBS})
 else()
+    # Modules using aws-cpp-sdk-gamelift-server functionality will needs pThreads to link.
+    set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+    set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+    find_package(Threads REQUIRED)
+    target_link_libraries(test_AWSGameLift PRIVATE Threads::Threads)
+
     target_link_libraries(${TARGET_WITH_NAMESPACE} INTERFACE ${AWSGAMELIFTSERVERSDK_LIBS})
     ly_add_dependencies(${TARGET_WITH_NAMESPACE} ${AWSGAMELIFTSERVERSDK_LIBS})
 endif()

+ 1 - 10
package-system/AWSGameLiftServerSDK/test/CMakeLists.txt

@@ -40,15 +40,6 @@ endfunction()
 
 PROJECT(test_AWSGameLift VERSION 1.0 LANGUAGES CXX)
 
-set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
-set(THREADS_PREFER_PTHREAD_FLAG TRUE)
-find_package(Threads REQUIRED)
-if (CMAKE_USE_PTHREADS_INIT)
-    message(WARNING "${CMAKE_THREAD_LIBS_INIT} is defined")
-else()
-    message(WARNING "CMAKE_USE_PTHREADS_INIT is false!")
-endif ()
-
 find_package(OpenSSL)
 find_package(AWSGameLiftServerSDK)
 
@@ -56,4 +47,4 @@ find_package(AWSGameLiftServerSDK)
 add_executable(test_AWSGameLift test_AWSGameLiftServer.cpp)
 
 
-target_link_libraries(test_AWSGameLift PRIVATE Threads::Threads 3rdParty::OpenSSL 3rdParty::AWSGameLiftServerSDK)
+target_link_libraries(test_AWSGameLift PRIVATE 3rdParty::OpenSSL 3rdParty::AWSGameLiftServerSDK)