- Move two cpp file into src/CGALQt4/

- Build a library "CGAL-Qt4".

I do not now yet how to include that library into the set of libraries of
CGAL.
This commit is contained in:
Laurent Rineau 2008-06-18 14:38:38 +00:00
parent ee1222919b
commit b873a87c96
5 changed files with 57 additions and 7 deletions

5
.gitignore vendored
View File

@ -15,6 +15,11 @@ GraphicsView/demo/GraphicsView/delaunay
GraphicsView/demo/GraphicsView/min
GraphicsView/demo/GraphicsView/qrc_*.cxx
GraphicsView/demo/GraphicsView/ui_*.h
GraphicsView/src/CGALQt4/*.dll
GraphicsView/src/CGALQt4/*.lib
GraphicsView/src/CGALQt4/*.so
GraphicsView/src/CGALQt4/*_moc.cpp
GraphicsView/src/CGALQt4/Makefile
Maintenance/rpm/BUILD/*
Maintenance/rpm/RPMS/*
Maintenance/rpm/SOURCES/CGAL-*-I-*.tar.gz

View File

@ -8,7 +8,6 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
find_package(CGAL REQUIRED)
include(${CGAL_USE_FILE})
include(CreateSingleSourceCGALQt4Program)
set( QT_USE_QTXML TRUE )
set( QT_USE_QTMAIN TRUE )
@ -19,6 +18,7 @@ set( QT_USE_QTOPENGL TRUE )
find_package(Qt4 REQUIRED)
include(${QT_USE_FILE})
include_directories (BEFORE ../../include)
link_directories(../../src/CGALQt4)
#--------------------------------
# The "delaunay" demo: delaunay
@ -30,20 +30,16 @@ qt4_wrap_ui( UI_FILES MainWindow.ui )
qt4_add_resources ( RESOURCE_FILES ./MainWindow.qrc ../icons/Input.qrc ../icons/File.qrc ../icons/Logos.qrc ../icons/Triangulation_2.qrc)
# use the Qt MOC preprocessor on classes that derives from QObject
qt4_generate_moc( ../../include/CGAL/IO/QtNavigation.h QtNavigation.moc )
qt4_generate_moc( ../../include/CGAL/IO/QtGraphicsItem.h QtGraphicsItem_moc.cpp )
qt4_generate_moc( ../../include/CGAL/IO/QtInput.h QtInput_moc.cpp )
macro_add_file_dependencies( QNavigation.cpp QtNavigation.moc )
qt4_automoc( MainWindow.cpp )
# The executable itself.
add_executable ( delaunay main.cpp MainWindow.cpp QtInput_moc.cpp QNavigation.cpp QtGraphicsItem_moc.cpp QPolylineInput_2_non_templated_base.cpp ${UI_FILES} ${RESOURCE_FILES} )
add_executable ( delaunay main.cpp MainWindow.cpp ${UI_FILES} ${RESOURCE_FILES} )
# Link with Qt libraries
target_link_libraries( delaunay ${QT_LIBRARIES} )
if ( NOT AUTO_LINK_ENABLED )
# If auto-link is not enabled (on Linux for example), link with libCGAL explicitly.
target_link_libraries( delaunay CGAL )
target_link_libraries( delaunay CGAL CGAL-Qt4 )
endif()
#----------------------------------------

View File

@ -0,0 +1,49 @@
# src/Core/CMakeLists.txt
#
# The following variables must be set from the parent script:
# The first two cannot be empty
#
# CGAL_BINARY_DIR
# CGAL_LIB_INSTALL_DIR
#
# CGAL_INCLUDE_DIRS
# GMP_INCLUDE_DIRS
# CGAL_DEFINITIONS
# CGAL_3RD_PARTY_INCLUDE_DIRS
# CGAL_3RD_PARTY_LIBRARIES
# CGAL_3RD_PARTY_DEFINITIONS
# CGAL_LIB_SHARED_LINKER_FLAGS
# CGAL_VERSION
# CGAL_MAJOR_VERSION
# CGAL_MINOR_VERSION
project (CGALQt4)
find_package(CGAL REQUIRED)
include(${CGAL_USE_FILE})
set( QT_USE_QTMAIN TRUE )
find_package(Qt4 QUIET)
include_directories (BEFORE ../../include)
if(QT4_FOUND)
include(${QT_USE_FILE})
qt4_generate_moc( ../../include/CGAL/IO/QtNavigation.h QtNavigation.moc )
qt4_generate_moc( ../../include/CGAL/IO/QtGraphicsItem.h QtGraphicsItem_moc.cpp )
qt4_generate_moc( ../../include/CGAL/IO/QtInput.h QtInput_moc.cpp )
macro_add_file_dependencies( QtNavigation.cpp QtNavigation.moc )
set( CGAL_QT4_BASENAME CGAL-Qt4 )
add_library( CGAL_QT4 QtInput_moc.cpp QtNavigation.cpp QtGraphicsItem_moc.cpp QtPolylineInput_non_templated_base.cpp )
target_link_libraries( CGAL_QT4 ${QT_LIBRARIES} )
if ( NOT AUTO_LINK_ENABLED )
# If auto-link is not enabled (on Linux for example), link with libCGAL explicitly.
target_link_libraries( CGAL_QT4 CGAL )
endif()
set_target_properties( CGAL_QT4 PROPERTIES OUTPUT_NAME "${CGAL_QT4_BASENAME}" )
endif(QT4_FOUND)