Explorar o código

ENH: Change ctkMacroGenerateDGraphInput into ctkFunctionGenerateDGraphInput

In CMake, since functions have their own scope, they are preferred over macro
Jean-Christophe Fillion-Robin %!s(int64=15) %!d(string=hai) anos
pai
achega
c49d3e2ef4
Modificáronse 2 ficheiros con 5 adicións e 5 borrados
  1. 2 2
      CMake/ctkMacroGenerateDGraphInput.cmake
  2. 3 3
      CMakeLists.txt

+ 2 - 2
CMake/ctkMacroGenerateDGraphInput.cmake

@@ -2,7 +2,7 @@
 #
 # Generate a DGrapgh input file expected by DGraph executable.
 #
-MACRO(ctkMacroGenerateDGraphInput dir target_directories with_option)
+FUNCTION(ctkFunctionGenerateDGraphInput dir target_directories with_option)
   IF(NOT EXISTS ${dir})
     MESSAGE(FATAL_ERROR "Directory ${dir} doesn't exist!")
   ENDIF()
@@ -81,4 +81,4 @@ MACRO(ctkMacroGenerateDGraphInput dir target_directories with_option)
 
   FILE(WRITE ${filename} ${dgraph_list})
   MESSAGE(STATUS "Generated: ${filename}")
-ENDMACRO()
+ENDFUNCTION()

+ 3 - 3
CMakeLists.txt

@@ -102,7 +102,7 @@ INCLUDE(CMake/ctkMacroTargetLibraries.cmake) # Import multiple macros
 INCLUDE(CMake/ctkFunctionExtractOptionNameAndValue.cmake)
 INCLUDE(CMake/ctkMacroValidateBuildOptions.cmake)
 INCLUDE(CMake/ctkMacroAddCtkLibraryOptions.cmake)
-INCLUDE(CMake/ctkMacroGenerateDGraphInput.cmake)
+INCLUDE(CMake/ctkFunctionGenerateDGraphInput.cmake)
 INCLUDE(CMake/ctkFunctionGenerateProjectXml.cmake)
 
 # Used by CTKGenerateCTKConfig.cmake
@@ -351,7 +351,7 @@ MARK_AS_ADVANCED(DGraph_EXECUTABLE)
 #-----------------------------------------------------------------------------
 # Let's make sure the enabled/disabled libraries, plugins or applications are coherent
 #
-ctkMacroGenerateDGraphInput(${CTK_BINARY_DIR} "${target_directories}" FALSE)
+ctkFunctionGenerateDGraphInput(${CTK_BINARY_DIR} "${target_directories}" FALSE)
 ctkMacroValidateBuildOptions("${CTK_BINARY_DIR}" "${DGraph_EXECUTABLE}" "${target_directories}")
 
 #-----------------------------------------------------------------------------
@@ -359,7 +359,7 @@ ctkMacroValidateBuildOptions("${CTK_BINARY_DIR}" "${DGraph_EXECUTABLE}" "${targe
 #
 
 # Generate DGraph input file expected by DGraph
-ctkMacroGenerateDGraphInput(${CTK_BINARY_DIR} "${target_directories}" TRUE)
+ctkFunctionGenerateDGraphInput(${CTK_BINARY_DIR} "${target_directories}" TRUE)
 
 # Obtain list of target ordered topologically
 EXECUTE_PROCESS(