From 4d4367fc3c8f0a459aaa78f9251088a352627379 Mon Sep 17 00:00:00 2001 From: Vitaly Novichkov Date: Mon, 17 Dec 2018 02:00:24 +0300 Subject: Fixed C++98 and C90 warnings, also CLang rpath warning --- utils/adlmidi-2/CMakeLists.txt | 2 +- utils/midiplay/CMakeLists.txt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'utils') 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}") -- cgit v1.2.3