From 517927f27d89d75255417c51ae3e7b51ce905e10 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 7 Dec 2012 09:23:47 +0100 Subject: [PATCH] Update to Intel Compiler 13 from beta to 13.0.1 --- .../CMakeCache.txt | 54 ++++++++++--------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-13.0beta-with-g++-4.6.3-STL_F16/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-13.0beta-with-g++-4.6.3-STL_F16/CMakeCache.txt index 613ee3df8d9..2dfda52271e 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-13.0beta-with-g++-4.6.3-STL_F16/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-13.0beta-with-g++-4.6.3-STL_F16/CMakeCache.txt @@ -88,7 +88,7 @@ CGAL_INSTALL_CMAKE_DIR:STRING=lib/CGAL //The folder where CGAL documentation and license files will be // installed, relative to CMAKE_INSTALL_PREFIX -CGAL_INSTALL_DOC_DIR:STRING=share/doc/CGAL-4.1-I-118 +CGAL_INSTALL_DOC_DIR:STRING=share/doc/CGAL-4.2-Ic-110 //The folder where CGAL header files will be installed, relative // to CMAKE_INSTALL_PREFIX @@ -142,7 +142,7 @@ CMAKE_BUILD_TYPE:STRING=Release CMAKE_COLOR_MAKEFILE:BOOL=ON //CXX compiler. -CMAKE_CXX_COMPILER:FILEPATH=/opt/intel/composer_xe_2013.0.030/bin/intel64/icpc +CMAKE_CXX_COMPILER:FILEPATH=/no-raid/opt/intel/composer_xe_2013.1.117/bin/intel64/icpc //User-defined flags CMAKE_CXX_FLAGS:STRING= -fp-model strict @@ -162,7 +162,7 @@ CMAKE_CXX_FLAGS_RELEASE:STRING=-O3 CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g //C compiler. -CMAKE_C_COMPILER:FILEPATH=/opt/intel/composer_xe_2013.0.030/bin/intel64/icc +CMAKE_C_COMPILER:FILEPATH=/no-raid/opt/intel/composer_xe_2013.1.117/bin/intel64/icc //Flags used by the compiler during all build types. CMAKE_C_FLAGS:STRING= @@ -255,10 +255,10 @@ 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=NO +CMAKE_SKIP_RPATH:BOOL=OFF //Path to a program. CMAKE_STRIP:FILEPATH=/usr/bin/strip @@ -270,7 +270,7 @@ CMAKE_USE_RELATIVE_PATHS:BOOL=OFF // .SILENT directive, and all commands will be echoed to the console // during the make. This is useful for debugging only. With Visual // Studio IDE projects all commands are done without /nologo. -CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE +CMAKE_VERBOSE_MAKEFILE:BOOL=OFF //The directory containing the GMP header files GMP_INCLUDE_DIR:PATH=/usr/include @@ -924,16 +924,16 @@ QT_WORLDTIMECLOCKPLUGIN_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/designer/ //Select external library BLAS WITH_BLAS:BOOL=OFF -//Enable CGAL component Core +//Enable CGAL component CGAL_Core WITH_CGAL_Core:BOOL=ON -//Enable CGAL component ImageIO +//Enable CGAL component CGAL_ImageIO WITH_CGAL_ImageIO:BOOL=ON -//Enable CGAL component Qt3 +//Enable CGAL component CGAL_Qt3 WITH_CGAL_Qt3:BOOL=ON -//Enable CGAL component Qt4 +//Enable CGAL component CGAL_Qt4 WITH_CGAL_Qt4:BOOL=ON //Select external library Coin3D @@ -996,6 +996,9 @@ WITH_demos:BOOL=OFF //Select examples WITH_examples:BOOL=OFF +//Select tests +WITH_tests:BOOL=OFF + //Path to a file. X11_ICE_INCLUDE_PATH:PATH=/usr/include @@ -1180,7 +1183,7 @@ X11_xf86misc_INCLUDE_PATH:PATH=/usr/include X11_xf86vmode_INCLUDE_PATH:PATH=/usr/include //Path to a program. -XIAR:FILEPATH=/opt/intel/composer_xe_2013.0.030/bin/intel64/xiar +XIAR:FILEPATH=/no-raid/opt/intel/composer_xe_2013.1.117/bin/intel64/xiar //Path to a file. ZLIB_INCLUDE_DIR:PATH=/usr/include @@ -1198,7 +1201,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_49 +Boost_LIB_VERSION:INTERNAL=1_52 //Whether the Boost SYSTEM library found Boost_SYSTEM_FOUND:INTERNAL=ON //ADVANCED property for variable: Boost_SYSTEM_LIBRARY @@ -1216,7 +1219,7 @@ 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=104900 +Boost_VERSION:INTERNAL=105200 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/home/lrineau/CGAL/boost/boost-release-branch CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_system-mt.so @@ -1275,11 +1278,7 @@ CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG_COMPILED:INTERNAL=TRUE CGAL_CFG_USING_BASE_MEMBER_BUG_2:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_USING_BASE_MEMBER_BUG_2_COMPILED:INTERNAL=TRUE -//Variable hidden from user -CGAL_CGAL_LIBRARY:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-13.0beta-with-g++-4.6.3-STL_F16/lib/libCGAL.so -//Variable hidden from user -CGAL_CGAL_LIBRARY_NAME:INTERNAL=libCGAL.so -CGAL_CONFIGURED_LIBRARIES:INTERNAL=CGAL;Core;ImageIO;Qt3;Qt4 +CGAL_CONFIGURED_LIBRARIES:INTERNAL=CGAL_Core;CGAL_ImageIO;CGAL_Qt3;CGAL_Qt4 CGAL_Core_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_Core_3RD_PARTY_INCLUDE_DIRS:INTERNAL= CGAL_Core_3RD_PARTY_LIBRARIES:INTERNAL= @@ -1287,9 +1286,9 @@ CGAL_Core_3RD_PARTY_LIBRARIES_DIRS:INTERNAL= //ADVANCED property for variable: CGAL_Core_LIBRARY CGAL_Core_LIBRARY-ADVANCED:INTERNAL=1 //Variable hidden from user -CGAL_Core_LIBRARY_NAME:INTERNAL=libCGAL_Core.so +CGAL_Core_LIBRARY_INSTALLED:INTERNAL=/usr/local/lib/libCGAL_Core.so //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 @@ -1336,12 +1335,12 @@ CGAL_ImageIO_3RD_PARTY_LIBRARIES_DIRS:INTERNAL= //ADVANCED property for variable: CGAL_ImageIO_LIBRARY CGAL_ImageIO_LIBRARY-ADVANCED:INTERNAL=1 //Variable hidden from user -CGAL_ImageIO_LIBRARY_NAME:INTERNAL=libCGAL_ImageIO.so +CGAL_ImageIO_LIBRARY_INSTALLED:INTERNAL=/usr/local/lib/libCGAL_ImageIO.so CGAL_ImageIO_USE_ZLIB:INTERNAL=ON //ADVANCED property for variable: CGAL_LIBRARY CGAL_LIBRARY-ADVANCED:INTERNAL=1 //Variable hidden from user -CGAL_LIBRARY_NAME:INTERNAL=libCGAL.so +CGAL_LIBRARY_INSTALLED:INTERNAL=/usr/local/lib/libCGAL.so CGAL_Qt3_3RD_PARTY_DEFINITIONS:INTERNAL=-DQT_SHARED;-DQT_NO_DEBUG;-DQT_THREAD_SUPPORT;-D_REENTRANT CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/lib64/qt-3.3/include;/usr/include CGAL_Qt3_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/qt-3.3/lib/libqassistantclient.a;/usr/lib64/qt-3.3/lib/libqt-mt.so;/usr/lib64/libSM.so;/usr/lib64/libICE.so;/usr/lib64/libX11.so;/usr/lib64/libXext.so;dl;-lpthread;/usr/lib64/libGLU.so;/usr/lib64/libGL.so;/usr/lib64/libSM.so;/usr/lib64/libICE.so;/usr/lib64/libX11.so;/usr/lib64/libXext.so @@ -1349,7 +1348,7 @@ CGAL_Qt3_3RD_PARTY_LIBRARIES_DIRS:INTERNAL= //ADVANCED property for variable: CGAL_Qt3_LIBRARY CGAL_Qt3_LIBRARY-ADVANCED:INTERNAL=1 //Variable hidden from user -CGAL_Qt3_LIBRARY_NAME:INTERNAL=libCGAL_Qt3.so +CGAL_Qt3_LIBRARY_INSTALLED:INTERNAL=/usr/local/lib/libCGAL_Qt3.so CGAL_Qt4_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_Qt4_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include CGAL_Qt4_3RD_PARTY_LIBRARIES:INTERNAL=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;/usr/lib64/libGLU.so;/usr/lib64/libGL.so;/usr/lib64/libSM.so;/usr/lib64/libICE.so;/usr/lib64/libX11.so;/usr/lib64/libXext.so @@ -1357,7 +1356,7 @@ CGAL_Qt4_3RD_PARTY_LIBRARIES_DIRS:INTERNAL= //ADVANCED property for variable: CGAL_Qt4_LIBRARY CGAL_Qt4_LIBRARY-ADVANCED:INTERNAL=1 //Variable hidden from user -CGAL_Qt4_LIBRARY_NAME:INTERNAL=libCGAL_Qt4.so +CGAL_Qt4_LIBRARY_INSTALLED:INTERNAL=/usr/local/lib/libCGAL_Qt4.so //Variable hidden from user CGAL_SUPPORTING_3RD_PARTY_LIBRARIES:INTERNAL=GMP;GMPXX;MPFR;ZLIB;OpenGL;LEDA;MPFI;RS;RS3;OpenNL;TAUCS;Eigen3;BLAS;LAPACK;QGLViewer;ESBTL;Coin3D;NTL;IPE //ADVANCED property for variable: CMAKE_AR @@ -1413,7 +1412,7 @@ CMAKE_DETERMINE_CXX_ABI_COMPILED:INTERNAL=TRUE //Result of TRY_COMPILE CMAKE_DETERMINE_C_ABI_COMPILED:INTERNAL=TRUE //Path to cache edit program executable. -CMAKE_EDIT_COMMAND:INTERNAL=/usr/bin/ccmake +CMAKE_EDIT_COMMAND:INTERNAL=/usr/bin/cmake-gui //Executable file format CMAKE_EXECUTABLE_FORMAT:INTERNAL=ELF //ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS @@ -1495,6 +1494,9 @@ CMAKE_SKIP_INSTALL_RPATH-ADVANCED:INTERNAL=1 CMAKE_SKIP_RPATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_STRIP CMAKE_STRIP-ADVANCED:INTERNAL=1 +//Suppress Warnings that are meant for the author of the CMakeLists.txt +// files. +CMAKE_SUPPRESS_DEVELOPER_WARNINGS:INTERNAL=FALSE //uname command CMAKE_UNAME:INTERNAL=/bin/uname //ADVANCED property for variable: CMAKE_USE_RELATIVE_PATHS @@ -1668,7 +1670,7 @@ QT_QJPEG_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 QT_QKRCODECS_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 //ADVANCED property for variable: QT_QKRCODECS_PLUGIN_RELEASE QT_QKRCODECS_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 -QT_QMAKE_EXECUTABLE_LAST:INTERNAL=/usr/lib64/qt-3.3/bin/qmake +QT_QMAKE_EXECUTABLE_LAST:INTERNAL=/usr/bin/qmake-qt4 //ADVANCED property for variable: QT_QMNG_PLUGIN_DEBUG QT_QMNG_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 //ADVANCED property for variable: QT_QMNG_PLUGIN_RELEASE