mojotrollz/mojo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix CMake build

Browse Source 
Sometimes I wonder how it ever worked without this...
This commit is contained in:
shlainn 2012-05-14 22:30:23 +02:00
parent 9e82dcef83
commit 021dbc99b7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Client/CMakeLists.txt
View File

@ -10,7 +10,7 @@ if(WIN32)
set(PSEUWOW_LIBS ${PSEUWOW_LIBS} Winmm) set(PSEUWOW_LIBS ${PSEUWOW_LIBS} Winmm)
endif() endif()
if(UNIX) if(UNIX)
set(EXECUTABLE_LINK_FLAGS "-pthread") set(EXECUTABLE_LINK_FLAGS "-pthread" ${EXECUTABLE_LINK_FLAGS})
set(PSEUWOW_LIBS ${PSEUWOW_LIBS} GL Xxf86vm bz2) set(PSEUWOW_LIBS ${PSEUWOW_LIBS} GL Xxf86vm bz2)
endif() endif()
@ -59,4 +59,7 @@ SCPDatabase.cpp
# Link the executable to the libraries. # Link the executable to the libraries.
target_link_libraries (pseuwow ${PSEUWOW_LIBS}) target_link_libraries (pseuwow ${PSEUWOW_LIBS})
set_target_properties(pseuwow PROPERTIES LINK_FLAGS
"${EXECUTABLE_LINK_FLAGS}"
)
install(TARGETS pseuwow DESTINATION ${CMAKE_INSTALL_PREFIX}) install(TARGETS pseuwow DESTINATION ${CMAKE_INSTALL_PREFIX})

3
src/tools/viewer/CMakeLists.txt
View File

@ -14,11 +14,12 @@ ${PROJECT_SOURCE_DIR}/src/Client/GUI/CM2Mesh.cpp
set(VIEWER_LIBS shared irrlicht StormLib_static zthread zlib) set(VIEWER_LIBS shared irrlicht StormLib_static zthread zlib)
if(UNIX) if(UNIX)
list(APPEND VIEWER_LIBS GL Xxf86vm bz2) list(APPEND VIEWER_LIBS GL Xxf86vm bz2)
set(EXECUTABLE_LINK_FLAGS "-pthread" ${EXECUTABLE_LINK_FLAGS})
endif() endif()
if(WIN32) if(WIN32)
list(APPEND VIEWER_LIBS Winmm) list(APPEND VIEWER_LIBS Winmm)
endif() endif()
target_link_libraries (viewer ${VIEWER_LIBS} ) target_link_libraries (viewer ${VIEWER_LIBS} )
set_target_properties (viewer PROPERTIES LINK_FLAGS "${EXECUTABLE_LINK_FLAGS}")
install(TARGETS viewer DESTINATION ${CMAKE_INSTALL_PREFIX}) install(TARGETS viewer DESTINATION ${CMAKE_INSTALL_PREFIX})