diff options
| author | Vitaly Novichkov <admin@wohlnet.ru> | 2018-12-17 02:00:24 +0300 |
|---|---|---|
| committer | Vitaly Novichkov <admin@wohlnet.ru> | 2018-12-17 02:00:24 +0300 |
| commit | 4d4367fc3c8f0a459aaa78f9251088a352627379 (patch) | |
| tree | 70dbbd732878c1451fd34a734f2e115fc4228bb8 /utils | |
| parent | 657c48c65cb312e6513a21696bec589cad03aa01 (diff) | |
| download | libADLMIDI-4d4367fc3c8f0a459aaa78f9251088a352627379.tar.gz libADLMIDI-4d4367fc3c8f0a459aaa78f9251088a352627379.tar.bz2 libADLMIDI-4d4367fc3c8f0a459aaa78f9251088a352627379.zip | |
Fixed C++98 and C90 warnings, also CLang rpath warning
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/adlmidi-2/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | utils/midiplay/CMakeLists.txt | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/utils/adlmidi-2/CMakeLists.txt b/utils/adlmidi-2/CMakeLists.txt index 3965c42..a85b7cc 100644 --- a/utils/adlmidi-2/CMakeLists.txt +++ b/utils/adlmidi-2/CMakeLists.txt @@ -63,7 +63,7 @@ if(MSVC) endif() if(TARGET ADLMIDI_shared AND NOT MSVC) - set_target_properties(adlmidi2 PROPERTIES COMPILE_FLAGS "-Wl,-rpath='$$ORIGIN/../lib'") + set_target_properties(adlmidi2 PROPERTIES INSTALL_RPATH "$ORIGIN/../lib") endif() install(TARGETS adlmidi2 diff --git a/utils/midiplay/CMakeLists.txt b/utils/midiplay/CMakeLists.txt index 3531090..eca1bb3 100644 --- a/utils/midiplay/CMakeLists.txt +++ b/utils/midiplay/CMakeLists.txt @@ -37,5 +37,9 @@ if(ADLMIDI_DOS) set_target_properties(adlmidiplay PROPERTIES OUTPUT_NAME adlmidi) endif() +if(TARGET ADLMIDI_shared) + set_target_properties(adlmidiplay PROPERTIES INSTALL_RPATH "$ORIGIN/../lib") +endif() + install(TARGETS adlmidiplay RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") |