diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-07-26 20:10:10 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-07-26 20:10:26 +0400 |
| commit | d4dadaea96ed6a1d385e5dbcb44a2cdc5f144f48 (patch) | |
| tree | 62a52cea92117cb6400ed416ce45c107149d2ab3 /CMakeLists.txt | |
| parent | a6eeeee4abeabeffcacbb4c69d43f349723bc387 (diff) | |
OSX/cmake: update buildsys for new osl/llvm/oiio usage, also use osx_locals.map in cmake
- fixes T40887
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b6fdccfe635..c50cdc14158 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1764,7 +1764,7 @@ elseif(APPLE) ) set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib) - set(OPENCOLLADA_LIBRARIES "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2 -lbuffer -lftoa") + set(OPENCOLLADA_LIBRARIES "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lxml2 -lbuffer -lftoa") # pcre is bundled with openCollada #set(PCRE ${LIBDIR}/pcre) #set(PCRE_LIBPATH ${PCRE}/lib) @@ -1929,6 +1929,8 @@ elseif(APPLE) # Xcode 5 is always using CLANG, which has too low template depth of 128 for libmv set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024") endif() + # Get rid of eventually clashes, we export some symbols explicite as local + set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Xlinker -unexported_symbols_list -Xlinker ${CMAKE_SOURCE_DIR}/source/creator/osx_locals.map") endif() #----------------------------------------------------------------------------- |