diff options
| author | Sam Spilsbury <smspillaz@gmail.com> | 2016-04-24 17:39:25 +0200 |
|---|---|---|
| committer | Sam Spilsbury <smspillaz@gmail.com> | 2016-04-24 17:39:25 +0200 |
| commit | df81fa11fc8972a5775a57ccde1e0ef8d7fbfe64 (patch) | |
| tree | 21f5e69d89dcd56ae37b25e4b41f4cb5dd4ae552 | |
| parent | Merge pull request #1576 from smspillaz/fix-build-errors-03272016 (diff) | |
| download | yuzu-df81fa11fc8972a5775a57ccde1e0ef8d7fbfe64.tar yuzu-df81fa11fc8972a5775a57ccde1e0ef8d7fbfe64.tar.gz yuzu-df81fa11fc8972a5775a57ccde1e0ef8d7fbfe64.tar.bz2 yuzu-df81fa11fc8972a5775a57ccde1e0ef8d7fbfe64.tar.lz yuzu-df81fa11fc8972a5775a57ccde1e0ef8d7fbfe64.tar.xz yuzu-df81fa11fc8972a5775a57ccde1e0ef8d7fbfe64.tar.zst yuzu-df81fa11fc8972a5775a57ccde1e0ef8d7fbfe64.zip | |
Diffstat (limited to '')
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/citra/CMakeLists.txt | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ddde19760..019321ad8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ -# CMake 2.8.11 required for Qt5 settings to be applied automatically on -# dependent libraries. -cmake_minimum_required(VERSION 2.8.11) +# CMake 3.1 required for Qt5 settings to be applied automatically on +# dependent libraries and IMPORTED targets. +cmake_minimum_required(VERSION 3.1) function(download_bundled_external remote_path lib_name prefix_var) set(prefix "${CMAKE_BINARY_DIR}/externals/${lib_name}") @@ -135,6 +135,8 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/externals/cmake-modules") find_package(OpenGL REQUIRED) include_directories(${OPENGL_INCLUDE_DIR}) +# Prefer the -pthread flag on Linux. +set (THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) if (ENABLE_SDL2) diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index 351752c1c..43fa06b4e 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} ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(citra ${PLATFORM_LIBRARIES} Threads::Threads) if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|OpenBSD|NetBSD") install(TARGETS citra RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") |