Synch with upstream and fix formatting diffs

packaging/CMakeLists.txt

@@ -66,9 +66,7 @@ if (WIN32)
     set(WIN_PACK_DIR ${PROJECT_SOURCE_DIR}/windows)
     include(${WIN_PACK_DIR}/WindowsLaunchers.cmake)
     include(${WIN_PACK_DIR}/WindowsPackaging.cmake)
-endif()
-
-if (UNIX)
+elseif (UNIX)
     if(APPLE)
         include(${PROJECT_SOURCE_DIR}/apple/ApplePackaging.cmake)
     else()

packaging/linux/LinuxPackaging.cmake

@@ -85,7 +85,9 @@ set(backup_CPACK_INSTALL_CMAKE_PROJECTS ${CPACK_INSTALL_CMAKE_PROJECTS})
 #clear it
 set(CPACK_INSTALL_CMAKE_PROJECTS "")
 foreach(external_project ${external_projects})
-    if(DEFINED ${external_project}_ROOT)
+    if(NOT USE_SYSTEM_${external_project}
+            AND BUILD_SHARED_LIBS_${external_project}
+            AND DEFINED ${external_project}_ROOT)
         install(CODE "
             execute_process(
                 COMMAND ${CMAKE_COMMAND} --install ${${external_project}_ROOT} --prefix \"\${CMAKE_INSTALL_PREFIX}\"

src/layers/legacy/medImageIO/itkDataImageWriterBase.cpp

@@ -49,8 +49,7 @@ bool itkDataImageWriterBase::canWrite(const QString& path)
 }
 
 template <unsigned DIM,typename T>
-bool itkDataImageWriterBase::write_image(const QString& path,const char* type)
-{
+bool itkDataImageWriterBase::write_image(const QString& path,const char* type){
     medAbstractData* medData = dynamic_cast<medAbstractData*>(this->data());
     if (medData && medData->identifier() != type)
     {

superbuild/CMakeLists.txt

@@ -94,15 +94,15 @@ if (USE_Python)
 endif()
 
 list(APPEND external_projects
-     VTK
-     ITK
-     RPI
-     TTK
-     DCMTK
-     QtDCM
-     dtk
-     LogDemons
-     )
+  VTK
+  ITK
+  RPI
+  TTK
+  DCMTK
+  QtDCM
+  dtk
+  LogDemons
+  )
 
 if(USE_MUSIC_PLUGINS)
     list(APPEND external_projects
@@ -165,10 +165,10 @@ set(medInria_BINARY_DIR ${CMAKE_BINARY_DIR}/medInria-build)
 ## #############################################################################
 
 set(CMAKE_MODULE_PATH
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/external_projects_tools
-    ${CMAKE_MODULE_PATH}
-    )
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/external_projects_tools
+  ${CMAKE_MODULE_PATH}
+  )
 
 option(USE_GITHUB_SSH 
        "Use by default Git SSH addresses, requires public key set on github" OFF
@@ -182,12 +182,12 @@ option(USE_GITLAB_INRIA_SSH
 # Asclepios and visages plugins
 set(${PROJECT_NAME}_CONFIG_FILE "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Config.cmake")
 file(WRITE ${${PROJECT_NAME}_CONFIG_FILE}
-     "set(CMAKE_MODULE_PATH
-     ${CMAKE_MODULE_PATH}
-     \${CMAKE_MODULE_PATH}
-     )\n\n
-set(USE_GITHUB_SSH ${USE_GITHUB_SSH})\n"
-)
+  "set(CMAKE_MODULE_PATH
+    ${CMAKE_MODULE_PATH}
+    \${CMAKE_MODULE_PATH}
+    )\n\n
+    set(USE_GITHUB_SSH ${USE_GITHUB_SSH})\n"
+  )
 
 # Add CMAKE_MODULE_PATH to superProjectConfig.cmake, usefull for 
 # Asclepios and visages plugins
@@ -213,9 +213,9 @@ set(PRIVATE_PLUGINS_LEGACY_DIRS "" CACHE PATH "Folders containing legacy private
 ## #############################################################################
 
 set(global_targets 
-    configure
-    install
-    )
+  configure
+  install
+  )
 
 # This adds targets that will be run in each external-projects
 set_property(DIRECTORY PROPERTY EP_STEP_TARGETS ${global_targets})

superbuild/ConfigureExternalProjects.cmake

@@ -87,7 +87,7 @@ else()
   else()
     if(EP_CHECKBOX_ON_TOP_LEVEL_change)
       unset(EP_PATH_BASE CACHE)
-	  unset(EP_PATH_BASE_PREVIOUS CACHE)
+      unset(EP_PATH_BASE_PREVIOUS CACHE)
       set(EP_DIR_NAME  "ExtProjs"                    CACHE FILEPATH ${ep_dir_name_comment}     FORCE)
     endif()
     ep_change_garde(EP_DIR_NAME)

superbuild/external_projects_tools/EP_Initialisation.cmake

@@ -14,12 +14,24 @@
 macro(ep_Initialisation ep)
 
 cmake_parse_arguments(ep_Initialisation
-    "NO_CONFIG_FILE"
+    "NO_CMAKE_PACKAGE"
     "USE_SYSTEM;BUILD_SHARED_LIBS;REQUIRED_FOR_PLUGINS;PACKAGE_NAME"
     ""
     ${ARGN}
     )
 
+if (NOT ep_Initialisation_USE_SYSTEM)
+    set(ep_Initialisation_USE_SYSTEM OFF)
+endif()
+
+if (NOT ep_Initialisation_BUILD_SHARED_LIBS)
+    set(ep_Initialisation_BUILD_SHARED_LIBS ON)
+endif()
+
+if (NOT ep_Initialisation_REQUIRED_FOR_PLUGINS)
+    set(ep_Initialisation_REQUIRED_FOR_PLUGINS OFF)
+endif()
+
 if (NOT ep_Initialisation_PACKAGE_NAME)
     set(ep_Initialisation_PACKAGE_NAME ${ep})
 endif()
@@ -35,10 +47,8 @@ option(USE_SYSTEM_${ep}
 
 if (USE_SYSTEM_${ep})
 
-    if(NOT ep_Initialisation_NO_CONFIG_FILE)
-        find_package(${ep_Initialisation_PACKAGE_NAME} REQUIRED
-            PATH_SUFFIXES install build
-            )
+    if(NOT ep_Initialisation_NO_CMAKE_PACKAGE)
+        find_package(${ep_Initialisation_PACKAGE_NAME} REQUIRED)
 
 ## #############################################################################
 ## Complete superProjectConfig.cmake
@@ -61,28 +71,30 @@ else()
 ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-  if (ep_Initialisation_REQUIRED_FOR_PLUGINS)
-    if (DEFINED ${ep}_BINARY_DIR)
-      file(APPEND ${${PROJECT_NAME}_CONFIG_FILE}
-      "find_package(${ep_Initialisation_PACKAGE_NAME} REQUIRED
-        PATHS \"${${ep_Initialisation_PACKAGE_NAME}_BINARY_DIR}\"
-        PATH_SUFFIXES install build
-        )\n"
-      )
-    else()
-	  if(DEFINED EP_PATH_BUILD)
-	      set(build_dir ${EP_PATH_BUILD})
-	  else()
-	      set(build_dir "${EP_PATH_SOURCE}/${ep}-build" )
-	  endif()
-
-      file(APPEND ${${PROJECT_NAME}_CONFIG_FILE}
-        "find_package(${ep} REQUIRED
-          PATHS \"${build_dir}\" 
-          PATH_SUFFIXES install build
-          )\n"
-        )
-    endif()
+  if(NOT ep_Initialisation_NO_CMAKE_PACKAGE)
+      if (ep_Initialisation_REQUIRED_FOR_PLUGINS)
+          if (DEFINED ${ep}_BINARY_DIR)
+              file(APPEND ${${PROJECT_NAME}_CONFIG_FILE}
+                  "find_package(${ep_Initialisation_PACKAGE_NAME} REQUIRED
+                      PATHS \"${${ep_Initialisation_PACKAGE_NAME}_BINARY_DIR}\"
+                      PATH_SUFFIXES install build
+                      )\n"
+                  )
+          else()
+              if(DEFINED EP_PATH_BUILD)
+                  set(build_dir ${EP_PATH_BUILD})
+              else()
+                  set(build_dir "${EP_PATH_SOURCE}/${ep}-build" )
+              endif()
+
+              file(APPEND ${${PROJECT_NAME}_CONFIG_FILE}
+                  "find_package(${ep} REQUIRED
+                      PATHS \"${build_dir}\"
+                      PATH_SUFFIXES install build
+                      )\n"
+                  )
+          endif()
+      endif()
   endif()
 
 

superbuild/projects_modules/medInria.cmake

@@ -161,7 +161,7 @@ if (WIN32)
         COMMAND for %%I in ( ${DCM_BIN_BASE}\\bin\\${CONFIG_MODE}\\*.dll ) do (if EXIST ${MED_BIN_BASE}\\%%~nxI (del /S ${MED_BIN_BASE}\\%%~nxI & mklink /H ${MED_BIN_BASE}\\%%~nxI %%~fI) else mklink /H ${MED_BIN_BASE}\\%%~nxI %%~fI)
         COMMAND for %%I in ( ${QT5_BIN_BASE}\\bin\\*.dll                 ) do (if EXIST ${MED_BIN_BASE}\\%%~nxI (del /S ${MED_BIN_BASE}\\%%~nxI & mklink /H ${MED_BIN_BASE}\\%%~nxI %%~fI) else mklink /H ${MED_BIN_BASE}\\%%~nxI %%~fI) 
         COMMAND for %%I in ( ${PYNCPP_BIN_BASE}\\bin\\*.dll ) do (if EXIST ${MED_BIN_BASE}\\%%~nxI (del /S ${MED_BIN_BASE}\\%%~nxI & mklink /H ${MED_BIN_BASE}\\%%~nxI %%~fI) else mklink /H ${MED_BIN_BASE}\\%%~nxI %%~fI)
-)
+        )
 endif()
 
 

superbuild/projects_modules/qwt.cmake

@@ -16,7 +16,7 @@ EP_Initialisation(${ep}
   USE_SYSTEM OFF 
   BUILD_SHARED_LIBS OFF
   REQUIRED_FOR_PLUGINS ON
-  NO_CONFIG_FILE
+  NO_CMAKE_PACKAGE
 )
 
 if (NOT USE_SYSTEM_${ep})