From 021dbc99b70091097d9d5bb493d6c37f13cbb679 Mon Sep 17 00:00:00 2001 From: shlainn Date: Mon, 14 May 2012 22:30:23 +0200 Subject: [PATCH] * Fix CMake build Sometimes I wonder how it ever worked without this... --- src/Client/CMakeLists.txt | 5 ++++- src/tools/viewer/CMakeLists.txt | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Client/CMakeLists.txt b/src/Client/CMakeLists.txt index 21650b4..8d674fe 100644 --- a/src/Client/CMakeLists.txt +++ b/src/Client/CMakeLists.txt @@ -10,7 +10,7 @@ if(WIN32) set(PSEUWOW_LIBS ${PSEUWOW_LIBS} Winmm) endif() if(UNIX) - set(EXECUTABLE_LINK_FLAGS "-pthread") + set(EXECUTABLE_LINK_FLAGS "-pthread" ${EXECUTABLE_LINK_FLAGS}) set(PSEUWOW_LIBS ${PSEUWOW_LIBS} GL Xxf86vm bz2) endif() @@ -59,4 +59,7 @@ SCPDatabase.cpp # Link the executable to the libraries. target_link_libraries (pseuwow ${PSEUWOW_LIBS}) +set_target_properties(pseuwow PROPERTIES LINK_FLAGS + "${EXECUTABLE_LINK_FLAGS}" +) install(TARGETS pseuwow DESTINATION ${CMAKE_INSTALL_PREFIX}) diff --git a/src/tools/viewer/CMakeLists.txt b/src/tools/viewer/CMakeLists.txt index a31e321..def2337 100644 --- a/src/tools/viewer/CMakeLists.txt +++ b/src/tools/viewer/CMakeLists.txt @@ -14,11 +14,12 @@ ${PROJECT_SOURCE_DIR}/src/Client/GUI/CM2Mesh.cpp set(VIEWER_LIBS shared irrlicht StormLib_static zthread zlib) if(UNIX) list(APPEND VIEWER_LIBS GL Xxf86vm bz2) + set(EXECUTABLE_LINK_FLAGS "-pthread" ${EXECUTABLE_LINK_FLAGS}) endif() if(WIN32) list(APPEND VIEWER_LIBS Winmm) endif() target_link_libraries (viewer ${VIEWER_LIBS} ) - +set_target_properties (viewer PROPERTIES LINK_FLAGS "${EXECUTABLE_LINK_FLAGS}") install(TARGETS viewer DESTINATION ${CMAKE_INSTALL_PREFIX})