Skip to content

Commit 0053426

Browse files
committed
Do not install tests, keep their default RPATH settings
1 parent 2d35b16 commit 0053426

File tree

1 file changed

+1
-20
lines changed

1 file changed

+1
-20
lines changed

tests/src/core/CMakeLists.txt

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -60,26 +60,7 @@ MACRO (ADD_QGIS_TEST testname testsrc)
6060
ADD_EXECUTABLE(qgis_${testname} ${qgis_${testname}_SRCS})
6161
ADD_DEPENDENCIES(qgis_${testname} qgis_${testname}moc)
6262
TARGET_LINK_LIBRARIES(qgis_${testname} ${QT_LIBRARIES} qgis_core)
63-
SET_TARGET_PROPERTIES(qgis_${testname}
64-
PROPERTIES
65-
# skip the full RPATH for the build tree
66-
SKIP_BUILD_RPATH TRUE
67-
# when building, use the install RPATH already
68-
# (so it doesn't need to relink when installing)
69-
BUILD_WITH_INSTALL_RPATH TRUE
70-
# the RPATH to be used when installing
71-
INSTALL_RPATH ${QGIS_LIB_DIR}
72-
# add the automatically determined parts of the RPATH
73-
# which point to directories outside the build tree to the install RPATH
74-
INSTALL_RPATH_USE_LINK_PATH true)
75-
IF (APPLE)
76-
# For Mac OS X, the executable must be at the root of the bundle's executable folder
77-
INSTALL(TARGETS qgis_${testname} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
78-
ADD_TEST(qgis_${testname} ${CMAKE_INSTALL_PREFIX}/qgis_${testname})
79-
ELSE (APPLE)
80-
INSTALL(TARGETS qgis_${testname} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
81-
ADD_TEST(qgis_${testname} ${CMAKE_INSTALL_PREFIX}/bin/qgis_${testname})
82-
ENDIF (APPLE)
63+
ADD_TEST(qgis_${testname} qgis_${testname})
8364
ENDMACRO (ADD_QGIS_TEST)
8465
8566
#############################################################

0 commit comments

Comments
 (0)