Skip to content

Commit 6e8cad2

Browse files
committed
cmake 2.8.7 needs append_string, not append
1 parent 018e7cf commit 6e8cad2

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

test/cpp/schema_specific/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ function(add_schema_dependent_test name sdai_lib exe_args )
4141
message(STATUS "include dir for ${sdai_lib}: ${sdai_src_path}")
4242
add_executable(tst_${name} "${name}.cc")
4343
set_target_properties(tst_${name} PROPERTIES EXCLUDE_FROM_ALL ON)
44-
if("${CMAKE_VERSION}" VERSION_GREATER "2.8.7")
44+
if(${CMAKE_VERSION} VERSION_GREATER 2.8.7)
4545
# INCLUDE_DIRECTORIES property added in cmake 2.8.8
4646
set_property(TARGET tst_${name} APPEND PROPERTY INCLUDE_DIRECTORIES ${sdai_src_path} ${ARGV3})
4747
else()
4848
foreach(ipath ${sdai_src_path} ${ARGV3})
49-
set_property(TARGET tst_${name} APPEND PROPERTY COMPILE_FLAGS "-I${ipath}")
49+
set_property(TARGET tst_${name} APPEND_STRING PROPERTY COMPILE_FLAGS " -I${ipath} ")
5050
endforeach(ipath ${sdai_src_path} ${ARGV3})
51-
endif("${CMAKE_VERSION}" VERSION_GREATER "2.8.7")
51+
endif(${CMAKE_VERSION} VERSION_GREATER 2.8.7)
5252
if(NOT ${ARGV4} STREQUAL "")
53-
set_property(TARGET tst_${name} APPEND PROPERTY COMPILE_FLAGS ${ARGV4} )
53+
set_property(TARGET tst_${name} APPEND_STRING PROPERTY COMPILE_FLAGS ${ARGV4} )
5454
endif(NOT ${ARGV4} STREQUAL "")
5555
if(NOT "${ARGV5}" MATCHES "NONE")
5656
DEFINE_DLL_IMPORTS("tst_${name}" "${ARGV5}")
@@ -68,7 +68,7 @@ function(add_schema_dependent_test name sdai_lib exe_args )
6868
COMMAND $<TARGET_FILE:tst_${name}> ${exe_args} )
6969
set_tests_properties( test_${name} PROPERTIES DEPENDS build_cpp_${name}
7070
LABELS cpp_schema_specific )
71-
endfunction( add_schema_dependent_test name sdai_lib exe_args )
71+
endfunction(add_schema_dependent_test name sdai_lib exe_args )
7272

7373
#if you need a schema that won't be built automatically (i.e. not in sc/data), put it in here
7474
#temporarily disabling testing ensures that the schema will be built before these tests run
@@ -77,7 +77,7 @@ SCHEMA_CMLIST(${SC_SOURCE_DIR}/test/unitary_schemas/array_bounds_expr.exp)
7777
SCHEMA_CMLIST(${SC_SOURCE_DIR}/test/unitary_schemas/inverse_attr.exp)
7878
set(SC_ENABLE_TESTING ON)
7979

80-
add_schema_dependent_test( "aggregate_bound_runtime" "array_bounds_expr"
80+
add_schema_dependent_test("aggregate_bound_runtime" "array_bounds_expr"
8181
"${SC_SOURCE_DIR}/test/p21/test_array_bounds.p21" "" "" "stepcore")
8282

8383
#can't use the macro for this one because it depends on the test above and needs WILL_FAIL

0 commit comments

Comments
 (0)