Added protection for null pointer

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

diff --git a/cmake/CMakemacosx64.cmake b/cmake/CMakemacosx64.cmake
index 840e7140d0988f588ea3498b1713eec9c49cd963..f6c24a416dac87325adaeee6e727d0fc7e89bd0a 100644 (file)
--- a/cmake/CMakemacosx64.cmake
+++ b/cmake/CMakemacosx64.cmake
@@ -67,9 +67,18 @@ set ( CLIBCXXOPTS )
 set ( CLIBCOPT )
 set ( CLIBFOPT  ${CLIBDEFS})
 
-set ( CXXWARN  "-Wall -Wno-long-long -W -Weffc++ -Wshadow -Woverloaded-virtual -ansi")
+set ( CXXWARN  "-Wall -Wno-long-long -W -Weffc++ -Wshadow -Woverloaded-virtual")
 
-set ( CXXSTF  "-pipe -fbounds-check -fsigned-char -fno-common -fmessage-length=0 -fno-default-inline -fno-inline -I/usr/X11R6/include -I${FINK_ROOT}/include")
+if ( CMAKE_CXX_COMPILER MATCHES "clang") 
+     
+     set ( CXXSTF  "-pipe -fsigned-char -fno-common -fmessage-length=0 -fno-inline -I/usr/X11R6/include -I${FINK_ROOT}/include")
+
+else( CMAKE_CXX_COMPILER MATCHES "clang")
+
+     set ( CXXSTF  "-pipe -fbounds-check -fsigned-char -fno-common -fmessage-length=0 -fno-default-inline -fno-inline -I/usr/X11R6/include -I${FINK_ROOT}/include")
+     set (CXXWARN "${CXXWARN} -ansi")
+
+endif( CMAKE_CXX_COMPILER MATCHES "clang")
 
 set ( CXXFLAGS  "${CXXOPT} ${CXXSTF}")
 
@@ -77,7 +86,7 @@ set ( CXXFLAGSNO  "${CXXNOOPT} ${CXXSTF}")
 
 set ( CFLAGS  "${COPT} -Wall -W -fno-common -pipe -I${FINK_ROOT}/include")
 
-set ( FFLAGS "${FFLAGS} -DFORTRAN_GFORTRAN")
+set ( FFLAGS "${FFLAGS} -m64 -DFORTRAN_GFORTRAN")
 
 set ( CINTFLAGS )