Restoring the generation of HTML documentation (Natalia) + related changes (PH)

[u/mrichter/AliRoot.git] / cmake / ALICE_CMake.cmake

diff --git a/cmake/ALICE_CMake.cmake b/cmake/ALICE_CMake.cmake
index 5d04bad5cfa519168160ba3b62be554889e8ea7e..f67cf78f664f8e30f72535605cb789249260f9b7 100644 (file)
--- a/cmake/ALICE_CMake.cmake
+++ b/cmake/ALICE_CMake.cmake
@@ -5,7 +5,7 @@
 # Author: Johny Jose (johny.jose@cern.ch)
 #         Port of previous Makefile build to cmake
 
-cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR)
 
 macro(ALICE_DevFlagsOutput)
 
@@ -119,22 +119,6 @@ endmacro(ALICE_CheckOutOfSourceBuild)
 
 macro(ALICE_ConfigureCompiler)
 
-  if(ALIDEBUG STREQUAL "YES")
-    set(ALICE_TARGET ${ALICE_TARGET}DEBUG)
-    message("Befor ${CXXFLAGS}")
-    string(REGEX MATCHALL "-O[^ ]*" FFLAGS "${FFLAGS}")
-    string(REGEX MATCHALL "-O[^ ]*" CXXFLAGS "${CXXFLAGS}")
-    message("After ${CXXFLAGS}")
-    string(REGEX MATCHALL "-O[^ ]*" CFLAGS "${CFLAGS}")
-    string(REGEX MATCHALL "-O[^ ]*" SOFLAGS "${SOFLAGS}")
-    string(REGEX MATCHALL "-O[^ ]*" LDFLAGS "${LDFLAGS}")
-    set(FFLAGS "-g ${FFLAGS}")
-    set(CXXFLAGS "-g ${CXXFLAGS}")
-    set(CFLAGS "-g ${CFLAGS}")
-    set(SOFLAGS "-g ${SOFLAGS}")
-    set(LDFLAGS "-g ${LDFLAGS}")
-  endif(ALIDEBUG STREQUAL "YES")
-
   if(ALIPROFILE STREQUAL "YES")
     set(ALICE_TARGET ${ALICE_TARGET}PROF)
     set(FFLAGS "-pg ${FFLAGS}")
@@ -282,6 +266,7 @@ macro(ALICE_BuildPackage)
 
   ALICE_SetPackageVariable(PEDEFINE "EDEFINE" "${EDEFINE}" "${EDEFINE}")
   ALICE_SetPackageVariable(PEXPORT "EXPORT" "${EXPORT}" "${EXPORT}")
+#  message(${CMAKE_INCLUDE_EXPORT_DIRECTORY})
   ALICE_SetPackageVariable(PEXPORTDEST "EXPORTDEST" "${CMAKE_INCLUDE_EXPORT_DIRECTORY}" "${CMAKE_INCLUDE_EXPORT_DIRECTORY}")
   ALICE_SetPackageVariable(PINC "INC" "${EINCLUDE};${MODULE}" "${EINCLUDE};${MODULE}")
   ALICE_SetPackageVariable(PELIBS "ELIBS" "${ELIBS}" "${ELIBS}")
@@ -343,7 +328,7 @@ endmacro(ALICE_BuildPackage)
 
 macro(ALICE_BuildModule)
 
-  add_definitions(-D_MODULE="${MODULE}")
+  add_definitions(-D_MODULE_="${MODULE}")
   foreach(PACKAGEFILE ${PACKAGES})
       set(lib)
       set(bin)
@@ -421,7 +406,6 @@ macro(ALICE_BuildLibrary)
 
   ALICE_Format(PELIBSDIR "-L" "" "${PELIBSDIR}")
   ALICE_CheckLibraries(PBLIBS "${PBLIBS}")
-  ALICE_CheckLibraries(PELIBS "${PELIBS}")
 
   ALICE_CorrectPaths(EINCLUDE "${EINCLUDE}")
   ALICE_CorrectPaths(PINC "${PINC}")