converted cmake keywords to lowercase as is best practice in modern c…

…make patterns

CMake/CMakeOptions.cmake

@@ -1,27 +1,27 @@
 #
 # Configure output paths for libraries and executables.
 #
-SET(LIBRARY_OUTPUT_PATH ${VTK_VMTK_BINARY_DIR}/bin CACHE PATH
+set(LIBRARY_OUTPUT_PATH ${VTK_VMTK_BINARY_DIR}/bin CACHE PATH
     "Single output directory for building all libraries.")
-SET(EXECUTABLE_OUTPUT_PATH ${VTK_VMTK_BINARY_DIR}/bin CACHE PATH
+set(EXECUTABLE_OUTPUT_PATH ${VTK_VMTK_BINARY_DIR}/bin CACHE PATH
     "Single output directory for building all executables.")
-MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
+mark_as_advanced(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
 
 #
 # Try to find VTK and include its settings (otherwise complain)
 #
-IF ( NOT VTK_FOUND )
-  FIND_PACKAGE(VTK REQUIRED)
-  INCLUDE(${VTK_USE_FILE})
-ENDIF ( NOT VTK_FOUND )
+if ( NOT VTK_FOUND )
+  find_package(VTK REQUIRED)
+  include(${VTK_USE_FILE})
+endif ( NOT VTK_FOUND )
 
 #
 # Try to find ITK and include its settings (otherwise complain)
 #
-IF ( NOT ITK_FOUND )
-  FIND_PACKAGE(ITK REQUIRED)
-  INCLUDE(${ITK_USE_FILE})
-ENDIF ( NOT ITK_FOUND )
+if ( NOT ITK_FOUND )
+  find_package(ITK REQUIRED)
+  include(${ITK_USE_FILE})
+endif ( NOT ITK_FOUND )
 
 #
 # Build shared libs ?
@@ -30,25 +30,25 @@ ENDIF ( NOT ITK_FOUND )
 #
 
 # Standard CMake option for building libraries shared or static by default.
-OPTION(BUILD_SHARED_LIBS
+option(BUILD_SHARED_LIBS
        "Build with shared libraries."
        ${VTK_BUILD_SHARED_LIBS})
 # Copy the CMake option to a setting with VTK_VMTK_ prefix for use in
 # our project.  This name is used in vtkvmtkConfigure.h.in.
-SET(VTK_VMTK_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
+set(VTK_VMTK_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
 
 # If this is a build tree, provide an option for putting
 # this project's executables and libraries in with VTK's.
-IF (EXISTS ${VTK_DIR}/bin)
-  OPTION(USE_VTK_OUTPUT_PATHS
+if (EXISTS ${VTK_DIR}/bin)
+  option(USE_VTK_OUTPUT_PATHS
          "Use VTK's output directory for this project's executables and libraries."
          OFF)
-  MARK_AS_ADVANCED (USE_VTK_OUTPUT_PATHS)
-  IF (USE_VTK_OUTPUT_PATHS)
-    SET (LIBRARY_OUTPUT_PATH ${VTK_DIR}/bin)
-    SET (EXECUTABLE_OUTPUT_PATH ${VTK_DIR}/bin)
-  ENDIF (USE_VTK_OUTPUT_PATHS)
-ENDIF (EXISTS ${VTK_DIR}/bin)
+  mark_as_advanced (USE_VTK_OUTPUT_PATHS)
+  if (USE_VTK_OUTPUT_PATHS)
+    set (LIBRARY_OUTPUT_PATH ${VTK_DIR}/bin)
+    set (EXECUTABLE_OUTPUT_PATH ${VTK_DIR}/bin)
+  endif (USE_VTK_OUTPUT_PATHS)
+endif (EXISTS ${VTK_DIR}/bin)
 
 
 #
@@ -64,69 +64,69 @@ ENDIF (EXISTS ${VTK_DIR}/bin)
 # Python
 #
 
-IF (VTK_WRAP_PYTHON)
+if (VTK_WRAP_PYTHON)
 
-  OPTION(VTK_VMTK_WRAP_PYTHON
+  option(VTK_VMTK_WRAP_PYTHON
          "Wrap classes into the Python interpreted language."
          ON)
 
-  IF (VTK_VMTK_WRAP_PYTHON)
-    SET(VTK_WRAP_PYTHON3_INIT_DIR "${VTK_VMTK_SOURCE_DIR}/Wrapping")
-    INCLUDE(${VTK_CMAKE_DIR}/vtkWrapPython.cmake)
-    IF (WIN32)
-      IF (NOT BUILD_SHARED_LIBS)
-        MESSAGE(FATAL_ERROR "Python support requires BUILD_SHARED_LIBS to be ON.")
-        SET (VTK_VMTK_CAN_BUILD 0)
-      ENDIF (NOT BUILD_SHARED_LIBS)
-    ENDIF (WIN32)
-  ENDIF (VTK_VMTK_WRAP_PYTHON)
-
-ELSE (VTK_WRAP_PYTHON)
-
-  IF (VTK_VMTK_WRAP_PYTHON)
-    MESSAGE("Warning. VTK_VMTK_WRAP_PYTHON is ON but the VTK version you have "
+  if (VTK_VMTK_WRAP_PYTHON)
+    set(VTK_WRAP_PYTHON3_INIT_DIR "${VTK_VMTK_SOURCE_DIR}/Wrapping")
+    include(${VTK_CMAKE_DIR}/vtkWrapPython.cmake)
+    if (WIN32)
+      if (NOT BUILD_SHARED_LIBS)
+        message(FATAL_ERROR "Python support requires BUILD_SHARED_LIBS to be ON.")
+        set (VTK_VMTK_CAN_BUILD 0)
+      endif (NOT BUILD_SHARED_LIBS)
+    endif (WIN32)
+  endif (VTK_VMTK_WRAP_PYTHON)
+
+else (VTK_WRAP_PYTHON)
+
+  if (VTK_VMTK_WRAP_PYTHON)
+    message("Warning. VTK_VMTK_WRAP_PYTHON is ON but the VTK version you have "
             "chosen has not support for Python (VTK_WRAP_PYTHON is OFF).  "
             "Please set VTK_VMTK_WRAP_PYTHON to OFF.")
-    SET (VTK_VMTK_WRAP_PYTHON OFF)
-  ENDIF (VTK_VMTK_WRAP_PYTHON)
+    set (VTK_VMTK_WRAP_PYTHON OFF)
+  endif (VTK_VMTK_WRAP_PYTHON)
 
-ENDIF (VTK_WRAP_PYTHON)
+endif (VTK_WRAP_PYTHON)
 
 #
 # Java
 #
 
-IF (VTK_WRAP_JAVA)
+if (VTK_WRAP_JAVA)
 
-  OPTION(VTK_VMTK_WRAP_JAVA
+  option(VTK_VMTK_WRAP_JAVA
          "Wrap classes into the Java interpreted language."
          ON)
 
-  IF (VTK_VMTK_WRAP_JAVA)
-    SET(VTK_WRAP_JAVA3_INIT_DIR "${VTK_VMTK_SOURCE_DIR}/Wrapping")
-    INCLUDE(${VTK_CMAKE_DIR}/vtkWrapJava.cmake)
-    IF (WIN32)
-      IF (NOT BUILD_SHARED_LIBS)
-        MESSAGE(FATAL_ERROR "Java support requires BUILD_SHARED_LIBS to be ON.")
-        SET (VTK_VMTK_CAN_BUILD 0)
-      ENDIF (NOT BUILD_SHARED_LIBS)
-    ENDIF (WIN32)
+  if (VTK_VMTK_WRAP_JAVA)
+    set(VTK_WRAP_JAVA3_INIT_DIR "${VTK_VMTK_SOURCE_DIR}/Wrapping")
+    include(${VTK_CMAKE_DIR}/vtkWrapJava.cmake)
+    if (WIN32)
+      if (NOT BUILD_SHARED_LIBS)
+        message(FATAL_ERROR "Java support requires BUILD_SHARED_LIBS to be ON.")
+        set (VTK_VMTK_CAN_BUILD 0)
+      endif (NOT BUILD_SHARED_LIBS)
+    endif (WIN32)
 
     # Tell the java wrappers where to go.
-    SET(VTK_JAVA_HOME ${VTK_VMTK_BINARY_DIR}/java/vtkvmtk)
+    set(VTK_JAVA_HOME ${VTK_VMTK_BINARY_DIR}/java/vtkvmtk)
     MAKE_DIRECTORY(${VTK_JAVA_HOME})
-  ENDIF (VTK_VMTK_WRAP_JAVA)
+  endif (VTK_VMTK_WRAP_JAVA)
 
-ELSE (VTK_WRAP_JAVA)
+else (VTK_WRAP_JAVA)
 
-  IF (VTK_VMTK_WRAP_JAVA)
-    MESSAGE("Warning. VTK_VMTK_WRAP_JAVA is ON but the VTK version you have "
+  if (VTK_VMTK_WRAP_JAVA)
+    message("Warning. VTK_VMTK_WRAP_JAVA is ON but the VTK version you have "
             "chosen has not support for Java (VTK_WRAP_JAVA is OFF).  "
             "Please set VTK_VMTK_WRAP_JAVA to OFF.")
-    SET (VTK_VMTK_WRAP_JAVA OFF)
-  ENDIF (VTK_VMTK_WRAP_JAVA)
+    set (VTK_VMTK_WRAP_JAVA OFF)
+  endif (VTK_VMTK_WRAP_JAVA)
 
-ENDIF (VTK_WRAP_JAVA)
+endif (VTK_WRAP_JAVA)
 
-# Setup our local hints file in case wrappers need them.
-SET(VTK_WRAP_HINTS ${VTK_VMTK_SOURCE_DIR}/Wrapping/hints)
+# setup our local hints file in case wrappers need them.
+set(VTK_WRAP_HINTS ${VTK_VMTK_SOURCE_DIR}/Wrapping/hints)

CMake/VMTKConfig.cmake.in

@@ -1,7 +1,7 @@
 # Tell the user project where to find headers and libraries
-SET (VMTK_CPP_SOURCE_DIRS "@VMTK_SOURCE_DIR@/vtkVmtk")
+set(VMTK_CPP_SOURCE_DIRS "@VMTK_SOURCE_DIR@/vtkVmtk")
 
-SET(VMTK_INCLUDE_DIRS
+set(VMTK_INCLUDE_DIRS
   ${VMTK_CPP_SOURCE_DIRS}
   ${VMTK_CPP_SOURCE_DIRS}/Common
   ${VMTK_CPP_SOURCE_DIRS}/ComputationalGeometry
@@ -14,16 +14,16 @@ SET(VMTK_INCLUDE_DIRS
   "@VMTK_BINARY_DIR@/vtkVmtk"
 )
 
-SET(VMTK_BUILD_SETTINGS_FILE
+set(VMTK_BUILD_SETTINGS_FILE
   "@VMTK_BINARY_DIR@/VMTKBuildSettings.cmake"
 )
 
-INCLUDE(
+include(
   "@VMTK_BINARY_DIR@/VMTK-Targets.cmake"
 )
 
-SET(VMTK_LIBRARY_DIRS "@VMTK_BINARY_DIR@/bin")
+set(VMTK_LIBRARY_DIRS "@VMTK_BINARY_DIR@/bin")
 
-SET(VMTK_USE_FILE
+set(VMTK_USE_FILE
   "@VMTK_BINARY_DIR@/VMTKUse.cmake"
 )

CMake/VMTKUse.cmake.in

@@ -1,9 +1,9 @@
-INCLUDE(CMakeImportBuildSettings)
+include(CMakeImportBuildSettings)
 
-CMAKE_IMPORT_BUILD_SETTINGS("${VMTK_BUILD_SETTINGS_FILE}")
+cmake_import_build_settings("${VMTK_BUILD_SETTINGS_FILE}")
 
-INCLUDE_DIRECTORIES(${VMTK_INCLUDE_DIRS})
+include_directories(${VMTK_INCLUDE_DIRS})
 
-LINK_DIRECTORIES(${VMTK_LIBRARY_DIRS})
+link_directories(${VMTK_LIBRARY_DIRS})
 
-LINK_LIBRARIES(vtkvmtkCommon vtkvmtkComputationalGeometry vtkvmtkContrib vtkvmtkDifferentialGeometry vtkvmtkIO vtkvmtkITK vtkvmtkMisc vtkvmtkSegmentation nl tet)
+link_libraries(vtkvmtkCommon vtkvmtkComputationalGeometry vtkvmtkContrib vtkvmtkDifferentialGeometry vtkvmtkIO vtkvmtkITK vtkvmtkMisc vtkvmtkSegmentation nl tet)

CMake/vmtkFunctions.cmake

@@ -1,4 +1,3 @@
-
 include(CMakeParseArguments)
 include(${VMTK_SOURCE_DIR}/CMake/vtkMacroKitPythonWrap.cmake)
 
@@ -9,6 +8,7 @@ function(vmtk_build_library)
   cmake_parse_arguments(VMTK_LIB "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
   set(expected_defined_vars NAME SRCS)
+
   foreach(var ${expected_defined_vars})
     if(NOT DEFINED VMTK_LIB_${var})
       message(FATAL_ERROR "error: ${var} parameter is mandatory !")
@@ -19,24 +19,28 @@ function(vmtk_build_library)
     include_directories(${VMTK_LIB_INCLUDE_DIRECTORIES})
   endif()
 
-  SET(lib_name ${VMTK_LIB_NAME})
+  set(lib_name ${VMTK_LIB_NAME})
+
   if(NOT VMTK_LIB_NAME MATCHES "^vtkvmtk")
-    SET(lib_name vtkvmtk${VMTK_LIB_NAME})
+    set(lib_name vtkvmtk${VMTK_LIB_NAME})
   endif()
 
-  ADD_LIBRARY(${lib_name} ${VMTK_LIB_SRCS})
-  IF(VMTK_LIBRARY_PROPERTIES)
+  add_library(${lib_name} ${VMTK_LIB_SRCS})
+
+  if(VMTK_LIBRARY_PROPERTIES)
     set_target_properties(${lib_name} PROPERTIES ${VMTK_LIBRARY_PROPERTIES})
-  ENDIF(VMTK_LIBRARY_PROPERTIES)
+  endif(VMTK_LIBRARY_PROPERTIES)
+
   set_target_properties(${lib_name} PROPERTIES LINKER_LANGUAGE CXX)
-  IF(NOT WIN32)
+
+  if(NOT WIN32)
     set_target_properties(${lib_name} PROPERTIES COMPILE_FLAGS -fPIC)
-  ENDIF(NOT WIN32)
+  endif(NOT WIN32)
+
   if(VMTK_LIB_TARGET_LINK_LIBRARIES)
     target_link_libraries(${lib_name} ${VMTK_LIB_TARGET_LINK_LIBRARIES})
   endif()
 
-
   install(TARGETS ${lib_name}
     EXPORT VMTK-Targets
     LIBRARY DESTINATION ${VTK_VMTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
@@ -52,7 +56,7 @@ function(vmtk_build_library)
     DESTINATION ${VTK_VMTK_INSTALL_INCLUDE_DIR}
     COMPONENT Development)
 
-  IF (VTK_WRAP_PYTHON AND VTK_VMTK_WRAP_PYTHON)
+  if (VTK_WRAP_PYTHON AND VTK_VMTK_WRAP_PYTHON)
 
     set(vmtk_wrapped_libs )
     foreach(lib IN LISTS VMTK_LIB_TARGET_LINK_LIBRARIES)
@@ -73,6 +77,6 @@ function(vmtk_build_library)
       KIT_INSTALL_LIB_DIR ${VTK_VMTK_INSTALL_LIB_DIR}
       KIT_MODULE_INSTALL_LIB_DIR ${VTK_VMTK_WRAPPED_MODULE_INSTALL_LIB_DIR}
       )
-  ENDIF (VTK_WRAP_PYTHON AND VTK_VMTK_WRAP_PYTHON)
+  endif (VTK_WRAP_PYTHON AND VTK_VMTK_WRAP_PYTHON)
 
 endfunction()