Merge branch 'master' into dev

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

diff --git a/cmake/CMakelinuxalphagcc.cmake b/cmake/CMakelinuxalphagcc.cmake
index e0e62220aa11c23683f53c57131de39dfe30d2af..5a503508720dc8427a23046d7d022bb7098d7f8c 100644 (file)
--- a/cmake/CMakelinuxalphagcc.cmake
+++ b/cmake/CMakelinuxalphagcc.cmake
@@ -6,21 +6,30 @@
 #--------------------------------------------------------------------------------#
 
 
-cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR)
 
 #Retrieve Compiler Version
 
 
-execute_process (COMMAND ${CMAKE_C_COMPILER} -dumpversion | cut -d. -f1 
+execute_process (COMMAND ${CMAKE_C_COMPILER} -dumpversion
+                 COMMAND cut -d. -f1
                  OUTPUT_VARIABLE CCMAJORV
                  OUTPUT_STRIP_TRAILING_WHITESPACE) 
-execute_process (COMMAND ${CMAKE_C_COMPILER} -dumpversion | cut -d. -f2
+execute_process (COMMAND ${CMAKE_C_COMPILER} -dumpversion
+                 COMMAND cut -d. -f2
                  OUTPUT_VARIABLE CCMINORV
                  OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 
 # 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})
@@ -101,7 +110,7 @@ else()
 endif(${CMAKE_Fortran_COMPILER} MATCHES "g95")
 
 set(LDFLAGS "${OPT}")
-set(SOFLAGS "${OPT} -shared -Wl")
+set(SOFLAGS "${OPT} -shared")
 set(ALLIB)