From 2570d2bfc1081f3632625d7e0ccd75136965a4a3 Mon Sep 17 00:00:00 2001 From: Akos Kiss Date: Wed, 19 Apr 2017 21:38:52 +0200 Subject: [PATCH] Allow platforms/compilers to signal that user-specified settings are overridden Currently, the Darwin platform and the TI compiler force some of the settings to predefined values. This patch ensures that these overrides are highlighted during build. JerryScript-DCO-1.0-Signed-off-by: Akos Kiss akiss@inf.u-szeged.hu --- CMakeLists.txt | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a4bde4ab47..ace26af1d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,6 +47,13 @@ if("${PLATFORM}" STREQUAL "DARWIN") set(ENABLE_LTO "OFF") set(ENABLE_STATIC_LINK "OFF") set(ENABLE_STRIP "OFF") + + set(JERRY_LIBC_MESSAGE " (FORCED BY PLATFORM)") + set(JERRY_LIBM_MESSAGE " (FORCED BY PLATFORM)") + set(ENABLE_ALL_IN_ONE_MESSAGE " (FORCED BY PLATFORM)") + set(ENABLE_LTO_MESSAGE " (FORCED BY PLATFORM)") + set(ENABLE_STATIC_LINK_MESSAGE " (FORCED BY PLATFORM)") + set(ENABLE_STRIP_MESSAGE " (FORCED BY PLATFORM)") endif() @@ -62,27 +69,24 @@ if(CMAKE_C_COMPILER_ID MATCHES "TI") set(USING_TI 1) endif() -# Status messages -message(STATUS "CMAKE_BUILD_TYPE " ${CMAKE_BUILD_TYPE}) -message(STATUS "CMAKE_SYSTEM_NAME " ${CMAKE_SYSTEM_NAME}) -message(STATUS "CMAKE_SYSTEM_PROCESSOR " ${CMAKE_SYSTEM_PROCESSOR}) -message(STATUS "ENABLE_ALL_IN_ONE " ${ENABLE_ALL_IN_ONE}) -message(STATUS "ENABLE_LTO " ${ENABLE_LTO}) - if(USING_TI) -# If using a compiler that _only_ does static linking, inform the user -# of the discrepancy in settings. set(ENABLE_STATIC_LINK "ON") - message(STATUS "ENABLE_STATIC_LINK " ${ENABLE_STATIC_LINK} " (ONLY OPTION FOR THIS COMPILER)") -else() - message(STATUS "ENABLE_STATIC_LINK " ${ENABLE_STATIC_LINK}) + + set(ENABLE_STATIC_LINK_MESSAGE " (FORCED BY COMPILER)") endif() -message(STATUS "ENABLE_STRIP " ${ENABLE_STRIP}) +# Status messages +message(STATUS "CMAKE_BUILD_TYPE " ${CMAKE_BUILD_TYPE}) +message(STATUS "CMAKE_SYSTEM_NAME " ${CMAKE_SYSTEM_NAME}) +message(STATUS "CMAKE_SYSTEM_PROCESSOR " ${CMAKE_SYSTEM_PROCESSOR}) +message(STATUS "ENABLE_ALL_IN_ONE " ${ENABLE_ALL_IN_ONE} ${ENABLE_ALL_IN_ONE_MESSAGE}) +message(STATUS "ENABLE_LTO " ${ENABLE_LTO} ${ENABLE_LTO_MESSAGE}) +message(STATUS "ENABLE_STATIC_LINK " ${ENABLE_STATIC_LINK} ${ENABLE_STATIC_LINK_MESSAGE}) +message(STATUS "ENABLE_STRIP " ${ENABLE_STRIP} ${ENABLE_STRIP_MESSAGE}) message(STATUS "JERRY_CMDLINE " ${JERRY_CMDLINE}) message(STATUS "JERRY_CMDLINE_MINIMAL " ${JERRY_CMDLINE_MINIMAL}) -message(STATUS "JERRY_LIBC " ${JERRY_LIBC}) -message(STATUS "JERRY_LIBM " ${JERRY_LIBM}) +message(STATUS "JERRY_LIBC " ${JERRY_LIBC} ${JERRY_LIBC_MESSAGE}) +message(STATUS "JERRY_LIBM " ${JERRY_LIBM} ${JERRY_LIBM_MESSAGE}) message(STATUS "PORT_DIR " ${PORT_DIR}) message(STATUS "UNITTESTS " ${UNITTESTS})