summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Neundorf <neundorf@kde.org>2012-11-04 18:45:25 (GMT)
committerAlex Neundorf <neundorf@kde.org>2012-11-05 18:17:24 (GMT)
commit2ae9d03fa64b49d708e489db0275f6893dfc05b4 (patch)
tree501d1dc92c8a2410e61015ebebf43a1a1a9dada4
parent53c42cb4eab9f1e975b287e5b6784fb83f48be1f (diff)
downloadCMake-2ae9d03fa64b49d708e489db0275f6893dfc05b4.zip
CMake-2ae9d03fa64b49d708e489db0275f6893dfc05b4.tar.gz
CMake-2ae9d03fa64b49d708e489db0275f6893dfc05b4.tar.bz2
Squish: use ${CMAKE_CURRENT_LIST_DIR}
Use ${CMAKE_CURRENT_LIST_DIR} instead of constructing the dir from pieces. Alex
-rw-r--r--Modules/FindSquish.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/FindSquish.cmake b/Modules/FindSquish.cmake
index 8fb8c37..10d287b 100644
--- a/Modules/FindSquish.cmake
+++ b/Modules/FindSquish.cmake
@@ -128,6 +128,7 @@ find_package_handle_standard_args(Squish REQUIRED_VARS SQUISH_INSTALL_DIR SQUI
VERSION_VAR SQUISH_VERSION )
+set(_SQUISH_MODULE_DIR "${CMAKE_CURRENT_LIST_DIR}")
macro(SQUISH_V3_ADD_TEST testName testAUT testCase envVars testWraper)
add_test(${testName}
@@ -139,7 +140,7 @@ macro(SQUISH_V3_ADD_TEST testName testAUT testCase envVars testWraper)
"-Dsquish_test_case:STRING=${testCase}"
"-Dsquish_env_vars:STRING=${envVars}"
"-Dsquish_wrapper:STRING=${testWraper}"
- -P "${CMAKE_ROOT}/Modules/SquishTestScript.cmake"
+ -P "${_SQUISH_MODULE_DIR}/SquishTestScript.cmake"
)
set_tests_properties(${testName}
PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED;ERROR;FATAL"