aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-08-10 22:22:53 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-08-10 22:22:53 +0200
commit6362bec5056c118f0687adb32282b61ac062e033 (patch)
tree96f9dd59804504a4bdd54ec9b2440a174539286b
parent392eb319f4a9c44736a2a584ee320658c593a9ba (diff)
parent3ab314a96617141b3f722299c031c9b4c7d32755 (diff)
downloadayatana-indicator-display-6362bec5056c118f0687adb32282b61ac062e033.tar.gz
ayatana-indicator-display-6362bec5056c118f0687adb32282b61ac062e033.tar.bz2
ayatana-indicator-display-6362bec5056c118f0687adb32282b61ac062e033.zip
Merge branch 'tari01-pr/no-pie-only-in-tests'
Attribute GH PR #23: https://github.com/AyatanaIndicators/ayatana-indicator-display/pull/23
-rw-r--r--tests/CMakeLists.txt2
-rw-r--r--tests/integration/CMakeLists.txt1
-rw-r--r--tests/unit/CMakeLists.txt2
3 files changed, 3 insertions, 2 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 42e6cb2..ecd7705 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,7 +1,5 @@
set(CMAKE_AUTOMOC ON)
-SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -no-pie")
-
find_package(GMock REQUIRED)
find_package(Qt5Core REQUIRED)
find_package(Qt5Test REQUIRED)
diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt
index 42d710e..9fea07d 100644
--- a/tests/integration/CMakeLists.txt
+++ b/tests/integration/CMakeLists.txt
@@ -18,6 +18,7 @@ function(add_qt_test_by_name name)
set(TEST_NAME ${name})
set(COVERAGE_TEST_TARGETS ${COVERAGE_TEST_TARGETS} ${TEST_NAME} PARENT_SCOPE)
add_executable (${TEST_NAME} ${TEST_NAME}.cpp)
+ target_link_options(${TEST_NAME} PRIVATE -no-pie)
add_test(${TEST_NAME} ${TEST_NAME})
set_property(TEST ${TEST_NAME} APPEND PROPERTY ENVIRONMENT ${CTEST_ENVIRONMENT})
target_link_libraries(${TEST_NAME} ${SERVICE_LINK_LIBRARIES} ${QT_LINK_LIBRARIES} ${TEST_LINK_LIBRARIES} ${THREAD_LINK_LIBRARIES})
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index fda43be..01592f3 100644
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -50,6 +50,7 @@ function(add_test_by_name name)
set(TEST_NAME ${name})
set(COVERAGE_TEST_TARGETS ${COVERAGE_TEST_TARGETS} ${TEST_NAME} PARENT_SCOPE)
add_executable (${TEST_NAME} ${TEST_NAME}.cpp gschemas.compiled)
+ target_link_options(${TEST_NAME} PRIVATE -no-pie)
add_test(${TEST_NAME} ${TEST_NAME})
set_property(TEST ${TEST_NAME} APPEND PROPERTY ENVIRONMENT ${CTEST_ENVIRONMENT})
target_link_libraries(${TEST_NAME} ${SERVICE_LINK_LIBRARIES} ${TEST_LINK_LIBRARIES} ${THREAD_LINK_LIBRARIES})
@@ -61,6 +62,7 @@ function(add_qt_test_by_name name)
set(TEST_NAME ${name})
set(COVERAGE_TEST_TARGETS ${COVERAGE_TEST_TARGETS} ${TEST_NAME} PARENT_SCOPE)
add_executable (${TEST_NAME} ${TEST_NAME}.cpp)
+ target_link_options(${TEST_NAME} PRIVATE -no-pie)
add_test(${TEST_NAME} ${TEST_NAME})
set_property(TEST ${TEST_NAME} APPEND PROPERTY ENVIRONMENT ${CTEST_ENVIRONMENT})
target_link_libraries(${TEST_NAME} ${SERVICE_LINK_LIBRARIES} ${QT_LINK_LIBRARIES} ${TEST_LINK_LIBRARIES} ${THREAD_LINK_LIBRARIES})