mirror of https://github.com/CGAL/cgal
Include CGALQt4 in the libraries compilation stuff.
We need to create a (potentially incomplete) CGALConfig.cmake file after the CGAL library has been built.
This commit is contained in:
parent
7306ccbf56
commit
d97c78b177
|
|
@ -26,59 +26,60 @@ include(${CGAL_USE_FILE})
|
|||
set( QT_USE_QTMAIN TRUE )
|
||||
set( QT_USE_QTOPENGL TRUE )
|
||||
find_package(Qt4 QUIET)
|
||||
message(STATUS "QT_DEFINITIONS=${QT_DEFINITIONS}")
|
||||
|
||||
include_directories (BEFORE ../../include)
|
||||
|
||||
if(QT4_FOUND)
|
||||
if(QT4_FOUND)
|
||||
include(${QT_USE_FILE})
|
||||
|
||||
get_dependency_version(QT4 Qt4)
|
||||
|
||||
# moc files that are compiled directly as cpp files
|
||||
qt4_generate_moc( ../../include/CGAL/Qt/GraphicsViewNavigation.h GraphicsViewNavigation_moc.cpp )
|
||||
qt4_generate_moc( ../../include/CGAL/Qt/DemosMainWindow.h DemosMainWindow_moc.cpp )
|
||||
qt4_generate_moc( ../../include/CGAL/Qt/GraphicsItem.h GraphicsItem_moc.cpp )
|
||||
qt4_generate_moc( ../../include/CGAL/Qt/GraphicsViewInput.h GraphicsViewInput_moc.cpp )
|
||||
qt4_wrap_cpp(mocfiles ../../include/CGAL/Qt/GraphicsViewNavigation.h
|
||||
../../include/CGAL/Qt/DemosMainWindow.h
|
||||
../../include/CGAL/Qt/GraphicsItem.h
|
||||
../../include/CGAL/Qt/GraphicsViewInput.h)
|
||||
|
||||
# qrc files (resources files, that contain icons, at least)
|
||||
qt4_add_resources ( RESOURCE_FILES ../../demo/resources/CGAL.qrc ../../demo/icons/Input.qrc ../../demo/icons/File.qrc ../../demo/icons/Triangulation_2.qrc)
|
||||
|
||||
set( CGAL_QT4_BASENAME CGAL-Qt4 )
|
||||
|
||||
add_library( CGAL_QT4 debug.cpp GraphicsViewInput_moc.cpp GraphicsViewNavigation.cpp GraphicsViewNavigation_moc.cpp GraphicsItem_moc.cpp GraphicsViewPolylineInput.cpp DemosMainWindow.cpp DemosMainWindow_moc.cpp ${RESOURCE_FILES} )
|
||||
target_link_libraries( CGAL_QT4 ${QT_LIBRARIES} )
|
||||
add_library( CGAL_Qt4 debug.cpp ${moc_files} GraphicsViewNavigation.cpp GraphicsViewPolylineInput.cpp DemosMainWindow.cpp ${RESOURCE_FILES} )
|
||||
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 )
|
||||
target_link_libraries( CGAL_Qt4 CGAL )
|
||||
endif()
|
||||
|
||||
set_target_properties(CGAL_QT4 PROPERTIES VERSION "${CGAL_VERSION}" SOVERSION "${CGAL_SOVERSION}")
|
||||
set_target_properties(CGAL_Qt4 PROPERTIES VERSION "${CGAL_VERSION}" SOVERSION "${CGAL_SOVERSION}")
|
||||
|
||||
if (NOT AUTO_LINK_ENABLED )
|
||||
set_target_properties( CGAL_QT4 PROPERTIES OUTPUT_NAME "${CGAL_QT4_BASENAME}" )
|
||||
get_target_property( CGAL_QT4_LIBRARY_FULL_PATH CGAL_QT4 LOCATION )
|
||||
set_target_properties( CGAL_Qt4 PROPERTIES OUTPUT_NAME "${CGAL_Qt4_BASENAME}" )
|
||||
get_target_property( CGAL_Qt4_LIBRARY_FULL_PATH CGAL_Qt4 LOCATION )
|
||||
|
||||
set(CGAL_QT4_LIBRARY "${CGAL_QT4_LIBRARY_FULL_PATH}" CACHE STRING "The CGAL-ImageIO library")
|
||||
mark_as_advanced(CGAL_QT4_LIBRARY)
|
||||
set(CGAL_Qt4_LIBRARY "${CGAL_Qt4_LIBRARY_FULL_PATH}" CACHE STRING "The CGAL-ImageIO library")
|
||||
mark_as_advanced(CGAL_Qt4_LIBRARY)
|
||||
|
||||
else(NOT AUTO_LINK_ENABLED)
|
||||
|
||||
set(CGAL_QT4_LIBRARY)
|
||||
set(CGAL_Qt4_LIBRARY)
|
||||
|
||||
set(CGAL_QT4_RELEASE_MANGLED_NAME "${CGAL_QT4_BASENAME}-${TOOLSET}-mt" )
|
||||
set(CGAL_QT4_DEBUG_MANGLED_NAME "${CGAL_QT4_BASENAME}-${TOOLSET}-mt-gd" )
|
||||
set(CGAL_QT4_MINSIZEREL_MANGLED_NAME "${CGAL_QT4_BASENAME}-${TOOLSET}-mt-o" )
|
||||
set(CGAL_QT4_RELWITHDEBINFO_MANGLED_NAME "${CGAL_QT4_BASENAME}-${TOOLSET}-mt-g" )
|
||||
set(CGAL_Qt4_RELEASE_MANGLED_NAME "${CGAL_Qt4_BASENAME}-${TOOLSET}-mt" )
|
||||
set(CGAL_Qt4_DEBUG_MANGLED_NAME "${CGAL_Qt4_BASENAME}-${TOOLSET}-mt-gd" )
|
||||
set(CGAL_Qt4_MINSIZEREL_MANGLED_NAME "${CGAL_Qt4_BASENAME}-${TOOLSET}-mt-o" )
|
||||
set(CGAL_Qt4_RELWITHDEBINFO_MANGLED_NAME "${CGAL_Qt4_BASENAME}-${TOOLSET}-mt-g" )
|
||||
|
||||
set_target_properties( CGAL_QT4 PROPERTIES DEBUG_OUTPUT_NAME "${CGAL_QT4_DEBUG_MANGLED_NAME}"
|
||||
RELEASE_OUTPUT_NAME "${CGAL_QT4_RELEASE_MANGLED_NAME}"
|
||||
MINSIZEREL_OUTPUT_NAME "${CGAL_QT4_MINSIZEREL_MANGLED_NAME}"
|
||||
RELWITHDEBINFO_OUTPUT_NAME "${CGAL_QT4_RELWITHDEBINFO_MANGLED_NAME}"
|
||||
set_target_properties( CGAL_Qt4 PROPERTIES DEBUG_OUTPUT_NAME "${CGAL_Qt4_DEBUG_MANGLED_NAME}"
|
||||
RELEASE_OUTPUT_NAME "${CGAL_Qt4_RELEASE_MANGLED_NAME}"
|
||||
MINSIZEREL_OUTPUT_NAME "${CGAL_Qt4_MINSIZEREL_MANGLED_NAME}"
|
||||
RELWITHDEBINFO_OUTPUT_NAME "${CGAL_Qt4_RELWITHDEBINFO_MANGLED_NAME}"
|
||||
)
|
||||
|
||||
if ( HAS_CFG_INTDIR )
|
||||
add_custom_command(TARGET CGAL_QT4 POST_BUILD COMMAND copy /Y "$(TargetPath)" "$(SolutionDir)lib" )
|
||||
add_custom_command(TARGET CGAL_QT4 POST_BUILD COMMAND if exist "$(TargetDir)$(TargetName).pdb" copy /Y "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)lib" )
|
||||
add_custom_command(TARGET CGAL_Qt4 POST_BUILD COMMAND copy /Y "$(TargetPath)" "$(SolutionDir)lib" )
|
||||
add_custom_command(TARGET CGAL_Qt4 POST_BUILD COMMAND if exist "$(TargetDir)$(TargetName).pdb" copy /Y "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)lib" )
|
||||
endif()
|
||||
|
||||
endif(NOT AUTO_LINK_ENABLED)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
add_subdirectory(CGAL)
|
||||
|
||||
create_CGALconfig_files()
|
||||
set(CGAL_DIR ${CMAKE_BINARY_DIR})
|
||||
optional_add_subdirectory( CGALCore ON )
|
||||
optional_add_subdirectory( CGALimageIO ON )
|
||||
optional_add_subdirectory( CGALPDB ON )
|
||||
optional_add_subdirectory( CGALQt ON )
|
||||
optional_add_subdirectory( CGALQt4 ON )
|
||||
|
|
|
|||
Loading…
Reference in New Issue