Task #8021: Changed CMakeLists.txt file to make use of new...

Task #8021: Changed CMakeLists.txt file to make use of new lofar_create_target_symlink() macro. Added <PACKAGE_NAME> to the name of the target created by lofar_create_target_symlink() to avoid multiple definitions of the same target across different packages.

CEP/MS/test/CMakeLists.txt

@@ -3,13 +3,11 @@
 include(LofarCTest)
 
 # Create symbolic links to scripts used by the tmakems test script.
-get_target_property(_loc getparsetvalue LOCATION)
-execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
-  ${_loc}
+lofar_create_target_symlink(
+  getparsetvalue 
   ${CMAKE_CURRENT_BINARY_DIR}/getparsetvalue)
-get_target_property(_loc finddproc LOCATION)
-execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
-  ${_loc}
+lofar_create_target_symlink(
+  finddproc 
   ${CMAKE_CURRENT_BINARY_DIR}/finddproc)
 execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
   ${LMWCommon_SOURCE_DIR}/src/startdistproc

CEP/ParmDB/test/CMakeLists.txt

@@ -3,13 +3,11 @@
 include(LofarCTest)
 
 # Create symbolic links to scripts used by some of the test programs
-get_target_property(_loc getparsetvalue LOCATION)
-execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
-  ${_loc}
+lofar_create_target_symlink(
+  getparsetvalue 
   ${CMAKE_CURRENT_BINARY_DIR}/getparsetvalue)
-get_target_property(_loc finddproc LOCATION)
-execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
-  ${_loc}
+lofar_create_target_symlink(
+  finddproc 
   ${CMAKE_CURRENT_BINARY_DIR}/finddproc)
 execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
   ${LMWCommon_SOURCE_DIR}/src/startdistproc

CEP/pyparmdb/test/CMakeLists.txt

@@ -4,9 +4,8 @@ include(LofarCTest)
 
 # We need to create a symlink to the parmdbm executable in the current
 # binary directory, so that the test program(s) can find it.
-get_target_property(_parmdbm parmdbm LOCATION_${CMAKE_BUILD_TYPE})
-execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
-  ${_parmdbm}
+lofar_create_target_symlink(
+  parmdbm
   ${CMAKE_CURRENT_BINARY_DIR}/parmdbm)
 
 lofar_add_test(tpyparmdb DEPENDS parmdbm _parmdb)

CMake/LofarMacros.cmake

@@ -184,11 +184,11 @@ if(NOT DEFINED LOFAR_MACROS_INCLUDED)
     else(POLICY CMP0026)
       get_target_property(_location ${_target} LOCATION)
     endif(POLICY CMP0026)
-    add_custom_target(${_target}_symlink ALL
+    add_custom_target(${PACKAGE_NAME}_${_target}_symlink ALL
       COMMAND ${CMAKE_COMMAND} -E create_symlink
       ${_location}
       ${_symlink})
-    add_dependencies(${_target}_symlink ${_target})
+    add_dependencies(${PACKAGE_NAME}_${_target}_symlink ${_target})
   endmacro(lofar_create_target_symlink _target _symlink)
 
 

RTCP/Cobalt/CobaltTest/test/CMakeLists.txt

@@ -3,9 +3,8 @@
 include(LofarCTest)
 
 # Create symbolic link to the outputProc executable used by the tests below.
-get_target_property(_loc outputProc LOCATION)
-execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
-  ${_loc}
+lofar_create_target_symlink(
+  outputProc
   ${CMAKE_CURRENT_BINARY_DIR}/outputProc)
 
 foreach(_test tMultiPartTABOutput tManyPartTABOutput)
@@ -15,4 +14,3 @@ foreach(_test tMultiPartTABOutput tManyPartTABOutput)
       PROPERTIES ENVIRONMENT "LOFARROOT=${GPUProc_SOURCE_DIR}")
   endif(BUILD_TESTING)
 endforeach()
-