diff options
| author | Jacob Keeler <jacob.keeler@livioradio.com> | 2018-08-24 16:04:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-24 16:04:19 -0400 |
| commit | 20f9f05a54c2cc91fd6f2ca6cc1d17da6bb9a5ce (patch) | |
| tree | 3c932c2753a7dc17efe64580182620c66bea82c6 | |
| parent | 3a7369da0bdc28c9d3537582e138bdcb82956f65 (diff) | |
| download | sdl_core-20f9f05a54c2cc91fd6f2ca6cc1d17da6bb9a5ce.tar.gz | |
Revert CMake changesfeature/PLAY_PAUSE_implementation
| -rw-r--r-- | CMakeLists.txt | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 806580030f..1a180b6cf9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,18 +62,18 @@ if(EXTENDED_POLICY STREQUAL "") set(EXTENDED_POLICY "PROPRIETARY") endif() -set(OS_TYPE_OPTION "$ENV{OS_TYPE}") -set(HMI_TYPE_OPTION "$ENV{HMI_TYPE}") -set(TARGET_OPTION "$ENV{TARGET}") -set(MEDIA_MODE_OPTION "$ENV{MEDIA_MODE}") -set(HMI_ADAPTER_OPTION "$ENV{HMI_ADAPTER}") +set(OS_TYPE_OPTION "$ENV{OS_TYPE}") +set(HMI_TYPE_OPTION "$ENV{HMI_TYPE}") +set(TARGET_OPTION "$ENV{TARGET}") +set(MEDIA_MODE_OPTION "$ENV{MEDIA_MODE}") +set(HMI_ADAPTER_OPTION "$ENV{HMI_ADAPTER}") set(ENABLE_TESTS_OPTION "$ENV{ENABLE_TESTS}") -set(ENABLE_LOG_OPTION "$ENV{ENABLE_LOG}") -set(ARCH_TYPE_OPTION "$ENV{ARCH_TYPE}") -set(POLICY_OPTION "$ENV{POLICY_TYPE}") -set(SECURITY_OPTION "$ENV{SECURITY_MODE}") +set(ENABLE_LOG_OPTION "$ENV{ENABLE_LOG}") +set(ARCH_TYPE_OPTION "$ENV{ARCH_TYPE}") +set(POLICY_OPTION "$ENV{POLICY_TYPE}") +set(SECURITY_OPTION "$ENV{SECURITY_MODE}") set(COMPONENTS_DIR ${CMAKE_SOURCE_DIR}/src/components) -set(SNAPSHOT_TAG "$ENV{SNAPSHOT_TAG}") +set(SNAPSHOT_TAG "$ENV{SNAPSHOT_TAG}") set(CMAKE_CXX_COMPILER $ENV{CMAKE_CXX_COMPILER}) set(CMAKE_C_COMPILER $ENV{CMAKE_C_COMPILER}) set(BUILDDIR "$ENV{BUILDDIR}") @@ -81,10 +81,10 @@ set(BUILDDIR "$ENV{BUILDDIR}") if (ARCH_TYPE_OPTION) if (NOT (${ARCH_TYPE_OPTION} STREQUAL "x86") AND NOT (${ARCH_TYPE_OPTION} STREQUAL "armv7")) message(AUTHOR_WARNING "HW architecture is not defined, using x86. Allowed values are x86/armv7 (case sensitive)") - set(ARCH_TYPE_OPTION "x86") + set(ARCH_TYPE_OPTION "x86") endif () else () - set(ARCH_TYPE_OPTION "x86") + set(ARCH_TYPE_OPTION "x86") endif() if (HMI_TYPE_OPTION) @@ -479,4 +479,4 @@ find_package(Doxygen) message(STATUS "sudo apt-get install doxygen graphviz") message(STATUS "To enable processing of MscGen comments please install mscgen") message(STATUS "sudo apt-get install mscgen") -endif()
\ No newline at end of file +endif() |