ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: linking of pthread

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10977 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
undef-in-ed 2012-03-15 12:50:51 +00:00
parent 70bb244bbb
commit 3234653cea
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CMakeLists.txt
View File

@ -135,14 +135,14 @@ if(APPLE)
add_custom_command(TARGET supertuxkart PRE_BUILD add_custom_command(TARGET supertuxkart PRE_BUILD
COMMAND ln -s ${PROJECT_SOURCE_DIR}/data ${CMAKE_BINARY_DIR}/bin/supertuxkart.app/Contents/Resources) COMMAND ln -s ${PROJECT_SOURCE_DIR}/data ${CMAKE_BINARY_DIR}/bin/supertuxkart.app/Contents/Resources)
else() else()
find_library(PTHREAD_LIBRARY NAMES pthread pthreadVC2 PATHS ${PROJECT_SOURCE_DIR}/dependencies/lib)
mark_as_advanced(PTHREAD_LIBRARY)
add_definitions(-DSUPERTUXKART_DATADIR=\"${CMAKE_INSTALL_PREFIX}/share/games/supertuxkart\") add_definitions(-DSUPERTUXKART_DATADIR=\"${CMAKE_INSTALL_PREFIX}/share/games/supertuxkart\")
# Build the final executable # Build the final executable
add_executable(supertuxkart ${STK_SOURCES} ${STK_HEADERS}) add_executable(supertuxkart ${STK_SOURCES} ${STK_HEADERS})
target_link_libraries(supertuxkart ${PTHREAD_LIBRARY})
if(UNIX OR CYGWIN)
target_link_libraries(supertuxkart pthread)
endif()
endif() endif()
# Common library dependencies # Common library dependencies
@ -167,15 +167,6 @@ if(USE_WIIUSE)
add_definitions(-DENABLE_WIIUSE) add_definitions(-DENABLE_WIIUSE)
endif() endif()
if(WIN32)
if(CYGWIN)
find_library(PTHREAD_LIBRARY NAMES pthread PATHS "${PROJECT_SOURCE_DIR}/dependencies/lib")
target_link_libraries(supertuxkart ${PTHREAD_LIBRARY})
else()
find_library(PTHREAD_LIBRARY NAMES pthreadVC2 PATHS "${PROJECT_SOURCE_DIR}/dependencies/lib")
target_link_libraries(supertuxkart ${PTHREAD_LIBRARY})
endif()
endif()
# Optional tools # Optional tools
add_subdirectory(tools/font_tool) add_subdirectory(tools/font_tool)