diff options
| author |  bunnei <bunneidev@gmail.com> | 2014-05-19 21:46:57 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-05-19 21:46:57 -0400 |
| commit | 204c6bfeca2d3bccfe6602699c0b3420f88aaf07 (patch) | |
| tree | 4ece05e69f90f50e3390eb93a0790180aafcdbc6 /CMakeLists.txt | |
| parent | b5d2ff9b26560b3f2bfdcd311ada661313eaba83 (diff) | |
| parent | 5a8ed196e6e9416134a85fbc7da14fed3af307e4 (diff) | |
Merge pull request #2 from archshift/issue-7-fix
Fixes issues with building Citra on OSX
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a588fe19..114e3920 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,21 +2,37 @@ cmake_minimum_required(VERSION 2.6) project(citra) -SET(GCC_COMPILE_FLAGS "-std=c++11 -fpermissive") +SET(CXX_COMPILE_FLAGS "-std=c++11 -fpermissive") # silence some spam add_definitions(-Wno-attributes) add_definitions(-DSINGLETHREADED) -add_definitions(${GCC_COMPILE_FLAGS}) +add_definitions(${CXX_COMPILE_FLAGS}) # dependency checking +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules/") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests) -include(FindOpenGL REQUIRED) include(FindX11 REQUIRED) find_package(PkgConfig REQUIRED) +find_package(GLEW REQUIRED) +find_package(OpenGL REQUIRED) pkg_search_module(GLFW REQUIRED glfw3) +# corefoundation is required only on OSX +IF (APPLE) + FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++") +ENDIF (APPLE) + +#external includes include_directories(${GLFW_INCLUDE_DIRS}) +include_directories(${OPENGL_INCLUDE_DIR}) +include_directories(${GLEW_INCLUDE_PATH}) + +# workaround for GLFW linking on OSX +link_directories(${GLFW_LIBRARY_DIRS}) + option(DISABLE_QT4 "Disable Qt4 GUI" OFF) if(NOT DISABLE_QT4) include(FindQt4) @@ -32,14 +48,10 @@ if(NOT DISABLE_QT4) endif() # generate git revision information -list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules/") include(GetGitRevisionDescription) get_git_head_revision(GIT_REF_SPEC GIT_REV) git_describe(GIT_DESC --always --long --dirty) git_branch_name(GIT_BRANCH) - -# external includes -include_directories(${OPENGL_INCLUDE_DIR}) # internal includes include_directories(src) |