From 4fceb74ea325bb1d793804efb30b9028fe8b8925 Mon Sep 17 00:00:00 2001 From: The Coriolis Project Date: Thu, 22 May 2008 11:41:35 +0000 Subject: [PATCH] remove doc compilation for the moment (not functionnal) FindHURRICANE.cmake seems to work (finds hurricane includes and hviewer includes) --- hurricane/cmake_modules/FindHURRICANE.cmake | 10 +++++----- hurricane/doc/hurricane/CMakeLists.txt | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/hurricane/cmake_modules/FindHURRICANE.cmake b/hurricane/cmake_modules/FindHURRICANE.cmake index b1100b42..8c1fc418 100644 --- a/hurricane/cmake_modules/FindHURRICANE.cmake +++ b/hurricane/cmake_modules/FindHURRICANE.cmake @@ -6,7 +6,7 @@ # HURRICANE_LIBRARIES - The path to where the Hurricane library files are. -SET(HURRICANE_INCLUDE_PATH_DESCRIPTION "directory containing the Hurricane include files. E.g /usr/local/include/hurricane or /asim/coriolis/include/hurricane") +SET(HURRICANE_INCLUDE_PATH_DESCRIPTION "directory containing the Hurricane include files. E.g /usr/local/include or /asim/coriolis/include") SET(HURRICANE_DIR_MESSAGE "Set the HURRICANE_INCLUDE_DIR cmake cache entry to the ${HURRICANE_INCLUDE_PATH_DESCRIPTION}") @@ -21,10 +21,10 @@ IF(UNIX) # # Look for an installation. # - FIND_PATH(HURRICANE_INCLUDE_PATH NAMES Cell.h PATHS + FIND_PATH(HURRICANE_INCLUDE_PATH NAMES hurricane/Cell.h PATHS # Look in other places. ${HURRICANE_DIR_SEARCH} - PATH_SUFFIXES include/hurricane + PATH_SUFFIXES include # Help the user find it if we cannot. DOC "The ${HURRICANE_INCLUDE_PATH_DESCRIPTION}" ) @@ -38,9 +38,9 @@ IF(UNIX) ) FIND_PATH(HURRICANE_VIEWER_INCLUDE_PATH - NAMES CellViewer.h HInspectorWidget.h + NAMES hurricane/viewer/CellViewer.h hurricane/inspector/HInspectorWidget.h PATHS ${HURRICANE_DIR_SEARCH} - PATH_SUFFIXES include/hurricane + PATH_SUFFIXES include # Help the user find it if we cannot. DOC "The ${HURRICANE_INCLUDE_PATH_DESCRIPTION}" ) diff --git a/hurricane/doc/hurricane/CMakeLists.txt b/hurricane/doc/hurricane/CMakeLists.txt index b50d0fac..f43a996f 100644 --- a/hurricane/doc/hurricane/CMakeLists.txt +++ b/hurricane/doc/hurricane/CMakeLists.txt @@ -1,8 +1,8 @@ - - set ( htmlInstallDir /share/doc/en/html/hurricane ) - - add_custom_target ( doc ALL cd ${HURRICANE_SOURCE_DIR}/doc/hurricane && ${DOXYGEN_EXECUTABLE} doxyfile ) - - install ( DIRECTORY html DESTINATION ${htmlInstallDir} ) - install ( FILES customHierarchy.html DESTINATION ${htmlInstallDir}/html ) - install ( FILES customSummary.html DESTINATION ${htmlInstallDir}/html ) +# +# set ( htmlInstallDir /share/doc/en/html/hurricane ) +# +# add_custom_target ( doc ALL cd ${HURRICANE_SOURCE_DIR}/doc/hurricane && ${DOXYGEN_EXECUTABLE} doxyfile ) +# +# install ( DIRECTORY html DESTINATION ${htmlInstallDir} ) +# install ( FILES customHierarchy.html DESTINATION ${htmlInstallDir}/html ) +# install ( FILES customSummary.html DESTINATION ${htmlInstallDir}/html )