diff options
| author | Sam Spilsbury <smspillaz@gmail.com> | 2016-03-27 11:59:50 +0800 |
|---|---|---|
| committer | Sam Spilsbury <smspillaz@gmail.com> | 2016-04-23 11:48:58 +0800 |
| commit | d051bd303225838e0e50a3e3ddc22337c1fc0f0c (patch) | |
| tree | d054f69d2cc8f03c4d73c2e74deb42ee5556be0d | |
| parent | 57a5fc40c0b66e8cc6e4e12598e9e852be767d35 (diff) | |
CMakeLists: Use CMAKE_THREAD_LIBS_INIT
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/citra/CMakeLists.txt | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a0a161e76..ddde197606 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,8 +65,8 @@ endif() message(STATUS "Target architecture: ${ARCHITECTURE}") if (NOT MSVC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y -Wno-attributes -pthread") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y -Wno-attributes") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") if (ARCHITECTURE_x86_64) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1") @@ -135,6 +135,8 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/externals/cmake-modules") find_package(OpenGL REQUIRED) include_directories(${OPENGL_INCLUDE_DIR}) +find_package(Threads REQUIRED) + if (ENABLE_SDL2) if (CITRA_USE_BUNDLED_SDL2) # Detect toolchain and platform diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index fa615deb96..351752c1c8 100644 --- a/src/citra/CMakeLists.txt +++ b/src/citra/CMakeLists.txt @@ -21,7 +21,7 @@ target_link_libraries(citra ${SDL2_LIBRARY} ${OPENGL_gl_LIBRARY} inih glad) if (MSVC) target_link_libraries(citra getopt) endif() -target_link_libraries(citra ${PLATFORM_LIBRARIES}) +target_link_libraries(citra ${PLATFORM_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|OpenBSD|NetBSD") install(TARGETS citra RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") |