From d27b7f8e3793c98dc83c6ff53cf9e66ce2ed8aca Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 20 Jan 2015 18:43:11 +0100 Subject: [PATCH] Test Boost-1.57, and TBB-4.3 (backup of Jane's work) --- .../reference_platforms/setup_common | 7 +++++++ .../CMakeCache.txt | 18 ------------------ .../setup | 3 ++- .../CMakeCache.txt | 18 ------------------ .../setup | 3 ++- 5 files changed, 11 insertions(+), 38 deletions(-) diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/setup_common b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/setup_common index 647d1fe5563..dc0258b2d84 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/setup_common +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/setup_common @@ -28,3 +28,10 @@ export QTDIR="C:\3rdPartyLibs\VC${VC_VERSION}-${ARCH}\QT-4.8.4" export PATH="`cygpath $CGAL_DIR`/bin:`cygpath $GMP_LIB_DIR`:`cygpath $QTDIR`/bin:`cygpath $BOOST_LIBRARYDIR`:`cygpath $QGLVIEWERROOT`/QGLViewer/debug:`cygpath $QGLVIEWERROOT`/QGLViewer/release:/cygdrive/c/3rdPartyLibs/VC-${ARCH}/zlib":$PATH +#TBB # only when TBB_ARCH_PLATFORM is already defined in platform-specific setup +if [ -n "${TBB_ARCH}" ]; then + export TBBROOT="C:\3rdPartyLibs\tbb43_20141204" + # bin and lib depend on compiler and architecture + export TBB_ARCH_PLATFORM="${TBB_ARCH}/vc${VC_VERSION}" + export PATH=$PATH:"${TBBROOT}\bin\\${TBB_ARCH}\vc${VC_VERSION}" +fi diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-32bits/CMakeCache.txt b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-32bits/CMakeCache.txt index 6f7c4cea506..66fc33ae61e 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-32bits/CMakeCache.txt +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-32bits/CMakeCache.txt @@ -20,24 +20,6 @@ BUILD_SHARED_LIBS:BOOL=ON //The directory containing a CMake configuration file for Boost. Boost_DIR:PATH=Boost_DIR-NOTFOUND -//Path to a file. -Boost_INCLUDE_DIR:PATH=C:/3rdPartyLibs/boost_1_55_0 - -//Boost library directory -Boost_LIBRARY_DIR:PATH=C:/3rdPartyLibs/boost_1_55_0/lib32 - -//Boost system library (debug) -Boost_SYSTEM_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/boost_1_55_0/lib32/boost_system-vc120-mt-gd-1_55.lib - -//Boost system library (release) -Boost_SYSTEM_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/boost_1_55_0/lib32/boost_system-vc120-mt-1_55.lib - -//Boost thread library (debug) -Boost_THREAD_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/boost_1_55_0/lib32/boost_thread-vc120-mt-gd-1_55.lib - -//Boost thread library (release) -Boost_THREAD_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/boost_1_55_0/lib32/boost_thread-vc120-mt-1_55.lib - //Select to allow to use all preconfigured external libraries CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT:BOOL=OFF diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-32bits/setup b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-32bits/setup index ba8fe639a1d..6a4f1cc5007 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-32bits/setup +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-32bits/setup @@ -2,5 +2,6 @@ export CGAL_DIR='/cygdrive/c/CGAL/reference_platforms/x64_Cygwin-Windows8_MSVC20 export VC_VERSION="12" export ARCH="32" export PLATFORM_REFERENCE="/cygdrive/c/CGAL/reference_platforms" -export BOOST_VERSION=1_55_0 +export BOOST_VERSION=1_57_0 +export TBB_ARCH="ia32" source "${PLATFORM_REFERENCE}/setup_common" diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-64bits/CMakeCache.txt b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-64bits/CMakeCache.txt index 411e389d9c8..2f384b9880a 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-64bits/CMakeCache.txt +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-64bits/CMakeCache.txt @@ -20,24 +20,6 @@ BUILD_SHARED_LIBS:BOOL=ON //The directory containing a CMake configuration file for Boost. Boost_DIR:PATH=Boost_DIR-NOTFOUND -//Path to a file. -Boost_INCLUDE_DIR:PATH=C:/3rdPartyLibs/boost_1_55_0 - -//Boost library directory -Boost_LIBRARY_DIR:PATH=C:/3rdPartyLibs/boost_1_55_0/lib64 - -//Boost system library (debug) -Boost_SYSTEM_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/boost_1_55_0/lib64/boost_system-vc120-mt-gd-1_55.lib - -//Boost system library (release) -Boost_SYSTEM_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/boost_1_55_0/lib64/boost_system-vc120-mt-1_55.lib - -//Boost thread library (debug) -Boost_THREAD_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/boost_1_55_0/lib64/boost_thread-vc120-mt-gd-1_55.lib - -//Boost thread library (release) -Boost_THREAD_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/boost_1_55_0/lib64/boost_thread-vc120-mt-1_55.lib - //Select to allow to use all preconfigured external libraries CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT:BOOL=OFF diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-64bits/setup b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-64bits/setup index 781fd8ab800..d46407016a2 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-64bits/setup +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-64bits/setup @@ -2,5 +2,6 @@ export CGAL_DIR='/cygdrive/c/CGAL/reference_platforms/x64_Cygwin-Windows8_MSVC20 export VC_VERSION="12" export ARCH="64" export PLATFORM_REFERENCE="/cygdrive/c/CGAL/reference_platforms" -export BOOST_VERSION=1_55_0 +export BOOST_VERSION=1_57_0 +export TBB_ARCH="intel64" source "${PLATFORM_REFERENCE}/setup_common"