From 2add0c7b3df11b6a9c76d65893295cb9199a9d6d Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Sun, 5 Jul 2015 14:22:45 +0200 Subject: [PATCH] Fix -Wno-deprecated-register flag w/ sles11sp3 (Unix/Darwin only) This only applies to git master (target 2.4) refs #8842 refs #9559 fixes #9414 Signed-off-by: Michael Friedrich --- lib/config/CMakeLists.txt | 2 +- tools/mkclass/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/config/CMakeLists.txt b/lib/config/CMakeLists.txt index ab9d80927..09cd12830 100644 --- a/lib/config/CMakeLists.txt +++ b/lib/config/CMakeLists.txt @@ -24,7 +24,7 @@ set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/config_parser.cc PROPERTY EXCLUD flex_target(config_lexer config_lexer.ll ${CMAKE_CURRENT_BINARY_DIR}/config_lexer.cc) set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/config_lexer.cc PROPERTY EXCLUDE_UNITY_BUILD TRUE) -if(UNIX) +if(APPLE) set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/config_parser.cc PROPERTY COMPILE_FLAGS "-Wno-deprecated-register") set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/config_lexer.cc PROPERTY COMPILE_FLAGS "-Wno-deprecated-register") endif() diff --git a/tools/mkclass/CMakeLists.txt b/tools/mkclass/CMakeLists.txt index 7f16402dc..424d2d3ab 100644 --- a/tools/mkclass/CMakeLists.txt +++ b/tools/mkclass/CMakeLists.txt @@ -22,7 +22,7 @@ bison_target(class_parser class_parser.yy ${CMAKE_CURRENT_BINARY_DIR}/class_pars flex_target(class_lexer class_lexer.ll ${CMAKE_CURRENT_BINARY_DIR}/class_lexer.cc) add_flex_bison_dependency(class_lexer class_parser) -if(UNIX) +if(APPLE) set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/class_parser.cc PROPERTY COMPILE_FLAGS "-Wno-deprecated-register") set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/class_lexer.cc PROPERTY COMPILE_FLAGS "-Wno-deprecated-register") endif()