From c1d06580737e32277ba6a1b0c41f43a5b8ccd38e Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Fri, 19 Apr 2019 09:46:52 +0200 Subject: [PATCH] Update boost --- .../CMakeCache.txt | 36 +++++++++---------- .../setup | 4 +-- .../CMakeCache.txt | 36 +++++++++---------- .../setup | 4 +-- .../CMakeCache.txt | 34 +++++++++--------- .../setup | 4 +-- 6 files changed, 59 insertions(+), 59 deletions(-) diff --git a/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release-cpp11/CMakeCache.txt b/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release-cpp11/CMakeCache.txt index 00ca3f06e7f..e72ea176daa 100644 --- a/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release-cpp11/CMakeCache.txt +++ b/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release-cpp11/CMakeCache.txt @@ -24,25 +24,25 @@ BUILD_SHARED_LIBS:BOOL=ON Boost_DEBUG:BOOL=OFF //Path to a file. -Boost_INCLUDE_DIR:PATH=/Users/cgaltester/boost-cpp11/boost_1_54_0 +Boost_INCLUDE_DIR:PATH=/Users/cgaltester/boost_1_60_0 //Boost library directory DEBUG -Boost_LIBRARY_DIR_DEBUG:PATH=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib +Boost_LIBRARY_DIR_DEBUG:PATH=/Users/cgaltester/boost_1_60_0/stage/lib //Boost library directory RELEASE -Boost_LIBRARY_DIR_RELEASE:PATH=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib +Boost_LIBRARY_DIR_RELEASE:PATH=/Users/cgaltester/boost_1_60_0/stage/lib //Boost system library (debug) -Boost_SYSTEM_LIBRARY_DEBUG:FILEPATH=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib/libboost_system.dylib +Boost_SYSTEM_LIBRARY_DEBUG:FILEPATH=/Users/cgaltester/boost_1_60_0/stage/lib/libboost_system.dylib //Boost system library (release) -Boost_SYSTEM_LIBRARY_RELEASE:FILEPATH=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib/libboost_system.dylib +Boost_SYSTEM_LIBRARY_RELEASE:FILEPATH=/Users/cgaltester/boost_1_60_0/stage/lib/libboost_system.dylib //Boost thread library (debug) -Boost_THREAD_LIBRARY_DEBUG:FILEPATH=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib/libboost_thread.dylib +Boost_THREAD_LIBRARY_DEBUG:FILEPATH=/Users/cgaltester/boost_1_60_0/stage/lib/libboost_thread.dylib //Boost thread library (release) -Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib/libboost_thread.dylib +Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/Users/cgaltester/boost_1_60_0/stage/lib/libboost_thread.dylib //Select to allow to use all preconfigured external libraries CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT:BOOL=OFF @@ -54,7 +54,7 @@ CGAL_BINARY_DIR:STATIC=/Users/cgaltester/cgal_test/reference_platforms/x86-64_Da CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/usr/local/lib/libmpfr.dylib;general;/usr/local/lib/libgmp.dylib;general;CGAL;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; +CGAL_Core_LIB_DEPENDS:STATIC=general;/usr/local/lib/libmpfr.dylib;general;/usr/local/lib/libgmp.dylib;general;CGAL;general;/Users/cgaltester/boost_1_60_0/stage/lib/libboost_thread.dylib;general;/Users/cgaltester/boost_1_60_0/stage/lib/libboost_system.dylib; //Set this to TRUE if you want to define or modify any of CMAKE_*_FLAGS. // When this is FALSE, all the CMAKE_*_FLAGS flags are overriden @@ -91,13 +91,13 @@ CGAL_INSTALL_LIB_DIR:STRING=lib CGAL_INSTALL_MAN_DIR:STRING=share/man/man1 //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;CGAL;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; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;CGAL;general;/Users/cgaltester/boost_1_60_0/stage/lib/libboost_thread.dylib;general;/Users/cgaltester/boost_1_60_0/stage/lib/libboost_system.dylib;general;/System/Library/Frameworks/AGL.framework;general;/System/Library/Frameworks/OpenGL.framework;general;/usr/lib/libz.dylib; //Dependencies for the target -CGAL_LIB_DEPENDS:STATIC=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; +CGAL_LIB_DEPENDS:STATIC=general;/Users/cgaltester/boost_1_60_0/stage/lib/libboost_thread.dylib;general;/Users/cgaltester/boost_1_60_0/stage/lib/libboost_system.dylib; //Dependencies for the target -CGAL_Qt5_LIB_DEPENDS:STATIC=general;Qt5::OpenGL;general;Qt5::Svg;general;CGAL;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; +CGAL_Qt5_LIB_DEPENDS:STATIC=general;Qt5::OpenGL;general;Qt5::Svg;general;CGAL;general;/Users/cgaltester/boost_1_60_0/stage/lib/libboost_thread.dylib;general;/Users/cgaltester/boost_1_60_0/stage/lib/libboost_system.dylib;general;/System/Library/Frameworks/AGL.framework;general;/System/Library/Frameworks/OpenGL.framework; //Value Computed by CMake CGAL_SOURCE_DIR:STATIC=/Users/cgaltester/cgal_test/CGAL-4.8-I @@ -115,7 +115,7 @@ CMAKE_COLOR_MAKEFILE:BOOL=ON CMAKE_CXX_COMPILER:FILEPATH=/Library/Developer/CommandLineTools/usr/bin/clang++ //Flags used by the compiler during all build types. -CMAKE_CXX_FLAGS:STRING=-Wall -Wextra -Wno-deprecated-register -std=c++11 -stdlib=libc++ -pipe -isystem /Users/cgaltester/boost-cpp11/boost_1_54_0 +CMAKE_CXX_FLAGS:STRING=-Wall -Wextra -Wno-deprecated-register -std=c++11 -stdlib=libc++ -pipe -isystem /Users/cgaltester/boost_1_60_0 //Flags used by the compiler during debug builds. CMAKE_CXX_FLAGS_DEBUG:STRING=-g @@ -417,9 +417,9 @@ Boost_THREAD_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 //ADVANCED property for variable: Boost_THREAD_LIBRARY_RELEASE Boost_THREAD_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= -CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/Users/cgaltester/boost-cpp11/boost_1_54_0 -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 -CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib +CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/Users/cgaltester/boost_1_60_0 +CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/Users/cgaltester/boost_1_60_0/stage/lib/libboost_thread.dylib;/Users/cgaltester/boost_1_60_0/stage/lib/libboost_system.dylib +CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/Users/cgaltester/boost_1_60_0/stage/lib CGAL_3RD_PARTY_PRECONFIGURED:INTERNAL= //ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1 @@ -728,11 +728,11 @@ _Boost_ADDITIONAL_VERSIONS_LAST:INTERNAL=1.69.1;1.69.0;1.69;1.68.1;1.68.0;1.68;1 //Components requested for this build tree. _Boost_COMPONENTS_SEARCHED:INTERNAL=system;thread //Last used Boost_INCLUDE_DIR value. -_Boost_INCLUDE_DIR_LAST:INTERNAL=/Users/cgaltester/boost-cpp11/boost_1_54_0 +_Boost_INCLUDE_DIR_LAST:INTERNAL=/Users/cgaltester/boost_1_60_0 //Last used Boost_LIBRARY_DIR_DEBUG value. -_Boost_LIBRARY_DIR_DEBUG_LAST:INTERNAL=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib +_Boost_LIBRARY_DIR_DEBUG_LAST:INTERNAL=/Users/cgaltester/boost_1_60_0/stage/lib //Last used Boost_LIBRARY_DIR_RELEASE value. -_Boost_LIBRARY_DIR_RELEASE_LAST:INTERNAL=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib +_Boost_LIBRARY_DIR_RELEASE_LAST:INTERNAL=/Users/cgaltester/boost_1_60_0/stage/lib //Last used Boost_NAMESPACE value. _Boost_NAMESPACE_LAST:INTERNAL=boost //Last used Boost_USE_MULTITHREADED value. diff --git a/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release-cpp11/setup b/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release-cpp11/setup index f4a1b192476..0c4ce468061 100644 --- a/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release-cpp11/setup +++ b/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release-cpp11/setup @@ -1,8 +1,8 @@ CXX=/Library/Developer/CommandLineTools/usr/bin/clang++ CC=/Library/Developer/CommandLineTools/usr/bin/clang -BOOST_LIBRARYDIR=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib -BOOST_INCLUDEDIR=/Users/cgaltester/boost-cpp11/boost_1_54_0 +BOOST_LIBRARYDIR=/Users/cgaltester/boost_1_60_0/stage/lib +BOOST_INCLUDEDIR=/Users/cgaltester/boost_1_60_0 DYLD_LIBRARY_PATH=$BOOST_LIBRARYDIR:$DYLD_LIBRARY_PATH export BOOST_LIBRARYDIR BOOST_INCLUDEDIR DYLD_LIBRARY_PATH diff --git a/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release/CMakeCache.txt b/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release/CMakeCache.txt index 681eb26ec49..02c3d3c4d0a 100644 --- a/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release/CMakeCache.txt +++ b/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release/CMakeCache.txt @@ -24,25 +24,25 @@ BUILD_SHARED_LIBS:BOOL=ON Boost_DEBUG:BOOL=OFF //Path to a file. -Boost_INCLUDE_DIR:PATH=/Users/cgaltester/boost-cpp11/boost_1_54_0 +Boost_INCLUDE_DIR:PATH=/Users/cgaltester/boost_1_60_0 //Boost library directory DEBUG -Boost_LIBRARY_DIR_DEBUG:PATH=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib +Boost_LIBRARY_DIR_DEBUG:PATH=/Users/cgaltester/boost_1_60_0/stage/lib //Boost library directory RELEASE -Boost_LIBRARY_DIR_RELEASE:PATH=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib +Boost_LIBRARY_DIR_RELEASE:PATH=/Users/cgaltester/boost_1_60_0/stage/lib //Boost system library (debug) -Boost_SYSTEM_LIBRARY_DEBUG:FILEPATH=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib/libboost_system.dylib +Boost_SYSTEM_LIBRARY_DEBUG:FILEPATH=/Users/cgaltester/boost_1_60_0/stage/lib/libboost_system.dylib //Boost system library (release) -Boost_SYSTEM_LIBRARY_RELEASE:FILEPATH=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib/libboost_system.dylib +Boost_SYSTEM_LIBRARY_RELEASE:FILEPATH=/Users/cgaltester/boost_1_60_0/stage/lib/libboost_system.dylib //Boost thread library (debug) -Boost_THREAD_LIBRARY_DEBUG:FILEPATH=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib/libboost_thread.dylib +Boost_THREAD_LIBRARY_DEBUG:FILEPATH=/Users/cgaltester/boost_1_60_0/stage/lib/libboost_thread.dylib //Boost thread library (release) -Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib/libboost_thread.dylib +Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/Users/cgaltester/boost_1_60_0/stage/lib/libboost_thread.dylib //Select to allow to use all preconfigured external libraries CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT:BOOL=OFF @@ -54,7 +54,7 @@ CGAL_BINARY_DIR:STATIC=/Users/cgaltester/cgal_test/reference_platforms/x86-64_Da CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/usr/local/lib/libmpfr.dylib;general;/usr/local/lib/libgmp.dylib;general;CGAL;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; +CGAL_Core_LIB_DEPENDS:STATIC=general;/usr/local/lib/libmpfr.dylib;general;/usr/local/lib/libgmp.dylib;general;CGAL;general;/Users/cgaltester/boost_1_60_0/stage/lib/libboost_thread.dylib;general;/Users/cgaltester/boost_1_60_0/stage/lib/libboost_system.dylib; //Set this to TRUE if you want to define or modify any of CMAKE_*_FLAGS. // When this is FALSE, all the CMAKE_*_FLAGS flags are overriden @@ -91,13 +91,13 @@ CGAL_INSTALL_LIB_DIR:STRING=lib CGAL_INSTALL_MAN_DIR:STRING=share/man/man1 //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;CGAL;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; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;CGAL;general;/Users/cgaltester/boost_1_60_0/stage/lib/libboost_thread.dylib;general;/Users/cgaltester/boost_1_60_0/stage/lib/libboost_system.dylib;general;/System/Library/Frameworks/AGL.framework;general;/System/Library/Frameworks/OpenGL.framework;general;/usr/lib/libz.dylib; //Dependencies for the target -CGAL_LIB_DEPENDS:STATIC=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; +CGAL_LIB_DEPENDS:STATIC=general;/Users/cgaltester/boost_1_60_0/stage/lib/libboost_thread.dylib;general;/Users/cgaltester/boost_1_60_0/stage/lib/libboost_system.dylib; //Dependencies for the target -CGAL_Qt5_LIB_DEPENDS:STATIC=general;Qt5::OpenGL;general;Qt5::Svg;general;CGAL;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; +CGAL_Qt5_LIB_DEPENDS:STATIC=general;Qt5::OpenGL;general;Qt5::Svg;general;CGAL;general;/Users/cgaltester/boost_1_60_0/stage/lib/libboost_thread.dylib;general;/Users/cgaltester/boost_1_60_0/stage/lib/libboost_system.dylib;general;/System/Library/Frameworks/AGL.framework;general;/System/Library/Frameworks/OpenGL.framework; //Value Computed by CMake CGAL_SOURCE_DIR:STATIC=/Users/cgaltester/cgal_test/CGAL-4.8-I @@ -115,7 +115,7 @@ CMAKE_COLOR_MAKEFILE:BOOL=ON CMAKE_CXX_COMPILER:FILEPATH=/Library/Developer/CommandLineTools/usr/bin/clang++ //Flags used by the compiler during all build types. -CMAKE_CXX_FLAGS:STRING='-Wall -Wextra -isystem /Users/cgaltester/boost-cpp11/boost_1_54_0 ' +CMAKE_CXX_FLAGS:STRING='-Wall -Wextra -isystem /Users/cgaltester/boost_1_60_0 ' //Flags used by the compiler during debug builds. CMAKE_CXX_FLAGS_DEBUG:STRING=-g @@ -417,9 +417,9 @@ Boost_THREAD_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 //ADVANCED property for variable: Boost_THREAD_LIBRARY_RELEASE Boost_THREAD_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= -CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/Users/cgaltester/boost-cpp11/boost_1_54_0 -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 -CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib +CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/Users/cgaltester/boost_1_60_0 +CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/Users/cgaltester/boost_1_60_0/stage/lib/libboost_thread.dylib;/Users/cgaltester/boost_1_60_0/stage/lib/libboost_system.dylib +CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/Users/cgaltester/boost_1_60_0/stage/lib CGAL_3RD_PARTY_PRECONFIGURED:INTERNAL= //ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1 @@ -728,11 +728,11 @@ _Boost_ADDITIONAL_VERSIONS_LAST:INTERNAL=1.69.1;1.69.0;1.69;1.68.1;1.68.0;1.68;1 //Components requested for this build tree. _Boost_COMPONENTS_SEARCHED:INTERNAL=system;thread //Last used Boost_INCLUDE_DIR value. -_Boost_INCLUDE_DIR_LAST:INTERNAL=/Users/cgaltester/boost-cpp11/boost_1_54_0 +_Boost_INCLUDE_DIR_LAST:INTERNAL=/Users/cgaltester/boost_1_60_0 //Last used Boost_LIBRARY_DIR_DEBUG value. -_Boost_LIBRARY_DIR_DEBUG_LAST:INTERNAL=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib +_Boost_LIBRARY_DIR_DEBUG_LAST:INTERNAL=/Users/cgaltester/boost_1_60_0/stage/lib //Last used Boost_LIBRARY_DIR_RELEASE value. -_Boost_LIBRARY_DIR_RELEASE_LAST:INTERNAL=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib +_Boost_LIBRARY_DIR_RELEASE_LAST:INTERNAL=/Users/cgaltester/boost_1_60_0/stage/lib //Last used Boost_NAMESPACE value. _Boost_NAMESPACE_LAST:INTERNAL=boost //Last used Boost_USE_MULTITHREADED value. diff --git a/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release/setup b/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release/setup index 0bd6c36dc11..dfd45ea12fe 100644 --- a/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release/setup +++ b/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release/setup @@ -1,8 +1,8 @@ CXX=/Library/Developer/CommandLineTools/usr/bin/clang++ CC=/Library/Developer/CommandLineTools/usr/bin/clang -BOOST_LIBRARYDIR=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib -BOOST_INCLUDEDIR=/Users/cgaltester/boost-cpp11/boost_1_54_0 +BOOST_LIBRARYDIR=/Users/cgaltester/boost_1_60_0/stage/lib +BOOST_INCLUDEDIR=/Users/cgaltester/boost_1_60_0 DYLD_LIBRARY_PATH=$BOOST_LIBRARYDIR:$DYLD_LIBRARY_PATH export BOOST_LIBRARYDIR BOOST_INCLUDEDIR DYLD_LIBRARY_PATH diff --git a/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.1_Release-LEDA-without-GMP/CMakeCache.txt b/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.1_Release-LEDA-without-GMP/CMakeCache.txt index 55440d98a8a..a881550c0d9 100644 --- a/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.1_Release-LEDA-without-GMP/CMakeCache.txt +++ b/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.1_Release-LEDA-without-GMP/CMakeCache.txt @@ -24,25 +24,25 @@ BUILD_SHARED_LIBS:BOOL=ON Boost_DEBUG:BOOL=OFF //Path to a file. -Boost_INCLUDE_DIR:PATH=/Users/cgaltester/boost-cpp11/boost_1_54_0 +Boost_INCLUDE_DIR:PATH=/Users/cgaltester/boost_1_60_0 //Boost library directory DEBUG -Boost_LIBRARY_DIR_DEBUG:PATH=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib +Boost_LIBRARY_DIR_DEBUG:PATH=/Users/cgaltester/boost_1_60_0/stage/lib //Boost library directory RELEASE -Boost_LIBRARY_DIR_RELEASE:PATH=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib +Boost_LIBRARY_DIR_RELEASE:PATH=/Users/cgaltester/boost_1_60_0/stage/lib //Boost system library (debug) -Boost_SYSTEM_LIBRARY_DEBUG:FILEPATH=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib/libboost_system.dylib +Boost_SYSTEM_LIBRARY_DEBUG:FILEPATH=/Users/cgaltester/boost_1_60_0/stage/lib/libboost_system.dylib //Boost system library (release) -Boost_SYSTEM_LIBRARY_RELEASE:FILEPATH=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib/libboost_system.dylib +Boost_SYSTEM_LIBRARY_RELEASE:FILEPATH=/Users/cgaltester/boost_1_60_0/stage/lib/libboost_system.dylib //Boost thread library (debug) -Boost_THREAD_LIBRARY_DEBUG:FILEPATH=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib/libboost_thread.dylib +Boost_THREAD_LIBRARY_DEBUG:FILEPATH=/Users/cgaltester/boost_1_60_0/stage/lib/libboost_thread.dylib //Boost thread library (release) -Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib/libboost_thread.dylib +Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/Users/cgaltester/boost_1_60_0/stage/lib/libboost_thread.dylib //Select to allow to use all preconfigured external libraries CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT:BOOL=OFF @@ -88,13 +88,13 @@ CGAL_INSTALL_LIB_DIR:STRING=lib CGAL_INSTALL_MAN_DIR:STRING=share/man/man1 //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=optimized;/Users/cgaltester/LEDA/leda-numbers/libleda_numbers.dylib;debug;/Users/cgaltester/LEDA/leda-numbers/libleda_numbers.dylib;general;CGAL;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; +CGAL_ImageIO_LIB_DEPENDS:STATIC=optimized;/Users/cgaltester/LEDA/leda-numbers/libleda_numbers.dylib;debug;/Users/cgaltester/LEDA/leda-numbers/libleda_numbers.dylib;general;CGAL;general;/Users/cgaltester/boost_1_60_0/stage/lib/libboost_thread.dylib;general;/Users/cgaltester/boost_1_60_0/stage/lib/libboost_system.dylib;general;/System/Library/Frameworks/AGL.framework;general;/System/Library/Frameworks/OpenGL.framework;general;/usr/lib/libz.dylib; //Dependencies for the target -CGAL_LIB_DEPENDS:STATIC=optimized;/Users/cgaltester/LEDA/leda-numbers/libleda_numbers.dylib;debug;/Users/cgaltester/LEDA/leda-numbers/libleda_numbers.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; +CGAL_LIB_DEPENDS:STATIC=optimized;/Users/cgaltester/LEDA/leda-numbers/libleda_numbers.dylib;debug;/Users/cgaltester/LEDA/leda-numbers/libleda_numbers.dylib;general;/Users/cgaltester/boost_1_60_0/stage/lib/libboost_thread.dylib;general;/Users/cgaltester/boost_1_60_0/stage/lib/libboost_system.dylib; //Dependencies for the target -CGAL_Qt5_LIB_DEPENDS:STATIC=optimized;/Users/cgaltester/LEDA/leda-numbers/libleda_numbers.dylib;debug;/Users/cgaltester/LEDA/leda-numbers/libleda_numbers.dylib;general;Qt5::OpenGL;general;Qt5::Svg;general;CGAL;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; +CGAL_Qt5_LIB_DEPENDS:STATIC=optimized;/Users/cgaltester/LEDA/leda-numbers/libleda_numbers.dylib;debug;/Users/cgaltester/LEDA/leda-numbers/libleda_numbers.dylib;general;Qt5::OpenGL;general;Qt5::Svg;general;CGAL;general;/Users/cgaltester/boost_1_60_0/stage/lib/libboost_thread.dylib;general;/Users/cgaltester/boost_1_60_0/stage/lib/libboost_system.dylib;general;/System/Library/Frameworks/AGL.framework;general;/System/Library/Frameworks/OpenGL.framework; //Value Computed by CMake CGAL_SOURCE_DIR:STATIC=/Users/cgaltester/cgal_test/CGAL-4.8-I @@ -112,7 +112,7 @@ CMAKE_COLOR_MAKEFILE:BOOL=ON CMAKE_CXX_COMPILER:FILEPATH=/Library/Developer/CommandLineTools/usr/bin/clang++ //Flags used by the compiler during all build types. -CMAKE_CXX_FLAGS:STRING='-Wall -Wextra -isystem /Users/cgaltester/boost-cpp11/boost_1_54_0 ' +CMAKE_CXX_FLAGS:STRING='-Wall -Wextra -isystem /Users/cgaltester/boost_1_60_0 ' //Flags used by the compiler during debug builds. CMAKE_CXX_FLAGS_DEBUG:STRING=-g @@ -420,9 +420,9 @@ Boost_THREAD_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 //ADVANCED property for variable: Boost_THREAD_LIBRARY_RELEASE Boost_THREAD_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= -CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/Users/cgaltester/boost-cpp11/boost_1_54_0 -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 -CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib +CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/Users/cgaltester/boost_1_60_0 +CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/Users/cgaltester/boost_1_60_0/stage/lib/libboost_thread.dylib;/Users/cgaltester/boost_1_60_0/stage/lib/libboost_system.dylib +CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/Users/cgaltester/boost_1_60_0/stage/lib CGAL_3RD_PARTY_PRECONFIGURED:INTERNAL= //ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1 @@ -719,11 +719,11 @@ _Boost_ADDITIONAL_VERSIONS_LAST:INTERNAL=1.69.1;1.69.0;1.69;1.68.1;1.68.0;1.68;1 //Components requested for this build tree. _Boost_COMPONENTS_SEARCHED:INTERNAL=system;thread //Last used Boost_INCLUDE_DIR value. -_Boost_INCLUDE_DIR_LAST:INTERNAL=/Users/cgaltester/boost-cpp11/boost_1_54_0 +_Boost_INCLUDE_DIR_LAST:INTERNAL=/Users/cgaltester/boost_1_60_0 //Last used Boost_LIBRARY_DIR_DEBUG value. -_Boost_LIBRARY_DIR_DEBUG_LAST:INTERNAL=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib +_Boost_LIBRARY_DIR_DEBUG_LAST:INTERNAL=/Users/cgaltester/boost_1_60_0/stage/lib //Last used Boost_LIBRARY_DIR_RELEASE value. -_Boost_LIBRARY_DIR_RELEASE_LAST:INTERNAL=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib +_Boost_LIBRARY_DIR_RELEASE_LAST:INTERNAL=/Users/cgaltester/boost_1_60_0/stage/lib //Last used Boost_NAMESPACE value. _Boost_NAMESPACE_LAST:INTERNAL=boost //Last used Boost_USE_MULTITHREADED value. diff --git a/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.1_Release-LEDA-without-GMP/setup b/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.1_Release-LEDA-without-GMP/setup index faf19397100..f869d2266fb 100644 --- a/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.1_Release-LEDA-without-GMP/setup +++ b/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.1_Release-LEDA-without-GMP/setup @@ -1,8 +1,8 @@ CXX=/Library/Developer/CommandLineTools/usr/bin/clang++ CC=/Library/Developer/CommandLineTools/usr/bin/clang -BOOST_LIBRARYDIR=/Users/cgaltester/boost-cpp11/boost_1_54_0/stage/lib -BOOST_INCLUDEDIR=/Users/cgaltester/boost-cpp11/boost_1_54_0 +BOOST_LIBRARYDIR=/Users/cgaltester/boost_1_60_0/stage/lib +BOOST_INCLUDEDIR=/Users/cgaltester/boost_1_60_0 DYLD_LIBRARY_PATH=$BOOST_LIBRARYDIR:$DYLD_LIBRARY_PATH export BOOST_LIBRARYDIR BOOST_INCLUDEDIR DYLD_LIBRARY_PATH