Fixes for #77589, Setting optimisation with cmake (Natalia)

diff --git a/README_CMake b/README_CMake
index df5457d20ef19bdf0c5b7f515b18e49051856554..450e2098065a4bc40f8dcb2056029928c57d4f94 100644 (file)
--- a/README_CMake
+++ b/README_CMake
@@ -31,8 +31,20 @@ It you do not specify it, "make install" will put lib, bin and include in ALICE_
 
        cmake $ALICE_ROOT
 
+
 Note: Some files CMakeLists.txt will be created in the source tree, so you need write access there. This 
 is a temporary situation that will change soon.
+       
+       6a.Run 
+               cmake -DCMAKE_BUILD_TYPE=DEBUG  $ALICE_ROOT
+ 
+       to compile AliRoot in Debug configuration (-g compiler flags).
+       To change the configuration later on you can either edit
+       cache variable CMAKE_BUILD_TYPE using 'ccmake' command ('None' value for default configuration), 
+       or setup default configuration by running 
+               cmake $ALICE_ROOT
+
+       6b. By default -O -g options are setting up. 
 
 7. Build and install AliRoot. Note that the parralel build is fully operational with CMake.
 

diff --git a/cmake/ALICE_CMake.cmake b/cmake/ALICE_CMake.cmake
index 023777b3efed80e0c9e507a2a4bdd62dc3ac1566..79ba6b7943bea4beb8ca390d786e2a4f8a3f60de 100644 (file)
--- a/cmake/ALICE_CMake.cmake
+++ b/cmake/ALICE_CMake.cmake
@@ -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}")

diff --git a/cmake/CMakelinux.cmake b/cmake/CMakelinux.cmake
index 718f7911c6c5cf465c55ac05f489831cbb766e2c..88d2805fba4fd8135d6d32b756506b987b295c30 100644 (file)
--- a/cmake/CMakelinux.cmake
+++ b/cmake/CMakelinux.cmake
@@ -22,7 +22,14 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
 endif(CMAKE_C_COMPILER_ID STREQUAL "GNU")
 
 # Global Optimization
-set(OPT "-O -g")
+set(OPT)
+# ------- Setting optimization flags for default configuration -------
+if((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "None"))
+    set(DEFAULT_CXX_FLAGS "-O -g")
+    set(OPT "${DEFAULT_CXX_FLAGS}")
+    message("-- Setting compiler flags for default configuration: ${DEFAULT_CXX_FLAGS}")
+endif((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "None"))
+# --------------------------------------------------------------------
 set(NOOPT "-g")
 
 set(CXXOPT ${OPT})

diff --git a/cmake/CMakelinuxalphagcc.cmake b/cmake/CMakelinuxalphagcc.cmake
index 53ecdecba51c6e8f57926bf8b6d29be39f0fa33a..918a7edc0356930d980b031fb7d5a38ea07aaa6e 100644 (file)
--- a/cmake/CMakelinuxalphagcc.cmake
+++ b/cmake/CMakelinuxalphagcc.cmake
@@ -20,7 +20,14 @@ execute_process (COMMAND ${CMAKE_C_COMPILER} -dumpversion | cut -d. -f2
 
 
 # Global Optimization
-set(OPT "-O -g")
+set(OPT)
+# ------- Setting optimization flags for default configuration -------
+if((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "None"))
+    set(DEFAULT_CXX_FLAGS "-O -g")
+    set(OPT "${DEFAULT_CXX_FLAGS}")
+    message("-- Setting compiler flags for default configuration: ${DEFAULT_CXX_FLAGS}")
+endif((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "None"))
+# --------------------------------------------------------------------
 set(NOOPT "-g")
 
 set(CXXOPT ${OPT})

diff --git a/cmake/CMakelinuxia64gcc.cmake b/cmake/CMakelinuxia64gcc.cmake
index ef2727b6e3c7e27e4ca2af02bb67fb9f8533ae00..54a2143ba558586e50e97f02711eb89ea9e293a3 100644 (file)
--- a/cmake/CMakelinuxia64gcc.cmake
+++ b/cmake/CMakelinuxia64gcc.cmake
@@ -20,7 +20,14 @@ execute_process (COMMAND ${CMAKE_C_COMPILER} -dumpversion | cut -d. -f2
 
 
 # Global Optimization
-set(OPT "-O -g -mieee -mno-soft-float")
+set(OPT)
+# ------- Setting optimization flags for default configuration -------
+if((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "None"))
+    set(DEFAULT_CXX_FLAGS "-O -g")
+    set(OPT "${DEFAULT_CXX_FLAGS}")
+    message("-- Setting compiler flags for default configuration: ${DEFAULT_CXX_FLAGS}")
+endif((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "None"))
+# --------------------------------------------------------------------
 set(NOOPT "-g -mieee -mno-soft-float")
 
 set(CXXOPT ${OPT})

diff --git a/cmake/CMakelinuxicc.cmake b/cmake/CMakelinuxicc.cmake
index 859427721ca6f166e8591bc903439b4c6bdecde7..c961f1b40a1778ae747d7ad57b0dde867367f74b 100644 (file)
--- a/cmake/CMakelinuxicc.cmake
+++ b/cmake/CMakelinuxicc.cmake
@@ -33,7 +33,15 @@ execute_process (COMMAND ${CMAKE_C_COMPILER} -V 2>&1 | awk '{ if(NR == 1) print
                  OUTPUT_VARIABLE ICC_MINOR
                  OUTPUT_STRIP_TRAILING_WHITESPACE)
 
+# Global Optimization
 set ( OPT  "-O -ip")
+# ------- Setting optimization flags for default configuration -------
+if((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "None"))
+    set(DEFAULT_CXX_FLAGS "-O -g")
+    set(OPT "${DEFAULT_CXX_FLAGS}")
+    message("-- Setting compiler flags for default configuration: ${DEFAULT_CXX_FLAGS}")
+endif((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "None"))
+# --------------------------------------------------------------------
 set ( NOOPT  "-O0")
 
 set ( CXXOPT  "${OPT} -fPIC")

diff --git a/cmake/CMakelinuxx8664gcc.cmake b/cmake/CMakelinuxx8664gcc.cmake
index 8263364b68c19b1b74fdaa08d131133165c0380a..1e7eeb6b1a381e78cdf69735e2c9bdbd4dd14681 100644 (file)
--- a/cmake/CMakelinuxx8664gcc.cmake
+++ b/cmake/CMakelinuxx8664gcc.cmake
@@ -22,7 +22,19 @@ execute_process (COMMAND ${CMAKE_C_COMPILER} -dumpversion | cut -d. -f2
 
 
 # Global Optimization
-set(OPT "-O -g")
+set(OPT)
+
+# ------- Setting optimization flags for default configuration -------
+
+if((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "None"))
+    set(DEFAULT_CXX_FLAGS "-O -g")
+    set(OPT "${DEFAULT_CXX_FLAGS}")
+    message("-- Setting compiler flags for default configuration: ${DEFAULT_CXX_FLAGS}")
+endif((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "None"))
+
+# --------------------------------------------------------------------
+
+
 set(NOOPT "-g")
 
 set(CXXOPT ${OPT})

diff --git a/cmake/CMakemacosx.cmake b/cmake/CMakemacosx.cmake
index fbd36a5a4987a7f567e647bef90ac291b8a27775..8d5dcdc434e3ab615ff8ae7e8d837c50a4c95b40 100644 (file)
--- a/cmake/CMakemacosx.cmake
+++ b/cmake/CMakemacosx.cmake
@@ -19,8 +19,16 @@ if( NOT FINK_ROOT )
 
 endif( NOT FINK_ROOT )
 
-set ( OPT  "-O -g")
-set ( NOOPT  "-O0 -g")
+# Global Optimization
+set ( OPT )
+# ------- Setting optimization flags for default configuration -------
+if((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "None"))
+    set(DEFAULT_CXX_FLAGS "-O -g")
+    set(OPT "${DEFAULT_CXX_FLAGS}")
+    message("-- Setting compiler flags for default configuration: ${DEFAULT_CXX_FLAGS}")
+endif((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "None"))
+# --------------------------------------------------------------------
+set ( NOOPT  "-g")
 
 set ( CXXOPT  "${OPT}")
 set ( CXXNOOPT  "${NOOPT}")

diff --git a/cmake/CMakemacosx64.cmake b/cmake/CMakemacosx64.cmake
index 1e27b8e8e569a3c5bbd36d8ac5054ca3b1b2259f..075f3f65ce568381ec96c92be6a758e9b74b0e83 100644 (file)
--- a/cmake/CMakemacosx64.cmake
+++ b/cmake/CMakemacosx64.cmake
@@ -40,9 +40,17 @@ if( NOT FINK_ROOT )
        set ( FINK_ROOT /usr/local)
 
 endif( NOT FINK_ROOT )
-               
-set ( OPT  "-O -g")
-set ( NOOPT  "-O0 -g")
+
+# Global Optimization          
+set ( OPT )
+# ------- Setting optimization flags for default configuration -------
+if((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "None"))
+    set(DEFAULT_CXX_FLAGS "-O -g")
+    set(OPT "${DEFAULT_CXX_FLAGS}")
+    message("-- Setting compiler flags for default configuration: ${DEFAULT_CXX_FLAGS}")
+endif((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "None"))
+# --------------------------------------------------------------------
+set ( NOOPT  "-g")
 
 set ( CXXOPT  ${OPT})
 set ( CXXNOOPT  ${NOOPT})

diff --git a/cmake/CMakemacosxicc.cmake b/cmake/CMakemacosxicc.cmake
index 94a8bdae553e7c726f95cf80d7c24b3dcb0a7448..bc79407c440a51df0a8993c2b3ee3436ac3a3236 100644 (file)
--- a/cmake/CMakemacosxicc.cmake
+++ b/cmake/CMakemacosxicc.cmake
@@ -32,7 +32,15 @@ if( NOT FINK_ROOT )
 
 endif( NOT FINK_ROOT )
 
-set ( OPT  "-O -g")
+# Global Optimization
+set ( OPT )
+# ------- Setting optimization flags for default configuration -------
+if((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "None"))
+    set(DEFAULT_CXX_FLAGS "-O -g")
+    set(OPT "${DEFAULT_CXX_FLAGS}")
+    message("-- Setting compiler flags for default configuration: ${DEFAULT_CXX_FLAGS}")
+endif((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "None"))
+# --------------------------------------------------------------------
 set ( NOOPT  "-g")
 
 set ( CXXOPT  ${OPT})

diff --git a/cmake/CMakesolarisCC5.cmake b/cmake/CMakesolarisCC5.cmake
index 7002e24107e94fc961828dd4cefc5f7c81ca4b6d..da2b98dde5116c6cd6bf4d4763315908453fb3c9 100644 (file)
--- a/cmake/CMakesolarisCC5.cmake
+++ b/cmake/CMakesolarisCC5.cmake
@@ -25,7 +25,15 @@
 # SHLIBS - Shared Libraries and objects for linking (Executables only)           #
 #--------------------------------------------------------------------------------#
 
-set ( OPT  "-g -O")
+# Global Optimization
+set ( OPT )
+# ------- Setting optimization flags for default configuration -------
+if((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "None"))
+    set(DEFAULT_CXX_FLAGS "-O -g")
+    set(OPT "${DEFAULT_CXX_FLAGS}")
+    message("-- Setting compiler flags for default configuration: ${DEFAULT_CXX_FLAGS}")
+endif((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "None"))
+# --------------------------------------------------------------------
 set ( NOOPT  "-g")
 
 set ( CXXOPT  ${OPT})

diff --git a/cmake/CMakewin32gcc.cmake b/cmake/CMakewin32gcc.cmake
index 252315c3a22ca94c6e237df1692598065ab6ea6e..2b8d4fae23ac52c7d6bb149ba28e209bc4d77cc4 100644 (file)
--- a/cmake/CMakewin32gcc.cmake
+++ b/cmake/CMakewin32gcc.cmake
@@ -25,7 +25,16 @@
 # SHLIBS - Shared Libraries and objects for linking (Executables only)           #
 #--------------------------------------------------------------------------------#
 
-set ( OPT  "-O -g")
+# Global Optimization
+set ( OPT )
+# ------- Setting optimization flags for default configuration -------
+if((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "None"))
+    set(DEFAULT_CXX_FLAGS "-O -g")
+    set(OPT "${DEFAULT_CXX_FLAGS}")
+    message("-- Setting compiler flags for default configuration: ${DEFAULT_CXX_FLAGS}")
+endif((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "None"))
+# --------------------------------------------------------------------
+
 set ( NOOPT  "-g")
 
 set ( CXXOPT  ${OPT})