From cf4c8c57c17b799243548ffda8e8fd2f4ff80d0f Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Fri, 13 Jun 2014 15:49:38 -0700 Subject: [PATCH] Fix CMake CMP0026 policy warnings --- BLAS/TESTING/CMakeLists.txt | 9 ++++----- TESTING/CMakeLists.txt | 5 ++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/BLAS/TESTING/CMakeLists.txt b/BLAS/TESTING/CMakeLists.txt index 6f553b4..b6e5a5c 100644 --- a/BLAS/TESTING/CMakeLists.txt +++ b/BLAS/TESTING/CMakeLists.txt @@ -30,17 +30,16 @@ macro(add_blas_test name src) get_filename_component(baseNAME ${src} NAME_WE) set(TEST_INPUT "${LAPACK_SOURCE_DIR}/BLAS/${baseNAME}.in") add_executable(${name} ${src}) - get_target_property(TEST_LOC ${name} LOCATION) target_link_libraries(${name} blas) if(EXISTS "${TEST_INPUT}") - add_test(BLAS-${name} "${CMAKE_COMMAND}" - -DTEST=${TEST_LOC} + add_test(NAME BLAS-${name} COMMAND "${CMAKE_COMMAND}" + -DTEST=$ -DINPUT=${TEST_INPUT} -DINTDIR=${CMAKE_CFG_INTDIR} -P "${LAPACK_SOURCE_DIR}/TESTING/runtest.cmake") else() - add_test(BLAS-${name} "${CMAKE_COMMAND}" - -DTEST=${TEST_LOC} + add_test(NAME BLAS-${name} COMMAND "${CMAKE_COMMAND}" + -DTEST=$ -DINTDIR=${CMAKE_CFG_INTDIR} -P "${LAPACK_SOURCE_DIR}/TESTING/runtest.cmake") endif() diff --git a/TESTING/CMakeLists.txt b/TESTING/CMakeLists.txt index 9025a98..203ad51 100644 --- a/TESTING/CMakeLists.txt +++ b/TESTING/CMakeLists.txt @@ -10,12 +10,11 @@ add_subdirectory(EIG) macro(add_lapack_test output input target) set(TEST_INPUT "${LAPACK_SOURCE_DIR}/TESTING/${input}") set(TEST_OUTPUT "${LAPACK_BINARY_DIR}/TESTING/${output}") - get_target_property(TEST_LOC ${target} LOCATION) string(REPLACE "." "_" input_name ${input}) set(testName "${target}_${input_name}") if(EXISTS "${TEST_INPUT}") - add_test(LAPACK-${testName} "${CMAKE_COMMAND}" - -DTEST=${TEST_LOC} + add_test(NAME LAPACK-${testName} COMMAND "${CMAKE_COMMAND}" + -DTEST=$ -DINPUT=${TEST_INPUT} -DOUTPUT=${TEST_OUTPUT} -DINTDIR=${CMAKE_CFG_INTDIR} -- 1.8.3.2