[CMake] Adding experimental support for tvOS and watchOS

Summary:
* Refactored the iOS config-ix.cmake code to be a more compact loop over supported embedded platforms.
* Added watchOS and tvOS as experimental platforms, they don't currently build so they are disabled by default

Reviewers: zaks.anna, kubabrecka, samsonov

Subscribers: llvm-commits

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

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

--- cmake/config-ix.cmake
+++ cmake/config-ix.cmake
@@ -299,10 +299,44 @@
   endif()

   option(COMPILER_RT_ENABLE_IOS "Enable building for iOS - Experimental" Off)
+  option(COMPILER_RT_ENABLE_WATCHOS "Enable building for watchOS - Experimental" Off)
+  option(COMPILER_RT_ENABLE_TVOS "Enable building for tvOS - Experimental" Off)

   find_darwin_sdk_dir(DARWIN_osx_SYSROOT macosx)
   find_darwin_sdk_dir(DARWIN_iossim_SYSROOT iphonesimulator)
   find_darwin_sdk_dir(DARWIN_ios_SYSROOT iphoneos)
+  find_darwin_sdk_dir(DARWIN_watchossim_SYSROOT watchsimulator)
+  find_darwin_sdk_dir(DARWIN_watchos_SYSROOT watchos)
+  find_darwin_sdk_dir(DARWIN_tvossim_SYSROOT appletvsimulator)
+  find_darwin_sdk_dir(DARWIN_tvos_SYSROOT appletvos)
+
+  if(COMPILER_RT_ENABLE_IOS)
+    list(APPEND DARWIN_EMBEDDED_PLATFORMS ios)
+    set(DARWIN_ios_MIN_VER_FLAG -miphoneos-version-min)
+    set(DARWIN_ios_SANITIZER_MIN_VER_FLAG
+      ${DARWIN_ios_MIN_VER_FLAG}=7.0)
+    set(DARWIN_ios_BUILTIN_MIN_VER 6.0)
+    set(DARWIN_ios_BUILTIN_MIN_VER_FLAG
+      ${DARWIN_ios_MIN_VER_FLAG}=${DARWIN_ios_BUILTIN_MIN_VER})
+  endif()
+  if(COMPILER_RT_ENABLE_WATCHOS)
+    list(APPEND DARWIN_EMBEDDED_PLATFORMS watchos)
+    set(DARWIN_watchos_MIN_VER_FLAG -mwatchos-version-min)
+    set(DARWIN_watchos_SANITIZER_MIN_VER_FLAG
+      ${DARWIN_watchos_MIN_VER_FLAG}=2.0)
+    set(DARWIN_watchos_BUILTIN_MIN_VER 2.0)
+    set(DARWIN_watchos_BUILTIN_MIN_VER_FLAG
+      ${DARWIN_watchos_MIN_VER_FLAG}=${DARWIN_watchos_BUILTIN_MIN_VER})
+  endif()
+  if(COMPILER_RT_ENABLE_TVOS)
+    list(APPEND DARWIN_EMBEDDED_PLATFORMS tvos)
+    set(DARWIN_tvos_MIN_VER_FLAG -mtvos-version-min)
+    set(DARWIN_tvos_SANITIZER_MIN_VER_FLAG
+      ${DARWIN_tvos_MIN_VER_FLAG}=9.0)
+    set(DARWIN_tvos_BUILTIN_MIN_VER 9.0)
+    set(DARWIN_tvos_BUILTIN_MIN_VER_FLAG
+      ${DARWIN_tvos_MIN_VER_FLAG}=${DARWIN_tvos_BUILTIN_MIN_VER})
+  endif()

   # Note: In order to target x86_64h on OS X the minimum deployment target must
   # be 10.8 or higher.
@@ -384,62 +418,62 @@
       list(APPEND BUILTIN_SUPPORTED_OS 10.4)
     endif()

-    if(DARWIN_iossim_SYSROOT)
-      set(DARWIN_iossim_CFLAGS
-        ${DARWIN_COMMON_CFLAGS}
-        -mios-simulator-version-min=7.0
-        -isysroot ${DARWIN_iossim_SYSROOT})
-      set(DARWIN_iossim_LINKFLAGS
-        ${DARWIN_COMMON_LINKFLAGS}
-        -mios-simulator-version-min=7.0
-        -isysroot ${DARWIN_iossim_SYSROOT})
-      set(DARWIN_iossim_BUILTIN_MIN_VER 6.0)
-      set(DARWIN_iossim_BUILTIN_MIN_VER_FLAG
-        -mios-simulator-version-min=${DARWIN_iossim_BUILTIN_MIN_VER})
-
-      set(DARWIN_iossim_SKIP_CC_KEXT On)
-      darwin_test_archs(iossim
-        DARWIN_iossim_ARCHS
-        ${toolchain_arches})
-      message(STATUS "iOS Simulator supported arches: ${DARWIN_iossim_ARCHS}")
-      if(DARWIN_iossim_ARCHS)
-        list(APPEND SANITIZER_COMMON_SUPPORTED_OS iossim)
-        list(APPEND BUILTIN_SUPPORTED_OS iossim)
-        list(APPEND PROFILE_SUPPORTED_OS iossim)
+    foreach(platform ${DARWIN_EMBEDDED_PLATFORMS})
+      if(DARWIN_${platform}sim_SYSROOT)
+        set(DARWIN_${platform}sim_CFLAGS
+          ${DARWIN_COMMON_CFLAGS}
+          ${DARWIN_${platform}_SANITIZER_MIN_VER_FLAG}
+          -isysroot ${DARWIN_iossim_SYSROOT})
+        set(DARWIN_${platform}sim_LINKFLAGS
+          ${DARWIN_COMMON_LINKFLAGS}
+          ${DARWIN_${platform}_SANITIZER_MIN_VER_FLAG}
+          -isysroot ${DARWIN_${platform}sim_SYSROOT})
+        set(DARWIN_${platform}sim_BUILTIN_MIN_VER
+          ${DARWIN_${platform}_BUILTIN_MIN_VER})
+        set(DARWIN_${platform}sim_BUILTIN_MIN_VER_FLAG
+          ${DARWIN_${platform}_BUILTIN_MIN_VER_FLAG})
+
+        set(DARWIN_${platform}sim_SKIP_CC_KEXT On)
+        darwin_test_archs(${platform}sim
+          DARWIN_${platform}sim_ARCHS
+          ${toolchain_arches})
+        message(STATUS "${platform} Simulator supported arches: ${DARWIN_${platform}sim_ARCHS}")
+        if(DARWIN_iossim_ARCHS)
+          list(APPEND SANITIZER_COMMON_SUPPORTED_OS ${platform}sim)
+          list(APPEND BUILTIN_SUPPORTED_OS ${platform}sim)
+          list(APPEND PROFILE_SUPPORTED_OS ${platform}sim)
+        endif()
+        foreach(arch ${DARWIN_${platform}sim_ARCHS})
+          list(APPEND COMPILER_RT_SUPPORTED_ARCH ${arch})
+          set(CAN_TARGET_${arch} 1)
+        endforeach()
       endif()
-      foreach(arch ${DARWIN_iossim_ARCHS})
-        list(APPEND COMPILER_RT_SUPPORTED_ARCH ${arch})
-        set(CAN_TARGET_${arch} 1)
-      endforeach()
-    endif()
-
-    if(DARWIN_ios_SYSROOT AND COMPILER_RT_ENABLE_IOS)
-      set(DARWIN_ios_CFLAGS
-        ${DARWIN_COMMON_CFLAGS}
-        -miphoneos-version-min=7.0
-        -isysroot ${DARWIN_ios_SYSROOT})
-      set(DARWIN_ios_LINKFLAGS
-        ${DARWIN_COMMON_LINKFLAGS}
-        -miphoneos-version-min=7.0
-        -isysroot ${DARWIN_ios_SYSROOT})
-      set(DARWIN_ios_BUILTIN_MIN_VER 6.0)
-      set(DARWIN_ios_BUILTIN_MIN_VER_FLAG
-        -miphoneos-version-min=${DARWIN_ios_BUILTIN_MIN_VER})
-
-      darwin_test_archs(ios
-        DARWIN_ios_ARCHS
-        ${toolchain_arches})
-      message(STATUS "iOS supported arches: ${DARWIN_ios_ARCHS}")
-      if(DARWIN_ios_ARCHS)
-        list(APPEND SANITIZER_COMMON_SUPPORTED_OS ios)
-        list(APPEND BUILTIN_SUPPORTED_OS ios)
-        list(APPEND PROFILE_SUPPORTED_OS ios)
+
+      if(DARWIN_${platform}_SYSROOT)
+        set(DARWIN_${platform}_CFLAGS
+          ${DARWIN_COMMON_CFLAGS}
+          ${DARWIN_${platform}_SANITIZER_MIN_VER_FLAG}
+          -isysroot ${DARWIN_${platform}_SYSROOT})
+        set(DARWIN_${platform}_LINKFLAGS
+          ${DARWIN_COMMON_LINKFLAGS}
+          ${DARWIN_${platform}_SANITIZER_MIN_VER_FLAG}
+          -isysroot ${DARWIN_${platform}_SYSROOT})
+
+        darwin_test_archs(${platform}
+          DARWIN_${platform}_ARCHS
+          ${toolchain_arches})
+        message(STATUS "${platform} supported arches: ${DARWIN_${platform}_ARCHS}")
+        if(DARWIN_${platform}_ARCHS)
+          list(APPEND SANITIZER_COMMON_SUPPORTED_OS ${platform})
+          list(APPEND BUILTIN_SUPPORTED_OS ${platform})
+          list(APPEND PROFILE_SUPPORTED_OS ${platform})
+        endif()
+        foreach(arch ${DARWIN_${platform}_ARCHS})
+          list(APPEND COMPILER_RT_SUPPORTED_ARCH ${arch})
+          set(CAN_TARGET_${arch} 1)
+        endforeach()
       endif()
-      foreach(arch ${DARWIN_ios_ARCHS})
-        list(APPEND COMPILER_RT_SUPPORTED_ARCH ${arch})
-        set(CAN_TARGET_${arch} 1)
-      endforeach()
-    endif()
+    endforeach()
   endif()

   # for list_union


r9434/sofa : cmake: link to the boost/lib directory

Former-commit-id: d013dabed307092d4f99bcb6b70b293892b6eb93


fixed _HDF5USEDLL_ redifined warning

fixed _HDF5USEDLL_ redifined warning

--- config/FindHDF5.cmake
+++ config/FindHDF5.cmake
@@ -8,13 +8,15 @@
     FIND_LIBRARY(HDF5_CORE_LIBRARY NAMES hdf5dll hdf5  )
     FIND_LIBRARY(HDF5_HL_LIBRARY NAMES hdf5_hldll hdf5_hl  )

-    IF(WIN32 AND HDF5_CORE_LIBRARY MATCHES "dll.lib$")
-        SET(HDF5_CFLAGS "-D_HDF5USEDLL_")
-        SET(HDF5_CPPFLAGS "-D_HDF5USEDLL_ -DHDF5CPP_USEDLL")
-    ELSE()
-        SET(HDF5_CFLAGS)
-        SET(HDF5_CPPFLAGS)
-    ENDIF()
+    # in new HDF5 versions, this is automatically defined
+    # (but I don't know the first version were this is true)
+    # IF(WIN32 AND HDF5_CORE_LIBRARY MATCHES "dll.lib$")
+        # SET(HDF5_CFLAGS "-D_HDF5USEDLL_")
+        # SET(HDF5_CPPFLAGS "-D_HDF5USEDLL_ -DHDF5CPP_USEDLL")
+    # ELSE()
+        # SET(HDF5_CFLAGS)
+        # SET(HDF5_CPPFLAGS)
+    # ENDIF()

     SET(HDF5_VERSION_MAJOR 1)
     SET(HDF5_VERSION_MINOR 8)


set boost flags to zero if not found

set boost flags to zero if not found

--- cmake/MCKL.cmake
+++ cmake/MCKL.cmake
@@ -273,10 +273,10 @@
 include(FindBoost)
 if(Boost_FOUND)
     set(FEATURES ${FEATURES} "Boost")
-    set(MCKL_INCLUDE_DIRS ${MCKL_INCLUDE_DIRS} ${Boost_INCLUDE_DIR})
+    set(MCKL_INCLUDE_DIRS ${MCKL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
     set(MCKL_DEFINITIONS ${MCKL_DEFINITIONS} -DMCKL_HAS_BOOST=1)
 else(Boost_FOUND)
-    set(MCKL_DEFINITIONS ${MCKL_DEFINITIONS} -DMCKL_HAS_BOOST=1)
+    set(MCKL_DEFINITIONS ${MCKL_DEFINITIONS} -DMCKL_HAS_BOOST=0)
 endif(Boost_FOUND)

 # Random123


Fixing cmake bug when build with BUILD_ONLY

--- cmake/sdks.cmake
+++ cmake/sdks.cmake
@@ -129,9 +129,6 @@
     endif()
 endforeach(custom_client)

-LIST(REMOVE_DUPLICATES SDK_BUILD_LIST)
-LIST(REMOVE_DUPLICATES SDK_DEPENDENCY_BUILD_LIST)
-
 # when building a fixed target set, missing SDKs are an error
 # when building "everything", we forgive missing SDKs; should this become an option instead?
 if(BUILD_ONLY)
@@ -148,15 +145,12 @@
     foreach (SDK IN LISTS TEMP_SDK_DEPENDENCY_BUILD_LIST)
         list(FIND SDK_BUILD_LIST ${SDK} DEPENDENCY_INDEX)
         if(DEPENDENCY_INDEX LESS 0)
-            find_package("aws-cpp-sdk-${SDK}" QUIET)
-            if (NOT ${SDK}_FOUND)
-                set(SDK_DIR "aws-cpp-sdk-${SDK}")
-                if (NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SDK_DIR}")
-                    message(FATAL_ERROR "${SDK} is required for build, but ${SDK_DIR} directory is missing!")
-                endif ()
-            else ()
-                list(REMOVE_ITEM SDK_DEPENDENCY_BUILD_LIST ${SDK})
-            endif ()
+            # test dependencies should also be built from source instead of locating by calling find_package
+            # which may cause version conflicts as well as double targeting built targets
+            set(SDK_DIR "aws-cpp-sdk-${SDK}")
+            if (NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SDK_DIR}")
+                message(FATAL_ERROR "${SDK} is required for build, but ${SDK_DIR} directory is missing!")
+            endif ()
         else ()
             list(REMOVE_ITEM SDK_DEPENDENCY_BUILD_LIST ${SDK})
         endif ()
@@ -167,17 +161,16 @@
     endforeach()
 endif()

+LIST(REMOVE_DUPLICATES SDK_BUILD_LIST)
+LIST(REMOVE_DUPLICATES SDK_DEPENDENCY_BUILD_LIST)
+
 macro(add_sdks)
     LIST(APPEND EXPORTS "")

     foreach(SDK IN LISTS SDK_BUILD_LIST)
         set(SDK_DIR "aws-cpp-sdk-${SDK}")
-        # when building with BUILD_ONLY, we will try to find dependencies first by calling find_package
-        # well find_package will set up target if library exists, so here to avoid duplicate target we
-        # test the existence of target first
-        if (NOT TARGET ${SDK_DIR})
-            add_subdirectory("${SDK_DIR}")
-        endif()
+
+        add_subdirectory("${SDK_DIR}")
         LIST(APPEND EXPORTS "${SDK_DIR}")
     endforeach()


Fix for FBX 2015

Fix for FBX 2015

--- FindFBX.cmake
+++ FindFBX.cmake
@@ -14,8 +14,11 @@
 #               The root directory of the FBX SDK install

 if(NOT FBX_VERSION)
-    set(FBX_VERSION 2014.1)
+    set(FBX_VERSION 2014.2)
 endif()
+string(REGEX REPLACE "^([0-9]+).*$" "\\1" FBX_VERSION_MAJOR "${FBX_VERSION}")
+string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*$" "\\1" FBX_VERSION_MINOR  "${FBX_VERSION}")
+string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" FBX_VERSION_PATCH "${FBX_VERSION}")

 set(FBX_MAC_LOCATIONS
     "/Applications/Autodesk/FBX\ SDK/${FBX_VERSION}"
@@ -42,11 +45,17 @@
     set(${_endvar} ${_output} PARENT_SCOPE)
 endfunction()

+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    set(fbx_compiler clang)
+elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    set(fbx_compiler gcc4)
+endif()
+
 function(_fbx_find_library _name _lib _suffix)
     find_library(${_name}
         NAMES ${_lib}
         HINTS ${FBX_SEARCH_LOCATIONS}
-        PATH_SUFFIXES lib/gcc4/ub/${_suffix} lib/vs2012/x64/${_suffix} lib/vs2010/x64/${_suffix} lib/vs2008/x64/${_suffix}
+        PATH_SUFFIXES lib/${fbx_compiler}/ub/${_suffix} lib/vs2013/x64/${_suffix} lib/vs2012/x64/${_suffix} lib/vs2010/x64/${_suffix} lib/vs2008/x64/${_suffix}
     )
     mark_as_advanced(${_name})
 endfunction()


Bump version number

Bump version number

--- version.cmake
+++ version.cmake
@@ -1 +1 @@
-set(autowiring_VERSION 0.4.3)
+set(autowiring_VERSION 0.4.4)


Split off 8.10.6

Split off 8.10.6

Signed-off-by: Gavin Halliday <2edfa8aca9fb78974188e5b35be8b52d4e4967ae@lexisnexis.com>

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


Update falcosecurity/libs version

Update falcosecurity/libs version

This moves up the commit to one that has plugins support.

Co-authored-by: Leonardo Grasso <b1c1d8736f20db3fb6c1c66bb1455ed43909f0d8@leonardograsso.com>
Co-authored-by: Loris Degioanni <2d8bc52360ae75b64057a85ebc6decd9d68bb36c@sysdig.com>
Signed-off-by: Mark Stemm <1b6cbc2e568a933a16c6fa30b73e50cd507debf7@gmail.com>

--- cmake/modules/falcosecurity-libs.cmake
+++ cmake/modules/falcosecurity-libs.cmake
@@ -20,8 +20,8 @@
 # default below In case you want to test against another falcosecurity/libs version just pass the variable - ie., `cmake
 # -DFALCOSECURITY_LIBS_VERSION=dev ..`
 if(NOT FALCOSECURITY_LIBS_VERSION)
-  set(FALCOSECURITY_LIBS_VERSION "a03ccfda795f2ba711b80f69cb06869f2b63121b")
-  set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=97ce5c30b985b77e1abb04ef7037c69be176cbe2122acf67a7f6ec6b39dbdc27")
+  set(FALCOSECURITY_LIBS_VERSION "340be865d951d1a9ee140daad7fb5a3d40d4d7dc")
+  set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=75b04026ce4090e944df22cfb9ebfa1fc32955222b10339097105ea9db1b3d49")
 endif()

 # cd /path/to/build && cmake /path/to/source


[Build] Added support for RMOL and AirInv in the CMake framework.

--- config/project_config_embeddable.cmake
+++ config/project_config_embeddable.cmake
@@ -120,7 +120,11 @@
   if (NOT EXISTS ${DOC_INSTALL_FILE})
     unset (DOC_INSTALL_FILE)
   endif (NOT EXISTS ${DOC_INSTALL_FILE})
-  set (BASICDOC_FILES AUTHORS NEWS README ${DOC_INSTALL_FILE})
+  set (DOC_NEWS_FILE NEWS)
+  if (NOT EXISTS ${DOC_NEWS_FILE})
+    unset (DOC_NEWS_FILE)
+  endif (NOT EXISTS ${DOC_NEWS_FILE})
+  set (BASICDOC_FILES AUTHORS ${DOC_NEWS_FILE} README ${DOC_INSTALL_FILE})
   set (BASICDOC_PATH "share/doc/${PACKAGE}-${PACKAGE_VERSION}")

 endmacro (set_project_options)
@@ -291,9 +295,49 @@
       get_stdair (${_arg_version})
     endif (${_arg_lower} STREQUAL "stdair")

+    if (${_arg_lower} STREQUAL "sevmgr")
+      get_sevmgr (${_arg_version})
+    endif (${_arg_lower} STREQUAL "sevmgr")
+
+    if (${_arg_lower} STREQUAL "trademgen")
+      get_trademgen (${_arg_version})
+    endif (${_arg_lower} STREQUAL "trademgen")
+
+    if (${_arg_lower} STREQUAL "travelccm")
+      get_travelccm (${_arg_version})
+    endif (${_arg_lower} STREQUAL "travelccm")
+
+    if (${_arg_lower} STREQUAL "airsched")
+      get_airsched (${_arg_version})
+    endif (${_arg_lower} STREQUAL "airsched")
+
     if (${_arg_lower} STREQUAL "airrac")
       get_airrac (${_arg_version})
     endif (${_arg_lower} STREQUAL "airrac")
+
+    if (${_arg_lower} STREQUAL "rmol")
+      get_rmol (${_arg_version})
+    endif (${_arg_lower} STREQUAL "rmol")
+
+    if (${_arg_lower} STREQUAL "airinv")
+      get_airinv (${_arg_version})
+    endif (${_arg_lower} STREQUAL "airinv")
+
+    if (${_arg_lower} STREQUAL "avlcal")
+      get_avlcal (${_arg_version})
+    endif (${_arg_lower} STREQUAL "avlcal")
+
+    if (${_arg_lower} STREQUAL "simfqt")
+      get_simfqt (${_arg_version})
+    endif (${_arg_lower} STREQUAL "simfqt")
+
+    if (${_arg_lower} STREQUAL "simlfs")
+      get_simlfs (${_arg_version})
+    endif (${_arg_lower} STREQUAL "simlfs")
+
+    if (${_arg_lower} STREQUAL "simcrs")
+      get_simcrs (${_arg_version})
+    endif (${_arg_lower} STREQUAL "simcrs")

     if (${_arg_lower} STREQUAL "doxygen")
       get_doxygen (${_arg_version})
@@ -577,6 +621,70 @@
   endif (AirRAC_FOUND)

 endmacro (get_airrac)
+
+# ~~~~~~~~~~ RMOL ~~~~~~~~~
+macro (get_rmol)
+  unset (_required_version)
+  if (${ARGC} GREATER 0)
+    set (_required_version ${ARGV0})
+    message (STATUS "Requires RMOL-${_required_version}")
+  else (${ARGC} GREATER 0)
+    message (STATUS "Requires RMOL without specifying any version")
+  endif (${ARGC} GREATER 0)
+
+  find_package (RMOL ${_required_version} REQUIRED
+	HINTS ${WITH_RMOL_PREFIX})
+  if (RMOL_FOUND)
+    #
+    message (STATUS "Found RMOL version: ${RMOL_VERSION}")
+
+    # Update the list of include directories for the project
+    include_directories (${RMOL_INCLUDE_DIRS})
+
+    # Update the list of dependencies for the project
+    set (PROJ_DEP_LIBS_FOR_LIB ${PROJ_DEP_LIBS_FOR_LIB} ${RMOL_LIBRARIES})
+
+  else (RMOL_FOUND)
+    set (ERROR_MSG "The RMOL library cannot be found. If it is installed in")
+    set (ERROR_MSG "${ERROR_MSG} a in a non standard directory, just invoke")
+    set (ERROR_MSG "${ERROR_MSG} 'cmake' specifying the -DWITH_RMOL_PREFIX=")
+    set (ERROR_MSG "${ERROR_MSG}<RMOL install path> variable.")
+    message (FATAL_ERROR "${ERROR_MSG}")
+  endif (RMOL_FOUND)
+
+endmacro (get_rmol)
+
+# ~~~~~~~~~~ Airinv ~~~~~~~~~
+macro (get_airinv)
+  unset (_required_version)
+  if (${ARGC} GREATER 0)
+    set (_required_version ${ARGV0})
+    message (STATUS "Requires Airinv-${_required_version}")
+  else (${ARGC} GREATER 0)
+    message (STATUS "Requires Airinv without specifying any version")
+  endif (${ARGC} GREATER 0)
+
+  find_package (Airinv ${_required_version} REQUIRED
+	HINTS ${WITH_AIRINV_PREFIX})
+  if (Airinv_FOUND)
+    #
+    message (STATUS "Found Airinv version: ${AIRINV_VERSION}")
+
+    # Update the list of include directories for the project
+    include_directories (${AIRINV_INCLUDE_DIRS})
+
+    # Update the list of dependencies for the project
+    set (PROJ_DEP_LIBS_FOR_LIB ${PROJ_DEP_LIBS_FOR_LIB} ${AIRINV_LIBRARIES})
+
+  else (Airinv_FOUND)
+    set (ERROR_MSG "The Airinv library cannot be found. If it is installed in")
+    set (ERROR_MSG "${ERROR_MSG} a in a non standard directory, just invoke")
+    set (ERROR_MSG "${ERROR_MSG} 'cmake' specifying the -DWITH_AIRINV_PREFIX=")
+    set (ERROR_MSG "${ERROR_MSG}<Airinv install path> variable.")
+    message (FATAL_ERROR "${ERROR_MSG}")
+  endif (Airinv_FOUND)
+
+endmacro (get_airinv)

 ##############################################
@@ -1572,6 +1680,34 @@
     message (STATUS "  - AIRRAC_INCLUDE_DIRS ........ : ${AIRRAC_INCLUDE_DIRS}")
   endif (AirRAC_FOUND)
 endmacro (display_airrac)
+
+# RMOL
+macro (display_rmol)
+  if (RMOL_FOUND)
+    message (STATUS)
+    message (STATUS "* RMOL:")
+    message (STATUS "  - RMOL_VERSION ............... : ${RMOL_VERSION}")
+    message (STATUS "  - RMOL_BINARY_DIRS ........... : ${RMOL_BINARY_DIRS}")
+    message (STATUS "  - RMOL_EXECUTABLES ........... : ${RMOL_EXECUTABLES}")
+    message (STATUS "  - RMOL_LIBRARY_DIRS .......... : ${RMOL_LIBRARY_DIRS}")
+    message (STATUS "  - RMOL_LIBRARIES ............. : ${RMOL_LIBRARIES}")
+    message (STATUS "  - RMOL_INCLUDE_DIRS .......... : ${RMOL_INCLUDE_DIRS}")
+  endif (RMOL_FOUND)
+endmacro (display_rmol)
+
+# Airinv
+macro (display_airinv)
+  if (Airinv_FOUND)
+    message (STATUS)
+    message (STATUS "* Airinv:")
+    message (STATUS "  - AIRINV_VERSION ............. : ${AIRINV_VERSION}")
+    message (STATUS "  - AIRINV_BINARY_DIRS ......... : ${AIRINV_BINARY_DIRS}")
+    message (STATUS "  - AIRINV_EXECUTABLES ......... : ${AIRINV_EXECUTABLES}")
+    message (STATUS "  - AIRINV_LIBRARY_DIRS ........ : ${AIRINV_LIBRARY_DIRS}")
+    message (STATUS "  - AIRINV_LIBRARIES ........... : ${AIRINV_LIBRARIES}")
+    message (STATUS "  - AIRINV_INCLUDE_DIRS ........ : ${AIRINV_INCLUDE_DIRS}")
+  endif (Airinv_FOUND)
+endmacro (display_airinv)

 ##
 macro (display_status_all_modules)
@@ -1658,6 +1794,8 @@
   display_soci ()
   display_stdair ()
   display_airrac ()
+  display_rmol ()
+  display_airinv ()
   #
   message (STATUS)
   message (STATUS "Change a value with: cmake -D<Variable>=<Value>" )


CMake: Cosmetic change: Do not print TARGET_SRC

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

--- deal.II/cmake/macros/macro_deal_ii_invoke_autopilot.cmake
+++ deal.II/cmake/macros/macro_deal_ii_invoke_autopilot.cmake
@@ -135,8 +135,7 @@
 #  Successfully set up project  ${TARGET}  with  ${DEAL_II_PACKAGE_NAME}-${DEAL_II_PACKAGE_VERSION}  found at
 #      ${DEAL_II_PATH}
 #
-#  CMAKE_BUILD_TYPE:   ${CMAKE_BUILD_TYPE}
-#  TARGET_SRC:         ${TARGET_SRC}
+#  CMAKE_BUILD_TYPE:         ${CMAKE_BUILD_TYPE}
 #
 #  You can now run
 #      $ make                - to compile and link the program


only set CPACK_GENERATOR if not defined

only set CPACK_GENERATOR if not defined

--- modules/macpro.cmake
+++ modules/macpro.cmake
@@ -298,8 +298,7 @@
     set(CPACK_PACKAGE_VERSION "unknown-version")
   endif()
   set(CPACK_PACKAGE_VENDOR "Space Dynamics Lab")
-  if(UNIX)
+  if(UNIX AND NOT DEFINED CPACK_GENERATOR)
     set(CPACK_GENERATOR STGZ) # STGZ = Self extracting Tar GZip compression
-    set(CPACK_SOURCE_GENERATOR) # none
-  endif()
-endmacro()
+  endif()
+endmacro()


CMake: Windows: Fixed configuration-dependent linkage of zlib.

The library generated by protobuf differs based on the configuration
and linkage.  For example, in Debug mode, the static library generated
is `zlibstaticd`, whereas in Release mode, the shared library is just
`zlib`.

Review: https://reviews.apache.org/r/59784/

--- 3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
+++ 3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
@@ -108,14 +108,23 @@
   # the library names are generated correctly.
   set(CURL_LFLAG     libcurl)

-  # Windows requires a static build of zlib.
-  set(ZLIB_LFLAG     zlibstaticd)
-
   set(PROTOBUF_LFLAG libprotobuf)

   # The generator expression below appends the letter "d"
   # when building the Debug configuration.
   string(APPEND PROTOBUF_LFLAG $<$<CONFIG:Debug>:d>)
+
+  # Zlib generates different libraries depending on the linkage
+  # and configuration.  i.e.:
+  #   * For a static Debug build: `zlibstaticd`.
+  #   * For a shared Release build: `zlib`.
+  set(ZLIB_LFLAG zlib)
+
+  if (NOT BUILD_SHARED_LIBS)
+    string(APPEND ZLIB_LFLAG static)
+  endif ()
+
+  string(APPEND ZLIB_LFLAG $<$<CONFIG:Debug>:d>)

   # Windows requires Dbghelp.lib when linking to glog.
   # NOTE: CMake's dependency graph does not pull in the `Dbghelp` library


Fix a small problem with add_subdirectory(${FLATBUFFERS_DIR}) from top level project. (#4764)

--- CMake/Version.cmake
+++ CMake/Version.cmake
@@ -1,7 +1,7 @@
 find_program(GIT git)
 execute_process(
     COMMAND ${GIT} describe
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     OUTPUT_VARIABLE GIT_DESCRIBE_DIRTY
     OUTPUT_STRIP_TRAILING_WHITESPACE
 )


ENH: superbuild: fix path to swig executable

--- SuperBuild/CMake/External_swig.cmake
+++ SuperBuild/CMake/External_swig.cmake
@@ -80,7 +80,7 @@
   endif()

   if(WIN32)
-    set(_SB_SWIG_EXECUTABLE ${SB_INSTALL_PREFIX}/bin/swig.exe)
+    set(_SB_SWIG_EXECUTABLE ${CMAKE_BINARY_DIR}/SWIG/src/SWIG/swig.exe)
   elseif(UNIX)
     set(_SB_SWIG_EXECUTABLE ${SB_INSTALL_PREFIX}/bin/swig)
   endif()


Moving towards new API, plus misc changes.

- Version number bumped and changelog removed (in favor of git)
- Dependencies are now handled automatically (via libfind_package)
- *_PROCESS_LIBS and *_PROCESS_INCLUDES are usually not needed at all
- Needs moar testing

--- LibFindMacros.cmake
+++ LibFindMacros.cmake
@@ -1,35 +1,20 @@
-# Version 2.0
+# Version 2.0+
 # Public Domain, originally written by Lasse Kärkkäinen <tronic>
 # Maintained at https://github.com/Tronic/cmake-modules
 # Please send your improvements as pull requests on Github.
-
-# Version (none) - originally published on 2009-10-08 on Kitware Public Wiki
-# Version 1.0 - update on Kitware Public Wiki
-# - Added a version number and a fancy header with license and authorship data,
-#   no other changes.
-# Version 2.0 - released 2014-05-30
-# - Development moved to https://github.com/Tronic/cmake-modules
-# - Remains compatible with older versions (drop-in replacement)
-# - Removed backwards compatibility with CMake older than 2.8
-# - Using function() rather than macro() where applicable
-# - Major code cleanup for better readability and more flexibility
-# - Added package version checks to libfind_process
-# - If a library fails to detect, none of its config options are hidden
-# - Added libfind_version_header for easy parsing of version.h
-# - Made pkg-config search QUIET
-# - Heavily improved error/warning messages on libfind_process

 # Works the same as find_package, but forwards the "REQUIRED" argument used for
 # the current package and always uses the "QUIET" flag. For this to work, the
 # first parameter must be the prefix of the current package, then the prefix of
 # the new package etc, which are passed to find_package.
-macro (libfind_package PREFIX)
-  set (LIBFIND_PACKAGE_ARGS ${ARGN} QUIET)
+macro (libfind_package PREFIX PKG)
+  set (LIBFIND_PACKAGE_ARGS ${PKG} ${ARGN} QUIET)
   if (${PREFIX}_FIND_REQUIRED)
     set (LIBFIND_PACKAGE_ARGS ${LIBFIND_PACKAGE_ARGS} REQUIRED)
   endif()
   find_package(${LIBFIND_PACKAGE_ARGS})
   unset(LIBFIND_PACKAGE_ARGS)
+  list(APPEND ${PREFIX}_DEPENDENCIES ${PKG})
 endmacro (libfind_package)

 # A simple wrapper to make pkg-config searches a bit easier.
@@ -105,13 +90,49 @@
   set(findver "${${PREFIX}_FIND_VERSION}")
   set(version "${${PREFIX}_VERSION}")

-  # Make sure that these don't already exist before we start making lists
+  # Lists of config option names (all, includes, libs)
   unset(configopts)
+  set(includeopts ${${PREFIX}_PROCESS_INCLUDES})
+  set(libraryopts ${${PREFIX}_PROCESS_LIBS})
+
+  # Process deps to add to
+  foreach (i ${PREFIX} ${${PREFIX}_DEPENDENCIES})
+    if (DEFINED ${i}_INCLUDE_OPTS OR DEFINED ${i}_LIBRARY_OPTS)
+      # The package seems to export option lists that we can use, woohoo!
+      list(APPEND includeopts ${${i}_INCLUDE_OPTS})
+      list(APPEND libraryopts ${${i}_LIBRARY_OPTS})
+    else()
+      # If plural forms don't exist or they equal singular forms
+      if ((NOT DEFINED ${i}_INCLUDE_DIRS AND NOT DEFINED ${i}_LIBRARIES) OR
+          ({i}_INCLUDE_DIR STREQUAL ${i}_INCLUDE_DIRS AND ${i}_LIBRARY STREQUAL ${i}_LIBRARIES))
+        # Singular forms can be used
+        if (DEFINED ${i}_INCLUDE_DIR)
+          list(APPEND includeopts ${i}_INCLUDE_DIR)
+        endif()
+        if (DEFINED ${i}_LIBRARY)
+          list(APPEND libraryopts ${i}_LIBRARY)
+        endif()
+      else()
+        # Oh no, we don't know the option names
+        message(FATAL_ERROR "We couldn't determine config variable names for ${i} includes and libs. Aieeh!")
+      endif()
+    endif()
+  endforeach()
+
+  if (includeopts)
+    list(REMOVE_DUPLICATES includeopts)
+  endif()
+
+  if (libraryopts)
+    list(REMOVE_DUPLICATES libraryopts)
+  endif()
+
+  # Include/library names separated by spaces (notice: not CMake lists)
   unset(includes)
   unset(libs)
-
+
   # Process all includes and set found false if any are missing
-  foreach (i ${${PREFIX}_PROCESS_INCLUDES})
+  foreach (i ${includeopts})
     list(APPEND configopts ${i})
     if (NOT "${${i}}" STREQUAL "${i}-NOTFOUND")
       set(includes ${includes} ${${i}})
@@ -122,7 +143,7 @@
   endforeach()

   # Process all libraries and set found false if any are missing
-  foreach (i ${${PREFIX}_PROCESS_LIBS})
+  foreach (i ${libraryopts})
     list(APPEND configopts ${i})
     if (NOT "${${i}}" STREQUAL "${i}-NOTFOUND")
       set(libs ${libs} ${${i}})
@@ -147,6 +168,8 @@
     foreach (i ${configopts})
       mark_as_advanced(${i})
     endforeach()
+    set (${PREFIX}_INCLUDE_OPTS ${includeopts} PARENT_SCOPE)
+    set (${PREFIX}_LIBRARY_OPTS ${libraryopts} PARENT_SCOPE)
     set (${PREFIX}_INCLUDE_DIRS ${includes} PARENT_SCOPE)
     set (${PREFIX}_LIBRARIES ${libs} PARENT_SCOPE)
     set (${PREFIX}_FOUND TRUE PARENT_SCOPE)


Commented out android debug message.

Commented out android debug message.

--- scripts/android.cmake
+++ scripts/android.cmake
@@ -260,7 +260,7 @@
   else ()
     set(include_suffix "/${include_suffix}")
   endif ()
-message("${CURRENT_TARGET} ${MYTHIC_DEPENDENCIES}/${path}/include${include_suffix}")
+#message("${CURRENT_TARGET} ${MYTHIC_DEPENDENCIES}/${path}/include${include_suffix}")
   include_directories(${MYTHIC_DEPENDENCIES}/${path}/include${include_suffix})

 endmacro()


Windows: remove duplicated entry in distribution

This removes the duplicated `llvm-mt` from the toolchain distribution
list.

--- cmake/caches/Windows-x86_64.cmake
+++ cmake/caches/Windows-x86_64.cmake
@@ -63,7 +63,6 @@
       llvm-dwp
       llvm-lib
       llvm-lipo
-      llvm-mt
       llvm-mt
       llvm-nm
       llvm-objcopy


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)


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 05)

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


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 09)

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


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   09)
+SET(KWSYS_DATE_STAMP_DAY   10)


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 11)

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


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 05)

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


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   06)
+SET(KWSYS_DATE_STAMP_DAY   07)


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 01)

 # 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 04)

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


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 02)

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


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 08)

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


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 10)

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


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 07)

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


Undo the change of location of PCM (it does not work)

--- cmake/modules/RootNewMacros.cmake
+++ cmake/modules/RootNewMacros.cmake
@@ -259,9 +259,9 @@

   if(ARG_MODULE)
     set(newargs -s ${libprefix}${ARG_MODULE}${libsuffix})
-    set(pcm_name ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${libprefix}${ARG_MODULE}_rdict.pcm)
-  else()
-    set(pcm_name ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${dictionary}_rdict.pcm)
+    set(pcm_name ${libprefix}${ARG_MODULE}_rdict.pcm)
+  else()
+    set(pcm_name ${dictionary}_rdict.pcm)
   endif()

   if(ARG_DEPENDENCIES)


PR 1091: remove pkg_config from linux config file

 - remove pkg_config from linux config file

--- cmake_includes/config_linux.cmake
+++ cmake_includes/config_linux.cmake
@@ -1,9 +1,3 @@
-option(BUILD_PKG_CONFIG "set BUILD_PKG_CONFIG to ON if pkg-config tool should be built, set to OFF to skip it" OFF)
-if(BUILD_PKG_CONFIG)
-    include(cmake_includes/pkg_config)
-endif(BUILD_PKG_CONFIG)
-
-
 set(COMPILE_DEFINITIONS -Wall -Wno-write-strings -Wno-comment -Wno-unknown-pragmas -Wno-unused-function -Wno-unused-variable -Wno-reorder -Werror)
 set(PTHREAD pthread)
 set(DL dl)


Lower cmake_minimum_version to 2.8 to compile on RedHat

--- tests/find_mkl.cmake
+++ tests/find_mkl.cmake
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 2.8)
 project(mkl_sgemm C)

 find_package(GreatCMakeCookOff NO_MODULE PATHS ${cookoff_path} REQUIRED)


Update Eq/Co version map

Update Eq/Co version map

[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[ ] Bugfix
[ ] New Feature
[x] Cleanup
[ ] Optimization
[ ] Documentation

--- FindEqualizer.cmake
+++ FindEqualizer.cmake
@@ -74,6 +74,7 @@
 endif()
 if(Equalizer_FIND_VERSION)
   # Matching Collage versions
+  set(_eq_coVersion_1.1.4 "0.4.1")
   set(_eq_coVersion_1.1.3 "0.4.0")
   set(_eq_coVersion_1.1.2 "0.4.0")
   set(_eq_coVersion_1.1.1 "0.4.0")


Minor tweak

Minor tweak

[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[ ] Bugfix
[ ] New Feature
[x] Cleanup
[ ] Optimization
[ ] Documentation

--- FindEqualizer.cmake
+++ FindEqualizer.cmake
@@ -195,7 +195,7 @@
 elseif(_eq_version_not_exact)
   set(_eq_EPIC_FAIL TRUE)
   message(${_eq_version_output_type}
-    "ERROR: Version ${Equalizer_FIND_VERSION} of Equalizer is required exactly. "
+    "Version ${Equalizer_FIND_VERSION} of Equalizer is required exactly. "
     "Version ${EQUALIZER_VERSION} was found.")
 else()
   if(Equalizer_FIND_REQUIRED)


Add missing library to FindGEOM() procedure

--- adm_local/cmake_files/FindGEOM.cmake
+++ adm_local/cmake_files/FindGEOM.cmake
@@ -31,6 +31,7 @@
 FIND_LIBRARY(GEOM_SupervEngine GEOM_SupervEngine ${GEOM_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(GEOM_GEOMSketcher GEOMSketcher ${GEOM_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(GEOM_SalomeIDLGEOM SalomeIDLGEOM ${GEOM_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(GEOM_SalomeIDLGEOMSuperv SalomeIDLGEOMSuperv ${GEOM_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(GEOM_SalomeIDLSTLPlugin SalomeIDLSTLPlugin ${GEOM_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(GEOM_SalomeIDLBREPPlugin SalomeIDLBREPPlugin ${GEOM_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(GEOM_SalomeIDLSTEPPlugin SalomeIDLSTEPPlugin ${GEOM_ROOT_DIR}/lib/salome)


Enable inclusion of sys/sysmacros.h, when present

--- deps/sigar.cmake
+++ deps/sigar.cmake
@@ -80,6 +80,11 @@

     SET(EXTRA_LIBS ${EXTRA_LIBS} -ltirpc)
   ENDIF(EXISTS /usr/include/tirpc)
+
+  CHECK_INCLUDE_FILES(sys/sysmacros.h HAVE_SYSMACROS_H)
+  IF(HAVE_SYSMACROS_H)
+    ADD_DEFINITIONS(-DHAVE_SYSMACROS_H)
+  ENDIF(HAVE_SYSMACROS_H)
 ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux")

 ## macosx, freebsd


Pass Qt version to ImageViewer

Pass Qt version to ImageViewer

--- CMake/Superbuild/External_ImageViewer.cmake
+++ CMake/Superbuild/External_ImageViewer.cmake
@@ -68,6 +68,7 @@
       -DCMAKE_BUILD_TYPE:STRING=${build_type}
       ${CMAKE_OSX_EXTERNAL_PROJECT_ARGS}
       -DITK_DIR:PATH=${ITK_DIR}
+      -DQT_QMAKE_EXECUTABLE:PATH=${QT_QMAKE_EXECUTABLE}
     INSTALL_COMMAND ""
     DEPENDS
       ${${proj}_DEPENDENCIES} )


cmake: Simplify VTK external project: Qt and Python are not needed

--- SuperBuild/External_VTK.cmake
+++ SuperBuild/External_VTK.cmake
@@ -34,10 +34,6 @@

 # Set dependency list
 set(${proj}_DEPENDENCIES "")
-set(${PROJECT_NAME}_USE_PYTHONQT OFF)
-if (${PROJECT_NAME}_USE_PYTHONQT)
-  list(APPEND ${proj}_DEPENDENCIES python)
-endif()

 # Include dependent projects if any
 SlicerMacroCheckExternalProjectDependency(${proj})
@@ -56,62 +52,6 @@
   endif()

   ### --- Project specific additions here
-  set(VTK_WRAP_PYTHON OFF)
-
-  if (${PROJECT_NAME}_USE_PYTHONQT)
-    set(VTK_WRAP_PYTHON ON)
-  endif()
-
-  set(VTK_PYTHON_ARGS
-      -DPYTHON_EXECUTABLE:PATH=${PYTHON_EXECUTABLE}
-      -DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR}
-      -DPYTHON_LIBRARIES:FILEPATH=${PYTHON_LIBRARIES}
-      )
-  if(${PROJECT_NAME}_USE_PYTHONQT)
-    list(APPEND VTK_PYTHON_ARGS
-      -DVTK_INSTALL_PYTHON_USING_CMAKE:BOOL=ON
-      )
-  endif()
-
-  set(VTK_QT_ARGS)
-  if(${PRIMARY_PROJECT_NAME}_USE_QT)
-    set(VTK_QT_ARGS
-      -DModule_vtkGUISupportQt:BOOL=ON
-      )
-    if(NOT APPLE)
-      list(APPEND VTK_QT_ARGS
-        #-DDESIRED_QT_VERSION:STRING=4 # Unused
-        -DVTK_USE_GUISUPPORT:BOOL=ON
-        -DVTK_USE_QVTK_QTOPENGL:BOOL=ON
-        -DVTK_USE_QT:BOOL=ON
-        -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
-        )
-    else()
-      list(APPEND VTK_QT_ARGS
-        -DVTK_USE_CARBON:BOOL=OFF
-        # Default to Cocoa, VTK/CMakeLists.txt will enable Carbon and disable cocoa if needed
-        -DVTK_USE_COCOA:BOOL=ON
-        -DVTK_USE_X:BOOL=OFF
-        #-DVTK_USE_RPATH:BOOL=ON # Unused
-        #-DDESIRED_QT_VERSION:STRING=4 # Unused
-        -DVTK_USE_GUISUPPORT:BOOL=ON
-        -DVTK_USE_QVTK_QTOPENGL:BOOL=ON
-        -DVTK_USE_QT:BOOL=ON
-        -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
-        )
-    endif()
-    find_package(Qt4 REQUIRED)
-  else()
-    set(VTK_QT_ARGS
-        -DVTK_USE_GUISUPPORT:BOOL=OFF
-        -DVTK_USE_QT:BOOL=OFF
-        )
-  endif()
-
-  # Disable Tk when Python wrapping is enabled
-  if (${PROJECT_NAME}_USE_PYTHONQT)
-    list(APPEND VTK_QT_ARGS -DVTK_USE_TK:BOOL=OFF)
-  endif()

   set(VTK_BUILD_STEP "")
   if(UNIX)
@@ -130,10 +70,11 @@
       -DVTK_LEGACY_REMOVE:BOOL=OFF
       -DVTK_WRAP_TCL:BOOL=OFF
       #-DVTK_USE_RPATH:BOOL=ON # Unused
-      -DVTK_WRAP_PYTHON:BOOL=${VTK_WRAP_PYTHON}
+      -DVTK_WRAP_PYTHON:BOOL=OFF
       -DVTK_INSTALL_LIB_DIR:PATH=${${PROJECT_NAME}_INSTALL_LIB_DIR}
-      ${VTK_PYTHON_ARGS}
-      ${VTK_QT_ARGS}
+      # Disable Qt
+      -DVTK_USE_GUISUPPORT:BOOL=OFF
+      -DVTK_USE_QT:BOOL=OFF
       ${VTK_MAC_ARGS}
     )
   ### --- End Project specific additions


set MYGUI_INSTALL_DEPENDENCIES (CMake var) to false by default

--- CMake/MyGUIInstallDependencies.cmake
+++ CMake/MyGUIInstallDependencies.cmake
@@ -9,7 +9,7 @@
 set(MYGUI_DEP_CUR_DIR ${MYGUI_DEPENDENCIES_DIR})
 set(MYGUI_DEP_BIN_DIR ${MYGUI_DEPENDENCIES_DIR}/../Samples/Common/bin)

-option(MYGUI_INSTALL_DEPENDENCIES "Install dependencies needed for sample builds" TRUE)
+option(MYGUI_INSTALL_DEPENDENCIES "Install dependencies needed for sample builds" FALSE)

 if (MYGUI_INSTALL_DEPENDENCIES)
   if (MYGUI_STATIC)


Removing usage of decpreated PS,SS with PT,ST

Build/Test Cases Summary
Enabled Packages: CTeuchos, ForTeuchos, VERAIn, DataTransferKit, MPACT_libs, MPACT_Drivers, Insilico, COBRA_TF, CASL_MOOSE, MAMBA2D, VRIPSS
Enabled all Forward Packages
0) MPI_DEBUG => passed: passed=480,notpassed=0 (47.26 min)
1) SERIAL_RELEASE => passed: passed=396,notpassed=0 (19.21 min)

--- PackagesList.cmake
+++ PackagesList.cmake
@@ -8,4 +8,4 @@
   DataTransferKit         .     SS
   )

-PACKAGE_DISABLE_ON_PLATFORMS(DataTransferKit Windows)
+TRIBITS_DISABLE_PACKAGE_ON_PLATFORMS(DataTransferKit Windows)


added FileDescription

added FileDescription

Fix issue #11 on google code. Thanks to jvanvorst.

--- PluginConfig.cmake
+++ PluginConfig.cmake
@@ -40,6 +40,7 @@

 # strings
 set(FBSTRING_CompanyName "RSATom")
+set(FBSTRING_FileDescription "FireBreathed VLC v.${PLUGIN_VERSION}")
 set(FBSTRING_PluginDescription "VLC Web Plugin (powered by FireBreath)")
 set(FBSTRING_PLUGIN_VERSION "${PLUGIN_VERSION}")
 set(FBSTRING_LegalCopyright "Copyright 2012 RSATom")


ci windows: remove needless _INIT flags

ci windows: remove needless _INIT flags


Implement a new test for the mitkStatistics calculator

--- Modules/ImageStatistics/Testing/files.cmake
+++ Modules/ImageStatistics/Testing/files.cmake
@@ -2,6 +2,7 @@
   mitkImageStatisticsCalculatorTest.cpp
   mitkPointSetStatisticsCalculatorTest.cpp
   mitkPointSetDifferenceStatisticsCalculatorTest.cpp
+  mitkImageStatisticsTextureAnalysisTest.cpp
 )

 set(MODULE_CUSTOM_TESTS


Adapting md5

Adapting md5

--- CMakeExternals/CTK.cmake
+++ CMakeExternals/CTK.cmake
@@ -61,7 +61,7 @@
       BINARY_DIR ${proj}-build
       PREFIX ${proj}-cmake
       URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/CTK_${revision_tag}.tar.gz
-      URL_MD5 56543b95bfb3fea7915b893c4619de3f
+      URL_MD5 2302f8101c95ae493c3b049febc554af
       UPDATE_COMMAND ""
       INSTALL_COMMAND ""
       CMAKE_GENERATOR ${gen}


Removed unused CMake macros

Removed unused CMake macros

--- CMakeModules/Utils.cmake
+++ CMakeModules/Utils.cmake
@@ -23,24 +23,3 @@
 		add_flag_append(CMAKE_CXX_FLAGS ${_FLAG})
 	endif()
 endmacro(add_compiler_flag_if_available _VAR_NAME _FLAG)
-
-# macro to verify if required flags are set. If not then the project should be skipped
-macro(verify_required_flags _FLAGS)
-	set (_RESULT 0)
-	foreach (_FLAG ${_FLAGS})
-		if (${${_FLAG}})
-			set (_RESULT 1)
-			break()
-		endif()
-	endforeach()
-	if (NOT (${_RESULT}))
-		message (STATUS "Project: ${PROJECT_NAME} will be skipped bulding due to missing required flags")
-		return()
-	endif()
-endmacro()
-
-macro(link_libraries_by_flag _FLAG _LIST _LIB)
-	if (${_FLAG})
-		list(APPEND ${_LIST} ${_LIB})
-	endif()
-endmacro()


AWI for Hezekiah M. Carty.  Remove unused cruft and replaced
plplot@LIB_TAG with the correct -lplplot@LIB_TAG.

svn path=/trunk/; revision=8545

--- bindings/ocaml/myocamlbuild.ml.cmake
+++ bindings/ocaml/myocamlbuild.ml.cmake
@@ -1,43 +1,14 @@
-open Ocamlbuild_plugin;;
-open Command;;
-
-(* ocamlfind packages required for compilation *)
-let packages = "";;
-
-(* Build an appropriate ocamlfind command line *)
-let ocamlfind cmd =
-  S [A "ocamlfind"; A cmd; A "-package"; A packages];;
-
-(* Link packages in when needed. *)
-flag ["ocaml"; "link"; "program"] (A "-linkpkg");;
+open Ocamlbuild_plugin
+open Command

 (* The camlidl command to use (default: first one found in $PATH) *)
-let camlidl = S([A"camlidl"; A"-header"]);;
+let camlidl = S([A"camlidl"; A"-header"])

 (* Files included in the main idl descriptor *)
-let idl_includes = ["plplot_h.inc"];;
-
-(* A simple function to check if a string is empty/whitespace *)
-let is_all_whitespace s =
-  try
-    String.iter (fun c -> if c <> ' ' then raise Exit) s;
-    true
-  with Exit -> false
-
-let get_env_elem s =
-  let it = getenv s in
-  match is_all_whitespace it with
-      true -> N
-    | false -> A it
-
+let idl_includes = ["plplot_h.inc"]
 ;;

 dispatch begin function
-  | After_options ->
-      (* Redefine ocaml{c,opt,dep} to use the ocamlfind equivalents *)
-      Options.ocamlc := ocamlfind "c";
-      Options.ocamlopt := ocamlfind "opt";
-      Options.ocamldep := ocamlfind "dep";
   | After_rules ->
       (* Handle *.idl files properly... I think *)
       rule "camlidl processing"
@@ -52,7 +23,8 @@

       (* Include the plplot and camlidl compiler options for ocamlmklib *)
       flag ["ocamlmklib"; "c"]
-        (S[A"-L@BUILD_DIR@/src"; A"-lplplot@LIB_TAG@"; A"-L@CAMLIDL_LIB_DIR@"; A"-lcamlidl"]);
+        (S[A"-L@BUILD_DIR@/src"; A"-lplplot@LIB_TAG@";
+           A"-L@CAMLIDL_LIB_DIR@"; A"-lcamlidl"]);

       (* gcc needs to know where to find the needed #includes *)
       flag ["c"; "compile"]
@@ -70,7 +42,7 @@

       flag ["ocaml"; "link"; "library"; "native"]
         (S[A"-cclib"; A"-lplplot_stubs";
-           A"-cclib"; A"plplot@LIB_TAG@";
+           A"-cclib"; A"-lplplot@LIB_TAG@";
            A"-cclib"; A"-lcamlidl"]);

       (* Make sure the C pieces and built... *)


Do detection in installation directory too.

svn path=/trunk/kdesupport/strigi/; revision=640163

--- cmake/FindCLucene.cmake
+++ cmake/FindCLucene.cmake
@@ -15,14 +15,14 @@

   SET(TRIAL_LIBRARY_PATHS
     $ENV{CLUCENE_HOME}/lib${LIB_SUFFIX}
-    $ENV{HOME}/testinstall/lib${LIB_SUFFIX}
+    ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
     /usr/lib${LIB_SUFFIX}
     /usr/local/lib${LIB_SUFFIX}
     /sw/lib${LIB_SUFFIX}
   )
   SET(TRIAL_INCLUDE_PATHS
     $ENV{CLUCENE_HOME}/include
-    $ENV{HOME}/testinstall/include
+    ${CMAKE_INSTALL_PREFIX}/include
     /usr/include
     /usr/local/include
     /sw/include


Fix a typo in a comment in FindJsonCpp.cmake.

--- cmake/FindJsonCpp.cmake
+++ cmake/FindJsonCpp.cmake
@@ -8,7 +8,7 @@
 ########################################################################
 # Cmake module for finding JsonCpp
 #
-# The following variabled will be defined:
+# The following variables will be defined:
 #
 #  JsonCpp_FOUND
 #  JsonCpp_INCLUDE_DIR


Added proper dependencies between imported mbedtls targets

--- cmake/FindMbedTLS.cmake
+++ cmake/FindMbedTLS.cmake
@@ -136,14 +136,6 @@
                                   VERSION_VAR MBEDTLS_VERSION)

-if(NOT TARGET mbedtls)
-    add_library(mbedtls UNKNOWN IMPORTED)
-    set_target_properties(mbedtls PROPERTIES
-                          INTERFACE_INCLUDE_DIRECTORIES "${MBEDTLS_INCLUDE_DIR}"
-                          IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-                          IMPORTED_LOCATION "${MBEDTLS_LIBRARY}")
-endif()
-
 if(NOT TARGET mbedcrypto)
     add_library(mbedcrypto UNKNOWN IMPORTED)
     set_target_properties(mbedcrypto PROPERTIES
@@ -158,4 +150,14 @@
                           INTERFACE_INCLUDE_DIRECTORIES "${MBEDTLS_INCLUDE_DIR}"
                           IMPORTED_LINK_INTERFACE_LANGUAGES "C"
                           IMPORTED_LOCATION "${MBEDTLS_X509_LIBRARY}")
+    target_link_libraries(mbedx509 INTERFACE mbedcrypto)
 endif()
+
+if(NOT TARGET mbedtls)
+    add_library(mbedtls UNKNOWN IMPORTED)
+    set_target_properties(mbedtls PROPERTIES
+                          INTERFACE_INCLUDE_DIRECTORIES "${MBEDTLS_INCLUDE_DIR}"
+                          IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+                          IMPORTED_LOCATION "${MBEDTLS_LIBRARY}")
+    target_link_libraries(mbedtls INTERFACE mbedx509)
+endif()


Create tbag_modules__apply_wxwidgets() cmake method.

--- cmake/TbagModules.cmake
+++ cmake/TbagModules.cmake
@@ -162,6 +162,17 @@
     set (TBAG_PROJECT_LIB_TYPE MODULE)
 endmacro ()

+macro (tbag_modules__apply_window_subsystem)
+    if (WIN32)
+        if (MSVC)
+            list (APPEND TBAG_PROJECT_LDFLAGS  /SUBSYSTEM:WINDOWS)
+        elseif (MINGW)
+            list (APPEND TBAG_PROJECT_CXXFLAGS -Wno-deprecated-declarations)
+            list (APPEND TBAG_PROJECT_LDFLAGS  -mwindows)
+        endif ()
+    endif ()
+endmacro ()
+
 ## -----
 ## CUDA.
 ## -----
@@ -630,6 +641,19 @@
     list (APPEND TBAG_PROJECT_LDFLAGS      ${UV_LIBRARIES})
 endmacro ()

+macro (tbag_modules__check_wxwidgets)
+    if (NOT wxWidgets_FOUND)
+        message (WARNING "Not found wxWidgets.")
+    endif ()
+endmacro ()
+
+macro (tbag_modules__apply_wxwidgets)
+    list (APPEND TBAG_PROJECT_DEFINITIONS  ${wxWidgets_DEFINITIONS})
+    list (APPEND TBAG_PROJECT_CXXFLAGS     ${wxWidgets_CXX_FLAGS})
+    list (APPEND TBAG_PROJECT_INCLUDE_DIRS ${wxWidgets_INCLUDE_DIRS})
+    list (APPEND TBAG_PROJECT_LDFLAGS      ${wxWidgets_LIBRARIES})
+endmacro ()
+
 ## ------------------
 ## Find object files.
 ## ------------------


do not modify RUNTIME_OUTPUT_DIRECTORY on Windows

git-svn-id: 5398946ba177a3e438c2dae55e2cdfc2fb96c905@3480 a9d63959-f2ad-4865-b262-bf0e56cfafb6

--- cmake/pcl_targets.cmake
+++ cmake/pcl_targets.cmake
@@ -248,7 +248,9 @@
     set(multiValueArgs FILES ARGUMENTS LINK_WITH)
     cmake_parse_arguments(PCL_ADD_TEST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
     add_executable(${_exename} ${PCL_ADD_TEST_FILES})
-    set_target_properties(${_exename} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    if(NOT WIN32)
+      set_target_properties(${_exename} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    endif(NOT WIN32)
     PCL_ADD_OPENMP_FLAGS(${_exename})
     target_link_libraries(${_exename} ${GTEST_BOTH_LIBRARIES} ${PCL_ADD_TEST_LINK_WITH})
     #


[cmake,tests] for non-RPATH builds, tests need LD_LIBRARY_PATH

--- cmake/tools4tests.cmake
+++ cmake/tools4tests.cmake
@@ -515,8 +515,12 @@
       configure_file(${file} ${SICONOS_SWIG_ROOT_DIR}/tests COPYONLY)
       set(name "python_${testname}")
       set(exename ${SICONOS_SWIG_ROOT_DIR}/tests/${exename})
-      # set_ldlibpath()
+      set_ldlibpath()
       add_python_test(${name} ${exename})
     endforeach()
   endif()
 endfunction()
+
+if(WITH_TESTING)
+  set_ldlibpath()
+endif()


Fix ITK packaging on linux

Fix ITK packaging on linux

--- projects/unix/tomviz.bundle.cmake
+++ projects/unix/tomviz.bundle.cmake
@@ -79,10 +79,13 @@
   COMPONENT superbuild)

 if(itk_ENABLED)
-install(DIRECTORY "${install_location}/lib/itk"
-        DESTINATION "lib"
-        USE_SOURCE_PERMISSIONS
-        COMPONENT superbuild)
+  install(CODE
+"
+  execute_process(COMMAND
+    ${CMAKE_COMMAND}
+    -E copy_directory ${install_location}/lib/itk \${CMAKE_INSTALL_PREFIX}/lib)
+"
+)
 endif()

 # install executables


cmake UPDATE remove useless paths from coverage

--- CMakeModules/GenCoverage.cmake
+++ CMakeModules/GenCoverage.cmake
@@ -97,7 +97,7 @@
             --output-file "${COVERAGE_FILE_RAW}"
         # Remove coverage of tests, system headers, etc.
         COMMAND "${PATH_LCOV}"
-            --remove "${COVERAGE_FILE_RAW}" '${CMAKE_SOURCE_DIR}/tests/*'
+            --remove "${COVERAGE_FILE_RAW}" '${CMAKE_SOURCE_DIR}/tests/*' '${CMAKE_SOURCE_DIR}/compat/*' '*libyang*'
             --rc lcov_branch_coverage=1
             --quiet --output-file "${COVERAGE_FILE_CLEAN}"
         # Generate HTML report


CMake compatability

CMake compatability

--- cmake/Modules/MexIFace-configure-matlab.cmake
+++ cmake/Modules/MexIFace-configure-matlab.cmake
@@ -354,9 +354,9 @@
             set_property(TARGET ${target_prefix}MEX_LIBRARIES APPEND PROPERTY INTERFACE_COMPILE_OPTIONS -fexceptions -fno-omit-frame-pointer)
             set_property(TARGET ${target_prefix}MEX_LIBRARIES APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS MATLAB_MEX_FILE)
             if(${CMAKE_VERSION} VERSION_GREATER "3.13.0")
-                target_link_options(${target_prefix}MEX_LIBRARIES -Wl,--no-undefined)
-                target_link_options(${target_prefix}MEX_LIBRARIES -Wl,--as-needed)
-                target_link_directories(${target_prefix}MEX_LIBRARIES ${lib_dir} ${extern_lib_dir} ${os_lib_dir})
+                target_link_options(${target_prefix}MEX_LIBRARIES INTERFACE -Wl,--no-undefined)
+                target_link_options(${target_prefix}MEX_LIBRARIES INTERFACE -Wl,--as-needed)
+                target_link_directories(${target_prefix}MEX_LIBRARIES INTERFACE ${lib_dir} ${extern_lib_dir} ${os_lib_dir})
             else()
                 set_property(TARGET ${target_prefix}MEX_LIBRARIES APPEND PROPERTY INTERFACE_LINK_LIBRARIES -Wl,--no-undefined) #Older CMake doesn't have INTERFACE_LINK_OPTIONS
                 set_property(TARGET ${target_prefix}MEX_LIBRARIES APPEND PROPERTY INTERFACE_LINK_LIBRARIES -Wl,--as-needed) #Older CMake doesn't have INTERFACE_LINK_OPTIONS


[FIX] make exception for dlopen gcc-5 issues

--- util/travis/linux-cibuild.cmake
+++ util/travis/linux-cibuild.cmake
@@ -19,6 +19,8 @@
 # customize reporting of errors in CDash
 set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS 1000)
 set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 1000)
+set(CTEST_CUSTOM_WARNING_EXCEPTION "statically linked applications")
+

 # Use 4 build threads
 set(CTEST_BUILD_FLAGS -j4)


Minor stylistic changes

Minor stylistic changes

--- cmake/modules/Platform/Arduino.cmake
+++ cmake/modules/Platform/Arduino.cmake
@@ -997,6 +997,7 @@
     endif()
 endfunction()

+
 # generate_cpp_from_sketch(MAIN_SKETCH_PATH SKETCH_SOURCES SKETCH_CPP)
 #
 #         MAIN_SKETCH_PATH - Main sketch file path
@@ -1059,9 +1060,9 @@
 if (NOT DEFINED ARDUINO_C_FLAGS)
     set(ARDUINO_C_FLAGS "-ffunction-sections -fdata-sections")
 endif()
-set(CMAKE_C_FLAGS                "-g -Os       ${ARDUINO_C_FLAGS}" CACHE STRING "")
-set(CMAKE_C_FLAGS_DEBUG          "-g           ${ARDUINO_C_FLAGS}" CACHE STRING "")
-set(CMAKE_C_FLAGS_MINSIZEREL     "-Os -DNDEBUG ${ARDUINO_C_FLAGS}" CACHE STRING "")
+set(CMAKE_C_FLAGS                "-g -Os       ${ARDUINO_C_FLAGS}"    CACHE STRING "")
+set(CMAKE_C_FLAGS_DEBUG          "-g           ${ARDUINO_C_FLAGS}"    CACHE STRING "")
+set(CMAKE_C_FLAGS_MINSIZEREL     "-Os -DNDEBUG ${ARDUINO_C_FLAGS}"    CACHE STRING "")
 set(CMAKE_C_FLAGS_RELEASE        "-Os -DNDEBUG -w ${ARDUINO_C_FLAGS}" CACHE STRING "")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "-Os -g       -w ${ARDUINO_C_FLAGS}" CACHE STRING "")

@@ -1092,17 +1093,17 @@
 #=============================================================================#
 #                       Shared Lbrary Linker Flags                            #
 #=============================================================================#
-set(CMAKE_SHARED_LINKER_FLAGS                ""                        CACHE STRING "")
-set(CMAKE_SHARED_LINKER_FLAGS_DEBUG          ""                        CACHE STRING "")
-set(CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL     ""                        CACHE STRING "")
-set(CMAKE_SHARED_LINKER_FLAGS_RELEASE        ""                        CACHE STRING "")
-set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO ""                        CACHE STRING "")
-
-set(CMAKE_MODULE_LINKER_FLAGS                ""                        CACHE STRING "")
-set(CMAKE_MODULE_LINKER_FLAGS_DEBUG          ""                        CACHE STRING "")
-set(CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL     ""                        CACHE STRING "")
-set(CMAKE_MODULE_LINKER_FLAGS_RELEASE        ""                        CACHE STRING "")
-set(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO ""                        CACHE STRING "")
+set(CMAKE_SHARED_LINKER_FLAGS                ""                     CACHE STRING "")
+set(CMAKE_SHARED_LINKER_FLAGS_DEBUG          ""                     CACHE STRING "")
+set(CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL     ""                     CACHE STRING "")
+set(CMAKE_SHARED_LINKER_FLAGS_RELEASE        ""                     CACHE STRING "")
+set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO ""                     CACHE STRING "")
+
+set(CMAKE_MODULE_LINKER_FLAGS                ""                     CACHE STRING "")
+set(CMAKE_MODULE_LINKER_FLAGS_DEBUG          ""                     CACHE STRING "")
+set(CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL     ""                     CACHE STRING "")
+set(CMAKE_MODULE_LINKER_FLAGS_RELEASE        ""                     CACHE STRING "")
+set(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO ""                     CACHE STRING "")

 #=============================================================================#


Set CMAKE_INSTALL_RPATH to fix libdir for MacOS and gnuinstall

--- cmake/modules/RootBuildOptions.cmake
+++ cmake/modules/RootBuildOptions.cmake
@@ -258,12 +258,16 @@
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # point to directories outside the build tree to the install RPATH

 # Check whether to add RPATH to the installation (the build tree always has the RPATH enabled)
-if(rpath OR gnuinstall)
+if(rpath)
   set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) # install LIBDIR
   set(CMAKE_SKIP_INSTALL_RPATH FALSE)          # don't skip the full RPATH for the install tree
 elseif(APPLE)
   set(CMAKE_INSTALL_NAME_DIR "@rpath")
-  set(CMAKE_INSTALL_RPATH "@loader_path/../lib")    # self relative LIBDIR
+  if(gnuinstall)
+    set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) # install LIBDIR
+  else()
+    set(CMAKE_INSTALL_RPATH "@loader_path/../lib")    # self relative LIBDIR
+  endif()
   set(CMAKE_SKIP_INSTALL_RPATH FALSE)          # don't skip the full RPATH for the install tree
 else()
   set(CMAKE_SKIP_INSTALL_RPATH TRUE)           # skip the full RPATH for the install tree


Added vc into the all option (CMake)

Added vc into the all option (CMake)

--- cmake/modules/RootBuildOptions.cmake
+++ cmake/modules/RootBuildOptions.cmake
@@ -158,6 +158,7 @@
  set(minuit2 ON CACHE BOOL "" FORCE)
  set(table   ON CACHE BOOL "" FORCE)
  set(unuran  ON CACHE BOOL "" FORCE)
+ set(vc      ON CACHE BOOL "" FORCE)
 endif()

 #---General Build options----------------------------------------------------------------------


FIX (#3463): adding ScalarBar & ScalarBarOverlay to files.cmake

--- CoreUI/Qmitk/files.cmake
+++ CoreUI/Qmitk/files.cmake
@@ -24,6 +24,8 @@
 QmitkRenderingManager.cpp
 QmitkRenderingManagerFactory.cpp
 QmitkRenderWindow.cpp
+QmitkScalarBar.cpp
+QmitkScalarBarOverlay.cpp
 QmitkSliderLevelWindowWidget.cpp
 QmitkStdMultiWidget.cpp
 QmitkTextOverlay.cpp
@@ -43,6 +45,8 @@
 QmitkOverlay.h
 QmitkOverlayController.h
 QmitkRenderWindowMenu.h
+QmitkScalarBar.h
+QmitkScalarBarOverlay.h
 QmitkPropertiesTableEditor.h
 QmitkPropertyDelegate.h
 QmitkRenderingManager.h


Fix documentation.

Fix documentation.

	* build-aux/cmake/modules/Gostai.cmake: Here.

--- build-aux/cmake/modules/Gostai.cmake
+++ build-aux/cmake/modules/Gostai.cmake
@@ -12,8 +12,8 @@
 # Add a Gostai executable target named _name_
 # Arguments:
 #  SOURCES	- the list of sources of the executable
-#  MOC		- the list of sources of the executable that need to be moc'ed
-#  UI		- the list of UI files used by the executable
+#  MOCS		- the list of sources of the executable that need to be moc'ed
+#  UIS		- the list of UI files used by the executable
 #  CPPFLAGS	- the list of CPPFLAGS to add
 #  LIBRARIES	- the list of libraries to link with.
 #  RESOURCES	- the list of resources files.


Configure qt-info.h.in and system-info.h.in.

	* build-aux/cmake/modules/Gostai.cmake (gostai_add_library): Here.

--- build-aux/cmake/modules/Gostai.cmake
+++ build-aux/cmake/modules/Gostai.cmake
@@ -536,6 +536,16 @@
     ${CMAKE_CURRENT_BINARY_DIR}/gostai-info.h
     ESCAPE_QUOTES
     @ONLY)
+  configure_file(
+    ${CMAKE_MODULE_PATH}/qt-info.h.in
+    ${CMAKE_CURRENT_BINARY_DIR}/qt-info.h
+    ESCAPE_QUOTES
+    @ONLY)
+  configure_file(
+    ${CMAKE_MODULE_PATH}/system-info.h.in
+    ${CMAKE_CURRENT_BINARY_DIR}/system-info.h
+    ESCAPE_QUOTES
+    @ONLY)

   # ============= #
   # Install files #


Fixing iree_cc_test android goo to use the proper executable name. (#5660)

--- build_tools/cmake/iree_cc_test.cmake
+++ build_tools/cmake/iree_cc_test.cmake
@@ -137,7 +137,7 @@
         ${_TEST_NAME}
       COMMAND
         "${CMAKE_SOURCE_DIR}/build_tools/cmake/run_android_test.${IREE_HOST_SCRIPT_EXT}"
-        "${_ANDROID_REL_DIR}/${_NAME}"
+        "${_ANDROID_REL_DIR}/$<TARGET_FILE_NAME:${_NAME}>"
     )
     # Use environment variables to instruct the script to push artifacts
     # onto the Android device before running the test. This needs to match


Fix for mac build failing to find google_breakpad client libraries.

--- indra/cmake/GoogleBreakpad.cmake
+++ indra/cmake/GoogleBreakpad.cmake
@@ -6,9 +6,14 @@
   # *TODO - implement this include(FindGoogleBreakpad)
 else (STANDALONE)
   use_prebuilt_binary(google_breakpad)
-  set(BREAKPAD_EXCEPTION_HANDLER_LIBRARIES exception_handler crash_generation_client common)
+  if (DARWIN)
+    set(BREAKPAD_EXCEPTION_HANDLER_LIBRARIES exception_handler)
+  endif (DARWIN)
   if (LINUX)
     set(BREAKPAD_EXCEPTION_HANDLER_LIBRARIES breakpad_client)
   endif (LINUX)
+  if (WINDOWS)
+    set(BREAKPAD_EXCEPTION_HANDLER_LIBRARIES exception_handler crash_generation_client common)
+  endif (WINDOWS)
 endif (STANDALONE)


incorporating bug fix to flann

incorporating bug fix to flann

fixing an issue which caused pcl to relink every time externals was built
its not pretty

--- software/externals/cmake/externals.cmake
+++ software/externals/cmake/externals.cmake
@@ -15,7 +15,7 @@
 set(opencv-drc_depends Eigen_pod)

 set(pcl_dep_url https://svn.csail.mit.edu/drc/trunk/software/externals/pcl_dep)
-set(pcl_dep_revision 8298)
+set(pcl_dep_revision 8330)
 set(pcl_dep_depends)

 set(pcl_drc_url https://svn.csail.mit.edu/drc/trunk/software/externals/pcl_drc)


-BUG: copypaste error, wrong name of include file

--- Testing/Dashboard/pxDashboard_BIGR_linux64_gcc.cmake
+++ Testing/Dashboard/pxDashboard_BIGR_linux64_gcc.cmake
@@ -51,5 +51,5 @@

 # Load the common dashboard script.
-include( ${CTEST_SCRIPT_DIRECTORY}/elxDashboardCommon.cmake )
+include( ${CTEST_SCRIPT_DIRECTORY}/pxDashboardCommon.cmake )


ENH: update PROJ version to 8.1.1

ENH: update PROJ version to 8.1.1

--- SuperBuild/CMake/External_proj.cmake
+++ SuperBuild/CMake/External_proj.cmake
@@ -28,8 +28,8 @@
 ExternalProject_Add(PROJ
   DEPENDS ${PROJ_DEPENDENCIES}
   PREFIX PROJ
-  URL "https://download.osgeo.org/proj/proj-7.1.0.tar.gz"
-  URL_MD5 1da6227c30b683d43f1c6d267224a262
+  URL "https://download.osgeo.org/proj/proj-8.1.1.tar.gz"
+  URL_MD5 f017fd7d35311b0d65b2cf0503844690
   BINARY_DIR ${PROJ_SB_SRC}
   INSTALL_DIR ${SB_INSTALL_PREFIX}
   DOWNLOAD_DIR ${DOWNLOAD_LOCATION}


BUG: Bug in DTIProcess required update.

BUG: Bug in DTIProcess required update.

--- SuperBuild/External_DTIProcess.cmake
+++ SuperBuild/External_DTIProcess.cmake
@@ -3,7 +3,7 @@

 ExternalProject_Add(DTIProcess
   SVN_REPOSITORY "https://www.nitrc.org/svn/dtiprocess/trunk"
-  SVN_REVISION -r "193"
+  SVN_REVISION -r "196"
   SVN_USERNAME slicerbot
   SVN_PASSWORD slicer
   SOURCE_DIR DTIProcess


ENH: allow the otb_test_application to work outside OTB

--- CMake/OTBApplicationMacros.cmake
+++ CMake/OTBApplicationMacros.cmake
@@ -118,25 +118,34 @@
    #endif()

    list(APPEND OTB_APPLICATIONS_NAME_LIST ${APPLICATION_NAME})
+   list(REMOVE_DUPLICATES OTB_APPLICATIONS_NAME_LIST)
    set(OTB_APPLICATIONS_NAME_LIST ${OTB_APPLICATIONS_NAME_LIST}
        CACHE STRING "List of all applications" FORCE)

 endmacro()

 macro(otb_test_application)
-   cmake_parse_arguments(TESTAPPLICATION  "" "NAME;APP" "OPTIONS;TESTENVOPTIONS;VALID" ${ARGN} )
-   otb_add_test(NAME ${TESTAPPLICATION_NAME}
-                COMMAND otbTestDriver
+  cmake_parse_arguments(TESTAPPLICATION  "" "NAME;APP" "OPTIONS;TESTENVOPTIONS;VALID" ${ARGN} )
+  if(otb-module)
+    otb_add_test(NAME ${TESTAPPLICATION_NAME}
+                  COMMAND otbTestDriver
                   ${TESTAPPLICATION_VALID}
                   Execute $<TARGET_FILE:otbApplicationLauncherCommandLine>
                   ${TESTAPPLICATION_APP}
                   $<TARGET_FILE_DIR:otbapp_${TESTAPPLICATION_APP}>
                   ${TESTAPPLICATION_OPTIONS}
                   -testenv ${TESTAPPLICATION_TESTENVOPTIONS})
-
-  if(otb-module)
     # Be sure that the ${otb-module}-all target triggers the build of commandline launcher and testdriver
     add_dependencies(${otb-module}-all otbApplicationLauncherCommandLine)
     add_dependencies(${otb-module}-all otbTestDriver)
+  else()
+    add_test(NAME ${TESTAPPLICATION_NAME}
+            COMMAND otbTestDriver
+            ${TESTAPPLICATION_VALID}
+            Execute $<TARGET_FILE:otbApplicationLauncherCommandLine>
+            ${TESTAPPLICATION_APP}
+            $<TARGET_FILE_DIR:otbapp_${TESTAPPLICATION_APP}>
+            ${TESTAPPLICATION_OPTIONS}
+            -testenv ${TESTAPPLICATION_TESTENVOPTIONS})
   endif()
 endmacro()


rename ThorPP macro "GENERATE_STUB --> THORPP_GEN"

* also, remove TO_LANGUAGE, FROM_LANGUAGE (default to "cpp")
* rename "GEN_PATH --> OUTPUT_PATH"
* rename "GEN_EXTENSION --> OUTPUT_EXT"

--- CMake/Packages/UsingThorPP.cmake
+++ CMake/Packages/UsingThorPP.cmake
@@ -21,14 +21,14 @@

 SET(THORPP_EXTENSION ".lp")

-MACRO(GENERATE_STUB)
+MACRO(THORPP_GEN)

     ###################
     # PARSE ARGUMENTS #
     ###################

     # parse the argument options
-    SET(__option_catalogries "TARGET;OUTPUT_VARIABLE;INPUT;GEN_PATH;GEN_EXTENSION;FROM_LANGUAGE;TO_LANGUAGE")
+    SET(__option_catalogries "TARGET;OUTPUT_VARIABLE;INPUT;OUTPUT_PATH;OUTPUT_EXT")
     SET(__temporary_options_variable ${ARGN})
     split_options(__temporary_options_variable "default" __option_catalogries __options_set)

@@ -36,10 +36,8 @@
     hashmap(GET __options_set "TARGET"          __target)
     hashmap(GET __options_set "OUTPUT_VARIABLE" __output_variable)
     hashmap(GET __options_set "INPUT"           __input_list)
-    hashmap(GET __options_set "GEN_PATH"        __gen_path)
-    hashmap(GET __options_set "GEN_EXTENSION"   __gen_extension)
-    hashmap(GET __options_set "FROM_LANGUAGE"   __from_language)
-    hashmap(GET __options_set "TO_LANGUAGE"     __to_language)
+    hashmap(GET __options_set "OUTPUT_PATH"     __output_path)
+    hashmap(GET __options_set "OUTPUT_EXT"      __output_ext)

     ###################
     # CHECK ARGUMENTS #
@@ -53,12 +51,12 @@
         MESSAGE(FATAL_ERROR "must specify either target or output variable!")
     ENDIF()

-    IF(NOT DEFINED __gen_path)
+    IF(NOT DEFINED __output_path)
         MESSAGE(STATUS "no code-gen path specified -- generating to build path!")
-        SET(__gen_path "${CMAKE_CURRENT_BINARY_DIR}")
+        SET(__output_path "${CMAKE_CURRENT_BINARY_DIR}")
     ENDIF()

-    IF(NOT DEFINED __gen_extension)
+    IF(NOT DEFINED __output_ext)
         MESSAGE(STATUS "no code-gen extension specified -- generating without extension!")
     ENDIF()

@@ -76,16 +74,16 @@
         GET_FILENAME_COMPONENT(__input_ext ${__input} EXT)

         IF(NOT ${__input_ext} STREQUAL ${THORPP_EXTENSION})
-            MESSAGE(FATAL_ERROR "unrecognized file extension!")
+            MESSAGE(FATAL_ERROR "unrecognized file extension! ${__input_ext}")
         ENDIF()

         IF(NOT EXISTS ${__input})
             MESSAGE(FATAL_ERROR "file must exist!")
         ENDIF()

-        SET(__input_stem "${__gen_path}/${__input_name}") # do everything in code-gen path
-        STRING(REGEX REPLACE ${__input_ext} "_generated_1.cpp"   gen_source_1 ${__input_stem})
-        STRING(REGEX REPLACE ${__input_ext} "${__gen_extension}" gen_source_2 ${__input_stem})
+        SET(__input_stem "${__output_path}/${__input_name}") # do everything in code-gen path
+        STRING(REGEX REPLACE ${__input_ext} "_generated_1.cpp" gen_source_1 ${__input_stem})
+        STRING(REGEX REPLACE ${__input_ext} "${__output_ext}" gen_source_2 ${__input_stem})

         ###########
         # DO WORK #
@@ -93,7 +91,7 @@

         # generate INTERMEDIATE generator source
         SET(cmd_string
-            ${THORPP_PROGRAM} --input ${__input} --from ${__from_language} --to ${__to_language}
+            ${THORPP_PROGRAM} --input ${__input} --from cpp --to cpp
             )
         SET(cmd_string
             ${CMAKE_COMMAND}


Remove obsolete comment

Remove obsolete comment

git-svn-id: fbbf69ba8011aca0e74e1c67904b11cccbdbe66b@27430 0785d39b-7218-0410-832d-ea1e28bc413d

--- deal.II/cmake/setup_deal_ii.cmake
+++ deal.II/cmake/setup_deal_ii.cmake
@@ -31,8 +31,6 @@
 #     DEAL_II_BASE_NAME               *)
 #     DEAL_II_DEBUG_SUFFIX            *)
 #     DEAL_II_RELEASE_SUFFIX          *)
-#     DEAL_II_LIBRARY_NAME_DEBUG
-#     DEAL_II_LIBRARY_NAME_RELEASE
 #
 #     DEAL_II_PATH                    *)
 #     DEAL_II_CMAKE_MACROS_RELDIR     *)


Revert "[root7] Root7 only compiles with C++17."

This reverts commit 5558580e1fe093f2e3c1fbfdaf8f592090678368.

I was mislead because of the old ROOT-performance-centos7-multicore/default bot
telling me it could not build in -DCMAKE_CXX_STANDARD=14.

--- cmake/modules/RootBuildOptions.cmake
+++ cmake/modules/RootBuildOptions.cmake
@@ -323,7 +323,7 @@
 endforeach()

 #---ROOT 7 requires C++14 standard or higher---------------------------------------------------
-if(NOT CMAKE_CXX_STANDARD GREATER 14)
+if(NOT CMAKE_CXX_STANDARD GREATER 11)
   set(root7_defvalue OFF)
 endif()

@@ -340,10 +340,10 @@

 if(root7)
   if(NOT CMAKE_CXX_STANDARD)
-    set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++17 standard used with root7")
-    message(STATUS "Enabling C++17 for compilation of root7 components")
-  elseif(NOT CMAKE_CXX_STANDARD GREATER 14)
-    message(FATAL_ERROR ">>> At least C++17 standard required with root7, please enable it using CMake option: -DCMAKE_CXX_STANDARD=14")
+    set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++14 standard used with root7")
+    message(STATUS "Enabling C++14 for compilation of root7 components")
+  elseif(NOT CMAKE_CXX_STANDARD GREATER 11)
+    message(FATAL_ERROR ">>> At least C++14 standard required with root7, please enable it using CMake option: -DCMAKE_CXX_STANDARD=14")
   endif()
 endif()


COMP: Update KWStyle to remove format-string warning message

- Apply the latest KWStyle source code to remove format-string warning
  messages on VS14.

- Those warning messages were reported at the following page:
  https://open.cdash.org/viewBuildError.php?type=1&buildid=4117158

Change-Id: I720227f2c900244198fd218aad5fb1e4e8f764c8

--- Utilities/KWStyle/BuildKWStyle.cmake
+++ Utilities/KWStyle/BuildKWStyle.cmake
@@ -15,7 +15,7 @@

 ExternalProject_add(KWStyle
   GIT_REPOSITORY "https://github.com/Kitware/KWStyle.git"
-  GIT_TAG 22f2e0bd4ec4c94ca85af0ce24747e67a17b4c52
+  GIT_TAG ea78cb4af42d1fd1eac5a6c9ca0d7d0a2e937321
   UPDATE_COMMAND ""
   DOWNLOAD_DIR ${KWStyle_SOURCE_DIR}
   SOURCE_DIR ${KWStyle_SOURCE_DIR}


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   19)
+SET(KWSYS_DATE_STAMP_DAY   20)


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 04)

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


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 02)

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


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 07)

 # 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 04)

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


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 11)

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


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 07)

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


COMP: wrong variable test in ImportLibKML


corrected usage of STIR_DISABLE_CERN_ROOT

forgotten to remove the _SUPPORT everywhere.

--- SuperBuild/External_STIR.cmake
+++ SuperBuild/External_STIR.cmake
@@ -51,11 +51,13 @@
   ### --- Project specific additions here
   set(STIR_Install_Dir ${SUPERBUILD_INSTALL_DIR})

+  option(BUILD_TESTING_${proj} "Build tests for STIR" OFF)
   option(BUILD_STIR_EXECUTABLES "Build all STIR executables" OFF)
   option(BUILD_STIR_SWIG_PYTHON "Build STIR Python interface" OFF)
   option(STIR_DISABLE_CERN_ROOT "Disable STIR ROOT interface" ON)
   option(STIR_DISABLE_LLN_MATRIX "Disable STIR Louvain-la-Neuve Matrix library for ECAT7 support" ON)
   option(STIR_ENABLE_EXPERIMENTAL "Enable STIR experimental code" OFF)
+
   mark_as_advanced(BUILD_STIR_EXECUTABLES BUILD_STIR_SWIG_PYTHON STIR_DISABLE_CERN_ROOT)
   mark_as_advanced(STIR_DISABLE_LLN_MATRIX STIR_ENABLE_EXPERIMENTAL)

@@ -79,7 +81,7 @@
         -DCMAKE_CXX_STANDARD=11
         -DSTIR_OPENMP=${BUILD_STIR_WITH_OPENMP}
         # Use 2 variables for ROOT to cover multiple STIR versions
-        -DDISABLE_CERN_ROOT_SUPPORT=${STIR_DISABLE_CERN_ROOT_SUPPORT} -DDISABLE_CERN_ROOT=${STIR_DISABLE_CERN_ROOT_SUPPORT}
+        -DDISABLE_CERN_ROOT_SUPPORT=${STIR_DISABLE_CERN_ROOT} -DDISABLE_CERN_ROOT=${STIR_DISABLE_CERN_ROOT}
         -DDISABLE_LLN_MATRIX=${STIR_DISABLE_LLN_MATRIX}
         -DSTIR_ENABLE_EXPERIMENTAL=${STIR_ENABLE_EXPERIMENTAL}
    )


Fix name of translated appdata file. Bug 713937.

* cmake/FindIntltool.cmake: Fix brown-paper-bag CMake typo.

--- cmake/FindIntltool.cmake
+++ cmake/FindIntltool.cmake
@@ -17,7 +17,7 @@
             ${INTLTOOL_MERGE_EXECUTABLE} --xml-style ${CMAKE_SOURCE_DIR}/${po_dir}
                 ${CMAKE_CURRENT_SOURCE_DIR}/${appstream_name}.in ${appstream_name}
         )
-        install (FILES ${CMAKE_CURRENT_BINARY_DIR}/{$appstream_name} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/appdata)
+        install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${appstream_name} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/appdata)
     endmacro (INTLTOOL_MERGE_DESKTOP appstream_name po_dir)
     macro (INTLTOOL_MERGE_DESKTOP desktop_id po_dir)
         add_custom_target (geary.desktop ALL


Moved FFTW to before MKL in compiler link list to ensure original FFTW
implementation is used.

git-svn-id: b7791fb0f5d07d96612766859ad70a13be88ea96@3915 305cdda6-5ce1-45b3-a98d-dfc68c8b3305


Adds support for the Newlib-Nano Standard Library

- For MCUs with very little flash, the Nano library is more suitable.
- This change supports building with the GCC nano stdlib, simply by
  linking STM32::Nano library in cmake.

--- cmake/stm32/common.cmake
+++ cmake/stm32/common.cmake
@@ -230,6 +230,12 @@
     target_link_options(STM32::NoSys INTERFACE $<$<C_COMPILER_ID:GNU>:--specs=nosys.specs>)
 endif()

+if(NOT (TARGET STM32::Nano))
+    add_library(STM32::Nano INTERFACE IMPORTED)
+    target_compile_options(STM32::Nano INTERFACE $<$<C_COMPILER_ID:GNU>:--specs=nano.specs>)
+    target_link_options(STM32::Nano INTERFACE $<$<C_COMPILER_ID:GNU>:--specs=nano.specs>)
+endif()
+
 include(stm32/utilities)
 include(stm32/f0)
 include(stm32/f1)


Updated FW with added Python bindings for timestamp and sequence numbers

--- cmake/Depthai/DepthaiDeviceSideConfig.cmake
+++ cmake/Depthai/DepthaiDeviceSideConfig.cmake
@@ -2,7 +2,7 @@
 set(DEPTHAI_DEVICE_SIDE_MATURITY "snapshot")

 # "full commit hash of device side binary"
-set(DEPTHAI_DEVICE_SIDE_COMMIT "a65fe39adf0174e0a9671f7118cd3707bcaa64c3")
+set(DEPTHAI_DEVICE_SIDE_COMMIT "a3c3514fb2da2a0af03744de0b8226475be9bafb")

 # "version if applicable"
 set(DEPTHAI_DEVICE_SIDE_VERSION "")


cmake: compiler: arcmwdt: Add no_strict_aliasing flag

This commit adds the `no_strict_aliasing` flag, which disables
the strict aliasing rule, for the ARC MetaWare compiler.

Signed-off-by: Stephanos Ioannidis <dc76e9f0c0006e8f919e0c515c66dbba3982f785@stephanos.io>

--- cmake/compiler/arcmwdt/compiler_flags.cmake
+++ cmake/compiler/arcmwdt/compiler_flags.cmake
@@ -132,6 +132,9 @@
 set_property(TARGET compiler-cpp PROPERTY dialect_cpp20 "")
 set_property(TARGET compiler-cpp PROPERTY dialect_cpp2b "")

+# Flag for disabling strict aliasing rule in C and C++
+set_compiler_property(PROPERTY no_strict_aliasing -fno-strict-aliasing)
+
 # Disable exceptions flag in C++
 set_property(TARGET compiler-cpp PROPERTY no_exceptions "-fno-exceptions")


revert v2 cmake changes

revert v2 cmake changes

--- cmake/configs/nuttx_px4fmu-v2_default.cmake
+++ cmake/configs/nuttx_px4fmu-v2_default.cmake
@@ -7,8 +7,7 @@
 	# Board support modules
 	#
 	#drivers/barometer
-	#drivers/differential_pressure
-	#drivers/distance_sensor
+	drivers/differential_pressure
 	#drivers/magnetometer
 	#drivers/telemetry

@@ -22,9 +21,6 @@
 	#drivers/bst
 	drivers/camera_trigger
 	drivers/device
-	drivers/differential_pressure/ms4525
-	drivers/differential_pressure/ms5525
-	drivers/differential_pressure/sdp3x
 	#drivers/frsky_telemetry
 	drivers/gps
 	#drivers/hott
@@ -55,7 +51,7 @@

 	# distance sensors
 	drivers/distance_sensor/ll40ls
-	#drivers/distance_sensor/mb12xx
+	drivers/distance_sensor/mb12xx
 	drivers/distance_sensor/sf0x
 	drivers/distance_sensor/sf1xx
 	drivers/distance_sensor/srf02


[cmake] gsl, tbb: for macOS11, pass isysroot also to ld;

silence warning "include <gsl/... - you meant <GSL/...?" by renaming source dir.

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -475,12 +475,14 @@
     set(GSL_CBLAS_LIBRARY ${CMAKE_BINARY_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gslcblas${CMAKE_STATIC_LIBRARY_SUFFIX})
     if(CMAKE_OSX_SYSROOT)
       set(_gsl_cppflags "-isysroot ${CMAKE_OSX_SYSROOT}")
+      set(_gsl_ldflags  "-isysroot ${CMAKE_OSX_SYSROOT}")
     endif()
     ExternalProject_Add(
       GSL
       # http://mirror.switch.ch/ftp/mirror/gnu/gsl/gsl-${gsl_version}.tar.gz
       URL ${lcgpackages}/gsl-${gsl_version}.tar.gz
       URL_HASH SHA256=0460ad7c2542caaddc6729762952d345374784100223995eb14d614861f2258d
+      SOURCE_DIR GSL-src # prevent "<gsl/...>" vs GSL/ macOS warning
       INSTALL_DIR ${CMAKE_BINARY_DIR}
       CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix <INSTALL_DIR>
                         --libdir=<INSTALL_DIR>/lib
@@ -488,6 +490,7 @@
                         CC=${CMAKE_C_COMPILER}
                         CFLAGS=${CMAKE_C_FLAGS}
                         CPPFLAGS=${_gsl_cppflags}
+                        LDFLAGS=${_gsl_ldflags}
       LOG_DOWNLOAD 1 LOG_CONFIGURE 1 LOG_BUILD 1 LOG_INSTALL 1
       BUILD_BYPRODUCTS ${GSL_LIBRARIES}
     )
@@ -1225,6 +1228,7 @@
     # it can happen that a "-isysroot" switch is added without an argument.
     if(APPLE AND CMAKE_OSX_SYSROOT)
       set(_tbb_cxxflags "${_tbb_cxxflags} -isysroot ${CMAKE_OSX_SYSROOT}")
+      set(_tbb_ldflags "${_tbb_ldflags} -isysroot ${CMAKE_OSX_SYSROOT}")
     endif()
     set(TBB_LIBRARIES ${CMAKE_BINARY_DIR}/lib/libtbb${CMAKE_SHARED_LIBRARY_SUFFIX})
     ExternalProject_Add(
@@ -1234,7 +1238,7 @@
       INSTALL_DIR ${CMAKE_BINARY_DIR}
       PATCH_COMMAND sed -i -e "/clang -v/s@-v@--version@" build/macos.inc
       CONFIGURE_COMMAND ""
-      BUILD_COMMAND make ${_tbb_compiler} cpp0x=1 "CXXFLAGS=${_tbb_cxxflags}" CPLUS=${CMAKE_CXX_COMPILER} CONLY=${CMAKE_C_COMPILER}
+      BUILD_COMMAND make ${_tbb_compiler} cpp0x=1 "CXXFLAGS=${_tbb_cxxflags}" CPLUS=${CMAKE_CXX_COMPILER} CONLY=${CMAKE_C_COMPILER} "LDFLAGS=${_tbb_ldflags}"
       INSTALL_COMMAND ${CMAKE_COMMAND} -Dinstall_dir=<INSTALL_DIR> -Dsource_dir=<SOURCE_DIR>
                                        -P ${CMAKE_SOURCE_DIR}/cmake/scripts/InstallTBB.cmake
       INSTALL_COMMAND ""


Fail to configure if fail-on-missing=ON and cfitsio is not found

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -748,11 +748,15 @@
     set(CFITSIO_TARGET CFITSIO)
   else()
     message(STATUS "Looking for CFITSIO")
-    find_package(CFITSIO)
-    if(NOT CFITSIO_FOUND)
-      message(STATUS "CFITSIO not found. You can enable the option 'builtin_cfitsio' to build the library internally'")
-      message(STATUS "                   For the time being switching off 'fitsio' option")
-      set(fitsio OFF CACHE BOOL "Disabled because CFITSIO not found and builtin_cfitsio disabled (${fitsio_description})" FORCE)
+    if(fail-on-missing)
+      find_package(CFITSIO REQUIRED)
+    else()
+      find_package(CFITSIO)
+      if(NOT CFITSIO_FOUND)
+        message(STATUS "CFITSIO not found. You can enable the option 'builtin_cfitsio' to build the library internally'")
+        message(STATUS "                   For the time being switching off 'fitsio' option")
+        set(fitsio OFF CACHE BOOL "Disabled because CFITSIO not found and builtin_cfitsio disabled (${fitsio_description})" FORCE)
+      endif()
     endif()
   endif()
 endif()


ARROW-928: [C++] Detect supported MSVC versions

Author: Max Risuhin <risuhin.max@gmail.com>

Closes #625 from MaxRis/ARROW-928 and squashes the following commits:

db81a27 [Max Risuhin] ARROW-928: [C++] Detect supported MSVC versions

--- cpp/cmake_modules/CompilerInfo.cmake
+++ cpp/cmake_modules/CompilerInfo.cmake
@@ -17,7 +17,11 @@
 #
 # Sets COMPILER_FAMILY to 'clang' or 'gcc'
 # Sets COMPILER_VERSION to the version
-execute_process(COMMAND "${CMAKE_CXX_COMPILER}" -v
+if (NOT MSVC)
+  set(COMPILER_GET_VERSION_SWITCH "-v")
+endif()
+
+execute_process(COMMAND "${CMAKE_CXX_COMPILER}" ${COMPILER_GET_VERSION_SWITCH}
                 ERROR_VARIABLE COMPILER_VERSION_FULL)
 message(INFO "Compiler version: ${COMPILER_VERSION_FULL}")
 message(INFO "Compiler id: ${CMAKE_CXX_COMPILER_ID}")
@@ -25,6 +29,13 @@

 if(MSVC)
   set(COMPILER_FAMILY "msvc")
+  if ("${COMPILER_VERSION_FULL}" MATCHES ".*Microsoft \\(R\\) C/C\\+\\+ Optimizing Compiler Version 19.*x64")
+    string(REGEX REPLACE ".*Optimizing Compiler Version ([0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+).*" "\\1"
+      COMPILER_VERSION "${COMPILER_VERSION_FULL}")
+  elseif(NOT "${COMPILER_VERSION_FULL}" STREQUAL "")
+    message(FATAL_ERROR "Not supported MSVC compiler:\n${COMPILER_VERSION_FULL}\n"
+      "Supported MSVC versions: Visual Studio 2015 2017 x64")
+  endif()

 # clang on Linux and Mac OS X before 10.9
 elseif("${COMPILER_VERSION_FULL}" MATCHES ".*clang version.*")


fix cmake (>=3.0) warning on MacOS

fix cmake (>=3.0) warning on MacOS

closes #2251

git-svn-id: e0b5bbb11d0e9fdbbfcabba14dc32ad5d6b235bd@1140 fdac6126-5c0c-442c-9429-916003d36597

--- cmake/ACGCommon.cmake
+++ cmake/ACGCommon.cmake
@@ -115,13 +115,24 @@
       SKIP_BUILD_RPATH 0
     )
   elseif (APPLE AND NOT ACG_PROJECT_MACOS_BUNDLE)
-    set_target_properties (
-      ${target} PROPERTIES
-      #INSTALL_NAME_DIR "@executable_path/../lib/${CMAKE_PROJECT_NAME}"
-      INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${ACG_PROJECT_LIBDIR}"
-#      BUILD_WITH_INSTALL_RPATH 1
-      SKIP_BUILD_RPATH 0
-    )
+  if (NOT (CMAKE_MAJOR_VERSION  LESS 3) )
+      # save rpath
+      set_target_properties (
+        ${target} PROPERTIES
+        INSTALL_RPATH "@executable_path/../${ACG_PROJECT_LIBDIR}"
+        MACOSX_RPATH 1
+        #BUILD_WITH_INSTALL_RPATH 1
+        SKIP_BUILD_RPATH 0
+      )
+    else()
+      # save rpath via install name dir
+      set_target_properties (
+        ${target} PROPERTIES
+        INSTALL_NAME_DIR "@executable_path/../${ACG_PROJECT_LIBDIR}"
+        #BUILD_WITH_INSTALL_RPATH 1
+        SKIP_BUILD_RPATH 0
+      )
+    endif(NOT (CMAKE_MAJOR_VERSION  LESS 3))
   elseif (NOT APPLE)

     set_target_properties (


changed permissions on FindDXSDK.cmake to match the rest of the directory


Fix variable names in FindNLopt.cmake

Fix variable names in FindNLopt.cmake

--- cmake/FindNLopt.cmake
+++ cmake/FindNLopt.cmake
@@ -9,12 +9,12 @@
 		${PATH}/${CMAKE_INSTALL_INCLUDEDIR}
 		${PATH}/NLopt*/${CMAKE_INSTALL_INCLUDEDIR}
 	)
-	list(APPEND NLopt_INCLUDE_HINTS ${HINTS})
+	list(APPEND NLOPT_INCLUDE_HINTS ${HINTS})
 endforeach()

 list(
 	APPEND
-	NLopt_INCLUDE_HINTS
+	NLOPT_INCLUDE_HINTS
 	$ENV{NLopt_DIR}/${CMAKE_INSTALL_INCLUDEDIR}
 )

@@ -25,7 +25,7 @@
 		${PATH}/${CMAKE_INSTALL_INCLUDEDIR}
 		${PATH}/NLopt*/${CMAKE_INSTALL_INCLUDEDIR}
 	)
-	list(APPEND NLopt_INCLUDE_HINTS ${HINTS})
+	list(APPEND NLOPT_INCLUDE_HINTS ${HINTS})
 endforeach()

 foreach(PATH $ENV{PATH})
@@ -34,7 +34,7 @@
 		HINTS
 		${PATH}/../${CMAKE_INSTALL_INCLUDEDIR}
 	)
-	list(APPEND NLopt_INCLUDE_HINTS ${HINTS})
+	list(APPEND NLOPT_INCLUDE_HINTS ${HINTS})
 endforeach()

 file(
@@ -65,12 +65,12 @@
 		${PATH}/${CMAKE_INSTALL_LIBDIR}
 		${PATH}/NLopt*/${CMAKE_INSTALL_LIBDIR}
 	)
-	list(APPEND NLopt_LIBRARY_HINTS ${HINTS})
+	list(APPEND NLOPT_LIBRARY_HINTS ${HINTS})
 endforeach()

 list(
 	APPEND
-	NLopt_LIBRARY_HINTS
+	NLOPT_LIBRARY_HINTS
 	$ENV{NLopt_DIR}/${CMAKE_INSTALL_LIBDIR}
 )

@@ -81,7 +81,7 @@
 		${PATH}/${CMAKE_INSTALL_LIBDIR}
 		${PATH}/NLopt*/${CMAKE_INSTALL_LIBDIR}
 	)
-	list(APPEND NLopt_LIBRARY_HINTS ${HINTS})
+	list(APPEND NLOPT_LIBRARY_HINTS ${HINTS})
 endforeach()

 foreach(PATH $ENV{PATH})
@@ -90,7 +90,7 @@
 		HINTS
 		${PATH}/../${CMAKE_INSTALL_LIBDIR}
 	)
-	list(APPEND NLopt_LIBRARY_HINTS ${HINTS})
+	list(APPEND NLOPT_LIBRARY_HINTS ${HINTS})
 endforeach()

 file(


Change FindQXMPP.cmake for correct include paths

Use standard functions instead of self-written ones, too

--- cmake/FindQXMPP.cmake
+++ cmake/FindQXMPP.cmake
@@ -7,9 +7,9 @@

 find_path(QXMPP_INCLUDE_DIR
     NAMES
-    qxmpp/QXmppClient.h
+    QXmppClient.h
     HINTS
-    /usr/include /usr/local/include
+    /usr/include/qxmpp /usr/local/include/qxmpp
     PATH
     ENV
 )
@@ -23,20 +23,6 @@
     /usr/lib
 )

-if(QXMPP_LIBRARIES AND QXMPP_INCLUDE_DIR)
-    set(QXMPP_INCLUDE_DIR
-        ${QXMPP_INCLUDE_DIR}
-    )
-    set(QXMPP_FOUND 1)
-endif()
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(QXmpp DEFAULT_MSG QXMPP_LIBRARIES QXMPP_INCLUDE_DIR)

-if(QXMPP_FOUND)
-    message(STATUS "Found QXmpp libraries at ${QXMPP_LIBRARIES}")
-    message(STATUS "Found QXmpp headers at ${QXMPP_INCLUDE_DIR}")
-else()
-    if(QXMPP_FIND_REQUIRED)
-        message(FATAL_ERROR "Could NOT find required QXmpp library, aborting")
-    else()
-        message(STATUS "Could NOT find QXmpp")
-    endif()
-endif()


fix warning

fix warning

git-svn-id: 6b1c4fe79111c0bc0cce83313250759594f8984b@4537 e128ff1e-fa79-4151-a8cb-522299a2c450

--- cmake/gsVersion.cmake
+++ cmake/gsVersion.cmake
@@ -29,7 +29,7 @@
 set(${PROJECT_NAME}_VERSION_TYPE  "alpha")

 # Constuct version info
-if( "${{PROJECT_NAME}_BUILD_VERSION}" STREQUAL "0")
+if( "${${PROJECT_NAME}_BUILD_VERSION}" STREQUAL "0")
     set(${PROJECT_NAME}_VERSION
         "${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION}${${PROJECT_NAME}_VERSION_TYPE}"
         CACHE INTERNAL "${PROJECT_NAME} version number")


customize nsis package filename

customize nsis package filename

git-svn-id: e7ea667a1d39a4453c4efcc4ba7bca3d620c3f19@3113 a9d63959-f2ad-4865-b262-bf0e56cfafb6

--- cmake/pcl_cpack.cmake
+++ cmake/pcl_cpack.cmake
@@ -45,6 +45,7 @@
   else(MSVC10)
     set(CPACK_NSIS_PACKAGE_NAME "${CPACK_NSIS_PACKAGE_NAME}-${win_system_name}")
   endif(MSVC10)
+  set(CPACK_PACKAGE_FILE_NAME ${CPACK_NSIS_PACKAGE_NAME})
   # force CPACK_PACKAGE_INSTALL_REGISTRY_KEY because of a known limitation in cmake/cpack to be fixed in next releases
   # http://public.kitware.com/Bug/view.php?id=9094
   # This is to allow a 32bit and a 64bit of PCL to get installed on one system


Specify PATH when calling format_check if using the custom toolchain (#5834)

The script would not find clang-format or it would use the system one,
which it shouldn't.

--- cmake/utilities.cmake
+++ cmake/utilities.cmake
@@ -235,15 +235,21 @@
     "libraries/cmake/source"
   )

+  set(command_prefix)
+  if(OSQUERY_TOOLCHAIN_SYSROOT)
+    set(command_prefix "${CMAKE_COMMAND}" -E env "PATH=${OSQUERY_TOOLCHAIN_SYSROOT}/usr/bin:$ENV{PATH}")
+  endif()
+
   add_custom_target(format_check
-    COMMAND ${EX_TOOL_PYTHON2_EXECUTABLE_PATH} ${CMAKE_SOURCE_DIR}/tools/formatting/format-check.py --exclude-folders ${excluded_folders} origin/master
+    COMMAND ${command_prefix} ${EX_TOOL_PYTHON2_EXECUTABLE_PATH} ${CMAKE_SOURCE_DIR}/tools/formatting/format-check.py --exclude-folders ${excluded_folders} origin/master
     WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
     VERBATIM
   )
   add_custom_target(format
-    COMMAND ${EX_TOOL_PYTHON2_EXECUTABLE_PATH} ${CMAKE_SOURCE_DIR}/tools/formatting/git-clang-format.py --exclude-folders ${excluded_folders} -f --style=file
+    COMMAND ${command_prefix} ${EX_TOOL_PYTHON2_EXECUTABLE_PATH} ${CMAKE_SOURCE_DIR}/tools/formatting/git-clang-format.py --exclude-folders ${excluded_folders} -f --style=file
     WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-    VERBATIM)
+    VERBATIM
+  )
 endfunction()

 function(collectInterfaceOptionsFromTarget)


Update FW

Update FW

--- cmake/Depthai/DepthaiDeviceSideConfig.cmake
+++ cmake/Depthai/DepthaiDeviceSideConfig.cmake
@@ -2,7 +2,7 @@
 set(DEPTHAI_DEVICE_SIDE_MATURITY "snapshot")

 # "full commit hash of device side binary"
-set(DEPTHAI_DEVICE_SIDE_COMMIT "b18e7fd4cf3f3d7fc64e2875fa413d939681ea0a")
+set(DEPTHAI_DEVICE_SIDE_COMMIT "1ea2a50a85eababb47d067b2f708426eff70e503")

 # "version if applicable"
 set(DEPTHAI_DEVICE_SIDE_VERSION "")


Allow user to turn off support for libAfterImage

The current setup builds the bundled libAfterImage by force,
even when support for X11 is disabled, which is a problem when
building ROOT on a headless server or with the Intel compiler.

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -340,7 +340,7 @@
 endif()

 #---Check for AfterImage---------------------------------------------------------------
-if(NOT builtin_afterimage)
+if(asimage AND NOT builtin_afterimage)
   message(STATUS "Looking for AfterImage")
   find_package(AfterImage)
   if(NOT AFTERIMAGE_FOUND)


[brief] Fixes compilation on Clang on Linux.

[detailed]
- Clang on Linux doesn't require libc++, so this is now only applied on OSX and
  Win32.

--- config/Compiler.cmake
+++ config/Compiler.cmake
@@ -34,8 +34,9 @@
     set(CMAKE_CXX_FLAGS_DEBUG "-g")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=gnu++14")

-    # Clang requires an additional library to be linked to use C++11.
-    if (ATLAS_COMPILER_CLANG)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+    if (APPLE or WIN32)
+        if (ATLAS_COMPILER_CLANG)
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+        endif()
     endif()
 endif()


Don''t need catch if not building tests

Don''t need catch if not building tests

--- cmake/CMakeDependencies.cmake
+++ cmake/CMakeDependencies.cmake
@@ -43,6 +43,7 @@
 # find doxygen
 find_package(Doxygen)

+if (COMPILE_TESTS)

 find_package(Catch)

@@ -54,3 +55,5 @@
 else()
     INCLUDE_DIRECTORIES(${CATCH_INCLUDE_DIRS})
 endif()
+
+endif()


HIP-Clang Temporarily include HIP_HCC_FLAGS for PyT

Change-Id: I0f5895fba69f5bf0c6cc13e9402bdc44726dcc5a

--- cmake/FindHIP/run_hipcc.cmake
+++ cmake/FindHIP/run_hipcc.cmake
@@ -58,7 +58,8 @@
             if(NOT "x${HIP_CLANG_PATH}" STREQUAL "x")
                 set(ENV{HIP_CLANG_PATH} ${HIP_CLANG_PATH})
             endif()
-            set(__CC_FLAGS ${HIP_CLANG_PARALLEL_BUILD_COMPILE_OPTIONS} ${HIP_HIPCC_FLAGS} ${HIP_CLANG_FLAGS} ${HIP_HIPCC_FLAGS_${build_configuration}} ${HIP_CLANG_FLAGS_${build_configuration}})
+            # Temporarily include HIP_HCC_FLAGS for HIP-Clang for PyTorch builds
+            set(__CC_FLAGS ${HIP_CLANG_PARALLEL_BUILD_COMPILE_OPTIONS} ${HIP_HIPCC_FLAGS} ${HIP_HCC_FLAGS} ${HIP_CLANG_FLAGS} ${HIP_HIPCC_FLAGS_${build_configuration}} ${HIP_HCC_FLAGS_${build_configuration}} ${HIP_CLANG_FLAGS_${build_configuration}})
         endif()
     else()
         set(__CC_FLAGS ${HIP_HIPCC_FLAGS} ${HIP_NVCC_FLAGS} ${HIP_HIPCC_FLAGS_${build_configuration}} ${HIP_NVCC_FLAGS_${build_configuration}})


-Werror flag added only for supported compilers

--- cmake/Modules/Compilers.cmake
+++ cmake/Modules/Compilers.cmake
@@ -45,7 +45,13 @@
     if(CMAKE_BUILD_TYPE STREQUAL "Test")
         set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb3 -O0 -ftest-coverage -fprofile-arcs")
     endif (CMAKE_BUILD_TYPE STREQUAL "Test")
-    set(CMAKE_CXX_FLAGS "-pedantic -Wextra -Wmissing-include-dirs -W -Wall -Werror -std=c++11 ${CMAKE_CXX_FLAGS}")
+    set(CMAKE_CXX_FLAGS "-pedantic -Wextra -Wmissing-include-dirs -W -Wall -std=c++11 ${CMAKE_CXX_FLAGS}")
+
+    if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.7
+        AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0 )
+        set(CMAKE_CXX_FLAGS "-Werror ${CMAKE_CXX_FLAGS}")
+        message("Detected supported compiler version added -Werror flag")
+    endif()
 elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL Intel)
   # using Intel C++
 elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
@@ -53,11 +59,19 @@
     # using Visual Studio C++
     # Newlines inside flags variables break CMake's NMake generator.
     # TODO(vladl@google.com): Add -RTCs and -RTCu to debug builds.
+
     set(CMAKE_CXX_FLAGS "-GS -W4 -WX -wd4251 -wd4275 -nologo -J -Zi")
-
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWIN32 -D_WIN32")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTRICT -DWIN32_LEAN_AND_MEAN")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -EHsc -D_HAS_EXCEPTIONS=1")
+
+    if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 17.0
+        AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 20.0 )
+        set(CMAKE_CXX_FLAGS "-WX ${CMAKE_CXX_FLAGS}")
+        message("Detected supported compiler version added -WX flag")
+    endif()
+
+
     set(gtest_force_shared_crt ON)
 elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL SunPro)
     # using gcc


added missing quotes

added missing quotes

git-svn-id: 5398946ba177a3e438c2dae55e2cdfc2fb96c905@3603 a9d63959-f2ad-4865-b262-bf0e56cfafb6

--- cmake/Modules/FindFlann.cmake
+++ cmake/Modules/FindFlann.cmake
@@ -28,7 +28,7 @@

   find_library(FLANN_LIBRARY_DEBUG
                NAMES flann_cpp_s-gd flann_cpp-gd flann_cpp_s flann_cpp
-               HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT} $ENV{FLANN_ROOT}"
+               HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}"
                PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann"
                      "$ENV{PROGRAMFILES}/flann 1.6.9" "$ENV{PROGRAMW6432}/flann 1.6.9"
                PATH_SUFFIXES lib)
@@ -40,7 +40,7 @@

   find_library(FLANN_LIBRARY_DEBUG
                NAMES flann_cpp-gd flann_cpp
-               HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT} $ENV{FLANN_ROOT}"
+               HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}"
                PATH_SUFFIXES lib)
 endif(WIN32)


Add missing dependence.

Add missing dependence.

--- cmake/Modules/UploadPPA.cmake
+++ cmake/Modules/UploadPPA.cmake
@@ -303,6 +303,7 @@

 add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/Debian/${DISTRI}/${DEB_SOURCE_CHANGES}
   COMMAND ${DEBUILD_EXECUTABLE} --no-tgz-check -S
+  DEPENDS ${DEBIAN_SOURCE_DIR}/CMakeLists.txt
   WORKING_DIRECTORY ${DEBIAN_SOURCE_DIR}
   )


cmake/modules/FindVIGRA.cmake: Switch VIGRA_INCLUDE_DIR search order.

--- cmake/modules/FindVIGRA.cmake
+++ cmake/modules/FindVIGRA.cmake
@@ -16,7 +16,7 @@
 endif()

 # configVersion.hxx only present, after build of Vigra
-FIND_PATH(VIGRA_INCLUDE_DIR vigra/configVersion.hxx PATHS $ENV{VIGRA_ROOT}/include ENV CPLUS_INCLUDE_PATH)
+FIND_PATH(VIGRA_INCLUDE_DIR vigra/configVersion.hxx $ENV{VIGRA_ROOT}/include PATHS ENV CPLUS_INCLUDE_PATH)

 EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c
                             "import vigra.vigranumpycore; print vigra.vigranumpycore.__file__"


ARROW-2320: [C++] Vendored Boost build does not build regex library

I can confirm that arrow failed to build with `-DARROW_BOOST_VENDORED=ON` and
builds successfully with this patch.

Author: Phillip Cloud <cpcloud@gmail.com>

Closes #1760 from cpcloud/ARROW-2320 and squashes the following commits:

3deb24e <Phillip Cloud> ARROW-2320:  Vendored Boost build does not build regex library

--- cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -158,7 +158,7 @@
   set(BOOST_STATIC_FILESYSTEM_LIBRARY
     "${BOOST_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}boost_filesystem${CMAKE_STATIC_LIBRARY_SUFFIX}")
   set(BOOST_STATIC_REGEX_LIBRARY
-          "${BOOST_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}boost_regex${CMAKE_STATIC_LIBRARY_SUFFIX}")
+    "${BOOST_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}boost_regex${CMAKE_STATIC_LIBRARY_SUFFIX}")
   set(BOOST_SYSTEM_LIBRARY "${BOOST_STATIC_SYSTEM_LIBRARY}")
   set(BOOST_FILESYSTEM_LIBRARY "${BOOST_STATIC_FILESYSTEM_LIBRARY}")
   set(BOOST_REGEX_LIBRARY "${BOOST_STATIC_REGEX_LIBRARY}")
@@ -174,7 +174,7 @@
     set(BOOST_CONFIGURE_COMMAND
       "./bootstrap.sh"
       "--prefix=${BOOST_PREFIX}"
-      "--with-libraries=filesystem,system")
+      "--with-libraries=filesystem,system,regex")
     if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
       set(BOOST_BUILD_VARIANT "debug")
     else()


ENH: This code no longer supports ITK 4.13

--- itk-module.cmake
+++ itk-module.cmake
@@ -9,10 +9,6 @@
 # and ITKMetaIO(besides ModuleTemplate and ITKCore)
 # By convention those modules outside of ITK are not prefixed with
 # ITK.
-
-if( NOT "${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}" VERSION_LESS "4.13" )
-  set(_GoogleTest_DEPENDS ITKGoogleTest)
-endif()

 # define the dependencies of the include module and the tests
 itk_module(TextureFeatures
@@ -26,7 +22,7 @@
     ITKMetaIO
     ITKImageIntensity
     ITKImageNoise
-    ${_GoogleTest_DEPENDS}
+    ITKGoogleTest
   DESCRIPTION
     "${DOCUMENTATION}"
   EXCLUDE_FROM_DEFAULT