zdoom
/
fluidsynth
mirror of https://github.com/ZDoom/fluidsynth.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cross-platform fixes for test utils 

Use executable suffix to make test work on Windows and
specify explicit output directory for dump_sfont tool.

Uses a generator expression $<0:> to prevent VS and Xcode from
adding per-config subdirectories to the RUNTIME_OUTPUT_DIRECTORY
This commit is contained in:
Marcus Weseloh 2021-03-23 21:48:03 +01:00
parent 703f158c99
commit 92947586fb
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake_admin/FluidUnitTest.cmake
View File

@ -33,6 +33,9 @@ macro ( ADD_FLUID_TEST_UTIL _util )
# only build this unit test when explicitly requested by "make check" # only build this unit test when explicitly requested by "make check"
set_target_properties(${_util} PROPERTIES EXCLUDE_FROM_ALL TRUE) set_target_properties(${_util} PROPERTIES EXCLUDE_FROM_ALL TRUE)
# append no-op generator expression to avoid VS or XCode from adding per-config subdirectories
set_target_properties(${_util} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/test/utils/$<0:>)
# import necessary compile flags and dependency libraries # import necessary compile flags and dependency libraries
if ( FLUID_CPPFLAGS ) if ( FLUID_CPPFLAGS )
set_target_properties ( ${_util} PROPERTIES COMPILE_FLAGS ${FLUID_CPPFLAGS} ) set_target_properties ( ${_util} PROPERTIES COMPILE_FLAGS ${FLUID_CPPFLAGS} )
@ -62,7 +65,7 @@ macro ( ADD_FLUID_SF_DUMP_TEST _sfname)
ADD_TEST(${_sfname}_dump_test ADD_TEST(${_sfname}_dump_test
${CMAKE_COMMAND} ${CMAKE_COMMAND}
-Dtest_cmd=${CMAKE_BINARY_DIR}/test/dump_sfont -Dtest_cmd=${CMAKE_BINARY_DIR}/test/utils/dump_sfont${CMAKE_EXECUTABLE_SUFFIX}
-Dtest_args=${test_args} -Dtest_args=${test_args}
-Dtest_output=${_sfname}.yml -Dtest_output=${_sfname}.yml
-Dexpected_output=${CMAKE_SOURCE_DIR}/sf2/${_sfname}.yml -Dexpected_output=${CMAKE_SOURCE_DIR}/sf2/${_sfname}.yml