From a994f77456fb4f7db30f187ff8298f4e6d318fcd Mon Sep 17 00:00:00 2001
From: Vassil Vassilev <v.g.vassilev@gmail.com>
Date: Sat, 3 Mar 2018 15:34:10 +0100
Subject: [PATCH] CLANG_INCLUDE_DIRS and LLVM_INCLUDE_DIRS can be lists of
values.
The cmake lists are semicolon-separated strings which we fail to pass
to the colon-expecting interface.
---
interpreter/cling/CMakeLists.txt | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/interpreter/cling/CMakeLists.txt b/interpreter/cling/CMakeLists.txt
index 7dcd5ecae01..38d0a4d24de 100644
--- a/interpreter/cling/CMakeLists.txt
+++ b/interpreter/cling/CMakeLists.txt
@@ -434,11 +434,14 @@ else()
endif()
if( CLING_INCLUDE_TESTS )
- set(cling_include_deflt "${CMAKE_INSTALL_PREFIX}/include${cling_path_delim}\
-${CMAKE_CURRENT_SOURCE_DIR}/include${cling_path_delim}\
-${CLANG_INCLUDE_DIRS}${cling_path_delim}\
-${LLVM_INCLUDE_DIRS}"
- )
+ set(cling_include_deflt ${CMAKE_INSTALL_PREFIX}/include
+ ${CMAKE_CURRENT_SOURCE_DIR}/include
+ ${CLANG_INCLUDE_DIRS}
+ ${LLVM_INCLUDE_DIRS}
+ )
+
+ # CLANG_INCLUDE_DIRS and LLVM_INCLUDE_DIRS can be a semicolon separated lists.
+ string(REPLACE ";" ${cling_path_delim} cling_include_deflt "${cling_include_deflt}")
endif()
if(NOT CLING_INCLUDE_PATHS)
--
GitLab