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

Fix CMake warnings (since 3.15)

This commit is contained in:
Laurent Rineau 2019-08-16 13:06:43 +02:00
parent 4ab183acd9
commit 5705b9da93
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -1,9 +1,11 @@
# Top level CMakeLists.txt for CGAL-branchbuild # Top level CMakeLists.txt for CGAL-branchbuild
# Minimal version of CMake:
cmake_minimum_required(VERSION 3.1)
message( "== CMake setup ==" ) message( "== CMake setup ==" )
project(CGAL CXX C) project(CGAL CXX C)
export(PACKAGE CGAL) export(PACKAGE CGAL)
# Minimal version of CMake:
cmake_minimum_required(VERSION 3.1)
set( CGAL_BRANCH_BUILD ON CACHE INTERNAL "Create CGAL from a Git branch" FORCE) set( CGAL_BRANCH_BUILD ON CACHE INTERNAL "Create CGAL from a Git branch" FORCE)

7
Installation/CMakeLists.txt
View File

@ -3,13 +3,14 @@
# refer to the root source directory of the project as ${CMAKE_SOURCE_DIR} or # refer to the root source directory of the project as ${CMAKE_SOURCE_DIR} or
# ${CMAKE_SOURCE_DIR} and to the root binary directory of the project as # ${CMAKE_SOURCE_DIR} and to the root binary directory of the project as
# ${CMAKE_BINARY_DIR} or ${CMAKE_BINARY_DIR}. # ${CMAKE_BINARY_DIR} or ${CMAKE_BINARY_DIR}.
if(NOT PROJECT_NAME)
project(CGAL CXX C)
endif()
# Minimal version of CMake: # Minimal version of CMake:
cmake_minimum_required(VERSION 3.1) cmake_minimum_required(VERSION 3.1)
if(NOT PROJECT_NAME)
project(CGAL CXX C)
endif()
# Tested version: # Tested version:
cmake_policy(VERSION 3.1) cmake_policy(VERSION 3.1)

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

@ -41,10 +41,7 @@ if(CGAL_FOUND AND CGAL_Core_FOUND AND Qt5_FOUND AND CGAL_Qt5_FOUND)
#add_executable ( Periodic_4_hyperbolic_billiards_demo #add_executable ( Periodic_4_hyperbolic_billiards_demo
#Periodic_4_hyperbolic_billiards_demo.cpp ${RESOURCE_FILES} ) #Periodic_4_hyperbolic_billiards_demo.cpp ${RESOURCE_FILES} )
qt5_use_modules( P4HDT2 Widgets ) target_link_libraries( P4HDT2 ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES} Qt5::Widgets)
#qt5_use_modules( Periodic_4_hyperbolic_billiards_demo Widgets )
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} ) #target_link_libraries( Periodic_4_hyperbolic_billiards_demo ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES} )
else() else()