CMake fixes

This commit is contained in:
Shahram Najm 2014-07-10 12:49:35 +01:00
parent 730127fa11
commit 333b4cbc88
2 changed files with 4 additions and 1 deletions

View File

@ -54,6 +54,7 @@ foreach( tool ${tests} )
ecbuild_add_test( TARGET f_${tool}_test ecbuild_add_test( TARGET f_${tool}_test
TYPE SCRIPT TYPE SCRIPT
DEPENDS f_${tool} DEPENDS f_${tool}
CONDITION ENABLE_FORTRAN
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/${tool}.sh COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/${tool}.sh
RESOURCES include.sh RESOURCES include.sh
) )

View File

@ -18,8 +18,10 @@ foreach( tool ${test_bins} )
SOURCES ${tool}.c SOURCES ${tool}.c
LIBS grib_api LIBS grib_api
) )
list( APPEND ptools p_${tool} )
endforeach() endforeach()
# Now add each test # Now add each test
################################################# #################################################
list( APPEND tests list( APPEND tests
@ -41,7 +43,7 @@ list( APPEND tests
foreach (test ${tests}) foreach (test ${tests})
ecbuild_add_test( TARGET p_${test}_test ecbuild_add_test( TARGET p_${test}_test
TYPE SCRIPT TYPE SCRIPT
DEPENDS p_${tool} DEPENDS ${ptools}
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/${test}.sh COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/${test}.sh
RESOURCES include.sh ${test}.py RESOURCES include.sh ${test}.py
ENVIRONMENT PYTHON=${PYTHON_EXECUTABLE} ENVIRONMENT PYTHON=${PYTHON_EXECUTABLE}