From 320606a75e88b43d585faade469ced22b687a981 Mon Sep 17 00:00:00 2001 From: hristov Date: Thu, 17 Apr 2014 13:08:49 +0200 Subject: [PATCH] Corrected compilation options --- cmake/ALICE_CMake.cmake | 4 ++++ cmake/CMakemacosx64.cmake | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake/ALICE_CMake.cmake b/cmake/ALICE_CMake.cmake index 2e3ec7dd5cc..16d2bb5ecef 100644 --- a/cmake/ALICE_CMake.cmake +++ b/cmake/ALICE_CMake.cmake @@ -135,6 +135,10 @@ macro(ALICE_ConfigureCompiler) endif(ALIPROFILE STREQUAL "YES") ALICE_RootConfig(RCFLAGS --auxcflags) + if ( CMAKE_CXX_COMPILER MATCHES "clang") + string(REPLACE "-pthread" " " RCFLAGS "${RCFLAGS}") + endif ( CMAKE_CXX_COMPILER MATCHES "clang") + ALICE_RootConfig(RLFLAGS --ldflags) set(CXXFLAGS "${CXXFLAGS} ${RCFLAGS}") diff --git a/cmake/CMakemacosx64.cmake b/cmake/CMakemacosx64.cmake index eb7f26d646e..f6c24a416da 100644 --- a/cmake/CMakemacosx64.cmake +++ b/cmake/CMakemacosx64.cmake @@ -67,7 +67,7 @@ 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") if ( CMAKE_CXX_COMPILER MATCHES "clang") @@ -76,10 +76,10 @@ if ( CMAKE_CXX_COMPILER MATCHES "clang") 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}") set ( CXXFLAGSNO "${CXXNOOPT} ${CXXSTF}") -- 2.43.0