Skip to content

Commit dc05b46

Browse files
committed
Update to Apple/clang 5.0 config
It seems that the new clang 5.0 from Apple uses libc++ by default, now. We have to use the Boost libraries I compiled with -stdlib=libc++.
1 parent 3381814 commit dc05b46

File tree

2 files changed

+21
-16
lines changed
  • Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release

2 files changed

+21
-16
lines changed

Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release/CMakeCache.txt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@
1818
BUILD_SHARED_LIBS:BOOL=ON
1919

2020
//Path to a file.
21-
Boost_INCLUDE_DIR:PATH=/usr/local/include
21+
Boost_INCLUDE_DIR:PATH=/Users/cgaltester/boost-cpp11/boost_1_54_0
2222

2323
//Boost library directory
24-
Boost_LIBRARY_DIR:PATH=/usr/local/lib
24+
Boost_LIBRARY_DIR:PATH=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib
2525

2626
//Boost system library (debug)
27-
Boost_SYSTEM_LIBRARY_DEBUG:FILEPATH=/usr/local/lib/libboost_system-mt.dylib
27+
Boost_SYSTEM_LIBRARY_DEBUG:FILEPATH=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib/libboost_system.dylib
2828

2929
//Boost system library (release)
30-
Boost_SYSTEM_LIBRARY_RELEASE:FILEPATH=/usr/local/lib/libboost_system-mt.dylib
30+
Boost_SYSTEM_LIBRARY_RELEASE:FILEPATH=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib/libboost_system.dylib
3131

3232
//Boost thread library (debug)
33-
Boost_THREAD_LIBRARY_DEBUG:FILEPATH=/usr/local/lib/libboost_thread-mt.dylib
33+
Boost_THREAD_LIBRARY_DEBUG:FILEPATH=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib/libboost_thread.dylib
3434

3535
//Boost thread library (release)
36-
Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/usr/local/lib/libboost_thread-mt.dylib
36+
Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib/libboost_thread.dylib
3737

3838
//Select to allow to use all preconfigured external libraries
3939
CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT:BOOL=OFF
@@ -48,7 +48,7 @@ CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF
4848
CGAL_Core_LIBRARY:STRING=/Users/cgaltester/cgal_test/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release/lib/libCGAL_Core.dylib
4949

5050
//Dependencies for the target
51-
CGAL_Core_LIB_DEPENDS:STATIC=general;/usr/local/lib/libmpfr.dylib;general;/usr/local/lib/libgmp.dylib;general;/Users/cgaltester/cgal_test/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release/lib/libCGAL.dylib;general;/usr/local/lib/libboost_thread-mt.dylib;general;/usr/local/lib/libboost_system-mt.dylib;
51+
CGAL_Core_LIB_DEPENDS:STATIC=general;/usr/local/lib/libmpfr.dylib;general;/usr/local/lib/libgmp.dylib;general;/Users/cgaltester/cgal_test/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release/lib/libCGAL.dylib;general;/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib/libboost_thread.dylib;general;/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib/libboost_system.dylib;
5252

5353
//Set this to TRUE if you want to define or modify any of CMAKE_*_FLAGS.
5454
// When this is FALSE, all the CMAKE_*_FLAGS flags are overriden
@@ -88,19 +88,19 @@ CGAL_INSTALL_MAN_DIR:STRING=share/man/man1
8888
CGAL_ImageIO_LIBRARY:STRING=/Users/cgaltester/cgal_test/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release/lib/libCGAL_ImageIO.dylib
8989

9090
//Dependencies for the target
91-
CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/usr/local/lib/libmpfr.dylib;general;/usr/local/lib/libgmp.dylib;general;/Users/cgaltester/cgal_test/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release/lib/libCGAL.dylib;general;/usr/local/lib/libboost_thread-mt.dylib;general;/usr/local/lib/libboost_system-mt.dylib;general;/System/Library/Frameworks/AGL.framework;general;/System/Library/Frameworks/OpenGL.framework;general;/usr/lib/libz.dylib;
91+
CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/usr/local/lib/libmpfr.dylib;general;/usr/local/lib/libgmp.dylib;general;/Users/cgaltester/cgal_test/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release/lib/libCGAL.dylib;general;/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib/libboost_thread.dylib;general;/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib/libboost_system.dylib;general;/System/Library/Frameworks/AGL.framework;general;/System/Library/Frameworks/OpenGL.framework;general;/usr/lib/libz.dylib;
9292

9393
//The CGAL library
9494
CGAL_LIBRARY:STRING=/Users/cgaltester/cgal_test/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release/lib/libCGAL.dylib
9595

9696
//Dependencies for the target
97-
CGAL_LIB_DEPENDS:STATIC=general;/usr/local/lib/libmpfr.dylib;general;/usr/local/lib/libgmp.dylib;general;/usr/local/lib/libboost_thread-mt.dylib;general;/usr/local/lib/libboost_system-mt.dylib;
97+
CGAL_LIB_DEPENDS:STATIC=general;/usr/local/lib/libmpfr.dylib;general;/usr/local/lib/libgmp.dylib;general;/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib/libboost_thread.dylib;general;/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib/libboost_system.dylib;
9898

9999
//The CGAL_Qt4 library
100100
CGAL_Qt4_LIBRARY:STRING=/Users/cgaltester/cgal_test/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release/lib/libCGAL_Qt4.dylib
101101

102102
//Dependencies for the target
103-
CGAL_Qt4_LIB_DEPENDS:STATIC=general;/usr/local/lib/libmpfr.dylib;general;/usr/local/lib/libgmp.dylib;general;/Users/cgaltester/cgal_test/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release/lib/libCGAL.dylib;general;/usr/local/lib/libboost_thread-mt.dylib;general;/usr/local/lib/libboost_system-mt.dylib;general;/usr/local/lib/QtOpenGL.framework;general;/usr/local/lib/QtGui.framework;general;/usr/local/lib/QtCore.framework;general;/System/Library/Frameworks/AGL.framework;general;/System/Library/Frameworks/OpenGL.framework;
103+
CGAL_Qt4_LIB_DEPENDS:STATIC=general;/usr/local/lib/libmpfr.dylib;general;/usr/local/lib/libgmp.dylib;general;/Users/cgaltester/cgal_test/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release/lib/libCGAL.dylib;general;/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib/libboost_thread.dylib;general;/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib/libboost_system.dylib;general;/usr/local/lib/QtOpenGL.framework;general;/usr/local/lib/QtGui.framework;general;/usr/local/lib/QtCore.framework;general;/System/Library/Frameworks/AGL.framework;general;/System/Library/Frameworks/OpenGL.framework;
104104

105105
//Value Computed by CMake
106106
CGAL_SOURCE_DIR:STATIC=/Users/cgaltester/cgal_test/CGAL-I
@@ -1012,9 +1012,9 @@ Boost_THREAD_LIBRARY_DEBUG-ADVANCED:INTERNAL=1
10121012
//ADVANCED property for variable: Boost_THREAD_LIBRARY_RELEASE
10131013
Boost_THREAD_LIBRARY_RELEASE-ADVANCED:INTERNAL=1
10141014
CGAL_3RD_PARTY_DEFINITIONS:INTERNAL=
1015-
CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/local/include
1016-
CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/local/lib/libboost_thread-mt.dylib;/usr/local/lib/libboost_system-mt.dylib
1017-
CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/local/lib
1015+
CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/Users/cgaltester/boost-cpp11/boost_1_54_0
1016+
CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib/libboost_thread.dylib;/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib/libboost_system.dylib
1017+
CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib
10181018
CGAL_3RD_PARTY_PRECONFIGURED:INTERNAL=
10191019
//ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS
10201020
CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1
@@ -1081,7 +1081,7 @@ CGAL_Core_LIBRARY-ADVANCED:INTERNAL=1
10811081
//Variable hidden from user
10821082
CGAL_Core_LIBRARY_INSTALLED:INTERNAL=/usr/local/lib/libCGAL_Core.dylib
10831083
//Variable hidden from user
1084-
CGAL_ESSENTIAL_3RD_PARTY_LIBRARIES:INTERNAL=GMP;MPFR
1084+
CGAL_ESSENTIAL_3RD_PARTY_LIBRARIES:INTERNAL=GMP;MPFR;GMP;MPFR;GMP;MPFR;GMP;MPFR;GMP;MPFR
10851085
CGAL_EXECUTABLE_TARGETS:INTERNAL=
10861086
//Variable hidden from user
10871087
CGAL_EXT_LIB_BLAS_PREFIX:INTERNAL=BLAS
@@ -1753,9 +1753,9 @@ _Boost_ADDITIONAL_VERSIONS_LAST:INTERNAL=1.56.1;1.56.0;1.56;1.55.1;1.55.0;1.55;1
17531753
//Components requested for this build tree.
17541754
_Boost_COMPONENTS_SEARCHED:INTERNAL=system;thread
17551755
//Last used Boost_INCLUDE_DIR value.
1756-
_Boost_INCLUDE_DIR_LAST:INTERNAL=/usr/local/include
1756+
_Boost_INCLUDE_DIR_LAST:INTERNAL=/Users/cgaltester/boost-cpp11/boost_1_54_0
17571757
//Last used Boost_LIBRARY_DIR value.
1758-
_Boost_LIBRARY_DIR_LAST:INTERNAL=/usr/local/lib
1758+
_Boost_LIBRARY_DIR_LAST:INTERNAL=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib
17591759
//Last used Boost_USE_MULTITHREADED value.
17601760
_Boost_USE_MULTITHREADED_LAST:INTERNAL=TRUE
17611761
//Last used Boost_USE_STATIC_LIBS value.

Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release/setup

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,8 @@ CXX=/Library/Developer/CommandLineTools/usr/bin/clang++
22
CC=/Library/Developer/CommandLineTools/usr/bin/clang
33
CXXFLAGS="-Wall -Wextra"
44
export CXX CC CXXFLAGS
5+
6+
BOOST_LIBRARYDIR=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib
7+
BOOST_INCLUDEDIR=/Users/cgaltester/boost-cpp11/boost_1_54_0
8+
DYLD_LIBRARY_PATH=$BOOST_LIBRARYDIR:$DYLD_LIBRARY_PATH
9+
export BOOST_LIBRARYDIR BOOST_INCLUDEDIR DYLD_LIBRARY_PATH

0 commit comments

Comments
 (0)