From 822fd9ae239a174ee59df6d3b94a33027533b478 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Mon, 15 Mar 2010 14:05:45 +0000 Subject: [PATCH] Rename documentation of hviewer into viewer. --- hurricane/cmake_modules/FindHURRICANE.cmake | 2 +- hurricane/doc/CMakeLists.txt | 2 +- hurricane/doc/{hviewer => viewer}/ASIM-bigfonts.css | 0 hurricane/doc/{hviewer => viewer}/ASIM.css | 0 hurricane/doc/{hviewer => viewer}/CMakeLists.txt | 6 +++--- hurricane/doc/{hviewer => viewer}/CellViewer.dox | 0 hurricane/doc/{hviewer => viewer}/DisplayStyle.dox | 0 hurricane/doc/{hviewer => viewer}/Graphics.dox | 0 .../doc/{hviewer => viewer}/InspectorWidget.dox | 0 hurricane/doc/{hviewer => viewer}/asimbook.cls | 0 hurricane/doc/{hviewer => viewer}/customSummary.html | 0 hurricane/doc/{hviewer => viewer}/doxyfile | 12 ++++++------ hurricane/doc/{hviewer => viewer}/footer.html | 0 hurricane/doc/{hviewer => viewer}/header.html | 0 hurricane/doc/{hviewer => viewer}/header.tex | 0 hurricane/src/viewer/CMakeLists.txt | 6 +++--- 16 files changed, 14 insertions(+), 14 deletions(-) rename hurricane/doc/{hviewer => viewer}/ASIM-bigfonts.css (100%) rename hurricane/doc/{hviewer => viewer}/ASIM.css (100%) rename hurricane/doc/{hviewer => viewer}/CMakeLists.txt (69%) rename hurricane/doc/{hviewer => viewer}/CellViewer.dox (100%) rename hurricane/doc/{hviewer => viewer}/DisplayStyle.dox (100%) rename hurricane/doc/{hviewer => viewer}/Graphics.dox (100%) rename hurricane/doc/{hviewer => viewer}/InspectorWidget.dox (100%) rename hurricane/doc/{hviewer => viewer}/asimbook.cls (100%) rename hurricane/doc/{hviewer => viewer}/customSummary.html (100%) rename hurricane/doc/{hviewer => viewer}/doxyfile (99%) rename hurricane/doc/{hviewer => viewer}/footer.html (100%) rename hurricane/doc/{hviewer => viewer}/header.html (100%) rename hurricane/doc/{hviewer => viewer}/header.tex (100%) diff --git a/hurricane/cmake_modules/FindHURRICANE.cmake b/hurricane/cmake_modules/FindHURRICANE.cmake index d14cf0f5..6502d4d5 100644 --- a/hurricane/cmake_modules/FindHURRICANE.cmake +++ b/hurricane/cmake_modules/FindHURRICANE.cmake @@ -94,7 +94,7 @@ IF(UNIX) ) FIND_LIBRARY(HURRICANE_VIEWER_LIBRARY_PATH - NAMES hviewer + NAMES viewer PATHS ${HURRICANE_DIR_SEARCH} PATH_SUFFIXES lib # Help the user find it if we cannot. diff --git a/hurricane/doc/CMakeLists.txt b/hurricane/doc/CMakeLists.txt index 86a90448..7bcc2744 100644 --- a/hurricane/doc/CMakeLists.txt +++ b/hurricane/doc/CMakeLists.txt @@ -1,2 +1,2 @@ add_subdirectory(hurricane) -add_subdirectory(hviewer) +add_subdirectory(viewer) diff --git a/hurricane/doc/hviewer/ASIM-bigfonts.css b/hurricane/doc/viewer/ASIM-bigfonts.css similarity index 100% rename from hurricane/doc/hviewer/ASIM-bigfonts.css rename to hurricane/doc/viewer/ASIM-bigfonts.css diff --git a/hurricane/doc/hviewer/ASIM.css b/hurricane/doc/viewer/ASIM.css similarity index 100% rename from hurricane/doc/hviewer/ASIM.css rename to hurricane/doc/viewer/ASIM.css diff --git a/hurricane/doc/hviewer/CMakeLists.txt b/hurricane/doc/viewer/CMakeLists.txt similarity index 69% rename from hurricane/doc/hviewer/CMakeLists.txt rename to hurricane/doc/viewer/CMakeLists.txt index 2dabe8e3..fdc3e63c 100644 --- a/hurricane/doc/hviewer/CMakeLists.txt +++ b/hurricane/doc/viewer/CMakeLists.txt @@ -1,8 +1,8 @@ - set ( htmlInstallDir /share/doc/en/html/hviewer ) - set ( latexInstallDir /share/doc/en/latex/hviewer ) + set ( htmlInstallDir /share/doc/en/html/viewer ) + set ( latexInstallDir /share/doc/en/latex/viewer ) - add_custom_target ( documentation ALL cd ${HURRICANE_SOURCE_DIR}/doc/hviewer && ${DOXYGEN_EXECUTABLE} doxyfile ) + add_custom_target ( documentation ALL cd ${HURRICANE_SOURCE_DIR}/doc/viewer && ${DOXYGEN_EXECUTABLE} doxyfile ) install ( DIRECTORY html/ DESTINATION ${htmlInstallDir} ) install ( FILES customSummary.html DESTINATION ${htmlInstallDir} ) diff --git a/hurricane/doc/hviewer/CellViewer.dox b/hurricane/doc/viewer/CellViewer.dox similarity index 100% rename from hurricane/doc/hviewer/CellViewer.dox rename to hurricane/doc/viewer/CellViewer.dox diff --git a/hurricane/doc/hviewer/DisplayStyle.dox b/hurricane/doc/viewer/DisplayStyle.dox similarity index 100% rename from hurricane/doc/hviewer/DisplayStyle.dox rename to hurricane/doc/viewer/DisplayStyle.dox diff --git a/hurricane/doc/hviewer/Graphics.dox b/hurricane/doc/viewer/Graphics.dox similarity index 100% rename from hurricane/doc/hviewer/Graphics.dox rename to hurricane/doc/viewer/Graphics.dox diff --git a/hurricane/doc/hviewer/InspectorWidget.dox b/hurricane/doc/viewer/InspectorWidget.dox similarity index 100% rename from hurricane/doc/hviewer/InspectorWidget.dox rename to hurricane/doc/viewer/InspectorWidget.dox diff --git a/hurricane/doc/hviewer/asimbook.cls b/hurricane/doc/viewer/asimbook.cls similarity index 100% rename from hurricane/doc/hviewer/asimbook.cls rename to hurricane/doc/viewer/asimbook.cls diff --git a/hurricane/doc/hviewer/customSummary.html b/hurricane/doc/viewer/customSummary.html similarity index 100% rename from hurricane/doc/hviewer/customSummary.html rename to hurricane/doc/viewer/customSummary.html diff --git a/hurricane/doc/hviewer/doxyfile b/hurricane/doc/viewer/doxyfile similarity index 99% rename from hurricane/doc/hviewer/doxyfile rename to hurricane/doc/viewer/doxyfile index ec998152..c3469f3c 100644 --- a/hurricane/doc/hviewer/doxyfile +++ b/hurricane/doc/viewer/doxyfile @@ -583,14 +583,14 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = ../../src/hviewer/hurricane/viewer/Graphics.h \ +INPUT = ../../src/viewer/hurricane/viewer/Graphics.h \ Graphics.dox \ - ../../src/hviewer/hurricane/viewer/DisplayStyle.h \ + ../../src/viewer/hurricane/viewer/DisplayStyle.h \ DisplayStyle.dox \ - ../../src/hviewer/hurricane/viewer/CellWidget.h \ - ../../src/hviewer/hurricane/viewer/CellViewer.h \ + ../../src/viewer/hurricane/viewer/CellWidget.h \ + ../../src/viewer/hurricane/viewer/CellViewer.h \ CellViewer.dox \ - ../../src/hviewer/hurricane/viewer/InspectorWidget.h \ + ../../src/viewer/hurricane/viewer/InspectorWidget.h \ InspectorWidget.dox # This tag can be used to specify the character encoding of the source files @@ -1291,7 +1291,7 @@ TAGFILES = "../hurricane/html/hurricane.tag=../hurricane" # When a file name is specified after GENERATE_TAGFILE, doxygen will create # a tag file that is based on the input files it reads. -GENERATE_TAGFILE = html/hviewer.tag +GENERATE_TAGFILE = html/viewer.tag # If the ALLEXTERNALS tag is set to YES all external classes will be listed # in the class index. If set to NO only the inherited external classes diff --git a/hurricane/doc/hviewer/footer.html b/hurricane/doc/viewer/footer.html similarity index 100% rename from hurricane/doc/hviewer/footer.html rename to hurricane/doc/viewer/footer.html diff --git a/hurricane/doc/hviewer/header.html b/hurricane/doc/viewer/header.html similarity index 100% rename from hurricane/doc/hviewer/header.html rename to hurricane/doc/viewer/header.html diff --git a/hurricane/doc/hviewer/header.tex b/hurricane/doc/viewer/header.tex similarity index 100% rename from hurricane/doc/hviewer/header.tex rename to hurricane/doc/viewer/header.tex diff --git a/hurricane/src/viewer/CMakeLists.txt b/hurricane/src/viewer/CMakeLists.txt index 0e73701a..45ff500e 100644 --- a/hurricane/src/viewer/CMakeLists.txt +++ b/hurricane/src/viewer/CMakeLists.txt @@ -108,9 +108,9 @@ install ( FILES ${exports} DESTINATION /include/hurricane/viewer ) - add_library ( hviewer ${cpps} ${MOC_SRCS} ${RCC_SRCS} ) - target_link_libraries ( hviewer hurricane + add_library ( viewer ${cpps} ${MOC_SRCS} ${RCC_SRCS} ) + target_link_libraries ( viewer hurricane ${QT_LIBRARIES} # ${Boost_LIBRARIES} ) - install ( TARGETS hviewer DESTINATION /lib ) + install ( TARGETS viewer DESTINATION /lib )