Test Boost-1.57, and TBB-4.3

(backup of Jane's work)
This commit is contained in:
Laurent Rineau 2015-01-20 18:43:11 +01:00
parent 579db3367d
commit d27b7f8e37
5 changed files with 11 additions and 38 deletions

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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

View File

@ -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"