summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Oleynik <aoleynik@luxoft.com>2016-11-24 23:19:45 +0200
committerAlexander Kutsan <AKutsan@luxoft.com>2016-12-05 09:33:20 +0200
commit6d4acf3557facb90d6c52584a5741f5502cf9d41 (patch)
tree3f40ad9f6e306b113167b0a78e5dfb2382b2e6ef
parentd9ad3d3a7dd390732902c5d1f338658e0d4265bd (diff)
downloadsdl_core-6d4acf3557facb90d6c52584a5741f5502cf9d41.tar.gz
Adds combobox for CMake UI, fixes typo
-rw-r--r--CMakeLists.txt3
-rw-r--r--tools/policy_table_validator/CMakeLists.txt2
2 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4abd83e302..fe81b838dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,7 +53,8 @@ option(USE_GOLD_LD "Use gold linker intead of GNU linker" ON)
option(USE_CCACHE "Turn on ccache usage" ON)
option(USE_DISTCC "Turn on distributed build_usage" ON)
-set (EXTENDED_POLICY "${EXTENDED_POLICY}" CACHE STRING "Policy mode (PROPRIETARY, HTTP or EXTERNAL_PROPRIETARY)")
+set (EXTENDED_POLICY "PROPRIETARY" CACHE STRING "Policy mode (PROPRIETARY, HTTP or EXTERNAL_PROPRIETARY)")
+set_property(CACHE EXTENDED_POLICY PROPERTY STRINGS PROPRIETARY HTTP EXTERNAL_PROPRIETARY)
if(EXTENDED_POLICY STREQUAL "")
set(EXTENDED_POLICY "PROPRIETARY")
endif()
diff --git a/tools/policy_table_validator/CMakeLists.txt b/tools/policy_table_validator/CMakeLists.txt
index fcd753ef06..eabe4cfd5c 100644
--- a/tools/policy_table_validator/CMakeLists.txt
+++ b/tools/policy_table_validator/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories(
${JSONCPP_INCLUDE_DIRECTORY}
)
- message(STATUS "use ${EXTENDED_POLICY} poicy")
+message(STATUS "Using ${EXTENDED_POLICY} policy mode")
if (${EXTENDED_POLICY} STREQUAL "EXTERNAL_PROPRIETARY")
include_directories(${CMAKE_SOURCE_DIR}/src/components/policy/policy_external/include/)
else()