From d788d1c559799dff9ade542a112e4467d9bcc4d8 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Wed, 21 May 2008 22:44:35 +0000 Subject: [PATCH] * ./hurricane/src : - Complete include re-organisation. include/hurricane/*.h : kernel. include/hurricane/viewer/*.h : hviewer. include/hurricane/inspector/*.h : hinspector. Includes have been moved into subdirectories of .cpp files (as in crlcore). - Now you must include files like this : #include #include #include - Suppressed viewer specific include path in FindHURRICANE.cmake. - Re-enabled documentation, with dot disabled as it seems to slow down doxygen. * ./crlcore/src/crlcore : - Adapted to new Hurricane include scheme. Corrected bugs in it's own include files (noticeably "Utilities.h"). --- hurricane/CMakeLists.txt | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/hurricane/CMakeLists.txt b/hurricane/CMakeLists.txt index bf331952..6b4b800e 100644 --- a/hurricane/CMakeLists.txt +++ b/hurricane/CMakeLists.txt @@ -4,15 +4,24 @@ 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) + +SET(QT_USE_QTXML "true") + 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) +FIND_PACKAGE(Doxygen) ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(cmake_modules) -#IF(DOXYGEN_FOUND) -# ADD_SUBDIRECTORY(doc) -#ENDIF(DOXYGEN_FOUND) +IF(DOXYGEN_FOUND) + ADD_SUBDIRECTORY(doc) +ENDIF(DOXYGEN_FOUND)