diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-11-23 09:55:21 +0100 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2018-10-15 18:22:48 +0200 |
| commit | 53cedab982e3a877fda6b8e18d1d7209a201faaa (patch) | |
| tree | b11977469caef3f7ada73c81c9bbdd9847f7fb7f /cmake/cmake.d/01-build_options.cmake | |
| parent | 518e3a766cdb5583695d44c56cf7e15e259725d9 (diff) | |
Protect path with space in it.
Bug-AGL: SPEC-1117
Change-Id: I36ba8047c3dc722c6c99ecbd90e14d5d717cb808
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'cmake/cmake.d/01-build_options.cmake')
| -rw-r--r-- | cmake/cmake.d/01-build_options.cmake | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/cmake/cmake.d/01-build_options.cmake b/cmake/cmake.d/01-build_options.cmake index 04c53c7..602cc58 100644 --- a/cmake/cmake.d/01-build_options.cmake +++ b/cmake/cmake.d/01-build_options.cmake @@ -75,17 +75,6 @@ foreach(option ${RELEASE_COMPILE_OPTIONS}) add_compile_options($<$<CONFIG:PROFILING>:${option}>) endforeach() -# Env variable overload default -# Disabled by default now. Tell me if you need really it -# but you should not have needs for that since you can -# set CMAKE_INSTALL_PREFIX in your config.cmake. -#if(DEFINED ENV{INSTALL_PREFIX}) -# set(INSTALL_PREFIX $ENV{INSTALL_PREFIX} CACHE PATH "The path where to install") -#else() -# set(INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/Install" CACHE PATH "The path where to install") -#endif() -#set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX} CACHE PATH "Installation Prefix") - # Loop on required package and add options foreach (PKG_CONFIG ${PKG_REQUIRED_LIST}) string(REGEX REPLACE "[<>]?=.*$" "" XPREFIX ${PKG_CONFIG}) @@ -110,7 +99,7 @@ ENDIF(CMAKE_BUILD_TYPE MATCHES DEBUG AND USE_EFENCE) INCLUDE_DIRECTORIES(${EXTRA_INCLUDE_DIRS}) # Default Linkflag -set (PKG_TEMPLATE_PREFIX ${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR} CACHE PATH "Default Package Templates Directory") +set(PKG_TEMPLATE_PREFIX "\"${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}\"" CACHE PATH "Default Package Templates Directory") if(NOT BINDINGS_LINK_FLAG) set(BINDINGS_LINK_FLAG "-Wl,--version-script=${PKG_TEMPLATE_PREFIX}/cmake/export.map") endif() |