From 57692b2ddcea40d1c091a01bd40d4ae985cc7ba2 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Tue, 2 Apr 2019 11:57:26 +0200 Subject: [PATCH 1/5] Rename executable from demos so it is tested in the testsuite. --- .../demo/Hyperbolic_triangulation_2/CMakeLists.txt | 4 ++-- .../Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt b/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt index 70337214193..21160f9701d 100644 --- a/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt +++ b/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt @@ -26,8 +26,8 @@ if(CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND AND CGAL_Core_FOUND) qt5_add_resources ( RESOURCE_FILES resources/Delaunay_triangulation_2.qrc ) # cpp files - add_executable ( HDT2_demo HDT2.cpp ${CGAL_Qt5_RESOURCE_FILES} ${RESOURCE_FILES} ${UIS}) - target_link_libraries ( HDT2_demo CGAL::CGAL CGAL::CGAL_Qt5 CGAL::CGAL_Core Qt5::Widgets) + add_executable ( HDT2 HDT2.cpp ${CGAL_Qt5_RESOURCE_FILES} ${RESOURCE_FILES} ${UIS}) + target_link_libraries ( HDT2 CGAL::CGAL CGAL::CGAL_Qt5 CGAL::CGAL_Core Qt5::Widgets) else() message(STATUS "NOTICE: This demo requires CGAL, CGAL_Core, and Qt5 and will not be compiled.") endif() diff --git a/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt b/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt index 3eccf62d297..b1739141818 100644 --- a/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt +++ b/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt @@ -35,16 +35,16 @@ if(CGAL_FOUND AND CGAL_Core_FOUND AND Qt5_FOUND AND CGAL_Qt5_FOUND) # cpp files - add_executable ( P4HDT2_demo + add_executable ( P4HDT2 P4HDT2.cpp ${RESOURCE_FILES} ${UIS}) #add_executable ( Periodic_4_hyperbolic_billiards_demo #Periodic_4_hyperbolic_billiards_demo.cpp ${RESOURCE_FILES} ) - qt5_use_modules( P4HDT2_demo Widgets ) + qt5_use_modules( P4HDT2 Widgets ) #qt5_use_modules( Periodic_4_hyperbolic_billiards_demo Widgets ) - target_link_libraries( P4HDT2_demo ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES} ) + target_link_libraries( P4HDT2 ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES} ) #target_link_libraries( Periodic_4_hyperbolic_billiards_demo ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES} ) else() From 0e8bd4aa9682c70c8fe9e239cb73268f9f8b68a7 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Tue, 2 Apr 2019 12:09:52 +0200 Subject: [PATCH 2/5] Update script for precompiled demo management --- Maintenance/public_release/scripts/precompiled_demos_zips | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Maintenance/public_release/scripts/precompiled_demos_zips b/Maintenance/public_release/scripts/precompiled_demos_zips index d1412e649d7..65d82b3b5c8 100755 --- a/Maintenance/public_release/scripts/precompiled_demos_zips +++ b/Maintenance/public_release/scripts/precompiled_demos_zips @@ -61,6 +61,9 @@ pushd Segment_Delaunay_graph_Linf_2_Demo; zip ../segment_voronoi_diagram_2.zip * # CGAL-4.8 pushd Optimal_transportation_reconstruction_2_Demo; zip ../otr2.zip *; popd +#missing demos +pushd Polygon_Demo; zip ../polygon.zip *; popd +pushd Principal_component_analysis_Demo; zip ../pca.zip *; popd # check echo CHECK now. The following lines should be empty. From 22caa66febf40d922844b6ac86df974d4955c08a Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Wed, 3 Apr 2019 11:07:13 +0200 Subject: [PATCH 3/5] Fix CMP0054 warning in hyperbolic triangulation demos --- .../demo/Hyperbolic_triangulation_2/CMakeLists.txt | 4 ++++ .../examples/Hyperbolic_triangulation_2/CMakeLists.txt | 4 ++++ .../test/Hyperbolic_triangulation_2/CMakeLists.txt | 4 ++++ .../Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt | 5 +++++ .../Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt | 4 ++++ .../Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt | 4 ++++ 6 files changed, 25 insertions(+) diff --git a/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt b/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt index 21160f9701d..3b3c3156057 100644 --- a/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt +++ b/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt @@ -8,6 +8,10 @@ set(CMAKE_AUTOMOC ON) cmake_minimum_required(VERSION 3.1...3.13) +if(POLICY CMP0054) + cmake_policy(SET CMP0054 NEW) +endif() + if(POLICY CMP0071) cmake_policy(SET CMP0071 NEW) endif() diff --git a/Hyperbolic_triangulation_2/examples/Hyperbolic_triangulation_2/CMakeLists.txt b/Hyperbolic_triangulation_2/examples/Hyperbolic_triangulation_2/CMakeLists.txt index eb40207eb5c..0bca3ad35e9 100644 --- a/Hyperbolic_triangulation_2/examples/Hyperbolic_triangulation_2/CMakeLists.txt +++ b/Hyperbolic_triangulation_2/examples/Hyperbolic_triangulation_2/CMakeLists.txt @@ -6,6 +6,10 @@ project( Hyperbolic_triangulation_2_Examples ) cmake_minimum_required(VERSION 2.8.10) +if(POLICY CMP0054) + cmake_policy(SET CMP0054 NEW) +endif() + find_package(CGAL QUIET COMPONENTS Core ) if ( CGAL_FOUND ) diff --git a/Hyperbolic_triangulation_2/test/Hyperbolic_triangulation_2/CMakeLists.txt b/Hyperbolic_triangulation_2/test/Hyperbolic_triangulation_2/CMakeLists.txt index c742bbb7edd..53c11677196 100644 --- a/Hyperbolic_triangulation_2/test/Hyperbolic_triangulation_2/CMakeLists.txt +++ b/Hyperbolic_triangulation_2/test/Hyperbolic_triangulation_2/CMakeLists.txt @@ -6,6 +6,10 @@ project( Hyperbolic_triangulation_2_Tests ) cmake_minimum_required(VERSION 2.8.10) +if(POLICY CMP0054) + cmake_policy(SET CMP0054 NEW) +endif() + find_package(CGAL QUIET COMPONENTS Core ) if ( CGAL_FOUND ) diff --git a/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt b/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt index b1739141818..456c466f607 100644 --- a/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt +++ b/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt @@ -16,6 +16,11 @@ if(POLICY CMP0071) cmake_policy(SET CMP0071 NEW) endif() + +if(POLICY CMP0054) + cmake_policy(SET CMP0054 NEW) +endif() + find_package(CGAL QUIET COMPONENTS Core Qt5) include(${CGAL_USE_FILE}) diff --git a/Periodic_4_hyperbolic_triangulation_2/examples/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt b/Periodic_4_hyperbolic_triangulation_2/examples/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt index e9d2c09896c..3dbfe7aad40 100644 --- a/Periodic_4_hyperbolic_triangulation_2/examples/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt +++ b/Periodic_4_hyperbolic_triangulation_2/examples/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt @@ -6,6 +6,10 @@ project( Periodic_4_hyperbolic_triangulation_2_Examples ) cmake_minimum_required(VERSION 2.8.10) +if(POLICY CMP0054) + cmake_policy(SET CMP0054 NEW) +endif() + find_package(CGAL QUIET COMPONENTS Core ) if ( CGAL_FOUND AND CGAL_Core_FOUND) diff --git a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt index 698818aeb6c..af1462f02c3 100644 --- a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt +++ b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt @@ -6,6 +6,10 @@ project( Periodic_4_hyperbolic_triangulation_2_Tests ) cmake_minimum_required(VERSION 2.8.10) +if(POLICY CMP0054) + cmake_policy(SET CMP0054 NEW) +endif() + find_package(CGAL QUIET COMPONENTS Core ) if ( CGAL_FOUND AND CGAL_Core_FOUND ) From ecff35a7e954bfc397faffe89017a963d7622aa1 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Wed, 3 Apr 2019 13:14:40 +0200 Subject: [PATCH 4/5] Replace the CMP0054 spec by the right cmake_required_version --- .../demo/Hyperbolic_triangulation_2/CMakeLists.txt | 4 ---- .../examples/Hyperbolic_triangulation_2/CMakeLists.txt | 6 +----- .../test/Hyperbolic_triangulation_2/CMakeLists.txt | 6 +----- .../Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt | 7 +------ .../Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt | 6 +----- .../Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt | 6 +----- 6 files changed, 5 insertions(+), 30 deletions(-) diff --git a/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt b/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt index 3b3c3156057..21160f9701d 100644 --- a/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt +++ b/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt @@ -8,10 +8,6 @@ set(CMAKE_AUTOMOC ON) cmake_minimum_required(VERSION 3.1...3.13) -if(POLICY CMP0054) - cmake_policy(SET CMP0054 NEW) -endif() - if(POLICY CMP0071) cmake_policy(SET CMP0071 NEW) endif() diff --git a/Hyperbolic_triangulation_2/examples/Hyperbolic_triangulation_2/CMakeLists.txt b/Hyperbolic_triangulation_2/examples/Hyperbolic_triangulation_2/CMakeLists.txt index 0bca3ad35e9..e0d12591bab 100644 --- a/Hyperbolic_triangulation_2/examples/Hyperbolic_triangulation_2/CMakeLists.txt +++ b/Hyperbolic_triangulation_2/examples/Hyperbolic_triangulation_2/CMakeLists.txt @@ -4,11 +4,7 @@ project( Hyperbolic_triangulation_2_Examples ) -cmake_minimum_required(VERSION 2.8.10) - -if(POLICY CMP0054) - cmake_policy(SET CMP0054 NEW) -endif() +cmake_minimum_required(VERSION 3.1...3.13) find_package(CGAL QUIET COMPONENTS Core ) diff --git a/Hyperbolic_triangulation_2/test/Hyperbolic_triangulation_2/CMakeLists.txt b/Hyperbolic_triangulation_2/test/Hyperbolic_triangulation_2/CMakeLists.txt index 53c11677196..73ee571e17d 100644 --- a/Hyperbolic_triangulation_2/test/Hyperbolic_triangulation_2/CMakeLists.txt +++ b/Hyperbolic_triangulation_2/test/Hyperbolic_triangulation_2/CMakeLists.txt @@ -4,11 +4,7 @@ project( Hyperbolic_triangulation_2_Tests ) -cmake_minimum_required(VERSION 2.8.10) - -if(POLICY CMP0054) - cmake_policy(SET CMP0054 NEW) -endif() +cmake_minimum_required(VERSION 3.1...3.13) find_package(CGAL QUIET COMPONENTS Core ) diff --git a/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt b/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt index 456c466f607..e0eb6720e8b 100644 --- a/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt +++ b/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt @@ -10,17 +10,12 @@ include_directories( ${CMAKE_BINARY_DIR} ) # Instruct CMake to run moc automatically when needed. set(CMAKE_AUTOMOC ON) -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.1...3.13) if(POLICY CMP0071) cmake_policy(SET CMP0071 NEW) endif() - -if(POLICY CMP0054) - cmake_policy(SET CMP0054 NEW) -endif() - find_package(CGAL QUIET COMPONENTS Core Qt5) include(${CGAL_USE_FILE}) diff --git a/Periodic_4_hyperbolic_triangulation_2/examples/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt b/Periodic_4_hyperbolic_triangulation_2/examples/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt index 3dbfe7aad40..9cdcb06874c 100644 --- a/Periodic_4_hyperbolic_triangulation_2/examples/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt +++ b/Periodic_4_hyperbolic_triangulation_2/examples/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt @@ -4,11 +4,7 @@ project( Periodic_4_hyperbolic_triangulation_2_Examples ) -cmake_minimum_required(VERSION 2.8.10) - -if(POLICY CMP0054) - cmake_policy(SET CMP0054 NEW) -endif() +cmake_minimum_required(VERSION 3.1...3.13) find_package(CGAL QUIET COMPONENTS Core ) diff --git a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt index af1462f02c3..e005c227093 100644 --- a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt +++ b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt @@ -4,11 +4,7 @@ project( Periodic_4_hyperbolic_triangulation_2_Tests ) -cmake_minimum_required(VERSION 2.8.10) - -if(POLICY CMP0054) - cmake_policy(SET CMP0054 NEW) -endif() +cmake_minimum_required(VERSION 3.1...3.13) find_package(CGAL QUIET COMPONENTS Core ) From 138e1b4d648367a232624a7eacb60b927862eeff Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 4 Apr 2019 13:39:18 +0200 Subject: [PATCH 5/5] Fix the link error on Windows (non header-only) --- .../demo/Hyperbolic_triangulation_2/HDT2.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/HDT2.cpp b/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/HDT2.cpp index be289b362b6..b2c5c9e40d2 100644 --- a/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/HDT2.cpp +++ b/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/HDT2.cpp @@ -412,12 +412,9 @@ int main(int argc, char **argv) app.setOrganizationName("GeometryFactory"); app.setApplicationName("Delaunay_triangulation_2 demo"); - // Import resources from libCGALQt4. - // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE - Q_INIT_RESOURCE(File); - Q_INIT_RESOURCE(Triangulation_2); - Q_INIT_RESOURCE(Input); - Q_INIT_RESOURCE(CGAL); + // Import resources from libCGALQt5 + // See http://doc.qt.io/qt-5/qdir.html#Q_INIT_RESOURCE + CGAL_Qt_init_resources();// that function is in a DLL MainWindow mainWindow; mainWindow.show();