From 73cbb3a156b37df3bf0caf3b992dde0d701eeeeb Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Wed, 29 Nov 2017 11:38:06 +0100 Subject: [PATCH] Use message(STATUS ...) in cmake files. --- CMakeLists.txt | 22 +++++++++++----------- FindSimGrid.cmake | 2 +- tools/cmake/GCCFlags.cmake | 10 +++++----- tools/cmake/Java.cmake | 6 +++--- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 58b548b592..b2faaf2fca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -205,7 +205,7 @@ IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86|AMD64|amd64") if (WIN32) message(STATUS "Disable fast raw contexts on Windows.") elseif(enable_address_sanitizer) - message("Disable fast raw contexts with ASan") + message(STATUS "Disable fast raw contexts with ASan") else() set(HAVE_RAW_CONTEXTS 1) endif() @@ -254,9 +254,9 @@ endif() # Not finding this is perfectly OK find_package(Boost COMPONENTS unit_test_framework) if (Boost_UNIT_TEST_FRAMEWORK_FOUND) - message("-- (enabling the Boost-based unit tests)") + message(STATUS "Enabling the Boost-based unit tests.") else() - message("-- (disabling the Boost-based unit tests -- please install libboost-test-dev)") + message(STATUS "Disabling the Boost-based unit tests -- please install libboost-test-dev.") endif() @@ -274,7 +274,7 @@ endif() find_package(Boost COMPONENTS context) set(Boost_FOUND 1) # This component is optional if(Boost_CONTEXT_FOUND) - message("Found Boost.Context") + message(STATUS "Found Boost.Context") set(HAVE_BOOST_CONTEXTS 1) else() message (" boost : found.") @@ -565,17 +565,17 @@ if(CMAKE_USE_PTHREADS_INIT) endif() set(HAVE_THREAD_CONTEXTS 1) - message("-- Support for thread context factory ok.") + message(STATUS "Support for thread context factory ok.") endif() set(HAVE_UCONTEXT_CONTEXTS 0) if(NOT HAVE_UCONTEXT_H) - message("-- No ucontext factory: not found.") + message(STATUS "No ucontext factory: not found.") elseif(APPLE) - message("-- No ucontext factory: Apple don't want us to use them.") + message(STATUS "No ucontext factory: Apple don't want us to use them.") set(HAVE_UCONTEXT_H 0) elseif(enable_address_sanitizer) - message("-- No ucontext factory: ASan does not support it (see http://code.google.com/p/address-sanitizer/issues/detail?id=189)") + message(STATUS "No ucontext factory: ASan does not support it (see http://code.google.com/p/address-sanitizer/issues/detail?id=189)") else() try_compile(compile_makecontext ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_makecontext.c OUTPUT_VARIABLE compile_makecontext_output) @@ -583,10 +583,10 @@ else() #If can have both context if(compile_makecontext) set(HAVE_UCONTEXT_CONTEXTS 1) - message("-- Support for ucontext factory ok.") + message(STATUS "Support for ucontext factory ok.") else() - message("-- Error: exists, but makecontext is not compilable. Compilation output:\n ${compile_makecontext_output}") - message("-- No ucontext factory: makecontext() is not compilable.") + message(STATUS "Error: exists, but makecontext is not compilable. Compilation output:\n ${compile_makecontext_output}") + message(STATUS "No ucontext factory: makecontext() is not compilable.") endif() # Stack setup (size and address) diff --git a/FindSimGrid.cmake b/FindSimGrid.cmake index e92af15f15..8a79cdf9d8 100644 --- a/FindSimGrid.cmake +++ b/FindSimGrid.cmake @@ -55,6 +55,6 @@ if ("${_SimGrid_CONFIG_H_CONTENTS}" MATCHES "${_SimGrid_VERSION_REGEX}") endif ("${_SimGrid_CONFIG_H_CONTENTS}" MATCHES "${_SimGrid_VERSION_REGEX}") -message("-- SimGrid found in ${SimGrid_PATH} (version ${SimGrid_VERSION})") +message(STATUS "SimGrid found in ${SimGrid_PATH} (version ${SimGrid_VERSION})") diff --git a/tools/cmake/GCCFlags.cmake b/tools/cmake/GCCFlags.cmake index 94aaffda7f..13db52578b 100644 --- a/tools/cmake/GCCFlags.cmake +++ b/tools/cmake/GCCFlags.cmake @@ -107,20 +107,20 @@ if(enable_lto) # User wants LTO. Try if we can do that endif() endif() if(enable_lto) - message("-- LTO seems usable.") + message(STATUS "LTO seems usable.") else() if(NOT enable_compile_optimizations) - message("-- LTO disabled: Compile-time optimizations turned off.") + message(STATUS "LTO disabled: Compile-time optimizations turned off.") else() if(enable_model-checking) - message("-- LTO disabled when compiling with model-checking.") + message(STATUS "LTO disabled when compiling with model-checking.") else() - message("-- LTO does not seem usable -- try updating your build chain.") + message(STATUS "LTO does not seem usable -- try updating your build chain.") endif() endif() endif() else() - message("-- LTO disabled on the command line.") + message(STATUS "LTO disabled on the command line.") endif() if(enable_lto) # User wants LTO, and it seems usable. Go for it set(optCFLAGS "${optCFLAGS} -flto ") diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake index 3d5a70d6b4..24c0994060 100644 --- a/tools/cmake/Java.cmake +++ b/tools/cmake/Java.cmake @@ -11,8 +11,8 @@ set(Java_FOUND 1) include(UseJava) find_package(JNI REQUIRED) -message("-- [Java] JNI found: ${JNI_FOUND}") -message("-- [Java] JNI include dirs: ${JNI_INCLUDE_DIRS}") +message(STATUS "[Java] JNI found: ${JNI_FOUND}") +message(STATUS "[Java] JNI include dirs: ${JNI_INCLUDE_DIRS}") if(WIN32) execute_process(COMMAND java -d64 -version @@ -39,7 +39,7 @@ else() endif() get_target_property(CHECK_INCLUDES simgrid-java INCLUDE_DIRECTORIES) -message("-- [Java] simgrid-java includes: ${CHECK_INCLUDES}") +message(STATUS "[Java] simgrid-java includes: ${CHECK_INCLUDES}") # Rules to build simgrid.jar ############################ -- 2.20.1