Make 2013 the default OCDB

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

diff --git a/cmake/CMakelinuxx8664gcc.cmake b/cmake/CMakelinuxx8664gcc.cmake
index 8263364b68c19b1b74fdaa08d131133165c0380a..74413fcc8f8df3dfd9396673e90f6044ad3f31bc 100644 (file)
--- a/cmake/CMakelinuxx8664gcc.cmake
+++ b/cmake/CMakelinuxx8664gcc.cmake
@@ -13,16 +13,30 @@ 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})
@@ -73,6 +87,7 @@ execute_process(COMMAND find /lib64 -name 'libNoVersion*.so'
                 OUTPUT_STRIP_TRAILING_WHITESPACE)
                 
 
+#set(SYSLIBS "-ldl -lcrypt -L/usr/X11R6/lib -lX11 -lGL -lGLU ${LIBNOVER}")
 set(SYSLIBS "-ldl -lcrypt -L/usr/X11R6/lib -lX11 ${LIBNOVER}")
 
 if(${CMAKE_Fortran_COMPILER} MATCHES "g95")
@@ -105,7 +120,7 @@ else()
 endif(${CMAKE_Fortran_COMPILER} MATCHES "g95")
 
 set(LDFLAGS "${OPT}")
-set(SOFLAGS "${OPT} -shared -Wl")
+set(SOFLAGS "${OPT} -shared")
 set(ALLIB)