gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not inject in the cling include paths portions of the sources

Browse Source 
unless we are in a regime where CLING_INCLUDE_TESTS is defined.
This requires to re-balance the dictionary construction adding the
paths for the runtime universe.
This commit is contained in:
Danilo Piparo 2016-09-14 18:09:05 +02:00 committed by sftnight
parent 083253181a
commit b1ce4dbc1f
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CMakeLists.txt
View File

@ -372,20 +372,25 @@ endif()
#Allow user to prepend to list via cmake -DCLING_INCLUDE_PATHS=
if(DEFINED ROOT_BINARY_DIR)
set(cling_include_deflt "\
${CMAKE_INSTALL_PREFIX}/include${cling_path_delim}${CMAKE_CURRENT_SOURCE_DIR}/include${cling_path_delim}\
set(cling_include_deflt "${CMAKE_INSTALL_PREFIX}/include${cling_path_delim}\
${CMAKE_CURRENT_BINARY_DIR}/../llvm/src/tools/clang/include${cling_path_delim}\
${CMAKE_CURRENT_BINARY_DIR}/../llvm/src/include${cling_path_delim}")
if( CLING_INCLUDE_TESTS )
set(cling_include_deflt "${cling_path_delim}${cling_include_deflt}${cling_path_delim}\
${CMAKE_CURRENT_SOURCE_DIR}/include${cling_path_delim}\
${CMAKE_CURRENT_SOURCE_DIR}/../llvm/src/tools/clang/include${cling_path_delim}\
${CMAKE_CURRENT_BINARY_DIR}/../llvm/src/include${cling_path_delim}\
${CMAKE_CURRENT_SOURCE_DIR}/../llvm/src/include"
)
)
endif()
else()
set(cling_include_deflt "\
${CMAKE_INSTALL_PREFIX}/include${cling_path_delim}\
set(cling_include_deflt "${CMAKE_INSTALL_PREFIX}/include")
if( CLING_INCLUDE_TESTS )
set(cling_include_deflt "${cling_path_delim}${cling_include_deflt}${cling_path_delim}\
${CMAKE_CURRENT_SOURCE_DIR}/include${cling_path_delim}\
${CMAKE_CURRENT_SOURCE_DIR}/../clang/include${cling_path_delim}\
${CMAKE_CURRENT_SOURCE_DIR}/../../include"
)
)
endif()
if (WIN32)
set(cling_include_deflt "${cling_include_deflt}${cling_path_delim}\
${CMAKE_BINARY_DIR}/include${cling_path_delim}\