From 22248f90dd83413e91c8d4b66e652ef1a7954b60 Mon Sep 17 00:00:00 2001
From: Wohlstand <admin@wohlnet.ru>
Date: Mon, 23 Sep 2019 12:51:19 +0300
Subject: Don't call "-no-pie" when it's unavailable

---
 utils/adlmidi-2/CMakeLists.txt   | 4 +---
 utils/dumpbank/CMakeLists.txt    | 4 +---
 utils/dumpmiles/CMakeLists.txt   | 4 +---
 utils/gen_adldata/CMakeLists.txt | 4 +---
 utils/midiplay/CMakeLists.txt    | 4 +---
 5 files changed, 5 insertions(+), 15 deletions(-)

(limited to 'utils')

diff --git a/utils/adlmidi-2/CMakeLists.txt b/utils/adlmidi-2/CMakeLists.txt
index 3b9c4f3..02351fa 100644
--- a/utils/adlmidi-2/CMakeLists.txt
+++ b/utils/adlmidi-2/CMakeLists.txt
@@ -29,9 +29,7 @@ if(NOT WIN32 AND NOT ADLMIDI_DOS)
     target_link_libraries(adlmidi2 PRIVATE ADLMIDI_SDL2)
 endif()
 
-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-    set_property(TARGET adlmidi2 APPEND_STRING PROPERTY LINK_FLAGS " -no-pie")
-endif()
+set_nopie(adlmidi2)
 
 if(ADLMIDI2_HAS_PUZZLE_GAME)
     target_compile_definitions(adlmidi2 PUBLIC SUPPORT_PUZZLE_GAME)
diff --git a/utils/dumpbank/CMakeLists.txt b/utils/dumpbank/CMakeLists.txt
index 1630ea5..571cdef 100644
--- a/utils/dumpbank/CMakeLists.txt
+++ b/utils/dumpbank/CMakeLists.txt
@@ -1,8 +1,6 @@
 add_executable(adldumpbank dumpbank.cpp)
 
-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-    set_property(TARGET adldumpbank APPEND_STRING PROPERTY LINK_FLAGS " -no-pie")
-endif()
+set_nopie(adldumpbank)
 
 install(TARGETS adldumpbank
         RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
diff --git a/utils/dumpmiles/CMakeLists.txt b/utils/dumpmiles/CMakeLists.txt
index 1e4349c..07f0a47 100644
--- a/utils/dumpmiles/CMakeLists.txt
+++ b/utils/dumpmiles/CMakeLists.txt
@@ -1,8 +1,6 @@
 add_executable(adldumpmiles dumpmiles.cpp)
 
-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-    set_property(TARGET adldumpmiles APPEND_STRING PROPERTY LINK_FLAGS " -no-pie")
-endif()
+set_nopie(adldumpmiles)
 
 install(TARGETS adldumpmiles
         RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
diff --git a/utils/gen_adldata/CMakeLists.txt b/utils/gen_adldata/CMakeLists.txt
index bd52283..a3be516 100644
--- a/utils/gen_adldata/CMakeLists.txt
+++ b/utils/gen_adldata/CMakeLists.txt
@@ -51,9 +51,7 @@ else()
     target_link_libraries(gen_adldata PRIVATE pthread m)
 endif()
 
-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-    set_property(TARGET gen_adldata APPEND_STRING PROPERTY LINK_FLAGS " -no-pie")
-endif()
+set_nopie(gen_adldata)
 
 if(WITH_GENADLDATA_COMMENTS)
     target_compile_options(gen_adldata PUBLIC "-DADLDATA_WITH_COMMENTS")
diff --git a/utils/midiplay/CMakeLists.txt b/utils/midiplay/CMakeLists.txt
index 14766b6..c60450f 100644
--- a/utils/midiplay/CMakeLists.txt
+++ b/utils/midiplay/CMakeLists.txt
@@ -3,9 +3,7 @@ add_executable(adlmidiplay
     wave_writer.c
 )
 
-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-    set_property(TARGET adlmidiplay APPEND_STRING PROPERTY LINK_FLAGS " -no-pie")
-endif()
+set_nopie(adlmidiplay)
 
 if(NOT ADLMIDI_DOS AND NOT MIDIPLAY_WAVE_ONLY)
     libADLMIDI_find_SDL2()
-- 
cgit v1.2.3