Skip to content

Commit aa967b3

Browse files
committed
tweak includ dir logic, print path
1 parent 17b41da commit aa967b3

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

test/cpp/schema_specific/CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ include_directories( ${SC_SOURCE_DIR}/src/cldai ${SC_SOURCE_DIR}/src/cleditor ${
99
# added as a workaround for changed behavior in newer cmake
1010
# versions (changes somewhere between 2.8 and 3.1)
1111
function(get_sdai_incl_dir out_path_var sdai_lib)
12-
if(DEFINED sdai_${sdai_lib}_SOURCE_DIR)
13-
set(${out_path_var} ${sdai_${sdai_lib}_SOURCE_DIR} PARENT_SCOPE)
12+
if(NOT "${sdai_${sdai_lib}_SOURCE_DIR}" STREQUAL "")
13+
set(${out_path_var} "${sdai_${sdai_lib}_SOURCE_DIR}" PARENT_SCOPE)
1414
return()
15-
endif(DEFINED sdai_${sdai_lib}_SOURCE_DIR)
15+
endif(NOT "${sdai_${sdai_lib}_SOURCE_DIR}" STREQUAL "")
1616
get_target_property(sdai_srcs sdai_${sdai_lib} SOURCES)
1717
foreach(src ${sdai_srcs})
1818
if(${src} MATCHES "schema.cc$")
@@ -38,6 +38,7 @@ endfunction(get_sdai_incl_dir out_path_var sdai_target)
3838
# three optional args: ARGV3, ARGV4, ARGV5 are include paths, compile flags, and libs, respectively.
3939
function(add_schema_dependent_test name sdai_lib exe_args )
4040
get_sdai_incl_dir(sdai_src_path ${sdai_lib})
41+
message(STATUS "include dir for ${sdai_lib}: ${sdai_src_path}")
4142
add_executable(tst_${name} "${name}.cc")
4243
set_target_properties(tst_${name} PROPERTIES EXCLUDE_FROM_ALL ON)
4344
set_property(TARGET tst_${name} APPEND PROPERTY INCLUDE_DIRECTORIES ${sdai_src_path} ${ARGV3} )

0 commit comments

Comments
 (0)