songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use Boost 1.54 instead of Boost 1.42

This commit is contained in:
Laurent Rineau 2013-02-25 18:32:14 +01:00
parent 3461d71750
commit 007ebf4b41
2 changed files with 48 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora16_g++-4.6.2_Release/CMakeCache.txt
View File

@ -21,28 +21,28 @@ BUILD_SHARED_LIBS:BOOL=ON
Boost_DIR:PATH=Boost_DIR-NOTFOUND
//Path to a file.
Boost_INCLUDE_DIR:PATH=/home/lrineau/CGAL/boost/1.42/include
Boost_INCLUDE_DIR:PATH=/home/lrineau/CGAL/boost/1_54/include
//Boost library directory
Boost_LIBRARY_DIRS:FILEPATH=/home/lrineau/CGAL/boost/1.42/lib
Boost_LIBRARY_DIRS:FILEPATH=/home/lrineau/CGAL/boost/1_54/lib
//The Boost SYSTEM library
Boost_SYSTEM_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/1.42/lib/libboost_system-mt.so
Boost_SYSTEM_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/1_54/lib/libboost_system-mt.so
//Boost system library (debug)
Boost_SYSTEM_LIBRARY_DEBUG:FILEPATH=/home/lrineau/CGAL/boost/1.42/lib/libboost_system-mt.so
Boost_SYSTEM_LIBRARY_DEBUG:FILEPATH=/home/lrineau/CGAL/boost/1_54/lib/libboost_system-mt.so
//Boost system library (release)
Boost_SYSTEM_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/1.42/lib/libboost_system-mt.so
Boost_SYSTEM_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/1_54/lib/libboost_system-mt.so
//The Boost THREAD library
Boost_THREAD_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so
Boost_THREAD_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/1_54/lib/libboost_thread-mt.so
//Boost thread library (debug)
Boost_THREAD_LIBRARY_DEBUG:FILEPATH=/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so
Boost_THREAD_LIBRARY_DEBUG:FILEPATH=/home/lrineau/CGAL/boost/1_54/lib/libboost_thread-mt.so
//Boost thread library (release)
Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so
Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/1_54/lib/libboost_thread-mt.so
//Select to allow to use all preconfigured external libraries
CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT:BOOL=OFF
@ -57,7 +57,7 @@ CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF
CGAL_CORE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I
//User-defined flags
CGAL_CXX_FLAGS:STRING=-I/home/lrineau/CGAL/boost/1.42/include -frounding-math
CGAL_CXX_FLAGS:STRING= -frounding-math
//Value Computed by CMake
CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-Fedora16_g++-4.6.2_Release/src/Core
@ -66,7 +66,7 @@ CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86
CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-Fedora16_g++-4.6.2_Release/lib/libCGAL_Core.so
//Dependencies for the target
CGAL_Core_LIB_DEPENDS:STATIC=general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-Fedora16_g++-4.6.2_Release/lib/libCGAL.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_system-mt.so;
CGAL_Core_LIB_DEPENDS:STATIC=general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-Fedora16_g++-4.6.2_Release/lib/libCGAL.so;general;/home/lrineau/CGAL/boost/1_54/lib/libboost_thread-mt.so;general;/home/lrineau/CGAL/boost/1_54/lib/libboost_system-mt.so;
//Value Computed by CMake
CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore
@ -115,7 +115,7 @@ CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/
CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-Fedora16_g++-4.6.2_Release/lib/libCGAL_ImageIO.so
//Dependencies for the target
CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-Fedora16_g++-4.6.2_Release/lib/libCGAL.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_system-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so;
CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-Fedora16_g++-4.6.2_Release/lib/libCGAL.so;general;/home/lrineau/CGAL/boost/1_54/lib/libboost_thread-mt.so;general;/home/lrineau/CGAL/boost/1_54/lib/libboost_system-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so;
//Value Computed by CMake
CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO
@ -124,7 +124,7 @@ CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO
CGAL_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-Fedora16_g++-4.6.2_Release/lib/libCGAL.so
//Dependencies for the target
CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_system-mt.so;
CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1_54/lib/libboost_thread-mt.so;general;/home/lrineau/CGAL/boost/1_54/lib/libboost_system-mt.so;
//Directory containing the Maintenance package
CGAL_MAINTENANCE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I
@ -148,7 +148,7 @@ CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-
CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-Fedora16_g++-4.6.2_Release/lib/libCGAL_Qt3.so
//Dependencies for the target
CGAL_Qt3_LIB_DEPENDS:STATIC=general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-Fedora16_g++-4.6.2_Release/lib/libCGAL.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_system-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;
CGAL_Qt3_LIB_DEPENDS:STATIC=general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-Fedora16_g++-4.6.2_Release/lib/libCGAL.so;general;/home/lrineau/CGAL/boost/1_54/lib/libboost_thread-mt.so;general;/home/lrineau/CGAL/boost/1_54/lib/libboost_system-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;
//Value Computed by CMake
CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3
@ -160,7 +160,7 @@ CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-
CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-Fedora16_g++-4.6.2_Release/lib/libCGAL_Qt4.so
//Dependencies for the target
CGAL_Qt4_LIB_DEPENDS:STATIC=general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-Fedora16_g++-4.6.2_Release/lib/libCGAL.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_system-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;
CGAL_Qt4_LIB_DEPENDS:STATIC=general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-Fedora16_g++-4.6.2_Release/lib/libCGAL.so;general;/home/lrineau/CGAL/boost/1_54/lib/libboost_thread-mt.so;general;/home/lrineau/CGAL/boost/1_54/lib/libboost_system-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;
//Value Computed by CMake
CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4
@ -191,7 +191,7 @@ CMAKE_COLOR_MAKEFILE:BOOL=ON
CMAKE_CXX_COMPILER:FILEPATH=/usr/lib64/ccache/c++
//User-defined flags
CMAKE_CXX_FLAGS:STRING= -frounding-math -I/home/lrineau/CGAL/boost/1.42/include
CMAKE_CXX_FLAGS:STRING= -frounding-math
//Flags used by the compiler during debug builds.
CMAKE_CXX_FLAGS_DEBUG:STRING=-g
@ -301,7 +301,7 @@ CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=
//If set, runtime paths are not added when installing shared libraries,
// but are added when building.
CMAKE_SKIP_INSTALL_RPATH:BOOL=NO
CMAKE_SKIP_INSTALL_RPATH:BOOL=OFF
//If set, runtime paths are not added when using shared libraries.
CMAKE_SKIP_RPATH:BOOL=OFF
@ -1044,19 +1044,19 @@ QT_ZLIB_LIBRARY:FILEPATH=/usr/lib64/libz.so
//Select external library BLAS
WITH_BLAS:BOOL=OFF
//Enable CGAL component CGAL_Core
//Enable CGAL component Core
WITH_CGAL_Core:BOOL=ON
//Enable CGAL component CGAL_ImageIO
//Enable CGAL component ImageIO
WITH_CGAL_ImageIO:BOOL=ON
//Enable CGAL component PDB
WITH_CGAL_PDB:BOOL=ON
//Enable CGAL component CGAL_Qt3
//Enable CGAL component Qt3
WITH_CGAL_Qt3:BOOL=ON
//Enable CGAL component CGAL_Qt4
//Enable CGAL component Qt4
WITH_CGAL_Qt4:BOOL=ON
//Select external library Coin3D
@ -1323,7 +1323,7 @@ Boost_INCLUDE_DIR-ADVANCED:INTERNAL=1
//ADVANCED property for variable: Boost_LIBRARY_DIRS
Boost_LIBRARY_DIRS-ADVANCED:INTERNAL=1
//The library version string for boost libraries
Boost_LIB_VERSION:INTERNAL=1_42
Boost_LIB_VERSION:INTERNAL=1_54
//Whether the Boost SYSTEM library found
Boost_SYSTEM_FOUND:INTERNAL=ON
//ADVANCED property for variable: Boost_SYSTEM_LIBRARY
@ -1341,11 +1341,11 @@ Boost_THREAD_LIBRARY_DEBUG-ADVANCED:INTERNAL=1
//ADVANCED property for variable: Boost_THREAD_LIBRARY_RELEASE
Boost_THREAD_LIBRARY_RELEASE-ADVANCED:INTERNAL=1
//The version number for boost libraries
Boost_VERSION:INTERNAL=104200
Boost_VERSION:INTERNAL=105400
CGAL_3RD_PARTY_DEFINITIONS:INTERNAL=
CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/home/lrineau/CGAL/boost/1.42/include
CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;/home/lrineau/CGAL/boost/1.42/lib/libboost_system-mt.so
CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/home/lrineau/CGAL/boost/1.42/lib
CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/home/lrineau/CGAL/boost/1_54/include
CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/home/lrineau/CGAL/boost/1_54/lib/libboost_thread-mt.so;/home/lrineau/CGAL/boost/1_54/lib/libboost_system-mt.so
CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/home/lrineau/CGAL/boost/1_54/lib
CGAL_3RD_PARTY_PRECONFIGURED:INTERNAL=
//ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS
CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1
@ -1488,7 +1488,7 @@ CGAL_Core_LIBRARY_INSTALLED:INTERNAL=/usr/local/lib/libCGAL_Core.so
//Variable hidden from user
CGAL_Core_LIBRARY_NAME:INTERNAL=
//Variable hidden from user
CGAL_ESSENTIAL_3RD_PARTY_LIBRARIES:INTERNAL=GMP;MPFR
CGAL_ESSENTIAL_3RD_PARTY_LIBRARIES:INTERNAL=GMP;MPFR;GMP;MPFR;GMP;MPFR;GMP;MPFR
CGAL_EXECUTABLE_TARGETS:INTERNAL=
//Variable hidden from user
CGAL_EXT_LIB_BLAS_PREFIX:INTERNAL=BLAS
@ -1528,6 +1528,26 @@ CGAL_EXT_LIB_RS_PREFIX:INTERNAL=RS
CGAL_EXT_LIB_TAUCS_PREFIX:INTERNAL=TAUCS
//Variable hidden from user
CGAL_EXT_LIB_ZLIB_PREFIX:INTERNAL=ZLIB
//Variable hidden from user
CGAL_INSTALLED_CGAL_Core_LIBRARY:INTERNAL=
//Variable hidden from user
CGAL_INSTALLED_CGAL_ImageIO_LIBRARY:INTERNAL=
//Variable hidden from user
CGAL_INSTALLED_CGAL_LIBRARY:INTERNAL=/usr/local/lib/libCGAL.so
//Variable hidden from user
CGAL_INSTALLED_CGAL_Qt3_LIBRARY:INTERNAL=
//Variable hidden from user
CGAL_INSTALLED_CGAL_Qt4_LIBRARY:INTERNAL=
//Variable hidden from user
CGAL_INSTALLED_Core_LIBRARY:INTERNAL=/usr/local/lib/libCGAL_Core.so
//Variable hidden from user
CGAL_INSTALLED_ImageIO_LIBRARY:INTERNAL=/usr/local/lib/libCGAL_ImageIO.so
//Variable hidden from user
CGAL_INSTALLED_LIBRARY:INTERNAL=/usr/local/lib/libCGAL.so
//Variable hidden from user
CGAL_INSTALLED_Qt3_LIBRARY:INTERNAL=/usr/local/lib/libCGAL_Qt3.so
//Variable hidden from user
CGAL_INSTALLED_Qt4_LIBRARY:INTERNAL=/usr/local/lib/libCGAL_Qt4.so
CGAL_ImageIO_3RD_PARTY_DEFINITIONS:INTERNAL=-DCGAL_USE_ZLIB
CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include
CGAL_ImageIO_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libGLU.so;/usr/lib64/libGL.so;/usr/lib64/libSM.so;/usr/lib64/libICE.so;/usr/lib64/libX11.so;/usr/lib64/libXext.so;/usr/lib64/libz.so
@ -1725,7 +1745,7 @@ CMAKE_UNAME:INTERNAL=/bin/uname
CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE
CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
CONFIG_CXX_FLAGS:INTERNAL= -frounding-math -I/home/lrineau/CGAL/boost/1.42/include
CONFIG_CXX_FLAGS:INTERNAL= -frounding-math
//Variable hidden from user
Core_LIBRARY_INSTALLED:INTERNAL=
//Variable hidden from user

2
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora16_g++-4.6.2_Release/setup
View File

@ -2,7 +2,7 @@ export QTDIR=/usr/lib64/qt-3.3
source /home/lrineau/CGAL/MPFI-RS/setup-rs
source /home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/setup-common
BOOST_ROOT=/home/lrineau/CGAL/boost/1.42
BOOST_ROOT=/home/lrineau/CGAL/boost/1_54
export BOOST_ROOT
CXX_FLAGS=-I$BOOST_ROOT/include