[extra-cmake-modules] modules: Revert "use the NAME_PREFIX only for the test, not for the executable"
Alex Merry
alex.merry at kde.org
Sat May 10 10:28:43 UTC 2014
Git commit 7213137a75e832976c25168ae640d26369c771a7 by Alex Merry.
Committed on 10/05/2014 at 10:26.
Pushed by alexmerry into branch 'master'.
Revert "use the NAME_PREFIX only for the test, not for the executable"
This reverts commits
b90b64632f46e929f26ab9a4ee0033478febe0eb
ba8600088b8838d5453dd0990ec595e904ec216e
554be62af6d0f01049985076b2445229bae41816
These were causing configure failures in frameworks that use
ECMAddTests.
CCMAIL: ps_ml at gmx.de
CCMAIL: kde-frameworks-devel at kde.org
M +2 -1 modules/ECMAddTests.cmake
http://commits.kde.org/extra-cmake-modules/7213137a75e832976c25168ae640d26369c771a7
diff --git a/modules/ECMAddTests.cmake b/modules/ECMAddTests.cmake
index 911476c..6cc20b6 100644
--- a/modules/ECMAddTests.cmake
+++ b/modules/ECMAddTests.cmake
@@ -63,11 +63,12 @@ function(ecm_add_test)
message(FATAL_ERROR "ecm_add_test() called with multiple source files but without setting \"TEST_NAME\"")
endif()
+ set(_testname "${ECM_ADD_TEST_NAME_PREFIX}${_testname}")
add_executable(${_testname} ${_sources})
if(NOT ECM_ADD_TEST_GUI)
ecm_mark_nongui_executable(${_testname})
endif()
- add_test(NAME "${ECM_ADD_TEST_NAME_PREFIX}${_testname}" COMMAND ${_testname})
+ add_test(NAME ${_testname} COMMAND ${_testname})
target_link_libraries(${_testname} ${ECM_ADD_TEST_LINK_LIBRARIES})
ecm_mark_as_test(${_testname})
endfunction()
More information about the Kde-frameworks-devel
mailing list