From 2bb20ce40c54367e8819f99bba2804c45d5cc5f1 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 14 Jul 2015 18:54:13 +0200 Subject: [PATCH] =?UTF-8?q?Qt5=20on=20our=20MacOS=C2=A0X=20machine?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit libQGLViewer-qt5 is still missing for now. --- .../reference_platforms/common_setup | 2 ++ .../x86-64_Darwin-13.0_Apple-clang-3.2_Debug/setup | 1 + .../x86-64_Darwin-13.0_Apple-clang-3.2_Release-cpp11/setup | 1 + .../x86-64_Darwin-13.0_Apple-clang-3.2_Release/setup | 1 + .../x86-64_Darwin-13.0_Apple-clang-5.0_Release-cpp11/setup | 1 + .../x86-64_Darwin-13.0_Apple-clang-5.0_Release/setup | 1 + .../setup | 1 + .../x86-64_Darwin-13.0_Apple-llvm-gcc-4.2_Release/setup | 1 + .../x86-64_Darwin-13.0_clang-3.2_isan-Release/setup | 1 + 9 files changed, 10 insertions(+) create mode 100644 Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/common_setup diff --git a/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/common_setup b/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/common_setup new file mode 100644 index 00000000000..d3b6a5d7375 --- /dev/null +++ b/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/common_setup @@ -0,0 +1,2 @@ +Qt5_DIR=/Users/lrineau/Qt/5.5/clang_64/lib/cmake/Qt5 +export Qt5_DIR diff --git a/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-3.2_Debug/setup b/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-3.2_Debug/setup index 071b34318e5..8baca9634bd 100644 --- a/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-3.2_Debug/setup +++ b/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-3.2_Debug/setup @@ -2,3 +2,4 @@ CXX=/usr/bin/clang++ CC=/usr/bin/clang CXXFLAGS="-Wall -Wextra" export CXX CC CXXFLAGS +source /Users/cgaltester/cgal_test/reference_platforms/common_setup diff --git a/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-3.2_Release-cpp11/setup b/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-3.2_Release-cpp11/setup index 3d765301e1c..1398748f1bb 100644 --- a/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-3.2_Release-cpp11/setup +++ b/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-3.2_Release-cpp11/setup @@ -8,3 +8,4 @@ export BOOST_LIBRARYDIR BOOST_INCLUDEDIR DYLD_LIBRARY_PATH CXXFLAGS="-Wall -Wextra -std=c++11 -stdlib=libc++ -pipe -isystem $BOOST_INCLUDEDIR" export CXX CC CXXFLAGS +source /Users/cgaltester/cgal_test/reference_platforms/common_setup diff --git a/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-3.2_Release/setup b/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-3.2_Release/setup index 071b34318e5..8baca9634bd 100644 --- a/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-3.2_Release/setup +++ b/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-3.2_Release/setup @@ -2,3 +2,4 @@ CXX=/usr/bin/clang++ CC=/usr/bin/clang CXXFLAGS="-Wall -Wextra" export CXX CC CXXFLAGS +source /Users/cgaltester/cgal_test/reference_platforms/common_setup 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 5c2356eeeea..f4a1b192476 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 @@ -8,3 +8,4 @@ export BOOST_LIBRARYDIR BOOST_INCLUDEDIR DYLD_LIBRARY_PATH CXXFLAGS="-Wall -Wextra -Wno-deprecated-register -std=c++11 -stdlib=libc++ -pipe -isystem $BOOST_INCLUDEDIR" export CXX CC CXXFLAGS +source /Users/cgaltester/cgal_test/reference_platforms/common_setup 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 685639ab1fa..0bd6c36dc11 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 @@ -8,3 +8,4 @@ export BOOST_LIBRARYDIR BOOST_INCLUDEDIR DYLD_LIBRARY_PATH CXXFLAGS="-Wall -Wextra -isystem $BOOST_INCLUDEDIR" export CXX CC CXXFLAGS +source /Users/cgaltester/cgal_test/reference_platforms/common_setup 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 be877d272c9..faf19397100 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 @@ -16,3 +16,4 @@ export LEDA_DIR LEDA_LIBRARY_RELEASE CGAL_DISABLE_GMP=1 export CGAL_DISABLE_GMP +source /Users/cgaltester/cgal_test/reference_platforms/common_setup diff --git a/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-llvm-gcc-4.2_Release/setup b/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-llvm-gcc-4.2_Release/setup index c7a7ad18186..8a56b0083d8 100644 --- a/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-llvm-gcc-4.2_Release/setup +++ b/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-llvm-gcc-4.2_Release/setup @@ -3,3 +3,4 @@ CXX=/usr/bin/g++ CXXFLAGS=-Wall export CC CXX CXXFLAGS +source /Users/cgaltester/cgal_test/reference_platforms/common_setup diff --git a/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_clang-3.2_isan-Release/setup b/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_clang-3.2_isan-Release/setup index f283768e45c..589e20a5466 100644 --- a/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_clang-3.2_isan-Release/setup +++ b/Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_clang-3.2_isan-Release/setup @@ -2,3 +2,4 @@ CXX=/usr/local/bin/clang++ CC=/usr/local/bin/clang CXXFLAGS="-Wall -Wextra -fsanitize=address" export CXX CC CXXFLAGS +source /Users/cgaltester/cgal_test/reference_platforms/common_setup