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

CMake can now also generate cygwin makefiles

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10962 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2012-03-12 00:48:52 +00:00
parent 74da40989e
commit bdac17c748
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -45,7 +45,7 @@ find_package(OpenGL REQUIRED)
include_directories(${OPENGL_INCLUDE_DIR})
# OpenAL
if(WIN32)
if(MSVC)
find_library(OPENAL_LIBRARY OpenAL32 REQUIRED PATHS "${PROJECT_SOURCE_DIR}/dependencies/lib")
else()
find_package(OpenAL REQUIRED)
@ -56,8 +56,11 @@ include_directories(${OPENAL_INCLUDE_DIR})
find_package(OggVorbis REQUIRED)
include_directories(${OGGVORBIS_INCLUDE_DIRS})
# CURL
if(WIN32)
if(CYGWIN)
find_package(CURL REQUIRED)
elseif(WIN32)
find_library(CURL_LIBRARIES curl libcurl_imp REQUIRED PATHS ${PROJECT_SOURCE_DIR}/dependencies/lib)
else()
find_package(CURL REQUIRED)
@ -136,7 +139,9 @@ else()
# Build the final executable
add_executable(supertuxkart ${STK_SOURCES})
if(UNIX)
if(CYGWIN)
target_link_libraries(supertuxkart pthread)
elseif(UNIX)
target_link_libraries(supertuxkart pthread Xxf86vm)
endif()
endif()
@ -164,8 +169,13 @@ if(USE_WIIUSE)
endif()
if(WIN32)
find_library(PTHREAD_LIBRARY NAMES pthreadVC2 PATHS "${PROJECT_SOURCE_DIR}/dependencies/lib")
target_link_libraries(supertuxkart ${PTHREAD_LIBRARY})
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

10
cmake/FindIrrlicht.cmake
View File

@ -16,12 +16,16 @@ set(IRRLICHT_DIR "" CACHE PATH "Path to Irrlicht")
# Set library directories depending on system
if(APPLE)
set(IRRLICHT_LIBRARY_DIR "/Library/Frameworks/IrrFramework.framework")
elseif(CYGWIN)
# CYGWIN must be checked before "Unix" since Cygwin is a Unix
set(IRRLICHT_LIBRARY_DIR "${PROJECT_SOURCE_DIR}/dependencies/lib")
elseif(UNIX)
set(IRRLICHT_LIBRARY_DIR "${IRRLICHT_DIR}/lib/Linux")
elseif(MSVC)
set(IRRLICHT_LIBRARY_DIR "${PROJECT_SOURCE_DIR}/dependencies/lib")
else()
set(IRRLICHT_LIBRARY_DIR "${IRRLICHT_DIR}/lib/Win32-gcc")
# mingw / cygwin
set(IRRLICHT_LIBRARY_DIR "${PROJECT_SOURCE_DIR}/dependencies/lib")
endif()
# Find include directory and library
@ -32,7 +36,9 @@ find_path(IRRLICHT_INCLUDE_DIR NAMES irrlicht.h
if(APPLE)
find_library(IRRLICHT_LIBRARY NAMES IrrFramework PATHS ${IRRLICHT_LIBRARY_DIR})
else()
find_library(IRRLICHT_LIBRARY NAMES Irrlicht PATHS ${IRRLICHT_LIBRARY_DIR} ${PROJECT_SOURCE_DIR})
message("IRRLICHT_LIBRARY_DIR = ${IRRLICHT_LIBRARY_DIR}")
find_library(IRRLICHT_LIBRARY REQUIRED NAMES Irrlicht libIrrlicht PATHS ${IRRLICHT_LIBRARY_DIR} ${PROJECT_SOURCE_DIR})
message("IRRLICHT_LIBRARY = ${IRRLICHT_LIBRARY}")
endif()
# Determine Irrlicht version