migrating to the new branch: changed CMakeLists

This commit is contained in:
Mikhail Bogdanov 2012-07-03 11:23:11 +00:00 committed by Iordan Iordanov
parent 1ada594b96
commit b7fb591a19
1 changed files with 12 additions and 10 deletions

View File

@ -3,15 +3,17 @@
project (Hyperbolic_Triangulation_2_demo) project (Hyperbolic_Triangulation_2_demo)
cmake_minimum_required(VERSION 2.4.5) cmake_minimum_required(VERSION 2.6.2)
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
cmake_policy(VERSION 2.8.4)
if ( COMMAND cmake_policy ) else()
cmake_policy( SET CMP0003 NEW ) cmake_policy(VERSION 2.6)
endif()
endif() endif()
find_package(CGAL COMPONENTS Qt4) find_package(CGAL COMPONENTS Qt4)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})
set( QT_USE_QTXML TRUE ) set( QT_USE_QTXML TRUE )
@ -19,9 +21,9 @@ set( QT_USE_QTMAIN TRUE )
set( QT_USE_QTSCRIPT TRUE ) set( QT_USE_QTSCRIPT TRUE )
set( QT_USE_QTOPENGL TRUE ) set( QT_USE_QTOPENGL TRUE )
find_package(Qt4) #find_package(Qt4)
include_directories (BEFORE ${CGAL_DIR}/demo/Triangulation_2) include_directories (BEFORE ${CGAL_DIR}/GraphicsView/demo/Triangulation_2)
include_directories (BEFORE ../../include) include_directories (BEFORE ../../include)
# demos contain their own headers # demos contain their own headers
include_directories (BEFORE include) include_directories (BEFORE include)
@ -34,10 +36,10 @@ include(${QT_USE_FILE})
# The "Delaunay" demo: Delaunay_triangulation_2 # The "Delaunay" demo: Delaunay_triangulation_2
#-------------------------------- #--------------------------------
# UI files (Qt Designer files) # UI files (Qt Designer files)
qt4_wrap_ui( DT_UI_FILES ${CGAL_DIR}/demo/Triangulation_2/Delaunay_triangulation_2.ui ) qt4_wrap_ui( DT_UI_FILES ${CGAL_DIR}/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.ui )
# qrc files (resources files, that contain icons, at least) # qrc files (resources files, that contain icons, at least)
qt4_add_resources ( DT_RESOURCE_FILES ${CGAL_DIR}/demo/Triangulation_2/Delaunay_triangulation_2.qrc ) qt4_add_resources ( DT_RESOURCE_FILES ${CGAL_DIR}/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.qrc )
# use the Qt MOC preprocessor on classes that derives from QObject # use the Qt MOC preprocessor on classes that derives from QObject
qt4_generate_moc( "Hyperbolic_Delaunay_triangulation_2_demo.cpp" "${CMAKE_CURRENT_BINARY_DIR}/Hyperbolic_Delaunay_triangulation_2_demo.moc" ) qt4_generate_moc( "Hyperbolic_Delaunay_triangulation_2_demo.cpp" "${CMAKE_CURRENT_BINARY_DIR}/Hyperbolic_Delaunay_triangulation_2_demo.moc" )