From 98fd607ba36daf8ebc21a933a3d4a914d40fa5e7 Mon Sep 17 00:00:00 2001 From: Christian Kern Date: Fri, 19 Jun 2015 14:34:06 +0200 Subject: [PATCH] Put printing the automatic initialization message to the main CMakeLists.txt file, as this is more logical --- CMakeLists.txt | 7 +++++++ mtapi_cpp/CMakeLists.txt | 4 ---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ed453d0..a2c580d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,6 +100,13 @@ else() endif() message(" (set with command line option -DWARNINGS_ARE_ERRORS=ON/OFF)") +if (USE_AUTOMATIC_INITIALIZATION STREQUAL ON) + message("-- MTAPI/Tasks automatic initialization enabled (default)") +else() + message("-- MTAPI/Tasks automatic initialization disabled") +endif() +message(" (set with command line option -DUSE_AUTOMATIC_INITIALIZATION=ON/OFF)") + include(CMakeCommon/SetCompilerFlags.cmake) SetGNUCompilerFlags(compiler_libs compiler_flags) SetVisualStudioCompilerFlags(compiler_libs compiler_flags) diff --git a/mtapi_cpp/CMakeLists.txt b/mtapi_cpp/CMakeLists.txt index 3652d63..3a343f2 100644 --- a/mtapi_cpp/CMakeLists.txt +++ b/mtapi_cpp/CMakeLists.txt @@ -5,14 +5,10 @@ file(GLOB_RECURSE EMBB_MTAPI_CPP_HEADERS "include/*.h") file(GLOB_RECURSE EMBB_MTAPI_CPP_TEST_SOURCES "test/*.cc" "test/*.h") if (USE_AUTOMATIC_INITIALIZATION STREQUAL ON) - message("-- Automatic initialization enabled (default)") set(MTAPI_CPP_AUTOMATIC_INITIALIZE 1) else() set(MTAPI_CPP_AUTOMATIC_INITIALIZE 0) - message("-- Automatic initialization disabled") endif() -message(" (set with command line option -DUSE_AUTOMATIC_INITIALIZATION=ON/OFF)") - # Execute the GroupSources macro include(${CMAKE_SOURCE_DIR}/CMakeCommon/GroupSourcesMSVC.cmake) -- libgit2 0.26.0