diff --git a/CMakeLists.txt b/CMakeLists.txt index 052c586a..4cf40229 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,6 +81,7 @@ endif() ## Compiler flags IF(APPLE) SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++") + include(${PROJECT_SOURCE_DIR}/mk/macosx/CMakeLists.txt) ENDIF(APPLE) IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) @@ -365,10 +366,6 @@ IF(EXISTS "${PROJECT_SOURCE_DIR}/source/") #endif() ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/tools/glexemel ) - IF(APPLE) - include(${PROJECT_SOURCE_DIR}/mk/macosx/CMakeLists.txt) - ENDIF() - ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/tests ) ENDIF() diff --git a/mk/macosx/CMakeLists.txt b/mk/macosx/CMakeLists.txt index dfb4947f..e4705f9b 100644 --- a/mk/macosx/CMakeLists.txt +++ b/mk/macosx/CMakeLists.txt @@ -25,7 +25,9 @@ IF(NOT CONFIG_HAS_BEEN_RUN_BEFORE) ENDIF() ENDIF(NOT CONFIG_HAS_BEEN_RUN_BEFORE) - +# Include extra paths to search for includes; this is the default system wide macports path. +INCLUDE_DIRECTORIES(/opt/local/include) +LINK_DIRECTORIES(/opt/local/lib) ##install part