diff --git a/hurricane/CMakeLists.txt b/hurricane/CMakeLists.txt index 6fa90749..9c2b28e0 100644 --- a/hurricane/CMakeLists.txt +++ b/hurricane/CMakeLists.txt @@ -4,13 +4,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0) SET(CMAKE_MODULE_PATH "${HURRICANE_SOURCE_DIR}/cmake_modules/") -SET(CMAKE_C_FLAGS_DEBUG "-pg -g -Wall" CACHE STRING "Debug options." FORCE) -SET(CMAKE_CXX_FLAGS_DEBUG "-pg -g -Wall" CACHE STRING "Debug options." FORCE) -SET(CMAKE_LINKER_FLAGS_DEBUG "-pg" CACHE STRING "Debug options." FORCE) -SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "-pg" CACHE STRING "Debug options." FORCE) -SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "-pg" CACHE STRING "Debug options." FORCE) -SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "-pg" CACHE STRING "Debug options." FORCE) - OPTION(BUILD_STATIC "Build static version of libraries & binaries" OFF) IF(BUILD_STATIC) @@ -31,7 +24,6 @@ FIND_PACKAGE(Qt4 REQUIRED) # find and setup Qt4 for this project FIND_PACKAGE(BISON REQUIRED) FIND_PACKAGE(FLEX REQUIRED) FIND_PACKAGE(PythonLibs REQUIRED) -FIND_PACKAGE(PythonInterp REQUIRED) FIND_PACKAGE(Doxygen) ADD_SUBDIRECTORY(src) diff --git a/hurricane/cmake_modules/FindHURRICANE.cmake b/hurricane/cmake_modules/FindHURRICANE.cmake index b0ac24ed..09edd474 100644 --- a/hurricane/cmake_modules/FindHURRICANE.cmake +++ b/hurricane/cmake_modules/FindHURRICANE.cmake @@ -45,7 +45,7 @@ IF(UNIX) DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}" ) - FIND_PATH(HURRICANE_VIEWER_INCLUDE_PATH + FIND_PATH(HURRICANE_GRAPHICAL_INCLUDE_PATH NAMES hurricane/viewer/CellViewer.h hurricane/viewer/HInspectorWidget.h PATHS ${HURRICANE_DIR_SEARCH} PATH_SUFFIXES include @@ -53,7 +53,7 @@ IF(UNIX) DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}" ) - FIND_LIBRARY(HURRICANE_VIEWER_LIBRARY_PATH + FIND_LIBRARY(HURRICANE_GRAPHICAL_LIBRARY_PATH NAMES hviewer PATHS ${HURRICANE_DIR_SEARCH} PATH_SUFFIXES lib @@ -61,7 +61,7 @@ IF(UNIX) DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}" ) - FIND_LIBRARY(HURRICANE_VIEWER_STATIC_LIBRARY_PATH + FIND_LIBRARY(HURRICANE_GRAPHICAL_STATIC_LIBRARY_PATH NAMES hviewer-static PATHS ${HURRICANE_DIR_SEARCH} PATH_SUFFIXES lib @@ -69,11 +69,28 @@ IF(UNIX) DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}" ) + FIND_PATH(HURRICANE_PYTHON_INCLUDE_PATH + NAMES hurricane/isobar/PyCell.h + PATHS ${HURRICANE_DIR_SEARCH} + PATH_SUFFIXES include + # Help the user find it if we cannot. + DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}" + ) + + FIND_LIBRARY(HURRICANE_PYTHON_LIBRARY_PATH + NAMES isobar + PATHS ${HURRICANE_DIR_SEARCH} + PATH_SUFFIXES lib + # Help the user find it if we cannot. + DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}" + ) + # Assume we didn't find it. SET(HURRICANE_FOUND "NOTFOUND") SET(HURRICANE_STATIC_FOUND "NOTFOUND") SET(HURRICANE_GRAPHICAL_FOUND "NOTFOUND") SET(HURRICANE_GRAPHICAL_STATIC_FOUND "NOTFOUND") + SET(HURRICANE_PYTHON_FOUND "NOTFOUND") IF(HURRICANE_INCLUDE_PATH) IF(HURRICANE_LIBRARY_PATH) @@ -96,26 +113,38 @@ IF(UNIX) ENDIF(HURRICANE_STATIC_LIBRARY_PATH) ENDIF(HURRICANE_INCLUDE_PATH) - IF(HURRICANE_VIEWER_INCLUDE_PATH) - IF(HURRICANE_VIEWER_LIBRARY_PATH) + IF(HURRICANE_GRAPHICAL_INCLUDE_PATH) + IF(HURRICANE_GRAPHICAL_LIBRARY_PATH) SET(HURRICANE_GRAPHICAL_FOUND "YES") SET(HURRICANE_GRAPHICAL_INCLUDE_DIR - ${HURRICANE_VIEWER_INCLUDE_PATH} + ${HURRICANE_GRAPHICAL_INCLUDE_PATH} ) SET(HURRICANE_GRAPHICAL_LIBRARIES - ${HURRICANE_VIEWER_LIBRARY_PATH} + ${HURRICANE_GRAPHICAL_LIBRARY_PATH} ) - ENDIF(HURRICANE_VIEWER_LIBRARY_PATH) - IF(HURRICANE_VIEWER_STATIC_LIBRARY_PATH) + ENDIF(HURRICANE_GRAPHICAL_LIBRARY_PATH) + IF(HURRICANE_GRAPHICAL_STATIC_LIBRARY_PATH) SET(HURRICANE_GRAPHICAL_STATIC_FOUND "YES") SET(HURRICANE_GRAPHICAL_INCLUDE_DIR - ${HURRICANE_VIEWER_INCLUDE_PATH} + ${HURRICANE_GRAPHICAL_INCLUDE_PATH} ) SET(HURRICANE_GRAPHICAL_STATIC_LIBRARIES - ${HURRICANE_VIEWER_STATIC_LIBRARY_PATH} + ${HURRICANE_GRAPHICAL_STATIC_LIBRARY_PATH} ) - ENDIF(HURRICANE_VIEWER_STATIC_LIBRARY_PATH) - ENDIF(HURRICANE_VIEWER_INCLUDE_PATH) + ENDIF(HURRICANE_GRAPHICAL_STATIC_LIBRARY_PATH) + ENDIF(HURRICANE_GRAPHICAL_INCLUDE_PATH) + + IF(HURRICANE_PYTHON_INCLUDE_PATH) + IF(HURRICANE_PYTHON_LIBRARY_PATH) + SET(HURRICANE_PYTHON_FOUND "YES") + SET(HURRICANE_PYTHON_INCLUDE_DIR + ${HURRICANE_PYTHON_INCLUDE_PATH} + ) + SET(HURRICANE_PYTHON_LIBRARIES + ${HURRICANE_PYTHON_LIBRARY_PATH} + ) + ENDIF(HURRICANE_PYTHON_LIBRARY_PATH) + ENDIF(HURRICANE_PYTHON_INCLUDE_PATH) IF(HURRICANE_FOUND OR HURRICANE_STATIC_FOUND) IF(NOT HURRICANE_FIND_QUIETLY) @@ -132,8 +161,10 @@ IF(UNIX) HURRICANE_LIBRARY_PATH HURRICANE_STATIC_LIBRARY_PATH HURRICANE_GRAPHICAL_INCLUDE_PATH - HURRICANE_VIEWER_LIBRARY_PATH - HURRICANE_VIEWER_STATIC_LIBRARY_PATH + HURRICANE_GRAPHICAL_LIBRARY_PATH + HURRICANE_GRAPHICAL_STATIC_LIBRARY_PATH + HURRICANE_PYTHON_INCLUDE_PATH + HURRICANE_PYTHON_LIBRARY_PATH ) ENDIF(UNIX) diff --git a/hurricane/doc/hurricane/Transformation.dox b/hurricane/doc/hurricane/Transformation.dox index 560a6e7b..d02a1350 100644 --- a/hurricane/doc/hurricane/Transformation.dox +++ b/hurricane/doc/hurricane/Transformation.dox @@ -101,17 +101,6 @@ * components of the translation and where a, b, c and d are the * coefficients of the matrix associated to the orientation. * - * \remark The exact name of the orientation is, i.e. for R1 : - * Transformation::Orientation::R1. It's a little verbose - * but you use seldom those codes. If nevertheless you make - * intensive use of them you can locally write : -\code -#define Transformation::Orientation TO -\endcode - * and then use the expression : -\code -TO::R1 -\endcode */ /*! \name Constructors diff --git a/hurricane/doc/hviewer/CMakeLists.txt b/hurricane/doc/hviewer/CMakeLists.txt index f7041eaa..2dabe8e3 100644 --- a/hurricane/doc/hviewer/CMakeLists.txt +++ b/hurricane/doc/hviewer/CMakeLists.txt @@ -2,7 +2,7 @@ set ( htmlInstallDir /share/doc/en/html/hviewer ) set ( latexInstallDir /share/doc/en/latex/hviewer ) - add_custom_target ( doc ALL cd ${HURRICANE_SOURCE_DIR}/doc/hviewer && ${DOXYGEN_EXECUTABLE} doxyfile ) + add_custom_target ( documentation ALL cd ${HURRICANE_SOURCE_DIR}/doc/hviewer && ${DOXYGEN_EXECUTABLE} doxyfile ) install ( DIRECTORY html/ DESTINATION ${htmlInstallDir} ) install ( FILES customSummary.html DESTINATION ${htmlInstallDir} )