From bde64cfb0255a9754cc9e744f19aa98ccec068c8 Mon Sep 17 00:00:00 2001 From: "adam.b" Date: Fri, 18 Oct 2019 12:28:41 +0100 Subject: [PATCH] Filled missing log values at the end of cmake run - Filled missing log values at the end of cmake run - Additional cleanup Change-Id: I85bf40dc4d9bad0de3faadedc5b16ad306aeae70 --- build/tizen/CMakeLists.txt | 14 ++++++-------- build/tizen/common.cmake | 7 +++++-- build/tizen/deps-check.cmake | 14 ++++++-------- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index 6e49cde..99b79aa 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -299,20 +299,18 @@ MESSAGE( STATUS "Lib Dir: ${LIB_DIR}" ) MESSAGE( STATUS "Include Dir: ${INCLUDE_DIR}" ) MESSAGE( STATUS "Coverage: ${ENABLE_COVERAGE}" ) MESSAGE( STATUS "Debug Build: ${ENABLE_DEBUG}") -MESSAGE( STATUS "Trace Build: ${ENABLE_TRACE}") -MESSAGE( STATUS "Compile flags: ${CMAKE_CXX_FLAGS}") -MESSAGE( STATUS "Freetype bitmap support (Emoji): ${freetype_bitmap_support}") +MESSAGE( STATUS "Freetype bitmap support (Emoji): ${freetype_bitmap_support_ENABLED}") MESSAGE( STATUS "Profile: ${ENABLE_PROFILE}") MESSAGE( STATUS "Data Dir (Read/Write): ${dataReadWriteDir}") MESSAGE( STATUS "Data Dir (Read Only): ${dataReadOnlyDir}") -MESSAGE( STATUS "EldBus: ${eldbus_available}") +MESSAGE( STATUS "EldBus: ${eldbus_available_ENABLED}") MESSAGE( STATUS "Shader Binary Cache: ${ENABLE_SHADERBINCACHE}") -MESSAGE( STATUS "Ecore Version At Least 1.13.0 ${ecore_imf_1_13}") +MESSAGE( STATUS "Ecore Version At Least 1.13.0 ${ecore_imf_1_13_ENABLED}") MESSAGE( STATUS "Network logging enabled: ${ENABLE_NETWORKLOGGING}") -MESSAGE( STATUS "Font config file: ${fontConfigurationFile}") +MESSAGE( STATUS "Font config file: \"${fontConfigurationFile}\"") MESSAGE( STATUS "Using Tizen APP FW libraries: ${ENABLE_APPFW}") -MESSAGE( STATUS "Tizen Platform Config supported ${tizenPlatformConfigSupported}") - +MESSAGE( STATUS "Tizen Platform Config supported ${TIZEN_PLATFORM_CONFIG_SUPPORTED_LOGMSG}") +MESSAGE( STATUS "Compile flags: ${CMAKE_CXX_FLAGS}") IF( enable_feedback ) ADD_SUBDIRECTORY( plugins ) ENDIF() diff --git a/build/tizen/common.cmake b/build/tizen/common.cmake index f5c9641..8149385 100644 --- a/build/tizen/common.cmake +++ b/build/tizen/common.cmake @@ -9,7 +9,10 @@ SET( CUSTOM_ARGUMENTS "" ) MACRO( CHECK_MODULE_AND_SET PKG_VAR PKG_LIB_REQUIREMENTS VAR_TO_SET ) PKG_CHECK_MODULES(${PKG_VAR} "${PKG_LIB_REQUIREMENTS}") IF( ${PKG_VAR}_FOUND ) - SET( ${VAR_TO_SET} 1 ) + SET( ${VAR_TO_SET} ON ) + SET( ${VAR_TO_SET}_ENABLED ON ) + ELSE() + SET( ${VAR_TO_SET}_ENABLED OFF ) ENDIF() ENDMACRO() @@ -25,7 +28,7 @@ ENDFUNCTION() # Conditional macro immitates autoconf AM_CONDITIONAL MACRO( CONDITIONAL VARIABLE ) IF( ${ARGN} ) - SET( ${VARIABLE} 1 ) + SET( ${VARIABLE} ON ) ENDIF() ENDMACRO() diff --git a/build/tizen/deps-check.cmake b/build/tizen/deps-check.cmake index 195c669..c653952 100644 --- a/build/tizen/deps-check.cmake +++ b/build/tizen/deps-check.cmake @@ -133,10 +133,6 @@ IF( NOT ${ENABLE_EXPORTALL} ) ADD_DEFINITIONS( "-fvisibility=hidden -DHIDE_DALI_INTERNALS" ) ENDIF() -IF( enable_trace ) - ADD_DEFINITIONS( -DTRACE_ENABLED ) -ENDIF() - IF( enable_shaderbincache ) ADD_DEFINITIONS( -DSHADERBIN_CACHE_ENABLED ) ENDIF() @@ -175,25 +171,27 @@ IF( ENABLE_COVERAGE OR "$ENV{CXXFLAGS}" MATCHES --coverage ) SET(COVERAGE --coverage) ENDIF() -IF( $ENV{DALI_DATA_RW_DIR} ) +IF( DEFINED ENV{DALI_DATA_RW_DIR} ) SET( dataReadWriteDir $ENV{DALI_DATA_RW_DIR} ) ELSE() SET( dataReadWriteDir ${CMAKE_INSTALL_PREFIX}/share/dali/ ) ENDIF() -IF( $ENV{DALI_DATA_RO_DIR} ) +IF( DEFINED ENV{DALI_DATA_RO_DIR ) SET( dataReadOnlyDir $ENV{DALI_DATA_RO_DIR} ) ELSE() SET( dataReadOnlyDir ${CMAKE_INSTALL_PREFIX}/share/dali/ ) ENDIF() -IF( $ENV{TIZEN_PLATFORM_CONFIG_SUPPORTED} ) +IF( DEFINED ENV{TIZEN_PLATFORM_CONFIG_SUPPORTED} ) SET( tizenPlatformConfigSupported $ENV{TIZEN_PLATFORM_CONFIG_SUPPORTED} ) + SET( TIZEN_PLATFORM_CONFIG_SUPPORTED_LOGMSG "YES" ) ELSE() SET( tizenPlatformConfigSupported 0 ) + SET( TIZEN_PLATFORM_CONFIG_SUPPORTED_LOGMSG "NO" ) ENDIF() -IF( $ENV{FONT_CONFIGURATION_FILE} ) +IF( DEFINED ENV{FONT_CONFIGURATION_FILE} ) SET( fontConfigurationFile $ENV{FONT_CONFIGURATION_FILE} ) ENDIF() -- 2.7.4