update the FindRTTPlugin from OCL / toolchain-2.3

--- lib/orogen/templates/config/FindRTTPlugin.cmake
+++ lib/orogen/templates/config/FindRTTPlugin.cmake
@@ -1,10 +1,10 @@
 ################################################################################
 #
 # CMake script for finding An Orocos RTT Plugin in case you require it during build time.
-# If the optional OROCOS_ROOT_DIR environment variable exists, header files and
-# libraries will be searched in the OROCOS_ROOT_DIR/include and OROCOS_ROOT_DIR/lib/orocos/plugins
+# If the optional RTT_COMPONENT_PATH environment variable exists, header files and
+# libraries will be searched in the RTT_COMPONENT_PATH/include and RTT_COMPONENT_PATH/lib/orocos/plugins
 # directories, respectively. Otherwise the default CMake search process will be
-# used.
+# used. Use the RTT_HINTS variable to hint the location of the orocos-rtt installation directory.
 #
 # Usage: find_package( RTTPlugin COMPONENTS rtt-scripting )
 #
@@ -17,44 +17,34 @@

 include(LibFindMacros)

-# Get hint from environment variable (if any)
-if(NOT $ENV{OROCOS_ROOT_DIR} STREQUAL "")
-  set(OROCOS_ROOT_DIR $ENV{OROCOS_ROOT_DIR} CACHE PATH "Xenomai base directory location (optional, used for nonstandard installation paths)" FORCE)
-  mark_as_advanced(OROCOS_ROOT_DIR)
-endif()
-
+find_package(Orocos-RTT REQUIRED ${RTT_HINTS})

 FOREACH(COMPONENT ${RTTPlugin_FIND_COMPONENTS})
+    # We search for both 'given name' and 'given name + -target'
     set(PLUGIN_NAME   ${COMPONENT} ${COMPONENT}-${OROCOS_TARGET} )
     #STRING(TOUPPER ${COMPONENT} COMPONENT)

-    set(RTT_PLUGIN_${COMPONENT}_INCLUDE_DIR ${OROCOS_RTT_INCLUDE_DIRS}
-        ${OrocosRTT_INCLUDE_DIRS})
+    set(RTT_PLUGIN_${COMPONENT}_INCLUDE_DIR ${OROCOS-RTT_INCLUDE_DIRS} )
     # Find plugins
-    if(OROCOS_ROOT_DIR)
+    if(OROCOS-RTT_PLUGIN_PATH)
         # Use location specified by environment variable
-        find_library(RTT_PLUGIN_${COMPONENT}_LIBRARY
-            NAMES ${PLUGIN_NAME}
-            PATHS ${OROCOS_ROOT_DIR}/lib
-            PATH_SUFFIXES
-                orocos/plugins orocos/plugins/${OROCOS_TARGET} orocos/${OROCOS_TARGET}/plugins
-                orocos/types orocos/types/${OROCOS_TARGET} orocos/${OROCOS_TARGET}/types
-                NO_DEFAULT_PATH)
+        find_library(RTT_PLUGIN_${COMPONENT}_LIBRARY        NAMES ${PLUGIN_NAME} PATHS ${OROCOS-RTT_PLUGIN_PATH} PATH_SUFFIXES ${OROCOS_TARGET}  NO_DEFAULT_PATH)
+        find_library(RTT_PLUGIN_${COMPONENT}D_LIBRARY       NAMES ${PLUGIN_NAME}${CMAKE_DEBUG_POSTFIX} PATHS ${OROCOS-RTT_PLUGIN_PATH} PATH_SUFFIXES ${OROCOS_TARGET}  NO_DEFAULT_PATH)
     else()
         # Use default CMake search process
-        find_library(RTT_PLUGIN_${COMPONENT}_LIBRARY
-            NAMES ${PLUGIN_NAME}
-            PATHS ${OROCOS_INSTALL}/lib
-            PATH_SUFFIXES
-                orocos/plugins orocos/plugins/${OROCOS_TARGET} orocos/${OROCOS_TARGET}/plugins
-                orocos/types orocos/types/${OROCOS_TARGET} orocos/${OROCOS_TARGET}/types
-                NO_DEFAULT_PATH)
+        find_library(RTT_PLUGIN_${COMPONENT}_LIBRARY        NAMES ${PLUGIN_NAME} PATHS ${OROCOS-RTT_PLUGIN_PATH} PATH_SUFFIXES ${OROCOS_TARGET})
+        find_library(RTT_PLUGIN_${COMPONENT}D_LIBRARY       NAMES ${PLUGIN_NAME}${CMAKE_DEBUG_POSTFIX} PATHS ${OROCOS-RTT_PLUGIN_PATH} PATH_SUFFIXES ${OROCOS_TARGET})
     endif()

     # Set the include dir variables and the libraries and let libfind_process do the rest.
     # NOTE: Singular variables for this library, plural for libraries this this lib depends on.
     set(RTT_PLUGIN_${COMPONENT}_PROCESS_INCLUDES RTT_PLUGIN_${COMPONENT}_INCLUDE_DIR )
-    set(RTT_PLUGIN_${COMPONENT}_PROCESS_LIBS     RTT_PLUGIN_${COMPONENT}_LIBRARY )
+    if ( RTT_PLUGIN_${COMPONENT}D_LIBRARY )
+      list(APPEND RTT_PLUGIN_${COMPONENT}_PROCESS_LIBS   RTT_PLUGIN_${COMPONENT}D_LIBRARY)
+    endif()
+    if ( RTT_PLUGIN_${COMPONENT}_LIBRARY )
+      list(APPEND RTT_PLUGIN_${COMPONENT}_PROCESS_LIBS   RTT_PLUGIN_${COMPONENT}_LIBRARY)
+    endif()

     libfind_process( RTT_PLUGIN_${COMPONENT} )


update shader factory tag

update shader factory tag

--- externals/CMakeExternals.cmake
+++ externals/CMakeExternals.cmake
@@ -596,7 +596,7 @@

       add_external_project(megamol-shader-factory STATIC
         GIT_REPOSITORY https://github.com/UniStuttgart-VISUS/megamol-shader-factory.git
-        GIT_TAG "04c3d154fa17a6fa885bf57d4f1e194cae3e9422"
+        GIT_TAG "bc3aa63cd4c22a11adfd2caa6f51ef5cab65df7e"
         BUILD_BYPRODUCTS
         "<INSTALL_DIR>/${MEGAMOL_SHADER_FACTORY_LIB}"
         DEPENDS glad)


webui: check cmake condition after ROOT_APPLY_OPTIONS

--- cmake/modules/RootBuildOptions.cmake
+++ cmake/modules/RootBuildOptions.cmake
@@ -292,6 +292,15 @@
   set(webui_defvalue OFF)
 endif()

+#---roottest option implies testing
+if(roottest OR rootbench)
+  set(testing ON CACHE BOOL "" FORCE)
+endif()
+
+#---Define at moment the options with the selected default values-----------------------------
+ROOT_APPLY_OPTIONS()
+
+#---check if webui can be build-------------------------------
 if(webui)
   if(CMAKE_CXX_STANDARD EQUAL 11)
     message(FATAL_ERROR "WebUI requires C++14 or higher")
@@ -300,13 +309,6 @@
   endif()
 endif()

-#---roottest option implies testing
-if(roottest OR rootbench)
-  set(testing ON CACHE BOOL "" FORCE)
-endif()
-
-#---Define at moment the options with the selected default values-----------------------------
-ROOT_APPLY_OPTIONS()

 #---Removed options------------------------------------------------------------
 foreach(opt afdsmgrd afs bonjour castor chirp geocad glite globus gviz hdfs ios qt qtgsi rfio ruby sapdb srp table)


mysql doesn't compile

mysql doesn't compile

--- modules.cmake
+++ modules.cmake
@@ -17,7 +17,7 @@
 clever_add_module(std_fcgi       OFF "enable the fcgi module"       "")
 clever_add_module(web_request    OFF "enable the request module"    "")
 clever_add_module(web_session    OFF "enable the session module"    "")
-clever_add_module(db_mysql       ON  "enable the mysql module"      "")
+clever_add_module(db_mysql       OFF  "enable the mysql module"      "")

 # Simple modules
 clever_add_simple_module(std_clever     ON  "enable the clever module"     "")


Maybe a header here will fix the internal client

--- Modules/DiffusionImaging/files.cmake
+++ Modules/DiffusionImaging/files.cmake
@@ -94,6 +94,7 @@
   # IO Datastructures
   IODataStructures/DiffusionWeightedImages/mitkDiffusionImage.h
   IODataStructures/FiberBundle/itkSlowPolyLineParametricPath.h
+  IODataStructures/TbssImages/mitkTbssImage.h

   # Tractography


ARROW-2675: Fix build error with clang-10 (Apple Clang / LLVM)

As mac os X has been updated to the version 10.13.5, XCode has been updated to XCode 9.4 and Command Line Tools have been updated to the version 10.0, the clang version has also been updated to clang-10 (Apple Clang / LLVM) correspondingly. However, Arrow can only be built under clang-9, as shown in the file
https://github.com/apache/arrow/blob/b1d1633c90d20d3cbcbcee9a29c3f057164bb53c/cpp/cmake_modules/CompilerInfo.cmake#L77

So, it's time to update Arrow to support clang-10.

Author: songqing <zhangsongqing164@163.com>

Closes #2106 from songqing/support_clang-10 and squashes the following commits:

980b41a0 <songqing> support clang-10

--- cpp/cmake_modules/CompilerInfo.cmake
+++ cpp/cmake_modules/CompilerInfo.cmake
@@ -78,6 +78,11 @@
   set(COMPILER_FAMILY "clang")
   set(COMPILER_VERSION "4.0.0svn")

+# clang on Mac OS X, XCode 9.
+elseif("${COMPILER_VERSION_FULL}" MATCHES ".*clang-10")
+  set(COMPILER_FAMILY "clang")
+  set(COMPILER_VERSION "4.1.0svn")
+
 # gcc
 elseif("${COMPILER_VERSION_FULL_LOWER}" MATCHES ".*gcc[ -]version.*")
   set(COMPILER_FAMILY "gcc")


Expose TM2-related flag to use local FW storage:
setting INTERNAL_FW_SOURCE=Local will prevent CMake accessing remote server

Change-Id: I71e3793b2fa594609e65971a997778408847ea5c
Signed-off-by: Evgeni Raikhel <f85458431d26324487c02be81bf1e902412cb12e@intel.com>

--- third-party/libtm/versions.cmake
+++ third-party/libtm/versions.cmake
@@ -8,7 +8,7 @@
 set(INTERNAL_FW_VERSION "0.0.18.3452")
 set(INTERNAL_CENTRAL_APP_VERSION "2.0.19.269")
 set(INTERNAL_CENTRAL_BL_VERSION "1.0.1.112")
-set(INTERNAL_FW_SOURCE "Remote")
+set(INTERNAL_FW_SOURCE "Remote" CACHE STRING "Select TM2 FW archive: Remote/Local (to avoid FW polling from remote server)")

 option(HOST_VERSION "set HOST_VERSION to host version, set to 0 to use internal configuration (INTERNAL_HOST_VERSION)" 0)
 if(HOST_VERSION)


going back to cmake install files

going back to cmake install files

--- SuperBuild/CMake/Package_Macro.cmake
+++ SuperBuild/CMake/Package_Macro.cmake
@@ -42,9 +42,9 @@
   configure_file(${SETUP_SCRIPT_SRC}
     ${CMAKE_BINARY_DIR}/pkgsetup @ONLY)

-  file(COPY ${CMAKE_BINARY_DIR}/pkgsetup
+  install(FILES ${CMAKE_BINARY_DIR}/pkgsetup
     DESTINATION ${PACKAGE_OUTDIR}
-    FILE_PERMISSIONS
+    PERMISSIONS
       OWNER_READ OWNER_WRITE OWNER_EXECUTE
       GROUP_READ GROUP_EXECUTE
       WORLD_READ WORLD_EXECUTE)


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 03)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   12)
+SET(KWSYS_DATE_STAMP_DAY   13)


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 01)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   03)
+SET(KWSYS_DATE_STAMP_DAY   04)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 09)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   01)
+SET(KWSYS_DATE_STAMP_DAY   02)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 12)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   12)
+SET(KWSYS_DATE_STAMP_DAY   13)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 10)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   02)
+SET(KWSYS_DATE_STAMP_DAY   03)


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 12)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   18)
+SET(KWSYS_DATE_STAMP_DAY   19)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 09)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   11)
+SET(KWSYS_DATE_STAMP_DAY   12)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 11)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   17)
+SET(KWSYS_DATE_STAMP_DAY   18)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 04)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   07)
+SET(KWSYS_DATE_STAMP_DAY   08)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 02)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   09)
+SET(KWSYS_DATE_STAMP_DAY   10)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 03)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   28)
+SET(KWSYS_DATE_STAMP_DAY   29)


CMake: Let FindMETIS search for libparmetis as well

git-svn-id: 31d9d2f6432a47c86a3640814024c107794ea77c@29976 0785d39b-7218-0410-832d-ea1e28bc413d

--- deal.II/cmake/modules/FindMETIS.cmake
+++ deal.II/cmake/modules/FindMETIS.cmake
@@ -49,13 +49,28 @@
     build/${CMAKE_CXX_PLATFORM_ID}-${CMAKE_SYSTEM_PROCESSOR}/libmetis
   )

+FIND_LIBRARY(PARMETIS_LIBRARY
+  NAMES parmetis
+  HINTS
+    ${METIS_DIR}
+  PATH_SUFFIXES
+    lib${LIB_SUFFIX} lib64 lib
+    # This is a hint, isn't it?
+    build/${CMAKE_CXX_PLATFORM_ID}-${CMAKE_SYSTEM_PROCESSOR}/libmetis
+  )
+
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(METIS DEFAULT_MSG
   METIS_LIBRARY
   METIS_INCLUDE_DIR
   )

 IF(METIS_FOUND)
-  SET(METIS_LIBRARIES
+
+  IF(NOT PARMETIS_LIBRARY MATCHES "-NOTFOUND")
+    SET(METIS_LIBRARIES ${PARMETIS_LIBRARY})
+  ENDIF()
+
+  LIST(APPEND METIS_LIBRARIES
     ${METIS_LIBRARY}
     ${MPI_C_LIBRARIES} # for good measure
     )


CMAke: Bugfix. Search for petscvariables in the right order

git-svn-id: 31d9d2f6432a47c86a3640814024c107794ea77c@29961 0785d39b-7218-0410-832d-ea1e28bc413d

--- deal.II/cmake/modules/FindPETSC.cmake
+++ deal.II/cmake/modules/FindPETSC.cmake
@@ -52,8 +52,8 @@
 FIND_FILE(PETSC_PETSCVARIABLES
   NAMES petscvariables
   HINTS
-    ${PETSC_DIR}
-    ${PETSC_DIR}/${PETSC_ARCH}
+    ${PETSC_DIR}/${PETSC_ARCH}
+    ${PETSC_DIR}
   PATH_SUFFIXES conf
   )


check_find_package now takes optional DEBUG to dump more info (#3005)

--- src/cmake/checked_find_package.cmake
+++ src/cmake/checked_find_package.cmake
@@ -8,6 +8,23 @@
 set (OPTIONAL_DEPS "" CACHE STRING
      "Additional dependencies to consider optional (semicolon-separated list, or ALL)")
 option (ALWAYS_PREFER_CONFIG "Prefer a dependency's exported config file if it's available" OFF)
+
+
+# Utility function to list the names and values of all variables matching
+# the pattern (case-insensitive)
+function (dump_matching_variables pattern)
+    string (TOLOWER ${pattern} _pattern_lower)
+    get_cmake_property(_allvars VARIABLES)
+    list (SORT _allvars)
+    foreach (_var IN LISTS _allvars)
+        string (TOLOWER ${_var} _var_lower)
+        if (_var_lower MATCHES ${_pattern_lower})
+            message (STATUS "    ${_var} = ${${_var}}")
+        endif ()
+    endforeach ()
+endfunction ()
+
+

 # checked_find_package(Pkgname ...) is a wrapper for find_package, with the
 # following extra features:
@@ -44,6 +61,8 @@
 #     can give an optional explanation, passed as RECOMMEND_MIN_REASON.
 #   * Optional PREFER_CONFIG, if supplied, tries to use an exported config
 #     file from the package before using a FindPackage.cmake module.
+#   * Optional DEBUG turns on extra debugging information related to how
+#     this package is found.
 #
 # N.B. This needs to be a macro, not a function, because the find modules
 # will set(blah val PARENT_SCOPE) and we need that to be the global scope,
@@ -51,7 +70,7 @@
 macro (checked_find_package pkgname)
     cmake_parse_arguments(_pkg   # prefix
         # noValueKeywords:
-        "REQUIRED;PREFER_CONFIG"
+        "REQUIRED;PREFER_CONFIG;DEBUG"
         # singleValueKeywords:
         "ENABLE;ISDEPOF;VERSION_MIN;VERSION_MAX;RECOMMEND_MIN;RECOMMEND_MIN_REASON"
         # multiValueKeywords:
@@ -60,7 +79,11 @@
         ${ARGN})
     string (TOLOWER ${pkgname} pkgname_lower)
     string (TOUPPER ${pkgname} pkgname_upper)
-    if (NOT VERBOSE)
+    set (_pkg_VERBOSE ${VERBOSE})
+    if (_pkg_DEBUG)
+        set (_pkg_VERBOSE ON)
+    endif ()
+    if (NOT _pkg_VERBOSE)
         set (${pkgname}_FIND_QUIETLY true)
         set (${pkgname_upper}_FIND_QUIETLY true)
     endif ()
@@ -120,7 +143,10 @@
                 endif ()
             endforeach ()
             message (STATUS "${ColorGreen}Found ${pkgname} ${${pkgname}_VERSION} ${_config_status}${ColorReset}")
-            if (VERBOSE)
+            if (_pkg_VERBOSE)
+                if (_pkg_DEBUG)
+                    dump_matching_variables (${pkgname})
+                endif ()
                 set (_vars_to_print ${pkgname}_INCLUDES ${pkgname_upper}_INCLUDES
                                     ${pkgname}_INCLUDE_DIR ${pkgname_upper}_INCLUDE_DIR
                                     ${pkgname}_INCLUDE_DIRS ${pkgname_upper}_INCLUDE_DIRS


ENH: mpi4py integration into paraview repo + changes to accept into cvs

ENH: mpi4py integration into paraview repository

ENH: intial commit for mpi4py-1.0.0

STYLE: removed more unnecessary stuff

STYLE:src directory is removed

STYLE: Reorganized src directory into Executable (to build MPI.so) and mpi (containing python bindings)

ENH: mpi4py builds with cmake in Utilities/mpi4py. Need to check install

ENH: install also works. Dependencies established.

STYLE: getting in style changed for cvs to accept

--- CMake/FindMPI.cmake
+++ CMake/FindMPI.cmake
@@ -56,7 +56,13 @@
 find_program(MPI_COMPILER
   NAMES mpic++ mpicxx mpiCC mpicc
   DOC "MPI compiler. Used only to detect MPI compilation flags.")
+
+find_program(MPI_C_COMPILER
+  NAMES mpicc
+  DOC "MPI compiler. Used for generating mpi4pi bindings")
+
 mark_as_advanced(MPI_COMPILER)
+mark_as_advanced(MPI_C_COMPILER)

 find_program(MPIEXEC
   NAMES mpiexec mpirun lamexec


Quote git command and output dir.

Quote git command and output dir.

--- CMake/MITKDashboardDriverScript.cmake
+++ CMake/MITKDashboardDriverScript.cmake
@@ -94,7 +94,7 @@
 endif()

 if(NOT EXISTS "${CTEST_CHECKOUT_DIR}")
-  set(CTEST_CHECKOUT_COMMAND "${CTEST_GIT_COMMAND} clone ${GIT_BRANCH} ${GIT_REPOSITORY} ${CTEST_CHECKOUT_DIR}")
+  set(CTEST_CHECKOUT_COMMAND "\"${CTEST_GIT_COMMAND}\" clone ${GIT_BRANCH} ${GIT_REPOSITORY} \"${CTEST_CHECKOUT_DIR}\"")
 endif()

 set(CTEST_UPDATE_TYPE "git")


Checks to report fatal error if FontConfig is not available

--- CMakeModules/FindFontConfig.cmake
+++ CMakeModules/FindFontConfig.cmake
@@ -10,18 +10,18 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.

-if ( FONTCONFIG_INCLUDE_DIR AND FONTCONFIG_LIBRARY )
+IF ( FONTCONFIG_INCLUDE_DIR AND FONTCONFIG_LIBRARY )
     # in cache already
     SET(Fontconfig_FIND_QUIETLY TRUE)
-endif ( FONTCONFIG_INCLUDE_DIR AND FONTCONFIG_LIBRARY )
+ENDIF ( FONTCONFIG_INCLUDE_DIR AND FONTCONFIG_LIBRARY )

 # use pkg-config to get the directories and then use these values
 # in the FIND_PATH() and FIND_LIBRARY() calls
-if(NOT WIN32)
-    find_package(PkgConfig)
+IF (NOT WIN32)
+    FIND_PACKAGE(PkgConfig)

     pkg_check_modules(FONTCONFIG_PKG QUIET fontconfig)
-endif(NOT WIN32)
+ENDIF (NOT WIN32)

 FIND_PATH(FONTCONFIG_INCLUDE_DIR NAMES fontconfig/fontconfig.h
     PATHS
@@ -31,6 +31,10 @@
     HINTS
     ${FONTCONFIG_PKG_INCLUDE_DIRS} # Generated by pkg-config
     )
+
+IF (DEFINED FONTCONFIG_INCLUDE_DIR-NOTFOUND)
+    MESSAGE(FATAL_ERROR "FontConfig header files not found")
+ENDIF (DEFINED FONTCONFIG_INCLUDE_DIR-NOTFOUND)

 FIND_LIBRARY(FONTCONFIG_LIBRARY NAMES fontconfig ${FONTCONFIG_PKG_LIBRARY}
     PATHS
@@ -44,7 +48,11 @@
     lib
     )

-include(FindPackageHandleStandardArgs)
+IF (DEFINED FONTCONFIG_LIBRARY-NOTFOUND)
+    MESSAGE(FATAL_ERROR "FontConfig library files not found")
+ENDIF (DEFINED FONTCONFIG_LIBRARY-NOTFOUND)
+
+INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Fontconfig DEFAULT_MSG FONTCONFIG_LIBRARY FONTCONFIG_INCLUDE_DIR)

 # show the FONTCONFIG_INCLUDE_DIR and FONTCONFIG_LIBRARY variables only in the advanced view


- issue 2289: fix detection on case sensitive platform

--- CMakeModules/FindLIBCOMBINE.cmake
+++ CMakeModules/FindLIBCOMBINE.cmake
@@ -26,6 +26,7 @@
 endif()

 find_package(${COMBINE_LIBRARY_NAME} CONFIG REQUIRED
+  CONFIGS Combine-static-config
   PATHS ${COPASI_DEPENDENCY_DIR}/lib/cmake
         /usr/lib/cmake
         /usr/lib64/cmake


Update FindTbag cmake settings.

Update FindTbag cmake settings.

--- cmake/TbagFindPackage/FindTbag.cmake
+++ cmake/TbagFindPackage/FindTbag.cmake
@@ -11,6 +11,11 @@
 set (__headers "libtbag/config.h")
 set (__libs    "tbag")

+if (IS_DIRECTORY "$ENV{TBAG_HOME}")
+    set (Tbag_ROOT_INCLUDE_PATHS "$ENV{TBAG_HOME}")
+    set (Tbag_ROOT_LIBRARY_PATHS "$ENV{TBAG_HOME}/build")
+endif ()
+
 include (TbagSimpleFindLibrary)
 tbag_simple_find_library_with_module_prefix ("${__headers}" "${__libs}")


From D. Berzano:
add build option to control afdsmgrd builds under cmake.

git-svn-id: 9d02132d8e1217b86764d694e1605987040d84e5@44331 27541ba8-7e3a-0410-8455-c3a389f83636

--- cmake/modules/RootBuildOptions.cmake
+++ cmake/modules/RootBuildOptions.cmake
@@ -55,78 +55,79 @@
   set(explicitlink_defvalue ON)
 endif()

-ROOT_BUILD_OPTION(afs OFF "AFS support, requires AFS libs and objects")
-ROOT_BUILD_OPTION(alien ON "AliEn support, requires libgapiUI from ALICE")
-ROOT_BUILD_OPTION(asimage ON "Image processing support, requires libAfterImage")
+ROOT_BUILD_OPTION(afdsmgrd OFF "Dataset manager for PROOF-based analysis facilities")
+ROOT_BUILD_OPTION(afs OFF "AFS support, requires AFS libs and objects")
+ROOT_BUILD_OPTION(alien ON "AliEn support, requires libgapiUI from ALICE")
+ROOT_BUILD_OPTION(asimage ON "Image processing support, requires libAfterImage")
 ROOT_BUILD_OPTION(astiff ON "Include tiff support in image processing")
-ROOT_BUILD_OPTION(bonjour ON "Bonjour support, requires libdns_sd and/or Avahi")
+ROOT_BUILD_OPTION(bonjour ON "Bonjour support, requires libdns_sd and/or Avahi")
 ROOT_BUILD_OPTION(builtin_afterimage OFF "Built included libAfterImage, or use system libAfterImage")
-ROOT_BUILD_OPTION(builtin_ftgl ON "Built included libFTGL, or use system libftgl")
-ROOT_BUILD_OPTION(builtin_freetype OFF "Built included libfreetype, or use system libfreetype")
+ROOT_BUILD_OPTION(builtin_ftgl ON "Built included libFTGL, or use system libftgl")
+ROOT_BUILD_OPTION(builtin_freetype OFF "Built included libfreetype, or use system libfreetype")
 ROOT_BUILD_OPTION(builtin_glew ON "Built included libGLEW, or use system libGLEW")
-ROOT_BUILD_OPTION(builtin_pcre OFF "Built included libpcre, or use system libpcre")
-ROOT_BUILD_OPTION(builtin_zlib OFF "Built included libz, or use system libz")
-ROOT_BUILD_OPTION(builtin_lzma OFF "Built included liblzma, or use system liblzma")
-ROOT_BUILD_OPTION(builtin_gsl OFF "Built the GSL library internally (downloading tarfile from the Web)")
-ROOT_BUILD_OPTION(builtin_cfitsio OFF "Built the FITSIO library internally (downloading tarfile from the Web)")
-ROOT_BUILD_OPTION(builtin_xrootd OFF "Built the XROOTD internally (downloading tarfile from the Web)")
-ROOT_BUILD_OPTION(castor ON "CASTOR support, requires libshift from CASTOR >= 1.5.2")
-ROOT_BUILD_OPTION(chirp ON "Chirp support (Condor remote I/O), requires libchirp_client")
-ROOT_BUILD_OPTION(cintex ON "Build the libCintex Reflex interface library")
+ROOT_BUILD_OPTION(builtin_pcre OFF "Built included libpcre, or use system libpcre")
+ROOT_BUILD_OPTION(builtin_zlib OFF "Built included libz, or use system libz")
+ROOT_BUILD_OPTION(builtin_lzma OFF "Built included liblzma, or use system liblzma")
+ROOT_BUILD_OPTION(builtin_gsl OFF "Built the GSL library internally (downloading tarfile from the Web)")
+ROOT_BUILD_OPTION(builtin_cfitsio OFF "Built the FITSIO library internally (downloading tarfile from the Web)")
+ROOT_BUILD_OPTION(builtin_xrootd OFF "Built the XROOTD internally (downloading tarfile from the Web)")
+ROOT_BUILD_OPTION(castor ON "CASTOR support, requires libshift from CASTOR >= 1.5.2")
+ROOT_BUILD_OPTION(chirp ON "Chirp support (Condor remote I/O), requires libchirp_client")
+ROOT_BUILD_OPTION(cintex ON "Build the libCintex Reflex interface library")
 ROOT_BUILD_OPTION(clarens ON "Clarens RPC support, optionally used by PROOF")
 ROOT_BUILD_OPTION(cling ON "Enable new CLING C++ interpreter")
-ROOT_BUILD_OPTION(cocoa OFF "Use native Cocoa/Quartz graphics backend (MacOS X only)")
-ROOT_BUILD_OPTION(dcache ON "dCache support, requires libdcap from DESY")
-ROOT_BUILD_OPTION(exceptions ON "Turn on compiler exception handling capability")
-ROOT_BUILD_OPTION(explicitlink ${explicitlink_defvalue} "Explicitly link with all dependent libraries")
-ROOT_BUILD_OPTION(fftw3 ON "Fast Fourier Transform support, requires libfftw3")
-ROOT_BUILD_OPTION(fitsio ON "Read images and data from FITS files, requires cfitsio")
-ROOT_BUILD_OPTION(gviz ON "Graphs visualization support, requires graphviz")
-ROOT_BUILD_OPTION(gdml OFF "GDML writer and reader")
-ROOT_BUILD_OPTION(genvector ON "Build the new libGenVector library" )
-ROOT_BUILD_OPTION(gfal ON "GFAL support, requires libgfal")
-ROOT_BUILD_OPTION(glite ON "gLite support, requires libglite-api-wrapper v.3 from GSI (https://subversion.gsi.de/trac/dgrid/wiki)")
-ROOT_BUILD_OPTION(globus OFF "Globus authentication support, requires Globus toolkit")
+ROOT_BUILD_OPTION(cocoa OFF "Use native Cocoa/Quartz graphics backend (MacOS X only)")
+ROOT_BUILD_OPTION(dcache ON "dCache support, requires libdcap from DESY")
+ROOT_BUILD_OPTION(exceptions ON "Turn on compiler exception handling capability")
+ROOT_BUILD_OPTION(explicitlink ${explicitlink_defvalue} "Explicitly link with all dependent libraries")
+ROOT_BUILD_OPTION(fftw3 ON "Fast Fourier Transform support, requires libfftw3")
+ROOT_BUILD_OPTION(fitsio ON "Read images and data from FITS files, requires cfitsio")
+ROOT_BUILD_OPTION(gviz ON "Graphs visualization support, requires graphviz")
+ROOT_BUILD_OPTION(gdml OFF "GDML writer and reader")
+ROOT_BUILD_OPTION(genvector ON "Build the new libGenVector library")
+ROOT_BUILD_OPTION(gfal ON "GFAL support, requires libgfal")
+ROOT_BUILD_OPTION(glite ON "gLite support, requires libglite-api-wrapper v.3 from GSI (https://subversion.gsi.de/trac/dgrid/wiki)")
+ROOT_BUILD_OPTION(globus OFF "Globus authentication support, requires Globus toolkit")
 ROOT_BUILD_OPTION(gsl_shared OFF "Enable linking against shared libraries for GSL (default no)")
-ROOT_BUILD_OPTION(hdfs ON "HDFS support; requires libhdfs from HDFS >= 0.19.1")
-ROOT_BUILD_OPTION(krb5 ON "Kerberos5 support, requires Kerberos libs")
-ROOT_BUILD_OPTION(ldap ON "LDAP support, requires (Open)LDAP libs")
-ROOT_BUILD_OPTION(mathmore ON "Build the new libMathMore extended math library, requires GSL (vers. >= 1.8)")
-ROOT_BUILD_OPTION(memstat ${memstat_defvalue} "A memory statistics utility, helps to detect memory leaks")
-ROOT_BUILD_OPTION(minuit2 OFF "Build the new libMinuit2 minimizer library")
-ROOT_BUILD_OPTION(monalisa ON "Monalisa monitoring support, requires libapmoncpp")
-ROOT_BUILD_OPTION(mysql ON "MySQL support, requires libmysqlclient")
-ROOT_BUILD_OPTION(odbc ON "ODBC support, requires libiodbc or libodbc")
-ROOT_BUILD_OPTION(opengl ON "OpenGL support, requires libGL and libGLU")
-ROOT_BUILD_OPTION(oracle ON "Oracle support, requires libocci")
-ROOT_BUILD_OPTION(pch ON)
-ROOT_BUILD_OPTION(peac ON "PEAC, PROOF Enabled Analysis Center, requires Clarens")
-ROOT_BUILD_OPTION(pgsql ON "PostgreSQL support, requires libpq")
-ROOT_BUILD_OPTION(pythia6 ON "Pythia6 EG support, requires libPythia6")
-ROOT_BUILD_OPTION(pythia8 ON "Pythia8 EG support, requires libPythia8")
-ROOT_BUILD_OPTION(python ON "Python ROOT bindings, requires python >= 2.2")
-ROOT_BUILD_OPTION(qt OFF "Qt graphics backend, requires libqt >= 4.x")
-ROOT_BUILD_OPTION(qtgsi OFF "GSI's Qt integration, requires libqt >= 3")
-ROOT_BUILD_OPTION(reflex ON "Build the libReflex dictionary library")
-ROOT_BUILD_OPTION(roofit OFF "Build the libRooFit advanced fitting package")
-ROOT_BUILD_OPTION(ruby OFF "Ruby ROOT bindings, requires ruby >= 1.8")
-ROOT_BUILD_OPTION(rfio ON "RFIO support, requires libshift from CASTOR >= 1.5.2")
-ROOT_BUILD_OPTION(rpath OFF "Set run-time library load path on executables and shared libraries (at installation area)")
-ROOT_BUILD_OPTION(sapdb ON "MaxDB/SapDB support, requires libsqlod and libsqlrte")
-ROOT_BUILD_OPTION(shadowpw ON "Shadow password support")
-ROOT_BUILD_OPTION(shared ON "Use shared 3rd party libraries if possible")
-ROOT_BUILD_OPTION(soversion OFF "Set version number in sonames (recommended)")
-ROOT_BUILD_OPTION(srp ON "SRP support, requires SRP source tree")
-ROOT_BUILD_OPTION(ssl ON "SSL encryption support, requires openssl")
-ROOT_BUILD_OPTION(table OFF "Build libTable contrib library")
-ROOT_BUILD_OPTION(tmva ON "Build TMVA multi variate analysis library")
-ROOT_BUILD_OPTION(unuran OFF "UNURAN - package for generating non-uniform random numbers")
-ROOT_BUILD_OPTION(winrtdebug OFF "Link against the Windows debug runtime library")
-ROOT_BUILD_OPTION(xft ON "Xft support (X11 antialiased fonts)")
+ROOT_BUILD_OPTION(hdfs ON "HDFS support; requires libhdfs from HDFS >= 0.19.1")
+ROOT_BUILD_OPTION(krb5 ON "Kerberos5 support, requires Kerberos libs")
+ROOT_BUILD_OPTION(ldap ON "LDAP support, requires (Open)LDAP libs")
+ROOT_BUILD_OPTION(mathmore ON "Build the new libMathMore extended math library, requires GSL (vers. >= 1.8)")
+ROOT_BUILD_OPTION(memstat ${memstat_defvalue} "A memory statistics utility, helps to detect memory leaks")
+ROOT_BUILD_OPTION(minuit2 OFF "Build the new libMinuit2 minimizer library")
+ROOT_BUILD_OPTION(monalisa ON "Monalisa monitoring support, requires libapmoncpp")
+ROOT_BUILD_OPTION(mysql ON "MySQL support, requires libmysqlclient")
+ROOT_BUILD_OPTION(odbc ON "ODBC support, requires libiodbc or libodbc")
+ROOT_BUILD_OPTION(opengl ON "OpenGL support, requires libGL and libGLU")
+ROOT_BUILD_OPTION(oracle ON "Oracle support, requires libocci")
+ROOT_BUILD_OPTION(pch ON)
+ROOT_BUILD_OPTION(peac ON "PEAC, PROOF Enabled Analysis Center, requires Clarens")
+ROOT_BUILD_OPTION(pgsql ON "PostgreSQL support, requires libpq")
+ROOT_BUILD_OPTION(pythia6 ON "Pythia6 EG support, requires libPythia6")
+ROOT_BUILD_OPTION(pythia8 ON "Pythia8 EG support, requires libPythia8")
+ROOT_BUILD_OPTION(python ON "Python ROOT bindings, requires python >= 2.2")
+ROOT_BUILD_OPTION(qt OFF "Qt graphics backend, requires libqt >= 4.x")
+ROOT_BUILD_OPTION(qtgsi OFF "GSI's Qt integration, requires libqt >= 3")
+ROOT_BUILD_OPTION(reflex ON "Build the libReflex dictionary library")
+ROOT_BUILD_OPTION(roofit OFF "Build the libRooFit advanced fitting package")
+ROOT_BUILD_OPTION(ruby OFF "Ruby ROOT bindings, requires ruby >= 1.8")
+ROOT_BUILD_OPTION(rfio ON "RFIO support, requires libshift from CASTOR >= 1.5.2")
+ROOT_BUILD_OPTION(rpath OFF "Set run-time library load path on executables and shared libraries (at installation area)")
+ROOT_BUILD_OPTION(sapdb ON "MaxDB/SapDB support, requires libsqlod and libsqlrte")
+ROOT_BUILD_OPTION(shadowpw ON "Shadow password support")
+ROOT_BUILD_OPTION(shared ON "Use shared 3rd party libraries if possible")
+ROOT_BUILD_OPTION(soversion OFF "Set version number in sonames (recommended)")
+ROOT_BUILD_OPTION(srp ON "SRP support, requires SRP source tree")
+ROOT_BUILD_OPTION(ssl ON "SSL encryption support, requires openssl")
+ROOT_BUILD_OPTION(table OFF "Build libTable contrib library")
+ROOT_BUILD_OPTION(tmva ON "Build TMVA multi variate analysis library")
+ROOT_BUILD_OPTION(unuran OFF "UNURAN - package for generating non-uniform random numbers")
+ROOT_BUILD_OPTION(winrtdebug OFF "Link against the Windows debug runtime library")
+ROOT_BUILD_OPTION(xft ON "Xft support (X11 antialiased fonts)")
 ROOT_BUILD_OPTION(xml ON "XML parser interface")
 ROOT_BUILD_OPTION(x11 ${x11_defvalue} "X11 support")
 ROOT_BUILD_OPTION(xrootd ON "Build xrootd file server and its client (if supported)")
-
+
 option(fail-on-missing "Fail the configure step if a required external package is missing" OFF)
 option(minimal "Do not automatically search for support libraries" OFF)
 option(gminimal "Do not automatically search for support libraries, but include X11" OFF)


try different options

try different options

--- vtkCMakeOptions.cmake
+++ vtkCMakeOptions.cmake
@@ -113,7 +113,7 @@
 IF(NOT CMAKE_COMPILER_IS_GNUCXX)
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_ANSI_CFLAGS}")
   IF(CMAKE_SYSTEM MATCHES "OSF1-V.*")
-     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nopt")
+     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -timplicit_local -no_implicit_include ")
   ENDIF(CMAKE_SYSTEM MATCHES "OSF1-V.*")
 ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX)


ENH: Update VariationalRegistration to remove warnings during compilation

Alexander Schmidt-Richberg (1):
      BUG: Small bugs fixed to avoid compiler warnings (unsigned int and unused variable).

Francois Budin (6):
      ENH: Replacing test data with MD5
      STYLE: Improve style to pass KWStyle test
      DOC: Missing backslash in documentation
      COMP: Remove compilation warnings from Visual Studio
      COMP: Correct warning due to locally defined symbol
      Merge pull request #9 from fbudin69500/locally_defined_symbol

aschmiri (5):
      Merge pull request #3 from thewtex/doxygen-warnings
      Merge pull request #4 from fbudin69500/DOC_missing_backslash_in_documentation
      Merge pull request #5 from fbudin69500/ENH_replace_test_data_with_MD5
      Merge pull request #6 from fbudin69500/ImproveStyle
      Merge pull request #7 from fbudin69500/remove_VS_warning_cherry_picked

Change-Id: Ibb959bc84e01edb6c3b78e0984d9f029992ff5af

--- Modules/Remote/VariationalRegistration.remote.cmake
+++ Modules/Remote/VariationalRegistration.remote.cmake
@@ -5,5 +5,5 @@
 itk_fetch_module(VariationalRegistration
   "A module to perform variational image registration. https://hdl.handle.net/10380/3460"
   GIT_REPOSITORY ${git_protocol}://github.com/InsightSoftwareConsortium/ITKVariationalRegistration.git
-  GIT_TAG da4acc1804e36b8f5b0fcf7179bddcf98679c6d3
+  GIT_TAG 68698e7558761846ae0a9b48c20f9f09f41698ca
   )


Fix parallel build on Linux when dtrace enabled

Change-Id: Ie6ba630555ca0be4c4d8c12f559ef8aba6625830
Reviewed-on: http://review.couchbase.org/85950
Tested-by: Build Bot <80754af91bfb6d1073585b046fe0a474ce868509@couchbase.com>
Reviewed-by: Sergey Avseyev <87f6d5e4fd3644c3c20800cde7fd3ad1569370b3@gmail.com>

--- cmake/Modules/ConfigureDtrace.cmake
+++ cmake/Modules/ConfigureDtrace.cmake
@@ -25,6 +25,9 @@
     ADD_DEFINITIONS(-DHAVE_DTRACE)
     IF(NOT APPLE)
         SET(LCB_DTRACE_OBJECT "${LCB_GENSRCDIR}/probes.o")
+        IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+            SET(LCB_DTRACE_OPTIONS "${LCB_DTRACE_OPTIONS} -k")
+        ENDIF()
         # Generate probes.o
         IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
             SET(LCB_DTRACE_INSTRO ON)
@@ -32,7 +35,7 @@
         ELSE()
             ADD_CUSTOM_COMMAND(OUTPUT ${LCB_DTRACE_OBJECT}
                 DEPENDS ${LCB_DTRACE_SRC}
-                COMMAND ${DTRACE} -C -G ${LCB_DTRACE_OPTIONS} -s ${LCB_DTRACE_SRC} -o ${LCB_DTRACE_OBJECT})
+                COMMAND ${DTRACE} -k -C -G ${LCB_DTRACE_OPTIONS} -s ${LCB_DTRACE_SRC} -o ${LCB_DTRACE_OBJECT})
         ENDIF()
     ENDIF()
 ENDIF()


CMake: clang: disable thread safety analysis if neg. capabilities don't work

--- cmake/compiler-warnings-clang.cmake
+++ cmake/compiler-warnings-clang.cmake
@@ -65,6 +65,44 @@
   list(APPEND CLANG_DISABLED_WARNING_FLAGS "missing-braces")
 endif()

+set(CMAKE_REQUIRED_FLAGS_ORIG "${CMAKE_REQUIRED_FLAGS}")
+set(CMAKE_REQUIRED_FLAGS "-c -Wthread-safety-analysis -Werror=thread-safety-analysis")
+CHECK_CXX_SOURCE_COMPILES(
+"// Enable thread safety attributes only with clang.
+// The attributes can be safely erased when compiling with other compilers.
+#if defined(__clang__) && (!defined(SWIG))
+#define THREAD_ANNOTATION_ATTRIBUTE__(x) __attribute__((x))
+#else
+#define THREAD_ANNOTATION_ATTRIBUTE__(x) // no-op
+#endif
+
+#define CAPABILITY(x) THREAD_ANNOTATION_ATTRIBUTE__(capability(x))
+#define REQUIRES(...) THREAD_ANNOTATION_ATTRIBUTE__(requires_capability(__VA_ARGS__))
+
+class CAPABILITY(\"mutex\") Mutex {
+public:
+  const Mutex& operator!() const { return *this; }
+};
+
+class ErrorLog {
+public:
+  Mutex mutex;
+
+  void test() REQUIRES(!mutex);
+};
+
+void test(ErrorLog e) {
+    e.test();
+}
+"
+  CLANG_CXX_THREAD_SAFETY_ANALYSIS_NEGATIVE_CAPABILITIES_WORK
+)
+set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS_ORIG}")
+
+if(NOT CLANG_CXX_THREAD_SAFETY_ANALYSIS_NEGATIVE_CAPABILITIES_WORK)
+  list(APPEND CLANG_DISABLED_WARNING_FLAGS "thread-safety-analysis")
+endif()
+
 if(NOT (UNIX OR APPLE))
   # bogus warnings about std functions...
   list(APPEND CLANG_DISABLED_WARNING_FLAGS "used-but-marked-unused")


Disable local builds if HUNTER_USE_CACHE_SERVERS=ONLY

--- cmake/modules/hunter_download.cmake
+++ cmake/modules/hunter_download.cmake
@@ -385,7 +385,16 @@
   endif()
   hunter_status_print("${build_message}")

-  if(HUNTER_DISABLE_BUILDS AND HUNTER_PACKAGE_SCHEME_INSTALL)
+  set(allow_builds TRUE)
+  if(HUNTER_DISABLE_BUILDS)
+    set(allow_builds FALSE)
+  endif()
+  string(COMPARE EQUAL "${HUNTER_USE_CACHE_SERVERS}" "ONLY" only_server)
+  if(only_server)
+    set(allow_builds FALSE)
+  endif()
+
+  if(NOT allow_builds AND HUNTER_PACKAGE_SCHEME_INSTALL)
     hunter_fatal_error(
         "Building package from source is disabled (dir: ${HUNTER_PACKAGE_HOME_DIR})"
         WIKI "error.build.disabled"


BUG: Use DEPENDS for dependent files

BUG: Use DEPENDS for dependent files

For:
CMake Warning (dev) at CMake/itkOpenCL.cmake:47 (add_dependencies):
  ...
  of target "GPUReductionKernel_Target" does not exist.

Change-Id: If55612e7938fd20062b51e854e0979cbfd1b0366

--- CMake/itkOpenCL.cmake
+++ CMake/itkOpenCL.cmake
@@ -38,13 +38,14 @@
     file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE}
          "${${GPUFILTER_KERNELNAME}_KernelString}")

+    configure_file(${OPENCL_FILE}
+                     ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE}.cl COPYONLY)
     add_custom_target(${GPUFILTER_KERNELNAME}_Target
-                      SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE})
-    add_dependencies(${GPUFILTER_KERNELNAME}_Target ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE})
-    add_dependencies(${GPUFILTER_KERNELNAME}_Target ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt)
-    configure_file(${OPENCL_FILE}
-                   ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE}.cl COPYONLY)
-    add_dependencies(${GPUFILTER_KERNELNAME}_Target ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE}.cl)
+                      DEPENDS
+                        ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE}
+                        ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                        ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE}.cl
+                      )
     set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE}
                                 PROPERTIES GENERATED ON)
     set(${SRC_VAR} ${${SRC_VAR}} ${OUTPUT_FILE})


ENH: Create custom target for dashboard kwstyle versus local kwstyle

--- CMake/TubeTKKWStyleConfig.cmake
+++ CMake/TubeTKKWStyleConfig.cmake
@@ -72,8 +72,14 @@
 configure_file( ${TubeTK_SOURCE_DIR}/CMake/KWStyle/KWStyle.Overwrite.txt
   ${TubeTK_BINARY_DIR}/KWStyle.Overwrite.txt )

+add_custom_command( OUTPUT KWStyle_Dashboard_Log.txt
+  COMMAND ${KWSTYLE_EXECUTABLE}
+  ARGS ${KWSTYLE_DASHBOARD_ARGUMENTS} )
+add_custom_target( StyleCheckDashboard
+  DEPENDS KWStyle_Dashboard_Log.txt )
+
 add_custom_command( OUTPUT KWStyle_Log.txt
   COMMAND ${KWSTYLE_EXECUTABLE}
-  ARGS ${KWSTYLE_DASHBOARD_ARGUMENTS} )
+  ARGS ${KWSTYLE_ARGUMENTS} )
 add_custom_target( StyleCheck
   DEPENDS KWStyle_Log.txt )


Remove LIBRARY_TYPE option from ctkMacroBuildPlugin

Plugins are expected to be shared library.

--- CMake/ctkMacroBuildPlugin.cmake
+++ CMake/ctkMacroBuildPlugin.cmake
@@ -47,7 +47,7 @@
 #
 MACRO(ctkMacroBuildPlugin)
   CtkMacroParseArguments(MY
-    "EXPORT_DIRECTIVE;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;RESOURCES;CACHED_RESOURCEFILES;TRANSLATIONS;LIBRARY_TYPE"
+    "EXPORT_DIRECTIVE;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;RESOURCES;CACHED_RESOURCEFILES;TRANSLATIONS"
     "TEST_PLUGIN"
     ${ARGN}
     )
@@ -56,9 +56,9 @@
   IF(NOT DEFINED MY_EXPORT_DIRECTIVE)
     MESSAGE(SEND_ERROR "EXPORT_DIRECTIVE is mandatory")
   ENDIF()
-  IF(NOT DEFINED MY_LIBRARY_TYPE)
-    SET(MY_LIBRARY_TYPE "SHARED")
-  ENDIF()
+
+  # Plugin are expected to be shared library
+  SET(MY_LIBRARY_TYPE "SHARED")

   # Define library name
   SET(lib_name ${PROJECT_NAME})


Require libraries when a wrapping for a language is enabled

At the Superbuild level when wrapping for a language was enabled, the
requirements for the language were not marked as required. Not when a
language is enabled the cmake package is required.

Conflicts:
	CMake/sitkLanguageOptions.cmake

Change-Id: I07f40e1e934d72b8d9b5fe128a1a5a8c30f1df47

--- CMake/sitkLanguageOptions.cmake
+++ CMake/sitkLanguageOptions.cmake
@@ -25,12 +25,15 @@
 #
 option ( WRAP_LUA "Wrap Lua" ON )

-find_package ( PythonInterp QUIET)

 # If you're not using python or it's the first time, be quiet
-if (NOT WRAP_PYTHON)
+if (DEFINED  WRAP_PYTHON AND WRAP_PYTHON)
+  set(_QUIET "REQUIRED")
+else()
   set(_QUIET "QUIET")
 endif()
+
+find_package ( PythonInterp ${_QUIET})

 find_package ( PythonLibs ${PYTHON_VERSION_STRING} EXACT ${_QUIET} )

@@ -61,8 +64,14 @@
 option( WRAP_PYTHON "Wrap Python" ${WRAP_PYTHON_DEFAULT} )
 check_PIC_flag ( Python )

-find_package ( Java COMPONENTS Development Runtime QUIET )
-find_package ( JNI QUIET )
+if (DEFINED  WRAP_JAVA AND WRAP_JAVA)
+  set(_QUIET "REQUIRED")
+else()
+  set(_QUIET "QUIET")
+endif()
+
+find_package ( Java COMPONENTS Development Runtime ${_QUIET} )
+find_package ( JNI ${_QUIET} )
 if ( ${JAVA_FOUND} AND ${JNI_FOUND} )
   set( WRAP_JAVA_DEFAULT ON )
 else ( ${JAVA_FOUND} AND ${JNI_FOUND} )
@@ -92,7 +101,14 @@
 option ( WRAP_JAVA "Wrap Java" ${WRAP_JAVA_DEFAULT} )
 check_PIC_flag ( Java )

-find_package ( TCL QUIET )
+
+if (DEFINED  WRAP_TCL AND WRAP_TCL)
+  set(_QUIET "REQUIRED")
+else()
+  set(_QUIET "QUIET")
+endif()
+
+find_package ( TCL ${_QUIET} )
 if ( ${TCL_FOUND} )
   set ( WRAP_TCL_DEFAULT ON )
 else ( ${TCL_FOUND} )
@@ -124,7 +140,14 @@
 option ( WRAP_RUBY "Wrap Ruby" ${WRAP_RUBY_DEFAULT} )
 check_PIC_flag ( Ruby )

-find_package( CSharp QUIET )
+
+if (DEFINED  WRAP_CSHARP AND WRAP_CSHARP)
+  set(_QUIET "REQUIRED")
+else()
+  set(_QUIET "QUIET")
+endif()
+
+find_package( CSharp ${_QUIET} )
 if ( ${CSHARP_FOUND} AND NOT MINGW )
   set ( WRAP_CSHARP_DEFAULT ON )
 else ()
@@ -137,7 +160,13 @@
 )
 option ( WRAP_CSHARP "Wrap C#" ${WRAP_CSHARP_DEFAULT} )

-find_package(R QUIET)
+if (DEFINED  WRAP_R AND WRAP_R)
+  set(_QUIET "REQUIRED")
+else()
+  set(_QUIET "QUIET")
+endif()
+
+find_package(R ${_QUIET})
 if ( ${R_FOUND} AND NOT WIN32 )
   set ( WRAP_R_DEFAULT ON )
 else( )


Use new version of MatchPoint

Use new version of MatchPoint

--- CMakeExternals/MatchPoint.cmake
+++ CMakeExternals/MatchPoint.cmake
@@ -26,8 +26,8 @@
       set(download_step SOURCE_DIR ${MatchPoint_SOURCE_DIR})
     else()
       set(download_step
-          URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/MatchPoint_rev_24ef6072.tar.gz
-          URL_MD5 b0a0d7d63da5071db8e73dd6e6b4db7c
+          URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/MatchPoint_rev_75012b13.tar.gz
+          URL_MD5 233c2c717bd11b25bc12c2ed54abb3f1
          )
     endif()


Removed XDG support

Removed XDG support

Signed-off-by: Harshavardhana <174852e042fc09daaa77fcfc841754dc87f0fc98@redhat.com>

--- cmake/Modules/DefineInstallationPaths.cmake
+++ cmake/Modules/DefineInstallationPaths.cmake
@@ -73,15 +73,6 @@
     CACHE PATH "The install dir for translations (default prefix/share/locale)"
   )

-  SET(XDG_APPS_DIR
-    "${SHARE_INSTALL_PREFIX}/applications/"
-    CACHE PATH "The XDG apps dir"
-  )
-  SET(XDG_DIRECTORY_DIR
-    "${SHARE_INSTALL_PREFIX}/desktop-directories"
-    CACHE PATH "The XDG directory"
-  )
-
   SET(SYSCONF_INSTALL_DIR
     "${EXEC_INSTALL_PREFIX}/etc"
     CACHE PATH "The ${APPLICATION_NAME} sysconfig install dir (default prefix/etc)"


Fix for ROOT-8184 - Error building XrdSysPthread with GCC 6.1. Upgraded xrootd version when using builtin_xrootd to 4.3.0

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -783,8 +783,8 @@
   endif()
 endif()
 if(builtin_xrootd)
-  set(xrootd_version 4.2.2)
-  set(xrootd_versionnum 400020002)
+  set(xrootd_version 4.3.0)
+  set(xrootd_versionnum 400030000)
   message(STATUS "Downloading and building XROOTD version ${xrootd_version}")
   string(REPLACE "-Wall " "" __cxxflags "${CMAKE_CXX_FLAGS}")  # Otherwise it produces many warnings
   string(REPLACE "-W " "" __cxxflags "${__cxxflags}")          # Otherwise it produces many warnings


Bump builtin VecCore version to 0.4.1

Bump builtin VecCore version to 0.4.1

This version introduces some bug fixes for the build system of VecCore,
as well as new API functions for reduction operations on SIMD vectors.

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -1377,15 +1377,15 @@
 endif()

 if(veccore AND NOT VecCore_FOUND)
-  set(VecCore_VERSION "0.4.0")
+  set(VecCore_VERSION "0.4.1")
   set(VecCore_PROJECT "VecCore-${VecCore_VERSION}")
   set(VecCore_SRC_URI "${lcgpackages}/${VecCore_PROJECT}.tar.gz")
-  set(VecCore_SRC_MD5 "c719909eaffbcc1d7a7680b25b6e5019")
+  set(VecCore_SRC_MD5 "7728dc706744e54a79fcb80059a31529")
   set(VecCore_DESTDIR "${CMAKE_BINARY_DIR}/VECCORE-prefix/install")
   set(VecCore_ROOTDIR "${VecCore_DESTDIR}/${CMAKE_INSTALL_PREFIX}")

   if(builtin_vc)
-    set(Vc_VERSION "1.3.1") # version built by VecCore
+    set(Vc_VERSION "1.3.2") # version built by VecCore
     set(Vc_LIBNAME "${CMAKE_STATIC_LIBRARY_PREFIX}Vc${CMAKE_STATIC_LIBRARY_SUFFIX}")
     set(Vc_LIBRARY "${VecCore_ROOTDIR}/lib/${Vc_LIBNAME}")
   endif()


Fix ``make clean`` not removing generator object files.

Running the clean target would not remove these files because
CMake was not aware that invoking the generators produced these
files.

--- HalideGenerator.cmake
+++ HalideGenerator.cmake
@@ -77,6 +77,7 @@
   # generated library
   if (WIN32)
     add_custom_command(OUTPUT "${SCRATCH_DIR}/${FILTER_LIB}" "${SCRATCH_DIR}/${FILTER_HDR}"
+                              "${SCRATCH_DIR}/${args_GENERATED_FUNCTION}.o"
       DEPENDS "${args_GENERATOR_TARGET}"
       COMMAND "${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/${generator_exec}" ${invoke_args}
       COMMAND "lib.exe" "/OUT:${FILTER_LIB}" "${SCRATCH_DIR}\\${args_GENERATED_FUNCTION}.o"
@@ -85,6 +86,7 @@
   elseif(XCODE)
     if (NOT target_is_pnacl)
       add_custom_command(OUTPUT "${SCRATCH_DIR}/${FILTER_LIB}" "${SCRATCH_DIR}/${FILTER_HDR}"
+                                "${SCRATCH_DIR}/${args_GENERATED_FUNCTION}.o"
         DEPENDS "${args_GENERATOR_TARGET}"

         # The generator executable will be placed in a configuration specific
@@ -110,6 +112,7 @@
     if (NOT target_is_pnacl)
       message(STATUS "The filter lib is ${FILTER_LIB}")
       add_custom_command(OUTPUT "${SCRATCH_DIR}/${FILTER_LIB}" "${SCRATCH_DIR}/${FILTER_HDR}"
+                                "${SCRATCH_DIR}/${args_GENERATED_FUNCTION}.o"
         DEPENDS "${args_GENERATOR_TARGET}"
         COMMAND "${CMAKE_BINARY_DIR}/bin/${generator_exec}" ${invoke_args}
         # Create an archive using ar (or similar)


Fixup WINDDK detection via environment variable

Handle the following case:
 1. user runs cmake, WinDDK is not detected (and WINDDK_DIR="")
 2. user sets the WINDDK_DIR env var
 3. user re-runs cmake and picks up the WINDDK_DIR env var

--- CMake/FindWinDDK.cmake
+++ CMake/FindWinDDK.cmake
@@ -27,7 +27,7 @@

 IF (NOT WINDDK_FOUND OR NOT WINDDK_DIR)
 	# If WINDDK_DIR was defined in the environment, use it.
-	IF (NOT DEFINED WINDDK_DIR AND NOT "$ENV{WINDDK_DIR}" STREQUAL "")
+	IF (NOT "$ENV{WINDDK_DIR}" STREQUAL "")
 		SET(WINDDK_DIR $ENV{WINDDK_DIR})
 	ENDIF()

@@ -63,47 +63,47 @@
 	SET(WINDDK_INCLUDE_SEARCH_DIRS ${WINDDK_DIR}/inc )
 	FIND_PATH(WINDDK_INCLUDE_DIR api/hidpi.h
 		PATHS ${WINDDK_INCLUDE_SEARCH_DIRS} )
-	SET(WINDDK_INCLUDE_DIR ${WINDDK_INCLUDE_DIR}
+	SET(WINDDK_INCLUDE_DIR ${WINDDK_INCLUDE_DIR}
 		CACHE STRING "Directory containing Ms WinDDK header files")

 	# Search for Win7-x86 libs
-	FIND_LIBRARY(WINDDK_WIN7_X86_HID_LIB hid
+	FIND_LIBRARY(WINDDK_WIN7_X86_HID_LIB hid
 		PATHS "${WINDDK_DIR}/lib/win7/i386"
 		DOC "MS WinDDK Win7-x86 hid library"
-	)
-	FIND_LIBRARY(WINDDK_WIN7_X86_SETUPAPI_LIB setupapi
+	)
+	FIND_LIBRARY(WINDDK_WIN7_X86_SETUPAPI_LIB setupapi
 		PATHS "${WINDDK_DIR}/lib/win7/i386"
 		DOC "MS WinDDK Win7-x86 setupapi library"
 	)

 	# Search for Win7-x64 libs
-	FIND_LIBRARY(WINDDK_WIN7_X64_HID_LIB hid
+	FIND_LIBRARY(WINDDK_WIN7_X64_HID_LIB hid
 		PATHS "${WINDDK_DIR}/lib/win7/amd64"
 		DOC "MS WinDDK Win7-x64 hid library"
 	)
-	FIND_LIBRARY(WINDDK_WIN7_X64_SETUPAPI_LIB setupapi
+	FIND_LIBRARY(WINDDK_WIN7_X64_SETUPAPI_LIB setupapi
 		PATHS "${WINDDK_DIR}/lib/win7/amd64"
 		DOC "MS WinDDK Win7-x64 setupapi library"
 	)

 	# Search for WinXP-x86 libs
-	FIND_LIBRARY(WINDDK_WINXP_X64_HID_LIB hid
+	FIND_LIBRARY(WINDDK_WINXP_X64_HID_LIB hid
 		PATHS "${WINDDK_DIR}/lib/wxp/i386"
 		DOC "MS WinDDK WinXP-x86 hid library"
 	)
-	FIND_LIBRARY(WINDDK_WINXP_X64_SETUPAPI_LIB setupapi
+	FIND_LIBRARY(WINDDK_WINXP_X64_SETUPAPI_LIB setupapi
 		PATHS "${WINDDK_DIR}/lib/wxp/i386"
 		DOC "MS WinDDK WinXP-x86 setupapi library"
 	)

 	# Set most variables as advanced
 	MARK_AS_ADVANCED(
-		WINDDK_INCLUDE_DIR
-		WINDDK_WIN7_X86_HID_LIB
-		WINDDK_WIN7_X86_SETUPAPI_LIB
-		WINDDK_WIN7_X64_HID_LIB
-		WINDDK_WIN7_X64_SETUPAPI_LIB
-		WINDDK_WINXP_X64_HID_LIB
+		WINDDK_INCLUDE_DIR
+		WINDDK_WIN7_X86_HID_LIB
+		WINDDK_WIN7_X86_SETUPAPI_LIB
+		WINDDK_WIN7_X64_HID_LIB
+		WINDDK_WIN7_X64_SETUPAPI_LIB
+		WINDDK_WINXP_X64_HID_LIB
 		WINDDK_WINXP_X64_SETUPAPI_LIB
 	)
 endif()


Fix Windows installation paths.

Fix Windows installation paths.

--- cmake/Modules/DefineInstallationPaths.cmake
+++ cmake/Modules/DefineInstallationPaths.cmake
@@ -94,13 +94,14 @@

 if (WIN32)
   # Same same
-  SET(BIN_INSTALL_DIR .)
-  SET(SBIN_INSTALL_DIR .)
-  SET(LIB_INSTALL_DIR .)
-  SET(PLUGIN_INSTALL_DIR plugins)
-  SET(HTML_INSTALL_DIR doc/HTML)
-  SET(ICON_INSTALL_DIR .)
-  SET(SOUND_INSTALL_DIR .)
-  SET(LOCALE_INSTALL_DIR lang)
+  set(BIN_INSTALL_DIR "." CACHE PATH "-")
+  set(SBIN_INSTALL_DIR "." CACHE PATH "-")
+  set(LIB_INSTALL_DIR "lib" CACHE PATH "-")
+  set(INCLUDE_INSTALL_DIR "include" CACHE PATH "-")
+  set(PLUGIN_INSTALL_DIR "plugins" CACHE PATH "-")
+  set(HTML_INSTALL_DIR "doc/HTML" CACHE PATH "-")
+  set(ICON_INSTALL_DIR "." CACHE PATH "-")
+  set(SOUND_INSTALL_DIR "." CACHE PATH "-")
+  set(LOCALE_INSTALL_DIR "lang" CACHE PATH "-")
 endif (WIN32)


MindPX: Enable DDS

MindPX: Enable DDS

--- cmake/configs/nuttx_mindpx-v2_default.cmake
+++ cmake/configs/nuttx_mindpx-v2_default.cmake
@@ -135,6 +135,9 @@
 	modules/uORB
 	modules/dataman

+	# micro RTPS
+	modules/micrortps_bridge/micrortps_client
+
 	#
 	# Libraries
 	#
@@ -198,6 +201,14 @@
 	#examples/ekf_att_pos_estimator
 )

+set(config_rtps_send_topics
+   sensor_combined
+   )
+
+set(config_rtps_receive_topics
+   sensor_baro
+   )
+
 set(config_extra_builtin_cmds
 	serdis
 	sercon


Simplify warning message

Simplify warning message

Co-Authored-By: Axel Naumann <cb9efc8f9015dd95c88a8e735ee07ab4f1027cd2@cern.ch>

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -1417,8 +1417,8 @@

 #---Check for VecGeom--------------------------------------------------------------------
 if(vecgeom AND builtin_veccore)
-  message(WARNING "VecGeom doesn't support external VecCore (veccore & builtin_veccore options), but only native VecCore built together with VecGeom. Option VecGeom will be disabled.")
-  set(vecgeom OFF CACHE BOOL "Disabled because VecGeom doesn't support external Vecore" FORCE)
+  message(WARNING "ROOT must be built against the VecCore installation that was used to build VecGeom; builtin_veccore cannot be used. Option VecGeom will be disabled.")
+  set(vecgeom OFF CACHE BOOL "Disabled because non-builtin VecGeom specified but its VecCore cannot be found" FORCE)
 endif()

 if (vecgeom)


Silent new warnings with ICC 15

Silent new warnings with ICC 15

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -102,7 +102,7 @@
       set(LZMA_CFLAGS "-Wno-format-nonliteral")
       set(LZMA_LDFLAGS "-Qunused-arguments")
     elseif( CMAKE_CXX_COMPILER_ID STREQUAL Intel)
-      set(LZMA_CFLAGS "-wd188 -wd181 -wd1292 -wd10006 -wd10156 -wd2259 -wd981 -wd128 -wd3179")
+      set(LZMA_CFLAGS "-wd188 -wd181 -wd1292 -wd10006 -wd10156 -wd2259 -wd981 -wd128 -wd3179 -wd2102")
     endif()
     ExternalProject_Add(
       LZMA


Fail if BLAS is not found by TMVA and fail-on-missing=ON

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -1554,9 +1554,12 @@

 if(tmva AND imt)
   message(STATUS "Looking for BLAS for optional parts of TMVA")
-  find_package(BLAS)
-endif()
-
+  if(fail-on-missing)
+    find_package(BLAS REQUIRED)
+  else()
+    find_package(BLAS)
+  endif()
+endif()

 #---Download googletest--------------------------------------------------------------
 if (testing)


remove empty lines

remove empty lines

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -1426,22 +1426,17 @@

 #---Check for CUDA-----------------------------------------------------------------------
 # if tmva-gpu is off and cuda is on cuda is searched but not used in tmva
-#  if cuda is off but tmva-gpu is on cuda is searched and activated if found !
-
+#  if cuda is off but tmva-gpu is on cuda is searched and activated if found !
+#
 if(cuda OR tmva-gpu)
-
   find_package(CUDA)
-
   if(CUDA_FOUND)
     if(NOT DEFINED CMAKE_CUDA_STANDARD)
       set(CMAKE_CUDA_STANDARD ${CMAKE_CXX_STANDARD})
     endif()
-
     enable_language(CUDA)
-
     set(cuda ON CACHE BOOL "Found Cuda for TMVA GPU" FORCE)
-
-
+    ###
     ### look for package CuDNN
     if (cudnn)
       if (fail-on-missing)
@@ -1449,7 +1444,6 @@
       else()
         find_package(CuDNN)
       endif()
-
       if (CUDNN_FOUND)
         message(STATUS "CuDNN library found: " ${CUDNN_LIBRARIES})
 	### set tmva-cudnn flag only if tmva-gpu is on!
@@ -1461,25 +1455,21 @@
         set(cudnn OFF CACHE BOOL "Disabled because cudnn is not found" FORCE)
       endif()
     endif()
-
   elseif(fail-on-missing)
     message(FATAL_ERROR "CUDA not found. Ensure that the installation of CUDA is in the CMAKE_PREFIX_PATH")
   endif()
-
 else()
   set(cudnn OFF)
 endif()
-
+#
 #---TMVA and its dependencies------------------------------------------------------------
 if (tmva AND NOT mlp)
   message(FATAL_ERROR "The 'tmva' option requires 'mlp', please enable mlp with -Dmlp=ON")
 endif()
-
 if(tmva)
   if(tmva-cpu AND imt)
     message(STATUS "Looking for BLAS for optional parts of TMVA")
     find_package(BLAS)
-
     if(NOT BLAS_FOUND)
       if (GSL_FOUND)
         message(STATUS "Using GSL CBLAS for optional parts of TMVA")
@@ -1490,11 +1480,9 @@
   else()
     set(tmva-cpu OFF CACHE BOOL "Disabled because 'imt' is disabled (${tmva-cpu_description})" FORCE)
   endif()
-
   if(tmva-gpu AND NOT CUDA_FOUND)
     set(tmva-gpu OFF CACHE BOOL "Disabled because cuda not found" FORCE)
   endif()
-
   if(tmva-pymva)
     if(fail-on-missing AND NOT NUMPY_FOUND)
       message(FATAL_ERROR "TMVA: numpy python package not found and tmva-pymva component required"
@@ -1504,7 +1492,6 @@
       set(tmva-pymva OFF CACHE BOOL "Disabled because Numpy was not found (${tmva-pymva_description})" FORCE)
     endif()
   endif()
-
   if(tmva-rmva AND NOT R_FOUND)
     set(tmva-rmva  OFF CACHE BOOL "Disabled because R was not found (${tmva-rmva_description})"  FORCE)
   endif()


Explicitly add Vc to ${VecCore_LIBRARIES} (needed for external Vc)

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -1409,6 +1409,7 @@

     set(VecCore_DEFINITIONS ${VecCore_Vc_DEFINITIONS})
     set(VecCore_INCLUDE_DIRS ${VecCore_Vc_INCLUDE_DIR} ${VecCore_INCLUDE_DIRS})
+    set(VecCore_LIBRARIES ${VecCore_LIBRARIES} ${Vc_LIBRARIES})
     target_link_libraries(VecCore INTERFACE ${Vc_LIBRARIES})
   endif()


++cache version

++cache version

--- scripts/create-toolchain-info.cmake
+++ scripts/create-toolchain-info.cmake
@@ -34,7 +34,7 @@
 file(
     WRITE
     "${TOOLCHAIN_INFO_FILE}"
-    "Cache version: 5\n"
+    "Cache version: 6\n"
     "Polly toolchains:\n"
     "    IPHONEOS_ARCHS: ${IPHONEOS_ARCHS}\n"
     "    IPHONESIMULATOR_ARCHS: ${IPHONESIMULATOR_ARCHS}\n"


Corrected typos in python embed detection for cmake

--- cmake/TestForPythonEmbed.cmake
+++ cmake/TestForPythonEmbed.cmake
@@ -18,8 +18,8 @@

 " PY_EMBED)
 	IF(PY_EMBED)
-	    MESSAGE(STATUS "Python is embeddable")
-	    SET(PYTHON_EMEDABLE TRUE)
+	    MESSAGE(STATUS "Python is embedable")
+	    SET(PYTHON_EMBEDABLE TRUE)
 	ELSE(PY_EMBED)
 	    MESSAGE(STATUS "Python is not embedable")
 	    SET(PYTHON_EMBEDABLE FALSE)


fixup! cmake: Change output

fixup! cmake: Change output

Former-commit-id: 0d7cc470e535222ce58c782e5263786944db7d1c

--- extlibs/metis-5.1.0/GKlib/GKlibSystem.cmake
+++ extlibs/metis-5.1.0/GKlib/GKlibSystem.cmake
@@ -119,11 +119,11 @@
     try_compile(HAVE_THREADLOCALSTORAGE
       ${CMAKE_BINARY_DIR}
       ${GKLIB_PATH}/conf/check_thread_storage.c)
-    if(HAVE_THREADLOCALSTORAGE)
-      message(STATUS "checking for thread-local storage - found")
-    else()
-      message(STATUS "checking for thread-local storage - not found")
-    endif()
+    # if(HAVE_THREADLOCALSTORAGE)
+    #   message(STATUS "checking for thread-local storage - found")
+    # else()
+    #   message(STATUS "checking for thread-local storage - not found")
+    # endif()
   endif()
   if(NOT HAVE_THREADLOCALSTORAGE)
     set(GKlib_COPTIONS "${GKlib_COPTIONS} -D__thread=")


PERF: MI thread performance from ITK

PERF: MI thread performance from ITK

--- SuperBuild/External_ITKv4.cmake
+++ SuperBuild/External_ITKv4.cmake
@@ -153,7 +153,7 @@

   ### --- End Project specific additions
   set(${proj}_REPOSITORY ${git_protocol}://itk.org/ITK.git)
-  set(${proj}_GIT_TAG 3b7d4fde0d71e0bb01c3a5f5c64f0ff09a6962f8) ## include bug fix for float transforms!
+  set(${proj}_GIT_TAG 8f51c0dcb33e796a3aac2728a0d613527b169491) ## MI multi-thread performance
   set(ITK_VERSION_ID ITK-4.9) ### NOTE: When updating GIT_TAG, also update ITK_VERSION_ID

   ExternalProject_Add(${proj}


fix missed variable name in refactoring

fix missed variable name in refactoring

--- rmw_implementation/cmake/add_executable_for_each_rmw_implementation.cmake
+++ rmw_implementation/cmake/add_executable_for_each_rmw_implementation.cmake
@@ -43,10 +43,10 @@
   foreach(_rmw_implementation ${_rmw_implementations})
     find_package("${_rmw_implementation}" REQUIRED)
   endforeach()
-  _add_executable_for_each_rmw_implementations(${ARGN})
+  _add_executable_for_each_rmw_implementations("${_rmw_implementations}" ${ARGN})
 endmacro()

-function(_add_executable_for_each_rmw_implementations target)
+function(_add_executable_for_each_rmw_implementations rmw_implementations target)
   cmake_parse_arguments(ARG
     "INSTALL;SKIP_DEFAULT" "ALL_TARGET_NAMES_VAR" "TARGET_DEPENDENCIES" ${ARGN})


should link properly on linux/osx

should link properly on linux/osx

--- scripts/cmake/common.cmake
+++ scripts/cmake/common.cmake
@@ -11,6 +11,8 @@
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)

 enable_testing()
+
+find_package(Threads)

 set(DOCTEST_TEST_MODE "COMPARE" CACHE STRING "Test mode - normal/run through valgrind/collect output/compare with output")
 set_property(CACHE DOCTEST_TEST_MODE PROPERTY STRINGS "NORMAL;VALGRIND;COLLECT;COMPARE")
@@ -61,6 +63,7 @@
 function(doctest_add_executable name)
     add_executable(${name} ${ARGN})
     add_dependencies(${name} assemble_single_header)
+    target_link_libraries(${name} ${CMAKE_THREAD_LIBS_INIT})
 endfunction()

 function(doctest_add_library name)


[C++, CMake] allow to filter sources before applying clang-format

Change-Id: I714b2c93436e8401d22743d81881bc796a5a4b4f

--- cpp/CMake/AddClangFormat.cmake
+++ cpp/CMake/AddClangFormat.cmake
@@ -13,9 +13,26 @@
     endif (NOT TARGET format)
 endif(ENABLE_CLANG_FORMATTER)

+function(FilterSourcesBeforeFormatting INPUT OUTPUT EXCLUDE_PATTERN)
+     set(FILTERED_LIST "")
+     foreach(ENTRY ${${INPUT}})
+       if(NOT ${ENTRY} MATCHES ${EXCLUDE_PATTERN})
+           list(APPEND FILTERED_LIST ${ENTRY})
+       endif()
+     endforeach()
+     set(${OUTPUT} ${FILTERED_LIST} PARENT_SCOPE)
+endfunction(FilterSourcesBeforeFormatting)
+
+
 function(AddClangFormat TARGET)
     if(${ENABLE_CLANG_FORMATTER})
         get_property(TARGET_SOURCES TARGET ${TARGET} PROPERTY SOURCES)
+        set (ADDITIONAL_FUNCTION_ARGS ${ARGN})
+        list(LENGTH ADDITIONAL_FUNCTION_ARGS NUM_ADDITIONAL_FUNCTION_ARGS)
+        if (${NUM_ADDITIONAL_FUNCTION_ARGS} GREATER 0)
+            list(GET ADDITIONAL_FUNCTION_ARGS 0 EXCLUDE_PATTERN)
+            FilterSourcesBeforeFormatting(TARGET_SOURCES TARGET_SOURCES ${EXCLUDE_PATTERN})
+        endif()
         set(COMMENT "running C++ code formatter: clang-format")
         set(COMMENT "${COMMENT}\nworking directory: ${CMAKE_CURRENT_SOURCE_DIR}")
         set(COMMENT "${COMMENT}\nprocessing files:\n${TARGET_SOURCES}")
@@ -23,7 +40,7 @@
         set(FORMAT_TARGET "format-${TARGET}")
         add_custom_target(
             ${FORMAT_TARGET}
-            COMMAND "${CLANG_FORMAT_PATH}" -i ${TARGET_SOURCES}
+            COMMAND "${CLANG_FORMAT_PATH}" -i ${FILTERED_TARGET_SOURCES}
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
             VERBATIM
             COMMENT "${COMMENT}"


update

update

--- modules/zlib.cmake
+++ modules/zlib.cmake
@@ -1,43 +1,38 @@
-if(NOT TARGET zlibstatic)
+if(NOT TARGET zlib)

-  # Temporary disable some warnings
-  # C4127: conditional expression is constant
-  # C4131: 'function' : uses old-style declarator
-  # C4210: nonstandard extension used : function given file scope
-  # C4244: 'conversion' conversion from 'type1' to 'type2', possible loss of data
-  set(CMAKE_OLD_C_FLAGS ${CMAKE_C_FLAGS})
-  set(CMAKE_OLD_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-  if(CMAKE_MAKE_PROGRAM MATCHES "(MSBuild|devenv|msdev|nmake)")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4127 /wd4131 /wd4210 /wd4244")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4127 /wd4131 /wd4210 /wd4244")
-  elseif(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUC)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic")
+  # Module definitions
+  if(MSVC)
+    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
   endif()

-  # Set module options
-  option(AMD64 "Enable building amd64 assembly implementation" ON)
-
-  # Set install flag
-  set(SKIP_INSTALL_ALL Y)
-
-  # Add module subdirectory
-  add_subdirectory("zlib")
-
-  # Add missing target sources
-  if(MSVC AND AMD64)
-    target_sources(zlib PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/zlib/contrib/masmx64/inffas8664.c")
-    target_sources(zlibstatic PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/zlib/contrib/masmx64/inffas8664.c")
+  # Module assembler files
+  if(CMAKE_COMPILER_IS_GNUCC)
+    add_definitions(-DASMV)
+    set(ASSEMBLER_FILES "zlib/contrib/amd64/amd64-match.S")
+    set_source_files_properties(${ASSEMBLER_FILES} PROPERTIES LANGUAGE C COMPILE_FLAGS -DNO_UNDERLINE)
+  elseif(MSVC)
+    ENABLE_LANGUAGE(ASM_MASM)
+    add_definitions(-DASMV -DASMINF)
+    set(ASSEMBLER_FILES "zlib/contrib/masmx64/gvmat64.asm" "zlib/contrib/masmx64/inffasx64.asm")
   endif()

-  # Set module folder
-  set_target_properties(zlibstatic zlib example minigzip PROPERTIES FOLDER modules/zlib)
+  # Module library
+  file(GLOB SOURCE_FILES "zlib/*.c")
+  if(CMAKE_MAKE_PROGRAM MATCHES "(MSBuild|devenv|msdev|nmake)")
+    # C4127: conditional expression is constant
+    # C4131: 'function' : uses old-style declarator
+    # C4210: nonstandard extension used : function given file scope
+    # C4244: 'conversion' conversion from 'type1' to 'type2', possible loss of data
+    set(${SOURCE_FILES} "zlib/contrib/masmx64/inffas8664.c" "zlib/contrib/masmx64/inffas8664.c")
+    set_source_files_properties(${SOURCE_FILES} PROPERTIES COMPILE_FLAGS "${COMMON_COMPILE_FLAGS} /wd4127 /wd4131 /wd4210 /wd4244")
+  else()
+    set_source_files_properties(${SOURCE_FILES} PROPERTIES COMPILE_FLAGS "${COMMON_COMPILE_FLAGS}")
+  endif()
+  add_library(zlib ${SOURCE_FILES} ${ASSEMBLER_FILES})
+  target_link_libraries(zlib)

-  # Exclude some modules from the build
-  set_target_properties(zlib example minigzip PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1)
-
-  # Restore default warnings
-  set(CMAKE_C_FLAGS ${CMAKE_OLD_C_FLAGS})
-  set(CMAKE_CXX_FLAGS ${CMAKE_OLD_CXX_FLAGS})
+  # Module folder
+  set_target_properties(zlib PROPERTIES FOLDER modules/zlib)

 endif()


Updated comment

Updated comment

--- android/android.toolchain.cmake
+++ android/android.toolchain.cmake
@@ -136,6 +136,7 @@
 #   - modified November 2011 Andrey Kamaev andrey.kamaev@itseez.com
 #     [*] rewritten for NDK r7
 #     [+] x86 toolchain support (experimental)
+#     [+] added "armeabi-v6 with VFP" ABI for ARMv6 processors.
 #     [~] improved compiler and linker flags management
 #     [+] support different build flags for Release and Debug configurations
 #     [~] by default compiler flags the same as used by ndk-build (but only


xpro::node library

xpro::node library

* STATIC IMPORTED on Windows, INTERFACE IMPORTED otherwise
* with INTERFACE_INCLUDE_DIRECTORIES property set
* issue https://github.com/smanders/externpro/issues/257

--- projects/use/usexp-node-config.cmake
+++ projects/use/usexp-node-config.cmake
@@ -25,6 +25,23 @@
 if(MSVC)
   set(${PRJ}_LIBRARIES ${XP_ROOTDIR}/node_${ver}/lib/node.lib)
   list(APPEND reqVars ${PRJ}_LIBRARIES)
+  if(NOT TARGET xpro::node)
+    add_library(xpro::node STATIC IMPORTED)
+    set_property(TARGET xpro::node APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+    set_target_properties(xpro::node PROPERTIES
+      IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C;CXX"
+      IMPORTED_LOCATION_RELEASE "${${PRJ}_LIBRARIES}"
+      )
+  endif()
+else()
+  if(NOT TARGET xpro::node)
+    add_library(xpro::node INTERFACE IMPORTED)
+  endif()
+endif()
+if(${PRJ}_INCLUDE_DIR)
+  set_target_properties(xpro::node PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${${PRJ}_INCLUDE_DIR}"
+    )
 endif()
 set(${PRJ}_EXE ${XP_ROOTDIR}/node_${ver}/bin/node${CMAKE_EXECUTABLE_SUFFIX})
 list(APPEND reqVars ${PRJ}_EXE)


Upgrade pip in virtual environment

Upgrade pip in virtual environment

--- Wrapping/Python/LegacyPackaging.cmake
+++ Wrapping/Python/LegacyPackaging.cmake
@@ -92,6 +92,7 @@

   add_custom_command( OUTPUT "${VIRTUAL_PYTHON_EXECUTABLE}"
     COMMAND "${PYTHON_EXECUTABLE}" "-m" "venv" "--clear" "${PythonVirtualenvHome}"
+    COMMAND "${VIRTUAL_PYTHON_EXECUTABLE}" "-m" "pip" "install" "--upgrade" "pip"
     COMMAND "${VIRTUAL_PYTHON_EXECUTABLE}" "setup.py" install
     WORKING_DIRECTORY "${SimpleITK_Python_BINARY_DIR}"
     DEPENDS


Ticket #3125 missing libX11-devel should disable KBDD

--- build/cmake/CondorConfigure.cmake
+++ build/cmake/CondorConfigure.cmake
@@ -334,8 +334,12 @@
 	check_include_files("linux/nfsd/const.h" HAVE_LINUX_NFSD_CONST_H)
 	check_include_files("linux/personality.h" HAVE_LINUX_PERSONALITY_H)
 	check_include_files("linux/sockios.h" HAVE_LINUX_SOCKIOS_H)
-
-	find_library(HAVE_X11 X11)
+	check_include_files("X11/Xlib.h" HAVE_XLIB_H)
+
+	if (HAVE_XLIB_H)
+	  find_library(HAVE_X11 X11)
+	endif()
+
 	dprint("Threaded functionality only enable in Linux and Windows")
 	set(HAS_PTHREADS ${CMAKE_USE_PTHREADS_INIT})
 	set(HAVE_PTHREADS ${CMAKE_USE_PTHREADS_INIT})


updates linux build

updates linux build

--- cmake/UbiTrackFindCoreLibraries.cmake
+++ cmake/UbiTrackFindCoreLibraries.cmake
@@ -36,6 +36,7 @@

 # always use supplied boost bindings
 set(BOOSTBINDINGS_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/modules/utcore/3rd/boost-bindings")
+add_subdirectory("${CMAKE_SOURCE_DIR}/modules/utcore/3rd/boost-bindings")
 IF(CMAKE_COMPILER_IS_GNUCXX)
   add_definitions("-DBOOST_UBLAS_BOUNDED_ARRAY_ALIGN=__attribute__ ((aligned (16)))")
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)


Update AddSwiftUnittests.cmake

Update AddSwiftUnittests.cmake

--- cmake/modules/AddSwiftUnittests.cmake
+++ cmake/modules/AddSwiftUnittests.cmake
@@ -49,8 +49,8 @@
     set_property(TARGET "${test_dirname}" APPEND PROPERTY LINK_LIBRARIES "log")
   elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
     if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64")
-      set_property(TARGET "${test_dirname}" APPEND_STRING PROPERTY COMPILE_FLAGS
-        " -march=core2")
+      target_compile_options(${test_dirname} PRIVATE
+        -march=core2)
     endif()
   endif()


Re-disable C4324 MSVC warning that was enabled in D65458 / rL367383

This was breaking /WX builds

git-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@367409 91177308-0d34-0410-b5e6-96231b3b80d8

--- cmake/modules/HandleLLVMOptions.cmake
+++ cmake/modules/HandleLLVMOptions.cmake
@@ -530,6 +530,14 @@
           # is fixed.
       -wd4709 # Suppress comma operator within array index expression

+      # Ideally, we'd like this warning to be enabled, but MSVC 2013 doesn't
+      # support the 'aligned' attribute in the way that clang sources requires (for
+      # any code that uses the LLVM_ALIGNAS macro), so this is must be disabled to
+      # avoid unwanted alignment warnings.
+      # When we switch to requiring a version of MSVC that supports the 'alignas'
+      # specifier (MSVC 2015?) this warning can be re-enabled.
+      -wd4324 # Suppress 'structure was padded due to __declspec(align())'
+
       # Promoted warnings.
       -w14062 # Promote 'enumerator in switch of enum is not handled' to level 1 warning.


Turn on LLVM_ENABLE_PLUGINS by default on Windows

Reviewers: rnk

Subscribers: llvm-commits

Differential Revision: http://reviews.llvm.org/D16760

git-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@260262 91177308-0d34-0410-b5e6-96231b3b80d8

--- cmake/modules/HandleLLVMOptions.cmake
+++ cmake/modules/HandleLLVMOptions.cmake
@@ -671,7 +671,7 @@

 # Plugin support
 # FIXME: Make this configurable.
-if(WIN32 OR CYGWIN)
+if(CYGWIN)
   if(BUILD_SHARED_LIBS)
     set(LLVM_ENABLE_PLUGINS ON)
   else()


Revert "[cmake] Remove duplicate command line options from build"

The Android sanitizer buildbot is failing with this change and it
looks like an additional change to cmake is necessary to fix the
build. Reverting this change for now.

git-svn-id: c199f293c43da69278bea8e88f92242bf3aa95f7@329828 91177308-0d34-0410-b5e6-96231b3b80d8

--- cmake/Modules/AddCompilerRT.cmake
+++ cmake/Modules/AddCompilerRT.cmake
@@ -63,8 +63,8 @@
       list(REMOVE_ITEM target_flags "-msse3")
     endif()

-    set_target_compile_flags(${libname} ${extra_cflags_${libname}} ${target_flags})
-
+    set_target_compile_flags(${libname}
+      ${CMAKE_CXX_FLAGS} ${extra_cflags_${libname}} ${target_flags})
     set_property(TARGET ${libname} APPEND PROPERTY
       COMPILE_DEFINITIONS ${LIB_DEFS})
     set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT Libraries")


[Fuchsia] Set ENABLE_X86_RELAX_RELOCATIONS for Fuchsia builds

This is a "Does your linker support it?" option, and all ours do.

Patch by Roland McGrath

Differential Revision: https://reviews.llvm.org/D37785

git-svn-id: ffe668792ed300d6c2daa1f6eba2e0aa28d7ec6c@313173 91177308-0d34-0410-b5e6-96231b3b80d8

--- cmake/caches/Fuchsia-stage2.cmake
+++ cmake/caches/Fuchsia-stage2.cmake
@@ -17,6 +17,13 @@
   set(LLVM_ENABLE_LLD ON CACHE BOOL "")
   set(CLANG_DEFAULT_LINKER lld CACHE STRING "")
 endif()
+
+# This is a "Does your linker support it?" option that only applies
+# to x86-64 ELF targets.  All Fuchsia target linkers do support it.
+# For x86-64 Linux, it's supported by LLD and by GNU linkers since
+# binutils 2.27, so one can hope that all Linux hosts in use handle it.
+# Ideally this would be settable as a per-target option.
+set(ENABLE_X86_RELAX_RELOCATIONS ON CACHE BOOL "")

 if(APPLE)
   set(LLDB_CODESIGN_IDENTITY "" CACHE STRING "")


[CMake][Fuchsia] Don't specify libc++ ABI version for Fuchsia

This is now set automatically in libc++ config header.

Differential Revision: https://reviews.llvm.org/D45511

git-svn-id: ffe668792ed300d6c2daa1f6eba2e0aa28d7ec6c@329984 91177308-0d34-0410-b5e6-96231b3b80d8

--- cmake/caches/Fuchsia-stage2.cmake
+++ cmake/caches/Fuchsia-stage2.cmake
@@ -73,7 +73,6 @@
   set(RUNTIMES_${target}-fuchsia_LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "")
   set(RUNTIMES_${target}-fuchsia_LIBCXXABI_ENABLE_STATIC OFF CACHE BOOL "")
   set(RUNTIMES_${target}-fuchsia_LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")
-  set(RUNTIMES_${target}-fuchsia_LIBCXX_ABI_VERSION 2 CACHE STRING "")
   set(RUNTIMES_${target}-fuchsia_LIBCXX_ENABLE_STATIC OFF CACHE BOOL "")
   set(RUNTIMES_${target}-fuchsia_SANITIZER_USE_COMPILER_RT ON CACHE BOOL "")


Turn find_package() into no-op if looking for builtins

From now on, if a package Foo is built by ROOT itself, its name should
be added to the 'ROOT_BUILTINS' list, which turns find_package(Foo) into
a no-op. This prevents find_package(Foo) from wrongly finding a version
of the package already installed in the system, which would lead to
inconsistencies in the build. Packages moving to this new system must
make sure to setup all variables that would normally be set up by the
call to find_package(), including the creation of imported targets with
the appropriate properties (i.e., include directories, etc).

--- cmake/modules/RootNewMacros.cmake
+++ cmake/modules/RootNewMacros.cmake
@@ -53,6 +53,12 @@
 set(CMAKE_INCLUDE_CURRENT_DIR OFF)

 include(CMakeParseArguments)
+
+macro(find_package)
+  if(NOT "${ARGV0}" IN_LIST ROOT_BUILTINS)
+    _find_package(${ARGV})
+  endif()
+endmacro()

 #---------------------------------------------------------------------------------------------------
 #---ROOT_GLOB_FILES( <variable> [REALTIVE path] [FILTER regexp] <sources> ...)


Use PI_TOOL env variable set in Dockerfile to get the proper cross compiler.

--- rpi/cmaketc/Toolchain-raspberrypi-arm.cmake
+++ rpi/cmaketc/Toolchain-raspberrypi-arm.cmake
@@ -4,18 +4,18 @@
 SET (CMAKE_SYSTEM_VERSION 1)

 # Check for Raspberry Pi Tools and bail out if they don't have it
-if(DEFINED ENV{PI_TOOLS_HOME})
-  message("Using Raspberry Pi Tools found in $ENV{PI_TOOLS_HOME}")
+if(DEFINED ENV{PI_TOOLS_HOME} AND DEFINED ENV{PI_TOOL})
+  message("Using Raspberry Pi Tools found in $ENV{PI_TOOLS_HOME}/ENV{PI_TOOL}")
 else()
-  message("PI_TOOLS_HOME is not set; You must tell CMake where to find Raspberry Pi Tools (cross-compiler)")
+  message("PI_TOOLS_HOME or PI_TOOL is not set; You must tell CMake where to find Raspberry Pi Tools (cross-compiler)")
   return()
 endif()

-SET (PiToolsDir arm-bcm2708/arm-bcm2708hardfp-linux-gnueabi)
+SET (PiToolsDir ENV{PI_TOOL})

 # specify the cross compiler
-SET (CMAKE_C_COMPILER $ENV{PI_TOOLS_HOME}/${PiToolsDir}/bin/arm-bcm2708hardfp-linux-gnueabi-gcc)
-SET (CMAKE_CXX_COMPILER $ENV{PI_TOOLS_HOME}/${PiToolsDir}/bin/arm-bcm2708hardfp-linux-gnueabi-g++)
+SET (CMAKE_C_COMPILER $ENV{PI_TOOLS_HOME}/${PiToolsDir}/bin/arm-linux-gnueabihf-gcc)
+SET (CMAKE_CXX_COMPILER $ENV{PI_TOOLS_HOME}/${PiToolsDir}/bin/arm-linux-gnueabihf-g++)

 # where is the target environment
 SET (CMAKE_FIND_ROOT_PATH $ENV{PI_TOOLS_HOME}/${PiToolsDir} $ENV{PI_TOOLS_HOME}/${PiToolsDir}/include)


fix TBB external

fix TBB external

--- externals/CMakeExternals.cmake
+++ externals/CMakeExternals.cmake
@@ -161,7 +161,7 @@
       GIT_REPOSITORY https://github.com/oneapi-src/oneTBB.git
       GIT_TAG "v2021.3.0"
       CMAKE_ARGS -DTBB_TEST=OFF
-      BUILD_BYPRODUCTS "<INSTALL_DIR>/${TBB_DLL}"
+      BUILD_BYPRODUCTS "<INSTALL_DIR>/${TBB_DLL}" "<INSTALL_DIR>/${TBB_LIB}"
     )

     add_external_library(tbb


Using CUDA_COMPILE means we don't automatically get the cuda include directories set.

git-svn-id: 42ad145e53d7314eb83f2e7cbbc363618536741c@2190 fa922fa7-2fde-0310-acd8-f43f465a7996

--- src/CMake/hoomd/HOOMDCUDASetup.cmake
+++ src/CMake/hoomd/HOOMDCUDASetup.cmake
@@ -8,6 +8,8 @@
     # add ENABLE_CUDA definition to compiler to enable #ifdef'd code
     if (ENABLE_CUDA)
         find_package(CUDA REQUIRED)
+
+        include_directories(${CUDA_INCLUDE_DIRS})

         mark_as_advanced(CUDA_SDK_ROOT_DIR)
         if (CUDA_TOOLKIT_ROOT_DIR)


include from rosidl_typesupport_connext_cpp

Now that the custom headers are in the
rosidl_typesupport_connext_cpp package, the
generated message libraries for connext need to
get include directories from that package.

--- rosidl_typesupport_connext_cpp/cmake/rosidl_typesupport_connext_cpp_generate_interfaces.cmake
+++ rosidl_typesupport_connext_cpp/cmake/rosidl_typesupport_connext_cpp_generate_interfaces.cmake
@@ -117,7 +117,8 @@
 endforeach()
 ament_target_dependencies(${rosidl_generate_interfaces_TARGET}${_target_suffix}
   "Connext"
-  "rosidl_generator_cpp")
+  "rosidl_generator_cpp"
+  "rosidl_typesupport_connext_cpp")

 add_dependencies(
   ${rosidl_generate_interfaces_TARGET}


fix win32 cmake for release/debug builds

--- cmake/MbedcryptoPlatforms.cmake
+++ cmake/MbedcryptoPlatforms.cmake
@@ -31,17 +31,24 @@
             $<$<BOOL:BUILD_TOOLSET_XP>:-D_WIN32_WINNT=0x0502 -DWINVER=0x0502>
             )
     endif()
-    if(MSVC AND MBEDCRYPTO_STATIC_CRT)
+    if(MSVC)
+        if(MBEDCRYPTO_STATIC_CRT)
+            set(_src_opt "/MD")
+            set(_dst_opt "/MT")
+        else()
+            set(_src_opt "/MT")
+            set(_dst_opt "/MD")
+        endif()
         foreach(flag
                 CMAKE_C_FLAGS   CMAKE_C_FLAGS_RELEASE   CMAKE_C_FLAGS_DEBUG
                 CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_DEBUG
                 )
-            string(REGEX REPLACE "/MD" "/MT" ${flag} "${${flag}}")
+            string(REGEX REPLACE ${_src_opt} ${_dst_opt} ${flag} "${${flag}}")
             set(${flag} "${${flag}}" CACHE STRING "msvc flags" FORCE)
         endforeach()
         target_compile_options(${tgt} PUBLIC
-            "$<$<CONFIG:Release>:-MT>"
-            "$<$<CONFIG:Debug>:-MTd>"
+            "$<$<CONFIG:Release>:${_src_opt}>"
+            "$<$<CONFIG:Debug>:${_dst_opt}d>"
             )
     endif()
 endmacro()


Create tbag_module_tbag cmake function.

Create tbag_module_tbag cmake function.

--- cmake/Modules/TbagModules.cmake
+++ cmake/Modules/TbagModules.cmake
@@ -210,3 +210,18 @@
     endif ()
 endmacro ()

+#/// Assign libtbag.
+#///
+#/// @remarsk
+#///  Recommended apply to the test project.
+macro (tbag_module_tbag)
+    if (NOT Tbag_FOUND)
+        find_package (Tbag)
+    endif ()
+
+    if (Tbag_FOUND)
+        list (APPEND TBAG_PROJECT_DEFINITIONS  -DUSE_TBAG)
+        list (APPEND TBAG_PROJECT_INCLUDE_DIRS ${Tbag_INCLUDE_DIRS})
+    endif ()
+endmacro ()
+


brining over fix in master (#4140) for libz import on 64-bit android

--- cmake/OpenCVFindLibsGrfmt.cmake
+++ cmake/OpenCVFindLibsGrfmt.cmake
@@ -8,7 +8,8 @@
 else()
   include(FindZLIB)
   if(ZLIB_FOUND AND ANDROID)
-    if(ZLIB_LIBRARY STREQUAL "${ANDROID_SYSROOT}/usr/lib/libz.so")
+    if(ZLIB_LIBRARIES STREQUAL "${ANDROID_SYSROOT}/usr/lib/libz.so" OR
+        ZLIB_LIBRARIES STREQUAL "${ANDROID_SYSROOT}/usr/lib64/libz.so")
       set(ZLIB_LIBRARY z)
       set(ZLIB_LIBRARIES z)
     endif()


enabled ctest unit testing

enabled ctest unit testing

--- cmake/SetupProjectOptions.cmake
+++ cmake/SetupProjectOptions.cmake
@@ -8,7 +8,7 @@

 # testing
 OPTION(DCSC08961_BLD_UTEST "Enable unit-test building by default"                          ON)
-OPTION(DCSC08961_RUN_CTEST "Enable unit-test execution using CTest by default"            OFF)
+OPTION(DCSC08961_RUN_CTEST "Enable unit-test execution using CTest by default"             ON)
 OPTION(DCSC08961_RUN_UTEST "Enable unit-test execution using the build system by default" OFF)

 # tracing


Update CMake LibDeps

Update CMake LibDeps

git-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@92540 91177308-0d34-0410-b5e6-96231b3b80d8

--- cmake/modules/LLVMLibDeps.cmake
+++ cmake/modules/LLVMLibDeps.cmake
@@ -24,7 +24,8 @@
 set(MSVC_LIB_DEPS_LLVMCppBackend LLVMCore LLVMCppBackendInfo LLVMSupport LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMCppBackendInfo LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMExecutionEngine LLVMCore LLVMSupport LLVMSystem LLVMTarget)
-set(MSVC_LIB_DEPS_LLVMInstrumentation LLVMAnalysis LLVMCore LLVMScalarOpts LLVMSupport LLVMSystem LLVMTransformUtils)
+set(MSVC_LIB_DEPS_LLVMInstCombine LLVMAnalysis LLVMCore LLVMSupport LLVMSystem LLVMTarget LLVMTransformUtils)
+set(MSVC_LIB_DEPS_LLVMInstrumentation LLVMAnalysis LLVMCore LLVMSupport LLVMSystem LLVMTransformUtils)
 set(MSVC_LIB_DEPS_LLVMInterpreter LLVMCodeGen LLVMCore LLVMExecutionEngine LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMJIT LLVMCodeGen LLVMCore LLVMExecutionEngine LLVMMC LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMLinker LLVMArchive LLVMBitReader LLVMCore LLVMSupport LLVMSystem)
@@ -43,7 +44,7 @@
 set(MSVC_LIB_DEPS_LLVMPowerPCAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMPowerPCInfo LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMPowerPCCodeGen LLVMCodeGen LLVMCore LLVMMC LLVMPowerPCInfo LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMPowerPCInfo LLVMSupport)
-set(MSVC_LIB_DEPS_LLVMScalarOpts LLVMAnalysis LLVMCore LLVMSupport LLVMSystem LLVMTarget LLVMTransformUtils LLVMInstCombine)
+set(MSVC_LIB_DEPS_LLVMScalarOpts LLVMAnalysis LLVMCore LLVMInstCombine LLVMSupport LLVMSystem LLVMTarget LLVMTransformUtils)
 set(MSVC_LIB_DEPS_LLVMSelectionDAG LLVMAnalysis LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMSparcAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSparcInfo LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMSparcCodeGen LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSparcInfo LLVMSupport LLVMSystem LLVMTarget)


CMake: Fix Typo in FindMUMPS.cmake, fix issue 60

git-svn-id: 31d9d2f6432a47c86a3640814024c107794ea77c@29752 0785d39b-7218-0410-832d-ea1e28bc413d

--- deal.II/cmake/modules/FindMUMPS.cmake
+++ deal.II/cmake/modules/FindMUMPS.cmake
@@ -62,7 +62,7 @@
 # If we can find libport.so (or similiar), link it in as well:
 #
 FIND_LIBRARY(PORD_LIBRARY
-  NAMES port
+  NAMES pord
   HINTS
     ${MUMPS_DIR}
   PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib


Enable -Ofast in Release

Enable -Ofast in Release

--- common/cmake/CommonHeader.cmake
+++ common/cmake/CommonHeader.cmake
@@ -36,10 +36,10 @@
 else ()
 	list (APPEND COMPILER_FLAGS_TO_CHECK -Wall -Wextra -Wshadow -Wnon-virtual-dtor -pedantic)
 	if (cmake_build_type_tolower STREQUAL "debug")
-		list (APPEND COMPILER_FLAGS_TO_CHECK -g -O0 --coverage)
+		list (APPEND COMPILER_FLAGS_TO_CHECK -g -Og --coverage)
 		link_libraries (--coverage)
 	else ()
-		list (APPEND COMPILER_FLAGS_TO_CHECK -march=native -mtune=native)
+		list (APPEND COMPILER_FLAGS_TO_CHECK -Ofast -march=native -mtune=native)
 	endif ()
 endif ()


HandleLLVMOptions.cmake: Typo in comment.

git-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@200498 91177308-0d34-0410-b5e6-96231b3b80d8

--- cmake/modules/HandleLLVMOptions.cmake
+++ cmake/modules/HandleLLVMOptions.cmake
@@ -362,7 +362,7 @@

 if(MSVC)
   # Remove flags here, for exceptions and RTTI.
-  # Each target property of source proerty should be responsible to control them.
+  # Each target property or source proerty should be responsible to control them.
   # CL.EXE complains to override flags like "/GR /GR-".
   string(REGEX REPLACE "(^| ) */EH[-cs]+ *( |$)" "\\1 \\2" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
   string(REGEX REPLACE "(^| ) */GR-? *( |$)" "\\1 \\2" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")


Re-enabling the C4065 warning for MSVC builds as it no longer fires due to tablegen.

git-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@187252 91177308-0d34-0410-b5e6-96231b3b80d8

--- cmake/modules/HandleLLVMOptions.cmake
+++ cmake/modules/HandleLLVMOptions.cmake
@@ -166,7 +166,6 @@
     -D_SCL_SECURE_NO_WARNINGS

     # Disabled warnings.
-    -wd4065 # Suppress 'switch statement contains 'default' but no 'case' labels'
     -wd4146 # Suppress 'unary minus operator applied to unsigned type, result still unsigned'
     -wd4180 # Suppress 'qualifier applied to function type has no meaning; ignored'
     -wd4181 # Suppress 'qualifier applied to reference type; ignored'


Fix check in 'hunter_setup_msvc'

Fix check in 'hunter_setup_msvc'

--- cmake/modules/hunter_setup_msvc.cmake
+++ cmake/modules/hunter_setup_msvc.cmake
@@ -137,7 +137,7 @@
           set(_hunter_vcvarsall_path
               "${_hunter_vcvarsall_path}/../../VC/Auxiliary/Build"
           )
-        elseif(is_msbuild_empty AND IS_ABSOLUTE "${CMAKE_VS_MSBUILD_COMMAND}")
+        elseif(NOT is_msbuild_empty AND IS_ABSOLUTE "${CMAKE_VS_MSBUILD_COMMAND}")
           get_filename_component(_hunter_vcvarsall_path
               "${CMAKE_VS_MSBUILD_COMMAND}" DIRECTORY
           )


Use the usResourceCompiler target name if available.

This establishes proper build system dependencies, making sure the
executable is build before it is used.

--- CMake/usFunctionEmbedResources.cmake
+++ CMake/usFunctionEmbedResources.cmake
@@ -79,9 +79,14 @@
     set(us_lib_name "\"\"")
   endif()

+  set(resource_compiler ${CppMicroServices_RCC_EXECUTABLE})
+  if(TARGET ${CppMicroServices_RCC_EXECUTABLE_NAME})
+    set(resource_compiler ${CppMicroServices_RCC_EXECUTABLE_NAME})
+  endif()
+
   add_custom_command(
     OUTPUT ${us_cpp_resource_file}
-    COMMAND ${CppMicroServices_RCC_EXECUTABLE} "${us_lib_name}" ${us_cpp_resource_file} ${absolute_res_files}
+    COMMAND ${resource_compiler} "${us_lib_name}" ${us_cpp_resource_file} ${absolute_res_files}
     WORKING_DIRECTORY ${US_RESOURCE_ROOT_DIR}
     DEPENDS ${absolute_res_files}
     COMMENT "Generating embedded resource file ${us_cpp_resource_name}"


add_python_extension: Re-organize code to call target_link_libraries once.

This is done anticipating further refactoring.

--- cmake/Extensions.cmake
+++ cmake/Extensions.cmake
@@ -152,13 +152,18 @@
     elseif(WIN32 AND NOT BUILD_SHARED)
         # Extensions cannot be built against a static libpython on windows
     else(BUILTIN_${upper_name})
+
         add_library(${target_name} SHARED ${absolute_sources})
         include_directories(${ADD_PYTHON_EXTENSION_INCLUDEDIRS})
+
+        if(WIN32)
+            list(APPEND ADD_PYTHON_EXTENSION_LIBRARIES libpython-shared)
+        endif()
+
         target_link_libraries(${target_name} ${ADD_PYTHON_EXTENSION_LIBRARIES})

         if(WIN32)
             #list(APPEND ADD_PYTHON_EXTENSION_DEFINITIONS Py_NO_ENABLE_SHARED)
-            target_link_libraries(${target_name} libpython-shared)
             if(MINGW)
                 set_target_properties(${target_name} PROPERTIES
                     LINK_FLAGS -Wl,--enable-auto-import


do not confuse Eigen3 or beta versions of Eigen3 with Eigen2

--- cmake/FindEigen2.cmake
+++ cmake/FindEigen2.cmake
@@ -39,11 +39,11 @@
   set(EIGEN2_MINOR_VERSION "${CMAKE_MATCH_1}")

   set(EIGEN2_VERSION ${EIGEN2_WORLD_VERSION}.${EIGEN2_MAJOR_VERSION}.${EIGEN2_MINOR_VERSION})
-  if(${EIGEN2_VERSION} VERSION_LESS ${Eigen2_FIND_VERSION})
+  if((${EIGEN2_WORLD_VERSION} NOTEQUAL 2) OR (${EIGEN2_MAJOR_VERSION} GREATER 10) OR (${EIGEN2_VERSION} VERSION_LESS ${Eigen2_FIND_VERSION}))
     set(EIGEN2_VERSION_OK FALSE)
-  else(${EIGEN2_VERSION} VERSION_LESS ${Eigen2_FIND_VERSION})
+  else()
     set(EIGEN2_VERSION_OK TRUE)
-  endif(${EIGEN2_VERSION} VERSION_LESS ${Eigen2_FIND_VERSION})
+  endif()

   if(NOT EIGEN2_VERSION_OK)


Update FindMatlab.cmake

Update FindMatlab.cmake

Added Matlab 2016


downgrade warnings for googletest (#1203)

fixes #1202. sort of.

--- cmake/GoogleTest.cmake
+++ cmake/GoogleTest.cmake
@@ -29,6 +29,9 @@

 include(${GOOGLETEST_PREFIX}/googletest-paths.cmake)

+# TODO(dominic): See #1202. Remove if https://github.com/google/googletest/pull/3492 lands upstream.
+add_compile_options(-w)
+
 # Add googletest directly to our build. This defines
 # the gtest and gtest_main targets.
 add_subdirectory(${GOOGLETEST_SOURCE_DIR}


cmake: Fix bug where -Wno- flags could not be compatbility-checked

It turns out that 'check_compiler_flag' has not been working for flags
that start with -Wno-. This has caused old compilers to accidentally
use flags that they do not support.

To fix this we check for compatibility with the appropriate -W flag
instead and infer the -Wno- compatibility from this check.

The root cause of this problem is explained well here:

https://github.com/zephyrproject-rtos/zephyr/pull/18922#discussion_r321537098

Signed-off-by: Sebastian Bøe <edee888afd63e94916688495334700803eba20a0@nordicsemi.no>

--- cmake/extensions.cmake
+++ cmake/extensions.cmake
@@ -747,8 +747,17 @@
     return()
   endif()

-  # Test the flag
-  check_compiler_flag(${lang} "${option}" inner_check)
+  # Flags that start with -Wno-<warning> can not be tested by
+  # check_compiler_flag, they will always pass, but -W<warning> can be
+  # tested, so to test -Wno-<warning> flags we test -W<warning>
+  # instead.
+  if("${option}" MATCHES "-Wno-(.*)")
+    set(possibly_translated_option -W${CMAKE_MATCH_1})
+  else()
+    set(possibly_translated_option ${option})
+  endif()
+
+  check_compiler_flag(${lang} "${possibly_translated_option}" inner_check)

   set(${check} ${inner_check} PARENT_SCOPE)


Split off 7.8.12

Split off 7.8.12

Signed-off-by: Richard Chapman <5900d56196fe29dba8e3ae556d57eae28e9f0195@hpccsystems.com>

--- version.cmake
+++ version.cmake
@@ -5,7 +5,7 @@
 set ( HPCC_PROJECT "nagios-monitoring" )
 set ( HPCC_MAJOR 7 )
 set ( HPCC_MINOR 8 )
-set ( HPCC_POINT 11 )
+set ( HPCC_POINT 13 )
 set ( HPCC_MATURITY "closedown" )
 set ( HPCC_SEQUENCE 0 )
 ###


CMake: When boost-download removes test/doc/example folders from libs, it only looks in either the tools or the libs subfolder. Had issues with it removing .git/modules/test

--- src/cmake/boost-download.cmake
+++ src/cmake/boost-download.cmake
@@ -109,7 +109,8 @@

     file(GLOB_RECURSE NON_SOURCE_DIRS
         LIST_DIRECTORIES true
-        "${args_BOOST_DIR}/*"
+        "${args_BOOST_DIR}/libs/*"
+        "${args_BOOST_DIR}/tools/*"
     )
     # Filter away all folder-paths not ending in either "doc", "example" or "test"
     list(FILTER NON_SOURCE_DIRS


BUG: Bump Cuberille Commit Hash

BUG: Bump Cuberille Commit Hash

Recent patches to ITKCuberille have addressed a longstanding issue
which caused failures when generating itk::QuadEdgeMesh objects.
This commit updates the git commit hash, bringing this bugfix into
the master branch if ITK.

--- Modules/Remote/Cuberille.remote.cmake
+++ Modules/Remote/Cuberille.remote.cmake
@@ -17,5 +17,5 @@
 http://www.insight-journal.org/browse/publication/213
 "
   GIT_REPOSITORY ${git_protocol}://github.com/InsightSoftwareConsortium/ITKCuberille.git
-  GIT_TAG 0fba9e190c931f34d31a362333765264101df1e8
+  GIT_TAG 026840c50eb2ca7e76a3b475a496b60ae0f5c603
   )


Do not store full CuDNN version in cache to exclude inconsistency during reconfiguration.

--- cmake/FindCUDNN.cmake
+++ cmake/FindCUDNN.cmake
@@ -78,12 +78,7 @@
   string(REGEX MATCH "define CUDNN_PATCHLEVEL ([0-9]+)" _ "${CUDNN_H_CONTENTS}")
   set(CUDNN_VERSION_PATCH ${CMAKE_MATCH_1} CACHE INTERNAL "")

-  set(CUDNN_VERSION
-    "${CUDNN_VERSION_MAJOR}.${CUDNN_VERSION_MINOR}.${CUDNN_VERSION_PATCH}"
-    CACHE
-    STRING
-    "cuDNN version"
-  )
+  set(CUDNN_VERSION "${CUDNN_VERSION_MAJOR}.${CUDNN_VERSION_MINOR}.${CUDNN_VERSION_PATCH}")

   unset(CUDNN_H_CONTENTS)
 endif()