diff options
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | test/bankmap/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/conversion/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/wopl-file/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | utils/adlmidi-2/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | utils/midiplay/CMakeLists.txt | 4 |
6 files changed, 12 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ea5e0d..4dcad04 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ function(set_visibility_hidden destTarget) else() target_compile_options(${destTarget} PRIVATE -fvisibility=hidden) endif() - target_compile_definitions(${destTarget} PRIVATE -DLIBADLMIDI_VISIBILITY) + target_compile_definitions(${destTarget} PRIVATE LIBADLMIDI_VISIBILITY=) endif() endfunction() #=========================================================================================== @@ -204,7 +204,7 @@ if(libADLMIDI_SHARED) set_visibility_hidden(ADLMIDI_shared) list(APPEND libADLMIDI_INSTALLS ADLMIDI_shared) if(WIN32) - target_compile_definitions(ADLMIDI_shared PRIVATE "-DADLMIDI_BUILD_DLL") + target_compile_definitions(ADLMIDI_shared PRIVATE ADLMIDI_BUILD_DLL) if(CMAKE_COMPILER_IS_GNUCXX) set_property(TARGET ADLMIDI_shared APPEND_STRING PROPERTY LINK_FLAGS " -static-libgcc -static-libstdc++") set_property(TARGET ADLMIDI_shared APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-Bstatic,--whole-archive -lpthread -Wl,-Bdynamic,--no-whole-archive") @@ -278,11 +278,11 @@ endif() if(WITH_HQ_RESAMPLER) if(libADLMIDI_SHARED) - target_compile_definitions(ADLMIDI_shared PRIVATE -DADLMIDI_ENABLE_HQ_RESAMPLER) + target_compile_definitions(ADLMIDI_shared PRIVATE ADLMIDI_ENABLE_HQ_RESAMPLER) target_link_libraries(ADLMIDI_shared PUBLIC "${ZITA_RESAMPLER_LIBRARY}") endif() if(libADLMIDI_STATIC OR WITH_VLC_PLUGIN) - target_compile_definitions(ADLMIDI_static PRIVATE -DADLMIDI_ENABLE_HQ_RESAMPLER) + target_compile_definitions(ADLMIDI_static PRIVATE ADLMIDI_ENABLE_HQ_RESAMPLER) target_link_libraries(ADLMIDI_static PUBLIC "${ZITA_RESAMPLER_LIBRARY}") endif() endif() diff --git a/test/bankmap/CMakeLists.txt b/test/bankmap/CMakeLists.txt index 2741637..e4f71de 100644 --- a/test/bankmap/CMakeLists.txt +++ b/test/bankmap/CMakeLists.txt @@ -8,5 +8,5 @@ include_directories( add_executable(BankMapTest bank_map.cpp $<TARGET_OBJECTS:Catch-objects>) -set_target_properties(BankMapTest PROPERTIES COMPILE_DEFINITIONS "GSL_THROW_ON_CONTRACT_VIOLATION") +target_compile_definitions(BankMapTest PRIVATE GSL_THROW_ON_CONTRACT_VIOLATION) add_test(NAME BankMapTest COMMAND BankMapTest) diff --git a/test/conversion/CMakeLists.txt b/test/conversion/CMakeLists.txt index 361c7e8..52e8e8a 100644 --- a/test/conversion/CMakeLists.txt +++ b/test/conversion/CMakeLists.txt @@ -8,5 +8,5 @@ include_directories( add_executable(ConversionTest conversion.cpp $<TARGET_OBJECTS:Catch-objects>) -set_target_properties(ConversionTest PROPERTIES COMPILE_DEFINITIONS "GSL_THROW_ON_CONTRACT_VIOLATION") +target_compile_definitions(ConversionTest PRIVATE GSL_THROW_ON_CONTRACT_VIOLATION) add_test(NAME ConversionTest COMMAND ConversionTest) diff --git a/test/wopl-file/CMakeLists.txt b/test/wopl-file/CMakeLists.txt index 082f1fe..e969419 100644 --- a/test/wopl-file/CMakeLists.txt +++ b/test/wopl-file/CMakeLists.txt @@ -10,6 +10,5 @@ add_executable(WoplFile ${libADLMIDI_SOURCE_DIR}/src/wopl/wopl_file.c $<TARGET_OBJECTS:Catch-objects>) -set_target_properties(WoplFile PROPERTIES COMPILE_DEFINITIONS "GSL_THROW_ON_CONTRACT_VIOLATION") +target_compile_definitions(WoplFile PRIVATE GSL_THROW_ON_CONTRACT_VIOLATION) add_test(NAME WoplFileTest COMMAND WoplFile) - diff --git a/utils/adlmidi-2/CMakeLists.txt b/utils/adlmidi-2/CMakeLists.txt index ea4dd3e..e8dbf13 100644 --- a/utils/adlmidi-2/CMakeLists.txt +++ b/utils/adlmidi-2/CMakeLists.txt @@ -34,15 +34,15 @@ if(NOT WIN32 AND NOT DJGPP AND NOT MSDOS) endif() if(ADLMIDI2_HAS_PUZZLE_GAME) - target_compile_definitions(adlmidi2 PUBLIC "-DSUPPORT_PUZZLE_GAME") + target_compile_definitions(adlmidi2 PUBLIC SUPPORT_PUZZLE_GAME) endif() if(ADLMIDI2_VIDEO_OUT_SUPPORT) - target_compile_definitions(adlmidi2 PUBLIC "-DSUPPORT_VIDEO_OUTPUT") + target_compile_definitions(adlmidi2 PUBLIC SUPPORT_VIDEO_OUTPUT) endif() if(MSDOS OR DJGPP) - target_compile_definitions(adlmidi2 PUBLIC "-DHARDWARE_OPL3") + target_compile_definitions(adlmidi2 PUBLIC HARDWARE_OPL3) message("Turn on hardware OPL3 support on ADLMIDI2 tool") endif() diff --git a/utils/midiplay/CMakeLists.txt b/utils/midiplay/CMakeLists.txt index 6e46885..9134f7f 100644 --- a/utils/midiplay/CMakeLists.txt +++ b/utils/midiplay/CMakeLists.txt @@ -16,12 +16,12 @@ if(NOT MSDOS AND NOT DJGPP AND NOT MIDIPLAY_WAVE_ONLY) endif() if(MIDIPLAY_WAVE_ONLY) - target_compile_definitions(adlmidiplay PUBLIC "-DOUTPUT_WAVE_ONLY") + target_compile_definitions(adlmidiplay PUBLIC OUTPUT_WAVE_ONLY) message("Demo tool will only output WAVE file, no playing support.") endif() if(MSDOS OR DJGPP) - target_compile_definitions(adlmidiplay PUBLIC "-DHARDWARE_OPL3") + target_compile_definitions(adlmidiplay PUBLIC HARDWARE_OPL3) message("Turn on hardware OPL3 support on demo tool") endif() |