From dc50a1bb01618e43bc2107a3e11a9194d2bca28e Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Mon, 30 Sep 2024 12:39:49 -0700 Subject: [PATCH] Don't force PIE support. https://redmine.stoutner.com/issues/1226 --- CMakeLists.txt | 11 ++++++----- src/helpers/FilterListHelper.cpp | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 16aec16..bdc5413 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Soren Stoutner . +# Copyright 2022-2024 Soren Stoutner . # # This file is part of Privacy Browser PC . # @@ -13,7 +13,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Privacy Browser PC. If not, see . +# along with Privacy Browser PC. If not, see . # Set the minimum CMake version. @@ -42,14 +42,15 @@ include(ECMInstallIcons) include(ECMQtDeclareLoggingCategory) include(FeatureSummary) +# Disable forcing of PIE, which appears to cause problems with Ubuntu's build system. # Include the Position Independent Executable checker. -include(CheckPIESupported) +#include(CheckPIESupported) # Check to see if Position Independent Executable is supported in the current linker and environment. -check_pie_supported() +#check_pie_supported() # Add the Position Independent Executable compiler flag if it is supported in the current linker and environment. -set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) +#set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) # Load the Qt components. find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS diff --git a/src/helpers/FilterListHelper.cpp b/src/helpers/FilterListHelper.cpp index c6d13ac..51f5c0c 100644 --- a/src/helpers/FilterListHelper.cpp +++ b/src/helpers/FilterListHelper.cpp @@ -14,7 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Privacy Browser PC. If not, see . + * along with Privacy Browser PC. If not, see . */ // Application headers. -- 2.45.2