diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-03-19 14:04:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-19 14:04:22 +0100 |
| commit | 9ead1bfe5afd7e519fe5f83b6603e5147fa91411 (patch) | |
| tree | 33f872deb81edd3de5609a1519c11083461f4b07 /cmake/ProjTest.cmake | |
| parent | 42b9332f70859e5f428901cd801c2a4064373373 (diff) | |
| parent | 2622d3851573cd44fc7b36bfd15f07215f434d4b (diff) | |
| download | PROJ-9ead1bfe5afd7e519fe5f83b6603e5147fa91411.tar.gz PROJ-9ead1bfe5afd7e519fe5f83b6603e5147fa91411.zip | |
Merge pull request #1330 from mwtoews/cmake
Normalize CMake with cmakelint, 2-space indent
Diffstat (limited to 'cmake/ProjTest.cmake')
| -rw-r--r-- | cmake/ProjTest.cmake | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/cmake/ProjTest.cmake b/cmake/ProjTest.cmake index 46c4e515..7404b59d 100644 --- a/cmake/ProjTest.cmake +++ b/cmake/ProjTest.cmake @@ -8,27 +8,27 @@ function(proj_add_test_script_sh SH_NAME BIN_USE) set(TEST_OK 1) if(ARGV2) - set(TEST_OK 0) - set(GRID_FULLNAME ${PROJECT_SOURCE_DIR}/data/${ARGV2}) - if(EXISTS ${GRID_FULLNAME}) - set(TEST_OK 1) - endif(EXISTS ${GRID_FULLNAME}) - endif(ARGV2) - - if( CMAKE_VERSION VERSION_LESS 2.8.4 ) - set(TEST_OK 0) - message(STATUS "test with bash script need a cmake version >= 2.8.4") + set(TEST_OK 0) + set(GRID_FULLNAME ${PROJECT_SOURCE_DIR}/data/${ARGV2}) + if(EXISTS ${GRID_FULLNAME}) + set(TEST_OK 1) + endif() + endif() + + if(CMAKE_VERSION VERSION_LESS 2.8.4) + set(TEST_OK 0) + message(STATUS "test with bash script need a cmake version >= 2.8.4") endif() if(${TEST_OK}) - add_test( NAME "${testname}" - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/data - COMMAND ${PROJECT_SOURCE_DIR}/test/cli/${SH_NAME} - ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${${BIN_USE}} - ) - endif(${TEST_OK}) - - endif(UNIX) + add_test(NAME "${testname}" + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/data + COMMAND ${PROJECT_SOURCE_DIR}/test/cli/${SH_NAME} + ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${${BIN_USE}} + ) + endif() + + endif() endfunction() @@ -36,10 +36,10 @@ function(proj_add_gie_test TESTNAME TESTCASE) set(GIE_BIN "gie") set(TESTFILE ${CMAKE_SOURCE_DIR}/test/${TESTCASE}) - add_test( NAME ${TESTNAME} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/test - COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${GIE_BIN} - ${TESTFILE} - ) + add_test(NAME ${TESTNAME} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/test + COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${GIE_BIN} + ${TESTFILE} + ) endfunction() |