From b8f7c6daae335f1fa620bcb8eb9c0125dbe5da31 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 6 Oct 2017 14:34:22 +0200 Subject: [PATCH] CMakeLists.txt: Put -pie as a linker flag were it belongs Fixes warning introduced by PR #6040 --- src/cmd/CMakeLists.txt | 5 +++-- src/gui/CMakeLists.txt | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt index 9cdd6cf32..89464ca38 100644 --- a/src/cmd/CMakeLists.txt +++ b/src/cmd/CMakeLists.txt @@ -20,8 +20,9 @@ include_directories(${CMAKE_SOURCE_DIR}/src/csync include_directories(${CMAKE_SOURCE_DIR}/src/3rdparty/qtokenizer) if(UNIX AND NOT APPLE) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pie -fPIE") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pie -fPIE") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie") endif() if(NOT BUILD_LIBRARIES_ONLY) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 0aa132a1e..2ae957355 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -243,8 +243,9 @@ if (NOT NO_SHIBBOLETH) endif() if(UNIX AND NOT APPLE) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pie -fPIE") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pie -fPIE") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie") endif() if(NOT BUILD_OWNCLOUD_OSX_BUNDLE) -- 2.30.2