From de0258e4fae5c0bdab324098fb0da0d26b2b9ff1 Mon Sep 17 00:00:00 2001 From: Sylvain Thery Date: Wed, 5 Nov 2014 18:16:47 +0100 Subject: [PATCH] remove warnings on mac --- CMakeLists.txt | 3 +++ SCHNApps/CMakeLists.txt | 16 ++++++++++------ SCHNApps/Plugins/plugins_cmake.txt | 3 +++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4bb722ba2..e6994b83c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -151,6 +151,9 @@ IF (WITH_GLEWMX) ADD_DEFINITIONS(-DGLEW_MX) ENDIF (WITH_GLEWMX) +if(APPLE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated") +endif() # qq definition specifiques pour mac #IF(APPLE) diff --git a/SCHNApps/CMakeLists.txt b/SCHNApps/CMakeLists.txt index aabcec28b..57d168b64 100644 --- a/SCHNApps/CMakeLists.txt +++ b/SCHNApps/CMakeLists.txt @@ -97,13 +97,17 @@ SET (EXT_LIBS # qq definition specifiques pour mac -IF(APPLE) +#IF(APPLE) # attention a changer pour chercher la bonne version automatiquement - SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.6.sdk" CACHE STRING "developer SDK") - SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-undefined -Wl,dynamic_lookup") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMAC_OSX") - SET(CMAKE_OSX_ARCHITECTURES x86_64) -ENDIF(APPLE) +# SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.6.sdk" CACHE STRING "developer SDK") +# SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-undefined -Wl,dynamic_lookup") +# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMAC_OSX") +# SET(CMAKE_OSX_ARCHITECTURES x86_64) +#ENDIF(APPLE) + +if(APPLE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated") +endif() if(CMAKE_COMPILER_IS_GNUCXX) execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) diff --git a/SCHNApps/Plugins/plugins_cmake.txt b/SCHNApps/Plugins/plugins_cmake.txt index e08b3edae..223f8c66c 100644 --- a/SCHNApps/Plugins/plugins_cmake.txt +++ b/SCHNApps/Plugins/plugins_cmake.txt @@ -7,6 +7,9 @@ QT4_WRAP_CPP( PLUGIN_MOC_FILES ${PLUGIN_QOBJECT_FILES} ) # SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -L/usr/local/lib") #ENDIF(APPLE) +if(APPLE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated") +endif() ADD_LIBRARY( ${PLUGIN_NAME} SHARED ${PLUGIN_FILES} -- GitLab