songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3825 from maxGimeno/CGAL_Demos-fix_missing_demos-GF 

Fix Precompiled Demos
This commit is contained in:
Laurent Rineau 2019-04-08 16:06:12 +02:00
parent c14308f300 138e1b4d64
commit 06e7fba9f1
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt
View File

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

9
Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/HDT2.cpp
View File

@ -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();

2
Hyperbolic_triangulation_2/examples/Hyperbolic_triangulation_2/CMakeLists.txt
View File

@ -4,7 +4,7 @@
project( Hyperbolic_triangulation_2_Examples )
cmake_minimum_required(VERSION 2.8.10)
cmake_minimum_required(VERSION 3.1...3.13)
find_package(CGAL QUIET COMPONENTS Core )

2
Hyperbolic_triangulation_2/test/Hyperbolic_triangulation_2/CMakeLists.txt
View File

@ -4,7 +4,7 @@
project( Hyperbolic_triangulation_2_Tests )
cmake_minimum_required(VERSION 2.8.10)
cmake_minimum_required(VERSION 3.1...3.13)
find_package(CGAL QUIET COMPONENTS Core )

3
Maintenance/public_release/scripts/precompiled_demos_zips
View File

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

8
Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt
View File

@ -10,7 +10,7 @@ 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)
@ -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()

2
Periodic_4_hyperbolic_triangulation_2/examples/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt
View File

@ -4,7 +4,7 @@
project( Periodic_4_hyperbolic_triangulation_2_Examples )
cmake_minimum_required(VERSION 2.8.10)
cmake_minimum_required(VERSION 3.1...3.13)
find_package(CGAL QUIET COMPONENTS Core )

2
Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt
View File

@ -4,7 +4,7 @@
project( Periodic_4_hyperbolic_triangulation_2_Tests )
cmake_minimum_required(VERSION 2.8.10)
cmake_minimum_required(VERSION 3.1...3.13)
find_package(CGAL QUIET COMPONENTS Core )