MapleShrine
/
mkxp
1
0
Fork 0
Code Issues 32 Pull Requests 11 Projects Releases Wiki Activity

cmake build system + OS X support / cleanups for Humble Release #8

Merged
urkle merged 25 commits from OSX into boost 2014-01-01 23:13:17 +00:00
Conversation 2 Commits 25 Files Changed 22 +7 -4
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 05668f792a - Show all commits

11
CMakeLists.txt
View File

@ -16,7 +16,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
IF("${CMAKE_SYSTEM}" MATCHES "Linux") IF("${CMAKE_SYSTEM}" MATCHES "Linux")
SET(LINUX ON) SET(LINUX ON)
SET(LINUX ON PARENT_SCOPE)
ENDIF() ENDIF()
IF(FORCE32) IF(FORCE32)
@ -34,14 +33,17 @@ IF(LINUX)
if(CMAKE_SIZEOF_VOID_P MATCHES "8" AND NOT(FORCE32) ) if(CMAKE_SIZEOF_VOID_P MATCHES "8" AND NOT(FORCE32) )
set(CMAKE_EXECUTABLE_SUFFIX ".bin.x86_64") set(CMAKE_EXECUTABLE_SUFFIX ".bin.x86_64")
set(BIN_RPATH "\$ORIGIN/lib64") set(BIN_RPATH "\$ORIGIN/lib64")
set(LIB_PATH "lib64")
else() else()
set(CMAKE_EXECUTABLE_SUFFIX ".bin.x86") set(CMAKE_EXECUTABLE_SUFFIX ".bin.x86")
set(BIN_RPATH "\$ORIGIN/lib") set(BIN_RPATH "\$ORIGIN/lib")
set(LIB_PATH "lib")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FILE_OFFSET_BITS=64") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FILE_OFFSET_BITS=64")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FILE_OFFSET_BITS=64") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FILE_OFFSET_BITS=64")
endif() endif()
elseif(APPLE) elseif(APPLE)
SET(BIN_RPATH "@executable_path/../Frameworks") SET(BIN_RPATH "@executable_path/../Frameworks")
set(LIB_PATH "lib")
endif() endif()
set(CMAKE_SKIP_BUILD_RPATH TRUE) set(CMAKE_SKIP_BUILD_RPATH TRUE)
@ -55,8 +57,9 @@ find_package(PkgConfig REQUIRED)
if (EXTERNAL_LIB_PATH) if (EXTERNAL_LIB_PATH)
set(CMAKE_PREFIX_PATH ${EXTERNAL_LIB_PATH}) set(CMAKE_PREFIX_PATH ${EXTERNAL_LIB_PATH})
if(EXISTS "${EXTERNAL_LIB_PATH}/lib/pkgconfig/")
SET(ENV{PKG_CONFIG_PATH} "${EXTERNAL_LIB_PATH}/lib/pkgconfig/") if(EXISTS "${EXTERNAL_LIB_PATH}/${LIB_PATH}/pkgconfig/")
SET(ENV{PKG_CONFIG_PATH} "${EXTERNAL_LIB_PATH}/${LIB_PATH}/pkgconfig/")
endif() endif()
if(APPLE) if(APPLE)
set(PLATFORM_SHARED_LIBS set(PLATFORM_SHARED_LIBS
@ -85,7 +88,7 @@ find_package(GLEW 1.9.0 REQUIRED)
find_package(Boost 1.49 COMPONENTS program_options REQUIRED) find_package(Boost 1.49 COMPONENTS program_options REQUIRED)
find_package(OpenAL REQUIRED) find_package(OpenAL REQUIRED)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
find_package(zlib REQUIRED) find_package(ZLIB REQUIRED)
## Setup main source ## ## Setup main source ##