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

Merge the work from CGAL-3.7-branch: 

| ------------------------------------------------------------------------
  | r57723 | lrineau | 2010-08-02 16:51:09 +0200 (Mon, 02 Aug 2010) | 9 lines
  | 
  | - Fix the Qt Help Collection stuff: 
  |   - CMakeLists.txt is changed (now that FindQt4.cmake has been update to
  |   the version shipped with CMake-2.8.1,
  |   - the .qhcp files have been updated, so that the first URL is correct.
  | 
  | - Use embedded resources in demo/Periodic_3_triangulation_3/MainWindow.h,
  |   so that the resources are found even if the build/install directory is
  |   out of sources.
  | 
  | ------------------------------------------------------------------------
This commit is contained in:
Laurent Rineau 2010-08-10 11:56:34 +00:00
parent f101addfb0
commit b0c3cf4121
6 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -472,9 +472,11 @@ Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/*.exe
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/*.sln
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/*.vcproj
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Makefile
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Periodic_3_triangulation_3.qch
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/demo_delaunay_qt
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/moc_*.cpp
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/ui_*.h
Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Periodic_Lloyd_3.qch
Point_set_processing_3/doc_doxygen
Point_set_processing_3/doc_html
Point_set_processing_3/doc_pdf

13
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
View File

@ -45,10 +45,17 @@ if (CGAL_FOUND AND OPENGL_FOUND AND QT4_FOUND AND QGLVIEWER_FOUND)
qt4_generate_moc ( Scene.h moc_Scene.cpp )
qt4_generate_moc ( MainWindow.h moc_MainWindow.cpp )
if(DEFINED QT_QCOLLECTIONGENERATOR_EXECUTABLE)
else()
set(QT_QCOLLECTIONGENERATOR_EXECUTABLE qcollectiongenerator)
endif()
# generate QtAssistant collection file
add_custom_target ( doc ALL
add_custom_command ( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Periodic_3_triangulation_3.qhc
DEPENDS Periodic_3_triangulation_3.qhp Periodic_3_triangulation_3.qhcp
COMMAND qcollectiongenerator Periodic_3_triangulation_3.qhcp
COMMAND ${QT_QCOLLECTIONGENERATOR_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/Periodic_3_triangulation_3.qhcp
-o ${CMAKE_CURRENT_BINARY_DIR}/Periodic_3_triangulation_3.qhc
)
# Make sure the compiler can find generated .moc files
@ -61,7 +68,7 @@ if (CGAL_FOUND AND OPENGL_FOUND AND QT4_FOUND AND QGLVIEWER_FOUND)
Scene.cpp moc_Scene.cpp
periodic_3_triangulation_3_demo.cpp
MainWindow.ui moc_MainWindow.cpp
${UI_FILES} ${RESOURCE_FILES})
${UI_FILES} ${RESOURCE_FILES} Periodic_3_triangulation_3.qhc)
add_to_cached_list( CGAL_EXECUTABLE_TARGETS periodic_3_triangulation_3_demo)

4
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.h
View File

@ -130,11 +130,11 @@ public slots:
}
void about() {
showFileBox("About the demo...","resources/about.html");
showFileBox("About the demo...",":/cgal/help/resources/about.html");
}
void about_CGAL() {
showFileBox("About CGAL...","resources/about_CGAL.html");
showFileBox("About CGAL...",":/cgal/help/resources/about_CGAL.html");
}
private:

2
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Periodic_3_triangulation_3.qhcp
View File

@ -3,7 +3,7 @@
<assistant>
<title>CGAL Periodic Delaunay Triangulation Demo</title>
<cacheDirectory>CGAL/Periodic_3_triangulation_3</cacheDirectory>
<startPage>qthelp://org.cgal.demos.periodic_3_triangulation_3/doc/index.html</startPage>
<startPage>qthelp://org.cgal.demos.periodic_3_triangulation_3/doc/documentation/index.html</startPage>
<enableDocumentationManager>false</enableDocumentationManager>
<enableAddressBar>false</enableAddressBar>
<enableFilterFunctionality>false</enableFilterFunctionality>

14
Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt
View File

@ -43,13 +43,21 @@ if ( CGAL_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND )
qt4_automoc( MainWindow.cpp Viewer.cpp)
if(DEFINED QT_QCOLLECTIONGENERATOR_EXECUTABLE)
else()
set(QT_QCOLLECTIONGENERATOR_EXECUTABLE qcollectiongenerator)
endif()
# generate QtAssistant collection file
add_custom_target ( doc ALL
add_custom_command ( OUTPUT Periodic_Lloyd_3.qhc
DEPENDS Periodic_Lloyd_3.qhp Periodic_Lloyd_3.qhcp
COMMAND qcollectiongenerator Periodic_Lloyd_3.qhcp
COMMAND ${QT_QCOLLECTIONGENERATOR_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/Periodic_Lloyd_3.qhcp
-o ${CMAKE_CURRENT_BINARY_DIR}/Periodic_Lloyd_3.qhc
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
add_executable ( Periodic_Lloyd_3 Periodic_Lloyd_3.cpp MainWindow.cpp Viewer.cpp ${uis} ${RESOURCE_FILES} )
add_executable ( Periodic_Lloyd_3 Periodic_Lloyd_3.qhc Periodic_Lloyd_3.cpp MainWindow.cpp Viewer.cpp ${uis} ${RESOURCE_FILES} )
add_to_cached_list( CGAL_EXECUTABLE_TARGETS Periodic_Lloyd_3 )

2
Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Periodic_Lloyd_3.qhcp
View File

@ -3,7 +3,7 @@
<assistant>
<title>CGAL Periodic Lloyd Demo</title>
<cacheDirectory>CGAL/Periodic_3_triangulation_3</cacheDirectory>
<startPage>qthelp://org.cgal.demos.periodic_lloyd_3/doc/index.html</startPage>
<startPage>qthelp://org.cgal.demos.periodic_lloyd_3/doc/documentation/index.html</startPage>
<enableDocumentationManager>false</enableDocumentationManager>
<enableAddressBar>false</enableAddressBar>
<enableFilterFunctionality>false</enableFilterFunctionality>