Merge pull request #39 from goetzk/change-library-search-paths-on-osx
Change library search paths on osx
This commit is contained in:
commit
0edee0ada6
|
@ -81,6 +81,7 @@ endif()
|
||||||
## Compiler flags
|
## Compiler flags
|
||||||
IF(APPLE)
|
IF(APPLE)
|
||||||
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
|
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
|
||||||
|
include(${PROJECT_SOURCE_DIR}/mk/macosx/CMakeLists.txt)
|
||||||
ENDIF(APPLE)
|
ENDIF(APPLE)
|
||||||
|
|
||||||
IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
|
IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
|
||||||
|
@ -365,10 +366,6 @@ IF(EXISTS "${PROJECT_SOURCE_DIR}/source/")
|
||||||
#endif()
|
#endif()
|
||||||
ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/tools/glexemel )
|
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 )
|
ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/tests )
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,9 @@ IF(NOT CONFIG_HAS_BEEN_RUN_BEFORE)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
ENDIF(NOT CONFIG_HAS_BEEN_RUN_BEFORE)
|
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
|
##install part
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue