Changed the path where files are configured to

--- cmake/doxygen_catkin.cmake
+++ cmake/doxygen_catkin.cmake
@@ -32,9 +32,9 @@
 ")
   endif()

-  set(DEVEL_DOC_PATH "${CATKIN_DEVEL_PREFIX}/share/${PROJECT_NAME}/doc")
+  set(doxygen_catkin_DOC_PATH "${CATKIN_DEVEL_PREFIX}/share/${PROJECT_NAME}/doc")

-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${DEVEL_DOC_PATH}/Doxyfile @ONLY)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)

   if(DOXYGEN_FOUND)
@@ -42,20 +42,20 @@
     if(add_dox_args_NOT_AUTOMATIC)
       # add a target to generate API documentation with Doxygen
       add_custom_target(doc
-        ${DOXYGEN_EXECUTABLE} ${DEVEL_DOC_PATH}/Doxyfile
-        WORKING_DIRECTORY ${DEVEL_DOC_PATH}
+        ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+        WORKING_DIRECTORY ${doxygen_catkin_DOC_PATH}
         COMMENT "Generating API documentation with Doxygen" VERBATIM
         )
     else()
       # add a target to generate API documentation with Doxygen
       add_custom_target(doc ALL
-        ${DOXYGEN_EXECUTABLE} ${DEVEL_DOC_PATH}/Doxyfile
-        WORKING_DIRECTORY ${DEVEL_DOC_PATH}
+        ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+        WORKING_DIRECTORY ${doxygen_catkin_DOC_PATH}
         COMMENT "Generating API documentation with Doxygen" VERBATIM
         )
     endif()

-    install(DIRECTORY ${DEVEL_DOC_PATH} DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
+    install(DIRECTORY ${doxygen_catkin_DOC_PATH} DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
   else()
     message("Unable to find Doxygen. API Documentation will not be generated")
   endif()


version bump

version bump

[ci skip]

--- cmake/ospray_options.cmake
+++ cmake/ospray_options.cmake
@@ -20,7 +20,7 @@

 SET(OSPRAY_VERSION_MAJOR 1)
 SET(OSPRAY_VERSION_MINOR 3)
-SET(OSPRAY_VERSION_PATCH 0)
+SET(OSPRAY_VERSION_PATCH 1)
 SET(OSPRAY_VERSION_GITHASH 0)
 IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
   FIND_PACKAGE(Git)


Switch to whitelist for version string

Switch to whitelist for version string

--- cmake/ospray_options.cmake
+++ cmake/ospray_options.cmake
@@ -39,8 +39,11 @@
       OUTPUT_VARIABLE "OSPRAY_VERSION_GITBRANCH"
       ERROR_QUIET
       OUTPUT_STRIP_TRAILING_WHITESPACE)
-    IF (OSPRAY_VERSION_GITBRANCH STREQUAL "devel")
-      SET(OSPRAY_VERSION_NOTE "-devel (${OSPRAY_VERSION_GITHASH_SHORT})")
+    IF (NOT OSPRAY_VERSION_GITBRANCH MATCHES "^master$|^release-")
+      IF (NOT OSPRAY_VERSION_GITBRANCH STREQUAL "HEAD")
+        SET(OSPRAY_VERSION_NOTE "-${OSPRAY_VERSION_GITBRANCH}")
+      ENDIF()
+      SET(OSPRAY_VERSION_NOTE "${OSPRAY_VERSION_NOTE} (${OSPRAY_VERSION_GITHASH_SHORT})")
     ENDIF()
   ENDIF()
 ENDIF()


fix openmp test

fix openmp test

--- cmake/vSMCFindOpenMP.cmake
+++ cmake/vSMCFindOpenMP.cmake
@@ -79,7 +79,7 @@
         for (int i = 0; i != N; ++i)
             src[i] = i;

-#pragma omp parallel for default(none) shared(N, dim, src, res)
+#pragma omp parallel for default(shared)
         for (int i = 0; i < N; ++i)
             this->eval(dim, Element(i, &src), res + i * dim);
     }


Look for rtiddsgen2 as well as rtiddsgen

--- connext_cmake_module/cmake/Modules/FindConnext.cmake
+++ connext_cmake_module/cmake/Modules/FindConnext.cmake
@@ -235,7 +235,13 @@
     set(Connext_LIBRARY_DIR "")
     set(Connext_DEFINITIONS
       ${nddscpp_DEFINITIONS} ${rticonnextmsgcpp_DEFINITIONS})
-    set(Connext_DDSGEN2 "/usr/bin/rtiddsgen2")
+    if(EXISTS "/usr/bin/rtiddsgen2")
+      set(Connext_DDSGEN2 "/usr/bin/rtiddsgen2")
+    elseif(EXISTS "/usr/bin/rtiddsgen")
+      set(Connext_DDSGEN2 "/usr/bin/rtiddsgen")
+    else()
+      message(FATAL_ERROR "Could not find executable 'rtiddsgen(2)'")
+    endif()
     set(Connext_FOUND TRUE)

     _find_connext_ensure_libraries(_found_all_libraries "${_expected_library_names}" "${Connext_LIBRARIES}")


switch to c++20

switch to c++20

--- toolchains/gcc_compatibles.cmake
+++ toolchains/gcc_compatibles.cmake
@@ -35,13 +35,16 @@
 # + 'COMPILE_LANGUAGE' isn't supported by VS generators:
 # https://cmake.org/cmake/help/latest/manual/cmake-generator-expressions.7.html#logical-expressions

-add_compile_options( $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++1z> )
+add_compile_options( $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++2a> )
 add_compile_options( $<$<NOT:$<COMPILE_LANGUAGE:CXX>>:-std=gnu11> )

 set( CMAKE_C_STANDARD   11 )
 set( CMAKE_CXX_STANDARD 14 )
 if ( CMAKE_VERSION VERSION_GREATER 3.7 )
     set( CMAKE_CXX_STANDARD 17 )
+    if ( CMAKE_VERSION VERSION_GREATER 3.7 )
+        set( CMAKE_CXX_STANDARD 20 )
+    endif()
 endif()

 # https://cmake.org/cmake/help/v3.3/policy/CMP0063.html


only looking for libtbb in TBB_ROOT folder under Linux

--- common/cmake/FindTBB.cmake
+++ common/cmake/FindTBB.cmake
@@ -64,8 +64,8 @@
     FIND_LIBRARY(TBB_LIBRARY_MALLOC tbbmalloc PATHS ${TBB_ROOT}/lib NO_DEFAULT_PATH)
   ELSE()
     FIND_PATH(TBB_INCLUDE_DIR tbb/task_scheduler_init.h PATHS ${TBB_ROOT}/include NO_DEFAULT_PATH)
-    FIND_LIBRARY(TBB_LIBRARY tbb PATHS ${TBB_ROOT}/lib/intel64/gcc4.4)
-    FIND_LIBRARY(TBB_LIBRARY_MALLOC tbbmalloc PATHS ${TBB_ROOT}/lib/intel64/gcc4.4)
+    FIND_LIBRARY(TBB_LIBRARY tbb PATHS ${TBB_ROOT}/lib/intel64/gcc4.4 ${TBB_ROOT}/lib ${TBB_ROOT}/lib64 NO_DEFAULT_PATH)
+    FIND_LIBRARY(TBB_LIBRARY_MALLOC tbbmalloc PATHS ${TBB_ROOT}/lib/intel64/gcc4.4 ${TBB_ROOT}/lib ${TBB_ROOT}/lib64 NO_DEFAULT_PATH)
   ENDIF()

 #  FIND_PATH(TBB_INCLUDE_DIR_MIC tbb/task_scheduler_init.h PATHS ${TBB_ROOT}/include NO_DEFAULT_PATH)


cmake: Remove uneeded variable

cmake: Remove uneeded variable

Change-Id: I7d863f1325a9a846ec12797f6f500431dfd2d409

--- CMake/CodeGenerator.cmake
+++ CMake/CodeGenerator.cmake
@@ -519,7 +519,6 @@

     execute_process(
       COMMAND ${KurentoModuleCreator_EXECUTABLE} -r ${PARAM_MODELS} -dr ${KURENTO_MODULES_DIR} -c ${CMAKE_BINARY_DIR}/java -it maven
-      OUTPUT_VARIABLE PROCESSOR_OUTPUT
     )

     execute_process(


COMP: Put ITKImageFunction in COMPILE_DEPENDS

Addresses:

  WARNING:root:emcc: cannot find library "ITKImageFunction"

--- itk-module.cmake
+++ itk-module.cmake
@@ -8,6 +8,7 @@
   DEPENDS
     ITKCommon
     ITKIOImageBase
+  COMPILE_DEPENDS
     ITKImageFunction
   TEST_DEPENDS
     ITKTestKernel


add min cmake version

add min cmake version

Noticed errors in Build logs complaining of CMakeLists not specifying
minimum version.

--- firestore/integration_test_internal/abseil-cpp.cmake
+++ firestore/integration_test_internal/abseil-cpp.cmake
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

+cmake_minimum_required(VERSION 2.8)
 include(ExternalProject)

 set(version 20200225)


SVN_SILENT made messages (.desktop file)

--- plugins/sipe/ktpaccountskcm_plugin_sipe.desktop.cmake
+++ plugins/sipe/ktpaccountskcm_plugin_sipe.desktop.cmake
@@ -13,6 +13,7 @@
 Comment[ia]=Interfacie de usator pro configuration de conto personalisate pro contos usante le gerente de connexion Sipe.
 Comment[it]=Interfaccia utente personalizzata di configurazione account per account che usano il gestore di connessioni Sipe.
 Comment[ko]=sipe 연결 관리자를 사용하는 계정 설정 사용자 인터페이스입니다.
+Comment[lt]=Savito paskyros konfigūravimo naudotojo sąsaja paskyroms naudojant sipe ryšio tvarkyklę.
 Comment[nb]=Brukerflate for å sette opp egendefinerte kontoer ved bruk av sipe tilkoblingsbehandler.
 Comment[nl]=Gebruikersinterface voor aangepaste accountconfiguratie voor accounts die de Sipe verbindingenbeheerder gebruiken.
 Comment[pl]=Własny interfejsu użytkownika konfiguracji kont dla kont wykorzystujących menadżera połączeń sipe.
@@ -43,6 +44,7 @@
 Name[ia]=Interfacie de usator de configuration de conto de Sipe
 Name[it]=Interfaccia utente di configurazione account Sipe
 Name[ko]=Sipe 계정 설정 사용자 인터페이스
+Name[lt]=Sipe paskyros konfigūravimo naudotojo sąsaja
 Name[nb]=Brukerflate for å sette opp Sipe-konto
 Name[nl]=Gebruikersinterface voor Sipe accountconfiguratie
 Name[pl]=Interfejs użytkownika konfiguracji konta Sipe


Fix PYTHON_OUTPUT being ignored

Fix PYTHON_OUTPUT being ignored

--- src/codegen.py.cmake
+++ src/codegen.py.cmake
@@ -29,7 +29,7 @@
 execute_process(COMMAND ${PYTHON} "${CMAKE_SOURCE_DIR}/codegen.py" "--all" ${ARGS}
 	ERROR_VARIABLE PYTHON_ERRORS OUTPUT_VARIABLE PYTHON_OUTPUT)

-if(OUTPUT_VARIABLE)
+if(PYTHON_OUTPUT)
 	message(${PYTHON_OUTPUT})
 endif()
 if(PYTHON_ERRORS)


[STATS] Missing check for MIC in config-ix.cmake

git-svn-id: f99161ee8ccfe2101cbe1bdda2220bce2ed25485@264616 91177308-0d34-0410-b5e6-96231b3b80d8

--- runtime/cmake/config-ix.cmake
+++ runtime/cmake/config-ix.cmake
@@ -202,7 +202,7 @@
      { unsigned long long t = __builtin_readcyclecounter(); return 0; }"
      LIBOMP_HAVE___BUILTIN_READCYCLECOUNTER)
   if(NOT LIBOMP_HAVE___BUILTIN_READCYCLECOUNTER)
-    if(${IA32} OR ${INTEL64})
+    if(${IA32} OR ${INTEL64} OR ${MIC})
       check_include_file(x86intrin.h LIBOMP_HAVE_X86INTRIN_H)
       libomp_append(CMAKE_REQUIRED_DEFINITIONS -DLIBOMP_HAVE_X86INTRIN_H LIBOMP_HAVE_X86INTRIN_H)
       check_c_source_compiles(


Fixing issue with doctestAddTests.cmake (#527)

Newer versions of CMake won't work with line 60: `if(${add_labels} EQUAL 1)`, changed it to simply `if (${add_labels})`

--- scripts/cmake/doctestAddTests.cmake
+++ scripts/cmake/doctestAddTests.cmake
@@ -61,7 +61,7 @@
   endif()
   set(test ${line})
   set(labels "")
-  if(${add_labels} EQUAL 1)
+  if(${add_labels})
     # get test suite that test belongs to
     execute_process(
       COMMAND ${TEST_EXECUTOR} "${TEST_EXECUTABLE}" --test-case=${test} --list-test-suites


COMP: fix otbIncludeDirectories for ITK include path

--- CMake/otbIncludeDirectories.cmake
+++ CMake/otbIncludeDirectories.cmake
@@ -126,7 +126,7 @@
     ${ITK_INCLUDE_DIRS} )
 ELSE(OTB_USE_EXTERNAL_ITK)
 	IF(NOT ITK_INSTALL_INCLUDE_DIR)
-  		SET(ITK_INSTALL_INCLUDE_DIR "/include/otb/Utilities/ITK")
+  		SET(ITK_INSTALL_INCLUDE_DIR "include/otb/Utilities/ITK")
 	ENDIF(NOT ITK_INSTALL_INCLUDE_DIR)
 #         INCLUDE(${OTB_SOURCE_DIR}/Utilities/ITK/Utilities/itkThirdParty.cmake)
 #  	INCLUDE(${OTB_SOURCE_DIR}/Utilities/ITK/itkIncludeDirectories.cmake)


fixed wrong call in enxure hg repo is current

--- CPM.cmake
+++ CPM.cmake
@@ -1205,7 +1205,7 @@

   else()
     # Target directory found, attempt to update.
-    _cpm_update_git_repo(${dir} ${tag})
+    _cpm_update_hg_repo(${dir} ${tag})
   endif()

 endmacro()


Fixed libcxx compilation

Fixed libcxx compilation

--- ThirdPartyLibraries.cmake
+++ ThirdPartyLibraries.cmake
@@ -209,7 +209,6 @@
 add_target(LIBCROCO libcroco)
 add_target(LIBCURL libcurl)
 add_target(LIBCXX libcxx)
-add_target(LIBCXX_HEADERS libcxx_headers)
 add_target(LIBCXXABI libcxxabi)
 add_target(LIBFFI libffi)
 add_target(LIBICONV libiconv)
@@ -2062,7 +2061,7 @@
 ################################################################################
 # libcxx_download.
 add_external_project(
-  ${LIBCXX_HEADERS_TARGET}
+  ${LIBCXX_TARGET}_headers
   PREFIX ${LIBCXX_PREFIX}
   DOWNLOAD_COMMAND
       ${SVN} export --force http://llvm.org/svn/llvm-project/libcxx/trunk ${LIBCXX_TARGET}
@@ -2095,7 +2094,7 @@
       -DLIBCXX_CXX_ABI=libcxxabi
       -DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${LIBCXXABI_PREFIX}/include)
 add_install_name_step(LIBCXX)
-add_dependencies(${LIBCXX_TARGET} ${LIBCXX_HEADERS_TARGET})
+add_dependencies(${LIBCXX_TARGET} ${LIBCXX_TARGET}_headers)
 add_dependencies(${LIBCXX_TARGET} ${LIBCXXABI_TARGET})

 ################################################################################


Bug fix: X11 is not support on simulator

--- ThirdPartyLibraries.cmake
+++ ThirdPartyLibraries.cmake
@@ -1636,7 +1636,7 @@
   set(IMAGEMAGICK_CONFIGURE_COMMAND ${IMAGEMAGICK_CONFIGURE_COMMAND}
       --with-sysroot=${CMAKE_OSX_SYSROOT})
 endif ()
-if (IOS_BUILD)
+if (IS_IOS)
   set(IMAGEMAGICK_CONFIGURE_COMMAND ${IMAGEMAGICK_CONFIGURE_COMMAND}
       --without-x)
 endif ()


- Fix CMake import_coffee_lib function

- Fix CMake import_coffee_lib function

--- toolchain/cmake/Modules/SubprojectFunctions.cmake
+++ toolchain/cmake/Modules/SubprojectFunctions.cmake
@@ -198,14 +198,16 @@
 # Helper for importing Coffee libraries
 ################################################################################

-macro( IMPORT_COFFEE_LIB LIBNAME DEPENDENCY )
+function( IMPORT_COFFEE_LIB LIBNAME DEPENDENCY )
     if( ${${LIBNAME}_DIR} )
         include( ${${LIBNAME}_DIR}/${LIBNAME}Config.cmake )
         return()
     endif()
+
     if( ${COFFEE_ROOT_DIR} )
         include( ${COFFEE_ROOT_DIR}/share/${LIBNAME}Config.cmake )
         return()
     endif()
+
     find_package( ${LIBNAME} ${DEPENDENCY} )
-endmacro()
+endfunction()


cmake-modules:
* updated Emotiv cmake script to use the new API version

git-svn-id: ed1ce8e5c168003d808aec37bc6fda77b178f7bb@3186 c330d7e9-fc0c-0410-a5b3-fd85c6f5aa8f

--- trunk/cmake-modules/FindThirdPartyEmotivAPI.cmake
+++ trunk/cmake-modules/FindThirdPartyEmotivAPI.cmake
@@ -9,6 +9,8 @@
 	FIND_PATH(PATH_EmotivAPI edk.h  PATHS
 		"C:/Program Files/Emotiv Development Kit_v1.0.0.3-PREMIUM"
 		"C:/Program Files/Emotiv Development Kit_v1.0.0.3-PREMIUM/doc/examples/include"
+		"C:\Program Files\Emotiv Research Edition SDK_v1.0.0.4-PREMIUM"
+		"C:\Program Files\Emotiv Research Edition SDK_v1.0.0.4-PREMIUM/doc/examples/include"
 		"C:\Program Files (x86)\Emotiv Research Edition SDK_v1.0.0.4-PREMIUM"
 		"C:\Program Files (x86)\Emotiv Research Edition SDK_v1.0.0.4-PREMIUM/doc/examples/include" $ENV{OpenViBE_dependencies})
 	IF(PATH_EmotivAPI)


ENH: Do not compile RSGDEachParameterApart component by default

--- SuperBuild/External_Elastix.cmake
+++ SuperBuild/External_Elastix.cmake
@@ -99,7 +99,7 @@
   -DUSE_PolydataDummyPenalty:BOOL=OFF
   -DUSE_Powell:BOOL=OFF
   -DUSE_QuasiNewtonLBFGS:BOOL=ON
-  -DUSE_RSGDEachParameterApart:BOOL=ON
+  -DUSE_RSGDEachParameterApart:BOOL=OFF
   -DUSE_RandomCoordinateSampler:BOOL=ON
   -DUSE_RandomSampler:BOOL=ON
   -DUSE_RandomSamplerSparseMask:BOOL=ON


ENH: Updated the git tag for ITK-Minimal-Path-Extraction remote module

$ git shortlog 611676c..c9cdc87

Jean-Christophe Fillion-Robin (1):
      Fix sign comparison warnings in SingleImageCostFunction
sumedhasingla (1):
      Facilitate integration of the module as shared library

Change-Id: I59b06f9c36fb368b2722c0dec98ecebc3db1b133

--- Modules/Remote/MinimalPathExtraction.remote.cmake
+++ Modules/Remote/MinimalPathExtraction.remote.cmake
@@ -3,5 +3,5 @@
  "http://www.insight-journal.org/browse/publication/213
 "
   GIT_REPOSITORY ${git_protocol}://github.com/InsightSoftwareConsortium/ITKMinimalPathExtraction.git
-  GIT_TAG 611676c916310b05ea6c5e6b7804df72f8d20807
+  GIT_TAG c9cdc87db021ff84417518979dd5924565ff5043
   )


ENH: Bump lastest version of remote repository.

Bump latest commit hash of the ITKTBBImageToImageFilter remote repo.

Change-Id: I5e776a246f04b53a0b00485fd214bd26427f1a8c

--- Modules/Remote/TBBImageToImageFilter.remote.cmake
+++ Modules/Remote/TBBImageToImageFilter.remote.cmake
@@ -4,5 +4,5 @@
   This module contains a class inheriting from `itk::ImageToimageFilter` that aim to optimize thread management using the TBB library.
   Insight Journal article: http://www.insight-journal.org/browse/publication/974"
   GIT_REPOSITORY ${git_protocol}://github.com/InsightSoftwareConsortium/ITKTBBImageToImageFilter.git
-  GIT_TAG a59908d51a7ee8c342b699b5f9b8acfdf7324f07
+  GIT_TAG 8f84d0dc9d09a5ff47460646fd99905c3c2b759e
   )


sanitize graph nodes

sanitize graph nodes

* it appears that '.' and '-' are not allowed
* for example, openssl_1.0.2a is a disaster in the graph
* issue https://github.com/smanders/externpro/issues/244

--- modules/xpfunmac.cmake
+++ modules/xpfunmac.cmake
@@ -641,6 +641,7 @@
     if(NOT DEFINED P_GRAPH_NODE)
       set(P_GRAPH_NODE ${P_NAME})
     endif()
+    ipSanitizeGraph(P_GRAPH_NODE)
     file(APPEND ${g_READMEdep} "  ${P_GRAPH_NODE} [")
     if(DEFINED P_GRAPH_LABEL)
       file(APPEND ${g_READMEdep} "label=\"${P_GRAPH_LABEL}\" ")
@@ -652,9 +653,18 @@
     endif()
     if(DEFINED P_BUILD_DEPS)
       foreach(dep ${P_BUILD_DEPS})
+        ipSanitizeGraph(dep)
         file(APPEND ${g_READMEdep} "  ${P_GRAPH_NODE} -> ${dep};\n")
       endforeach()
     endif()
+  endif()
+endfunction()
+
+function(ipSanitizeGraph node)
+  string(REGEX REPLACE "([.-]+)" "_" sanitized ${${node}})
+  if(NOT sanitized STREQUAL ${${node}})
+    set(P_GRAPH_LABEL ${${node}} PARENT_SCOPE)
+    set(${node} ${sanitized} PARENT_SCOPE)
   endif()
 endfunction()


Fix Protobuf_DIR on Win32

Fix Protobuf_DIR on Win32

--- cmake/External_Protobuf.cmake
+++ cmake/External_Protobuf.cmake
@@ -32,7 +32,11 @@
 )

 ExternalProject_Get_Property(protobuf install_dir)
-set(Protobuf_DIR "${install_dir}/lib/cmake/protobuf" CACHE INTERNAL "")
+if(WIN32)
+  set(Protobuf_DIR "${install_dir}/cmake" CACHE INTERNAL "")
+else()
+  set(Protobuf_DIR "${install_dir}/lib/cmake/protobuf" CACHE INTERNAL "")
+endif()

 sequoia_append_and_export_variable(
    SEQUOIA_EXTERNAL_CMAKE_ARGS


Final fix to cmake to find liblo on windows

--- cmake/Modules/FindLIBLO.cmake
+++ cmake/Modules/FindLIBLO.cmake
@@ -7,9 +7,9 @@
 find_path(LIBLO_INCLUDE_DIR lo.h PATH_SUFFIXES lo)

 if(LINUX)
-find_library(LIBLO_LIBRARY NAMES lo)
+ find_library(LIBLO_LIBRARY NAMES lo)
 else()
-find_library(LIBLO_LIBRARY NAMES liblo.a lo)
+ find_library(LIBLO_LIBRARY NAMES liblo.a liblo)
 endif()

 set(LIBLO_INCLUDE_DIRS ${LIBLO_INCLUDE_DIR})


cmake: Fix undefined MSVC_MP_FLAG variable in mingw (#3124)

* cmake: Fix undefined MSVC_MP_FLAG variable in mingw

MSVC_MP_FLAG is defined for MSVC only. So, check MSVC instead of WIN32 platform.
This fixes CMake Warning:
Manually-specified variables were not used by the project:
MSVC_MP_FLAG

* Make MSVC_MP_FLAG usage conditional on its definition

Co-authored-by: Isaiah Norton <ced85eede9dfb014f98f4fa74105491039fe0df2@users.noreply.github.com>

--- cmake/TileDB-Superbuild.cmake
+++ cmake/TileDB-Superbuild.cmake
@@ -55,7 +55,8 @@
   )
 endif()

-if (WIN32)
+# MSVC_MP_FLAG is defined by bootstrap.ps1
+if (DEFINED MSVC_MP_FLAG)
   list(APPEND INHERITED_CMAKE_ARGS
     -DMSVC_MP_FLAG=${MSVC_MP_FLAG}
   )


Fix cmake of cryptopp to avoid downloading every time (#31447)

--- cmake/external/cryptopp.cmake
+++ cmake/external/cryptopp.cmake
@@ -60,6 +60,7 @@
     "${CRYPTOPP_DOWNLOAD_CMD}"
     PREFIX          ${CRYPTOPP_PREFIX_DIR}
     SOURCE_DIR      ${CRYPTOPP_SOURCE_DIR}
+    UPDATE_COMMAND  ""
     PATCH_COMMAND
     COMMAND ${CMAKE_COMMAND} -E remove_directory "<SOURCE_DIR>/cmake/"
     COMMAND git clone ${GIT_URL}/noloader/cryptopp-cmake "<SOURCE_DIR>/cmake"


Tweak compiler options: don't enable split-dwarf option by default.

--- cmake/toolchain_options.cmake
+++ cmake/toolchain_options.cmake
@@ -30,7 +30,7 @@
   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
   string(REPLACE "/W3" "/W4" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
   if(NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
-      add_compile_options(/wd4503)
+      add_compile_options(/wd4503 /std:c++latest)
   endif()
 elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
   set(CMAKE_CXX_FLAGS "-pedantic-errors -Wextra -Wconversion -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Werror ${CMAKE_CXX_FLAGS}")
@@ -42,9 +42,25 @@
   endif()
 endif()

-if(MINGW OR UNIX AND NOT APPLE)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections -gsplit-dwarf")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffunction-sections -fdata-sections -gsplit-dwarf")
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold -Wl,--gc-sections -Wl,--gdb-index")
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold -Wl,--gc-sections -Wl,--gdb-index")
+OPTION(GC_SECTIONS "Enable function and data sections generation for the compiler, and also remove unused sections on link" ON)
+OPTION(SPLIT_DEBUG "Split debug info from the rest of the binaries. This should improve link time")
+
+if(GC_SECTIONS)
+  if(MINGW OR UNIX AND NOT APPLE)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffunction-sections -fdata-sections")
+  endif()
+
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gc-sections")
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--gc-sections")
 endif()
+
+if(SPLIT_DEBUG)
+  if(NOT MINGW AND UNIX AND NOT APPLE)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -gsplit-dwarf")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -gsplit-dwarf")
+
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold -Wl,--gdb-index")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=gold -Wl,--gdb-index")
+  endif()
+endif()


Fixed VTK include dir export issue.

Fixed VTK include dir export issue.

--- cmake_modules/LPSCommon.cmake
+++ cmake_modules/LPSCommon.cmake
@@ -813,7 +813,7 @@
         file(APPEND ${CMAKE_BINARY_DIR}/${EXPORTS_FILE} "\n")
         file(APPEND ${CMAKE_BINARY_DIR}/${EXPORTS_FILE} "set(VTK_BIN_DIR @VTK_BIN_DIR@ CACHE PATH  \"VTK DLL path\" FORCE)\n")
         file(APPEND ${CMAKE_BINARY_DIR}/${EXPORTS_FILE} "\n")
-        file(APPEND ${CMAKE_BINARY_DIR}/${EXPORTS_FILE} "set(VTK_INC_DIR @VTK_INC_DIR@ CACHE PATH  \"VTK DLL path\" FORCE)\n")
+        file(APPEND ${CMAKE_BINARY_DIR}/${EXPORTS_FILE} "set(VTK_INC_DIRS @VTK_INC_DIRS@ CACHE PATH  \"VTK DLL path\" FORCE)\n")
         file(APPEND ${CMAKE_BINARY_DIR}/${EXPORTS_FILE} "\n")
         file(APPEND ${CMAKE_BINARY_DIR}/${EXPORTS_FILE} "set(TETGEN_INCLUDE_DIR ${TETGEN_INC_DIR} CACHE STRING \"Tetgen Include Path \")\n")
         file(APPEND ${CMAKE_BINARY_DIR}/${EXPORTS_FILE} "\n")


Backup.

Backup.

--- cmake_modules/LPSCommon.cmake
+++ cmake_modules/LPSCommon.cmake
@@ -808,7 +808,6 @@
             string(REPLACE "${VTK_LIB_DIR}/lib${name}.a" "" files "${files}")
             set(VTK_INST_LIBS ${VTK_INST_LIBS} "${files}")
         endforeach()
-          message(STATUS "VTK INSTALL LIBS ARE: ${VTK_INST_LIBS}")
         install(FILES ${VTK_INST_LIBS} DESTINATION lib/vtk/
         PERMISSIONS
         OWNER_WRITE OWNER_READ OWNER_EXECUTE


using robs remus repo

using robs remus repo

For now use robs remus repo so we have access to a branch needed for building

--- superbuild/versions.cmake
+++ superbuild/versions.cmake
@@ -154,8 +154,9 @@
 endif()

 add_revision(remus
-  GIT_REPOSITORY http://public.kitware.com/Remus.git
-  GIT_TAG 7f9fbb25f78e0b7627e31c0d55d28716bb75b3e4
+  #GIT_REPOSITORY http://public.kitware.com/Remus.git
+  GIT_REPOSITORY https://github.com/robertmaynard/Remus.git
+  GIT_TAG c21bfabd468a5b2f99f91184b643b5fea2645aea
   )

 add_revision(kml


FindOpenEXR.cmake: Add detection of debug builds (#2505)

Debug builds of OpenEXR have an _d suffix (on Windows at least). This patch adds these file names to the searched library names.

--- src/cmake/modules/FindOpenEXR.cmake
+++ src/cmake/modules/FindOpenEXR.cmake
@@ -121,6 +121,8 @@
     find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY
                   NAMES ${COMPONENT}-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}
                         ${COMPONENT}
+                        ${COMPONENT}-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}_d
+                        ${COMPONENT}_d
                   HINTS ${OPENEXR_LIBRARY_DIR} $ENV{OPENEXR_LIBRARY_DIR}
                         ${GENERIC_LIBRARY_PATHS} )
 endforeach ()


SWDEV-1 - Add -ldl as linking flag for catch2 tests. (#2741)

Change-Id: I81c759363f35c3822447563e51c2db670edf9cb3

--- tests/catch/external/Catch2/cmake/Catch2/Catch.cmake
+++ tests/catch/external/Catch2/cmake/Catch2/Catch.cmake
@@ -216,6 +216,7 @@
   catch_discover_tests(${_NAME} PROPERTIES  SKIP_REGULAR_EXPRESSION "HIP_SKIP_THIS_TEST")
   if(UNIX)
     set(_LINKER_LIBS ${_LINKER_LIBS} stdc++fs)
+    set(_LINKER_LIBS ${_LINKER_LIBS} -ldl)
   else()
     # res files are built resource files using rc files.
     # use llvm-rc exe to build the res files


let's go with

let's go with

name rel/path/to/name

in etc/packages.list

--- cmake/install_cmake_infrastructure.cmake
+++ cmake/install_cmake_infrastructure.cmake
@@ -56,7 +56,7 @@
   endif()
   file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/etc)
   safe_execute_process(COMMAND ${catkin_EXTRAS_DIR}/update_index.py
-    ${CMAKE_BINARY_DIR}/etc/packages.yaml
+    ${CMAKE_BINARY_DIR}/etc/packages.list
     "${PACKAGE_NAME}"
     "${PACKAGE_RELATIVE_PATH}"
     )


ENH: Merge changes from main tree into VTK-5-2 branch. (cvs -q up -j1.5 -j1.6 CMake/KitCommonPythonWrapBlock.cmake)

--- CMake/KitCommonPythonWrapBlock.cmake
+++ CMake/KitCommonPythonWrapBlock.cmake
@@ -54,4 +54,15 @@
   IF(WIN32 OR APPLE)
     TARGET_LINK_LIBRARIES (vtk${KIT}Python ${VTK_PYTHON_LIBRARIES})
   ENDIF(WIN32 OR APPLE)
+
+  # Generally the pyhon extension module created is installed using setup.py.
+  # However projects that include VTK (such as ParaView) can override this
+  # behaviour by not using setup.py, instead directly installing the extension
+  # module at the same location as other libraries.
+  IF (VTK_INSTALL_PYTHON_USING_CMAKE AND NOT VTK_INSTALL_NO_LIBRARIES)
+    INSTALL(TARGETS vtk${KIT}Python
+      RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
+      LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
+      ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+  ENDIF (VTK_INSTALL_PYTHON_USING_CMAKE AND NOT VTK_INSTALL_NO_LIBRARIES)
 ENDIF(PYTHON_ENABLE_MODULE_vtk${KIT}Python)


fbcode_builder: use build interface generator expression for thrift include directories

Summary:
Fix an error about source directories being included in the include
path in add_thrift_cpp2_library. I don't know why this was failing for
fb303 and not for other projects, but adding a generation expression
appears to fix the issue.

Reviewed By: strager

Differential Revision: D15725024

fbshipit-source-id: 6c02fed6c6703733cf9e0b130c0f90b70e3ea300

--- build/fbcode_builder/CMake/ThriftCppLibrary.cmake
+++ build/fbcode_builder/CMake/ThriftCppLibrary.cmake
@@ -105,8 +105,8 @@
   target_include_directories(
     ${LIB_NAME}
     PUBLIC
-      ${CMAKE_SOURCE_DIR}
-      ${CMAKE_BINARY_DIR}
+      $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
+      $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
       ${FOLLY_INCLUDE_DIR}
       ${FBTHRIFT_INCLUDE_DIR}
   )


Removed the unsetting of ${libPortAudioCpp}

I was trying to use your cmake-file for one of my projects, though it didn't find the cpp-library correctly. Took a quick peek in the file and found that the variable was unset quickly after it was set and just before it was used. This pull request corrects this.

--- CmakeIncludes/FindPortAudio.cmake
+++ CmakeIncludes/FindPortAudio.cmake
@@ -15,16 +15,14 @@
 )

-
-# finally the library itself
+# Finally the library itself.
 find_library(libPortAudio NAMES portaudio)
 find_library(libPortAudioCpp NAMES portaudiocpp)
-set(libPortAudioCpp "")
 set(PORTAUDIO_LIBRARIES ${libPortAudio} ${libPortAudioCpp})

-# handle the QUIETLY and REQUIRED arguments and set PORTAUDIO_FOUND to TRUE if
-# all listed variables are TRUE
+# Handle the QUIETLY and REQUIRED arguments and set PORTAUDIO_FOUND to TRUE if
+# all listed variables are TRUE.
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(PortAudio DEFAULT_MSG PORTAUDIO_LIBRARIES PORTAUDIO_INCLUDE_DIR)

-mark_as_advanced(PORTAUDIO_LIBRARIES PORTAUDIO_INCLUDE_DIR)+mark_as_advanced(PORTAUDIO_LIBRARIES PORTAUDIO_INCLUDE_DIR)


cmake: Remove unused or obsolete module

cmake: Remove unused or obsolete module

Starting with CMake >= 3.4, the module CMakeParseArguments is natively
implemented in CMake and explicitly including the module is not needed.


Always optimize the builtin library bitcode.

Otherwise linker.cpp takes forever and might explode the memory usage
at runtime regardless of the LLVM build type. Better pay it once at
build time. linker.cpp might also perform unneccessary copying in that
case (that should be investigated). With optimized bitcode it works
within reasonable link time and memory usage.

--- cmake/bitcode_rules.cmake
+++ cmake/bitcode_rules.cmake
@@ -141,12 +141,7 @@
   set(BC_LIST_FILE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/kernel_${NAME}_linklist.txt")
   file(WRITE "${BC_LIST_FILE}" "${BC_LIST_FILE_TXT}")

-  # opt command of llvm debug builds takes forever, skip it
-  if(LLVM_BUILD_MODE_DEBUG)
-    set(OPT_CMD "${CMAKE_COMMAND}" -E copy "kernel-${NAME}-unoptimized.bc" "${KERNEL_BC}")
-  else()
-    set(OPT_CMD "${LLVM_OPT}" ${LLC_FLAGS} "-O3" "-fp-contract=off" "-o" "${KERNEL_BC}" "kernel-${NAME}-unoptimized.bc")
-  endif()
+  set(OPT_CMD "${LLVM_OPT}" ${LLC_FLAGS} "-O3" "-fp-contract=off" "-o" "${KERNEL_BC}" "kernel-${NAME}-unoptimized.bc")

   add_custom_command( OUTPUT "${KERNEL_BC}"
 # ${KERNEL_BC}: ${OBJ}


fix grpc cdn

fix grpc cdn

--- cmake/external/grpc.cmake
+++ cmake/external/grpc.cmake
@@ -44,7 +44,7 @@
     # 3. keep only zlib, cares, protobuf, boringssl under "third_party",
     #    checkout and clean other dirs under third_party
     # 4. remove .git, and package the directory.
-    URL "http://paddlepaddledeps.bj.bcebos.com/grpc-v1.10.x.tar.gz"
+    URL "http://paddlepaddledeps.cdn.bcebos.com/grpc-v1.10.x.tar.gz"
     URL_MD5  "1f268a2aff6759839dccd256adcc91cf"
     PREFIX          ${GRPC_SOURCES_DIR}
     UPDATE_COMMAND  ""


fix install path (rm msg/srv dir)

fix install path (rm msg/srv dir)

--- cmake/rosruby-macro.cmake
+++ cmake/rosruby-macro.cmake
@@ -22,17 +22,9 @@
     -d ${ROSRUBY_DEVEL_LIB_DESTINATION}
     )
   foreach(package ${ARGN})
-    if(EXISTS ${ROSRUBY_DEVEL_LIB_DESTINATION}/msg/${package})
-      install(DIRECTORY
-	${ROSRUBY_DEVEL_LIB_DESTINATION}/msg/${package}
-	DESTINATION ${ROSRUBY_LIB_DESTINATION}
-	)
-    endif()
-    if(EXISTS ${ROSRUBY_DEVEL_LIB_DESTINATION}/srv/${package})
-      install(DIRECTORY
-	${ROSRUBY_DEVEL_LIB_DESTINATION}/srv/${package}
-	DESTINATION ${ROSRUBY_LIB_DESTINATION}
-	)
-    endif()
+    install(DIRECTORY
+      ${ROSRUBY_DEVEL_LIB_DESTINATION}/${package}
+      DESTINATION ${ROSRUBY_LIB_DESTINATION}
+      )
   endforeach()
 endmacro()


cmake: Improve error messages for detecting libgcc

Use two different variables for the distinct values LIBGCC_FILE_NAME
and LIBGCC_DIR and assert that each of them exists.

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

--- cmake/toolchain-gcc.cmake
+++ cmake/toolchain-gcc.cmake
@@ -76,7 +76,7 @@

 execute_process(
   COMMAND ${CMAKE_C_COMPILER} ${TOOLCHAIN_C_FLAGS} --print-libgcc-file-name
-  OUTPUT_VARIABLE LIBGCC_DIR
+  OUTPUT_VARIABLE LIBGCC_FILE_NAME
   OUTPUT_STRIP_TRAILING_WHITESPACE
   )

@@ -86,9 +86,11 @@
   OUTPUT_STRIP_TRAILING_WHITESPACE
   )

-get_filename_component(LIBGCC_DIR ${LIBGCC_DIR} DIRECTORY)
+assert_exists(LIBGCC_FILE_NAME)

-assert(LIBGCC_DIR "LIBGCC_DIR not found")
+get_filename_component(LIBGCC_DIR ${LIBGCC_FILE_NAME} DIRECTORY)
+
+assert_exists(LIBGCC_DIR)

 LIST(APPEND LIB_INCLUDE_DIR "-L\"${LIBGCC_DIR}\"")
 LIST(APPEND TOOLCHAIN_LIBS gcc)


Fix issue with libgflags.so.2.2 not being found at runtime with dynamic linkage

Former-commit-id: d9e641fa9823576de9e5a9ad7a5863a6f30dbb84

--- cmake-modules/CompilerFlags.cmake
+++ cmake-modules/CompilerFlags.cmake
@@ -93,7 +93,7 @@
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND NOT CMAKE_EXE_LINKER_FLAGS MATCHES "fuse-ld=gold")
-    set(CMAKE_EXE_LINKER_FLAGS "-fuse-ld=gold ${CMAKE_EXE_LINKER_FLAGS}")
+    set(CMAKE_EXE_LINKER_FLAGS "-fuse-ld=gold ${CMAKE_EXE_LINKER_FLAGS} -Wl,--disable-new-dtags")
 endif()


build: eliminate ICC PCH warning

build: eliminate ICC PCH warning

--- cmake/OpenCVCompilerOptions.cmake
+++ cmake/OpenCVCompilerOptions.cmake
@@ -441,6 +441,7 @@
     foreach(flags CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_DEBUG CMAKE_C_FLAGS CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_DEBUG)
       string(REGEX REPLACE "( |^)/W[0-9]+( |$)" "\\1\\2" ${flags} "${${flags}}")
     endforeach()
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qwd673") # PCH warning
   endif()
 endif()


Always link dependencies for external projects

Without this, dependencies specified in ROOT_LINKER_LIBRARY() get
dropped without any warning, leading to underlinking in external
projects that make use of ROOT CMake macros (including roottest).

Fixes: ROOT-9827

--- cmake/modules/RootNewMacros.cmake
+++ cmake/modules/RootNewMacros.cmake
@@ -654,10 +654,10 @@
     if(ARG_TYPE STREQUAL SHARED)
       set_target_properties(${library} PROPERTIES  ${ROOT_LIBRARY_PROPERTIES} )
     endif()
-    if(explicitlink OR ROOT_explicitlink_FOUND)
+    if(CMAKE_PROJECT_NAME STREQUAL ROOT AND NOT explicitlink)
+      target_link_libraries(${library} PUBLIC ${ARG_LIBRARIES})
+    else()
       target_link_libraries(${library} PUBLIC ${ARG_LIBRARIES} ${ARG_DEPENDENCIES})
-    else()
-      target_link_libraries(${library} PUBLIC ${ARG_LIBRARIES})
     endif()
   endif()
   if(TARGET G__${library})


pyqt4.cmake (re-)enabled patch support

pyqt4.cmake (re-)enabled patch support

--- pyqt4.cmake
+++ pyqt4.cmake
@@ -9,7 +9,7 @@
 include (ExternalProject)
 include (ExternalSource)
 include (BuildSupport)
-#include (PatchSupport)
+include (PatchSupport)

 include (python)
 include (qt4)


Disable server_lib_test on windows.

Disable server_lib_test on windows.

PiperOrigin-RevId: 167632798

--- tensorflow/contrib/cmake/tf_tests.cmake
+++ tensorflow/contrib/cmake/tf_tests.cmake
@@ -240,6 +240,8 @@
       "${tensorflow_source_dir}/tensorflow/python/training/quantize_training_test.py"  # Needs quantization ops to be included in windows.
       "${tensorflow_source_dir}/tensorflow/python/training/supervisor_test.py"  # Flaky I/O error on rename.
       "${tensorflow_source_dir}/tensorflow/python/training/sync_replicas_optimizer_test.py"  # Needs portpicker.
+      "${tensorflow_source_dir}/tensorflow/python/training/server_lib_test.py"  # Test occasionally deadlocks.
+
       "${tensorflow_source_dir}/tensorflow/python/kernel_tests/array_ops_test.py"  # depends on python/framework/test_ops
       # Broken tensorboard test due to cmake issues.
       "${tensorflow_source_dir}/tensorflow/contrib/data/python/kernel_tests/dataset_constructor_op_test.py"


Fix MSVC version detection.

Fix MSVC version detection.

--- run_ctest.cmake
+++ run_ctest.cmake
@@ -122,7 +122,7 @@
     set(CC_NAME "msvc")
     set(CC_PLATFORM "windows")
     exec_program(cl OUTPUT_VARIABLE CC_VERSION_VERBOSE)
-    string(FIND "${CC_VERSION_VERBOSE}" "19.10" CC_VERSION_2017)
+    string(FIND "${CC_VERSION_VERBOSE}" "19.1" CC_VERSION_2017)
     if(CC_VERSION_2017 GREATER_EQUAL 0)
         set(CC_VERSION "2017")
     endif()


Removed Clang 3.7 workarrounds.

Removed Clang 3.7 workarrounds.

--- run_ctest.cmake
+++ run_ctest.cmake
@@ -291,9 +291,6 @@
             if(CC_VERSION VERSION_LESS 3.8)
                 set(CC_ASAN_FLAGS "-fuse-ld=gold")
             endif()
-            if(CC_VERSION VERSION_EQUAL 3.7)
-                set(CTEST_MEMORYCHECK_TYPE "")
-            endif()
         endif()
     endif()
 endif()


EEPROMv7 fixes

EEPROMv7 fixes

--- 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 "b6ecdc6f5a272abbf8404f0afd5f921620256d97")
+set(DEPTHAI_DEVICE_SIDE_COMMIT "a35d3a30f927ba29486d2aad2242bc2e756b249a")

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


Updated FW - NeuralNetwork hotfix

Updated FW - NeuralNetwork hotfix

--- 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 "0450e1fd6b11c892d3c75b3794a7b9839796afd2")
+set(DEPTHAI_DEVICE_SIDE_COMMIT "eef12eeeff0152ef565180bbe0e71e19da23aacf")

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


Update FW: patch EEPROM data for incorrectly programmed RGB spec translation, for manually ran calibration on CM3/CM4 boards. Was leading to wrong RGB-depth alignment

--- 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 "0db59ca9b81e4901f8bc49023fb8c0121be821a0")
+set(DEPTHAI_DEVICE_SIDE_COMMIT "5813806b6f2de7aaa4c211e5d8aa8e98774da8c8")

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


Update FW: stereo fixes: LR-check flip, `depth` align to RGB

--- 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 "2ca9f51f803f2ebb587ffb7fdcea01d6638bdf6a")
+set(DEPTHAI_DEVICE_SIDE_COMMIT "d26fdab6b0a66b09f0b3b6ca8d0dea50229278b7")

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


Do subpixel interpolation after LR-check; improves performance to 30fps@800p

--- 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 "f81a69c4d259004213234511738af9df1142c2c7")
+set(DEPTHAI_DEVICE_SIDE_COMMIT "ad6167f25ed047f2fe69caeb9006db04e469734a")

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


git describe version fix

git describe version fix

--- cmake/GetGitRevisionDescriptionExtern.cmake
+++ cmake/GetGitRevisionDescriptionExtern.cmake
@@ -1,4 +1,4 @@

 include(cmake/GetGitRevisionDescription.cmake)
-git_describe(ApproxMVBB_VERSION)
+git_describe(ApproxMVBB_VERSION "--tags")
 message(STATUS "${ApproxMVBB_VERSION}")


nuttx_crazyflie_default.cmake: add vl53lxx driver, pmw3901 driver and topic_listener

--- cmake/configs/nuttx_crazyflie_default.cmake
+++ cmake/configs/nuttx_crazyflie_default.cmake
@@ -10,6 +10,8 @@
 	drivers/imu/mpu9250
 	drivers/barometer/lps25h
 	drivers/gps
+	drivers/distance_sensor/vl53lxx
+	drivers/pmw3901
 	modules/sensors

 	#
@@ -29,6 +31,7 @@
 	systemcmds/dumpfile
 	systemcmds/ver
 	systemcmds/hardfault_log
+	systemcmds/topic_listener

 	#
 	# General system control


Fixing the installation of TBB libraries for Linux (buitin_tbb)

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -1185,7 +1185,7 @@
   )
   set(TBB_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/include)
   set(TBB_LIBRARIES ${CMAKE_BINARY_DIR}/lib/libtbb${CMAKE_SHARED_LIBRARY_SUFFIX})
-  install(FILES ${CMAKE_BINARY_DIR}/lib/libtbb${CMAKE_SHARED_LIBRARY_SUFFIX} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
+  install(DIRECTORY ${CMAKE_BINARY_DIR}/lib/ DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries FILES_MATCHING PATTERN "libtbb*")
 endif()

 #---Check for OCC--------------------------------------------------------------------


Findamentally re-wrote the check for libatomic.

Stealing from the LLVM code, the ROOT code now first checks if
code using atomics can be built without using any special libraries.
If yes, the code doesn't do anything further, it just sets up an
empty ROOT_ATOMIC_LIBS variable.

If that compilation fails, then the code looks for the libatomic
shared library, and sets ROOT_ATOMIC_LIBS to that.

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -1712,18 +1712,30 @@
 endif()

 #------------------------------------------------------------------------------------
-# Look for libatomic. On ARM systems we need to explicitly link against that library
-# in certain places. But if it's not available, then assume that we are on a system
-# on which it is not needed.
+# Check if we need libatomic to use atomic operations in the C++ code. On ARM systems
+# we generally do. First just test if CMake is able to compile a test executable
+# using atomic operations without the help of a library. Only if it can't do we start
+# looking for libatomic for the build.
 #
-string(REPLACE ":" ";" _libatomicSearchPaths "$ENV{LD_LIBRARY_PATH}")
-find_library(ROOT_ATOMIC_LIB NAMES atomic
-  HINTS ${_libatomicSearchPaths}
-  DOC "Path to the atomic library to use during the build")
-mark_as_advanced(ROOT_ATOMIC_LIB)
-if(ROOT_ATOMIC_LIB)
-  set(ROOT_ATOMIC_LIBS ${ROOT_ATOMIC_LIB})
-else()
-  set(ROOT_ATOMIC_LIBS)
-endif()
-unset(_libatomicSearchPaths)
+include(CheckCXXSourceCompiles)
+check_cxx_source_compiles("
+#include <atomic>
+#include <cstdint>
+int main() {
+   std::atomic<int> a1;
+   int a1val = a1.load();
+   std::atomic<uint64_t> a2;
+   uint64_t a2val = a2.load(std::memory_order_relaxed);
+   return 0;
+}
+" ROOT_HAVE_CXX_ATOMICS_WITHOUT_LIB)
+set(ROOT_ATOMIC_LIBS)
+if(NOT ROOT_HAVE_CXX_ATOMICS_WITHOUT_LIB)
+  find_library(ROOT_ATOMIC_LIB NAMES atomic
+    HINTS ENV LD_LIBRARY_PATH
+    DOC "Path to the atomic library to use during the build")
+  mark_as_advanced(ROOT_ATOMIC_LIB)
+  if(ROOT_ATOMIC_LIB)
+    set(ROOT_ATOMIC_LIBS ${ROOT_ATOMIC_LIB})
+  endif()
+endif()


 - More rigorous check of existance of OpenGL

git-svn-id: ecbadac9c76e8cf640a0bca86f6bd796c98521e3@49123 27541ba8-7e3a-0410-8455-c3a389f83636

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -266,7 +266,7 @@
 if(opengl)
   message(STATUS "Looking for OpenGL")
   find_package(OpenGL)
-  if(NOT OPENGL_FOUND)
+  if(NOT OPENGL_FOUND OR NOT OPENGL_GLU_FOUND)
     if(fail-on-missing)
       message(FATAL_ERROR "OpenGL package not found and opengl option required")
     else()


[cmake] Update built-in xrootd to 4.12.3:

We see authentication issues with the builtin client, see https://cern.service-now.com/service-portal?id=ticket&table=incident&sys_id=8cfde578db0d50d0006fd9f9f49619e7&view=sp
The hope is that recent xrootd changes might solve those.

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -869,8 +869,8 @@
 endif()

 if(builtin_xrootd)
-  set(XROOTD_VERSION 4.10.0)
-  set(XROOTD_VERSIONNUM 400100000)
+  set(XROOTD_VERSION 4.12.3)
+  set(XROOTD_VERSIONNUM 400120003)
   set(XROOTD_SRC_URI ${lcgpackages}/xrootd-${XROOTD_VERSION}.tar.gz)
   set(XROOTD_DESTDIR ${CMAKE_BINARY_DIR})
   set(XROOTD_ROOTDIR ${XROOTD_DESTDIR})
@@ -893,7 +893,7 @@
   ExternalProject_Add(
     XROOTD
     URL ${XROOTD_SRC_URI}
-    URL_HASH SHA256=f07f85e27d72e9e8ff124173c7b53619aed8fcd36f9d6234c33f8f7fd511995b
+    URL_HASH SHA256=6f2ca1accc8d49d605706bb556777c753860bf46d845b1ee11393a5cb5987f15
     INSTALL_DIR ${XROOTD_ROOTDIR}
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
                -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}


ARROW-4866: [C++] Fix zstd_ep build for Debug, static CRT builds. Add separate CMake variable for propagating compiler toolchain to ExternalProjects

zstd sets a bunch of its own compilation flags and they conflict with the CFLAGS/CXXFLAGS that are part of EP_COMMON_CMAKE_ARGS

Author: Wes McKinney <wesm+git@apache.org>

Closes #3905 from wesm/ARROW-4866 and squashes the following commits:

de7c0ae6 <Wes McKinney> Pass EP compiler toolchain as separate variable. Do not override CFLAGS and CXXFLAGS for zstd_ep

--- cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -350,29 +350,29 @@
 # directory. This leads to issues if the variables are exported in a subshell
 # and the invocation of make/ninja is in distinct subshell without the same
 # environment (CC/CXX).
-set(EP_COMMON_CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-                         -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
+set(EP_COMMON_TOOLCHAIN -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+                        -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
+
+if (CMAKE_AR)
+  set(EP_COMMON_TOOLCHAIN ${EP_COMMON_TOOLCHAIN}
+                           -DCMAKE_AR=${CMAKE_AR})
+endif()
+
+if (CMAKE_RANLIB)
+  set(EP_COMMON_TOOLCHAIN ${EP_COMMON_TOOLCHAIN}
+                           -DCMAKE_RANLIB=${CMAKE_RANLIB})
+endif()

 # External projects are still able to override the following declarations.
 # cmake command line will favor the last defined variable when a duplicate is
 # encountered. This requires that `EP_COMMON_CMAKE_ARGS` is always the first
 # argument.
-set(EP_COMMON_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS}
+set(EP_COMMON_CMAKE_ARGS ${EP_COMMON_TOOLCHAIN}
                          -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
                          -DCMAKE_C_FLAGS=${EP_C_FLAGS}
                          -DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_C_FLAGS}
                          -DCMAKE_CXX_FLAGS=${EP_CXX_FLAGS}
                          -DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_CXX_FLAGS})
-
-if (CMAKE_AR)
-  set(EP_COMMON_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS}
-                           -DCMAKE_AR=${CMAKE_AR})
-endif()
-
-if (CMAKE_RANLIB)
-  set(EP_COMMON_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS}
-                           -DCMAKE_RANLIB=${CMAKE_RANLIB})
-endif()

 if (NOT ARROW_VERBOSE_THIRDPARTY_BUILD)
   set(EP_LOG_OPTIONS
@@ -1438,7 +1438,7 @@
   message(STATUS "Building zstd from source")
   set(ZSTD_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/zstd_ep-install")

-  set(ZSTD_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS}
+  set(ZSTD_CMAKE_ARGS ${EP_COMMON_TOOLCHAIN}
     "-DCMAKE_INSTALL_PREFIX=${ZSTD_PREFIX}"
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
     -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}


v2x: Rename test function.

v2x: Rename test function.

Signed-off-by: Tim 'mithro' Ansell <b1c1d8736f20db3fb6c1c66bb1455ed43909f0d8@mith.ro>

--- v2x_tests.cmake
+++ v2x_tests.cmake
@@ -1,9 +1,9 @@
 # Creating new target to call all the added tests
 add_custom_target(all_v2x_tests ALL)

-function(V2X_GENERIC_TEST)
+function(V2X_TEST_GENERIC)
   # ~~~
-  # V2X_GENERIC_TEST(
+  # V2X_TEST_GENERIC(
   #   NAME name
   #   TYPE pb_type | model
   #   )
@@ -18,19 +18,19 @@
   #
   # In addition it adds the newly created target to the `all_v2x_tests` dependencies. (all tests will be performed with `make all_v2x_tests`)
   #
-  # Usage: v2x_generic_test(NAME <test_name> TYPE <model|pb_type>) (All fields are required)
+  # Usage: v2x_test_generic(NAME <test_name> TYPE <model|pb_type>) (All fields are required)

   set(oneValueArgs NAME TYPE)
   cmake_parse_arguments(
-    V2X_GENERIC_TEST
+    V2X_TEST_GENERIC
     "${options}"
     "${oneValueArgs}"
     "${multiValueArgs}"
     ${ARGN}
   )

-  set(TYPE ${V2X_GENERIC_TEST_TYPE})
-  set(NAME ${V2X_GENERIC_TEST_NAME})
+  set(TYPE ${V2X_TEST_GENERIC_TYPE})
+  set(NAME ${V2X_TEST_GENERIC_NAME})

   # pb_type checking
   set(GOLDEN_XML golden.${TYPE}.xml)
@@ -51,7 +51,7 @@
     POST_BUILD
     COMMAND cp ${ACTUAL_XML} ${CMAKE_CURRENT_SOURCE_DIR}/golden.${TYPE}.xml
     )
-endfunction(V2X_GENERIC_TEST)
+endfunction(V2X_TEST_GENERIC)

 function(V2X_TEST_MODEL)
   # ~~~
@@ -61,7 +61,7 @@
   #   )
   # ~~~
   #
-  # This function is to test only the model XML generation. It will call V2X_GENERIC_TEST with the field TYPE set to `model`.
+  # This function is to test only the model XML generation. It will call V2X_TEST_GENERIC with the field TYPE set to `model`.
   #
   # NAME name of the test.
   # TOP_MODULE name of the top verilog module that has to be tested.
@@ -83,7 +83,7 @@
   set(SRC ${NAME}.sim.v)
   v2x(NAME ${NAME} SRCS ${SRC} TOP_MODULE ${TOP_MODULE})

-  v2x_generic_test(NAME ${NAME} TOP_MODULE ${TOP_MODULE} TYPE model)
+  v2x_test_generic(NAME ${NAME} TOP_MODULE ${TOP_MODULE} TYPE model)

   add_custom_target(${NAME}_diff ALL DEPENDS ${NAME}_model_diff)
 endfunction(V2X_TEST_MODEL)
@@ -96,7 +96,7 @@
   #   )
   # ~~~
   #
-  # This function is to test only the pb_type XML generation. It will call V2X_GENERIC_TEST with the field TYPE set to `pb_type`
+  # This function is to test only the pb_type XML generation. It will call V2X_TEST_GENERIC with the field TYPE set to `pb_type`
   #
   # NAME name of the test.
   # TOP_MODULE name of the top verilog module that has to be tested.
@@ -118,7 +118,7 @@
   set(SRC ${NAME}.sim.v)
   v2x(NAME ${NAME} SRCS ${SRC} TOP_MODULE ${TOP_MODULE})

-  v2x_generic_test(NAME ${NAME} TOP_MODULE ${TOP_MODULE} TYPE pb_type)
+  v2x_test_generic(NAME ${NAME} TOP_MODULE ${TOP_MODULE} TYPE pb_type)

   add_custom_target(${NAME}_diff ALL DEPENDS ${NAME}_pb_type_diff)
 endfunction(V2X_TEST_PB_TYPE)
@@ -131,7 +131,7 @@
   #   )
   # ~~~
   #
-  # This function is to test both the pb_type XML generation. It will call V2X_GENERIC_TEST multiple times first with the field TYPE set to `pb_type`
+  # This function is to test both the pb_type XML generation. It will call V2X_TEST_GENERIC multiple times first with the field TYPE set to `pb_type`
   # then with `model`
   #
   # NAME name of the test.
@@ -154,8 +154,8 @@
   set(SRC ${NAME}.sim.v)
   v2x(NAME ${NAME} SRCS ${SRC} TOP_MODULE ${TOP_MODULE})

-  v2x_generic_test(NAME ${NAME} TOP_MODULE ${MODULE} TYPE pb_type)
-  v2x_generic_test(NAME ${NAME} TOP_MODULE ${TOP_MODULE} TYPE model)
+  v2x_test_generic(NAME ${NAME} TOP_MODULE ${MODULE} TYPE pb_type)
+  v2x_test_generic(NAME ${NAME} TOP_MODULE ${TOP_MODULE} TYPE model)
   vpr_test_pbtype(NAME ${NAME})

   add_custom_target(${NAME}_diff ALL DEPENDS ${NAME}_pb_type_diff ${NAME}_model_diff)


CMake: update FeatureSummary

CMake: update FeatureSummary

--- CMake/FeatureSummary.cmake
+++ CMake/FeatureSummary.cmake
@@ -69,6 +69,9 @@
 if (OGRE_BUILD_PLUGIN_OCTREE)
 	set(_plugins "${_plugins}  + Octree scene manager\n")
 endif ()
+if(OGRE_BUILD_PLUGIN_EXRCODEC)
+	set(_plugins "${_plugins}  + OpenEXR image codec\n")
+endif()
 if (OGRE_BUILD_PLUGIN_PCZ)
 	set(_plugins "${_plugins}  + Portal connected zone scene manager\n")
 endif ()
@@ -150,14 +153,11 @@
 if (OGRE_CONFIG_ENABLE_GLES2_CG_SUPPORT)
 	set(_core "${_core}  + Cg for OpenGL ES 2.0\n")
 endif ()
-if (OGRE_CONFIG_ENABLE_GLES2_VAO_SUPPORT)
-	set(_core "${_core}  + VertexArrayObjects for OpenGL ES 2.0\n")
-endif ()
 if (OGRE_CONFIG_ENABLE_GL_STATE_CACHE_SUPPORT)
 	set(_core "${_core}  + StateCacheManager for OpenGL\n")
 endif ()
 if (OGRE_CONFIG_ENABLE_GLES3_SUPPORT)
-	set(_core "${_core}  + OpenGL ES 3.0 Support (EXPERIMENTAL)\n")
+	set(_core "${_core}  + OpenGL ES 3.0 Support [BETA]\n")
 endif ()
 if (OGRE_CONFIG_ENABLE_QUAD_BUFFER_STEREO)
 	set(_core "${_core}  + Quad Buffer Stereo Technology (EXPERIMENTAL)\n")


Issue #43: Updates to move from Boost 1.64 to 1.68

--- CMake/mpIncludeBoost.cmake
+++ CMake/mpIncludeBoost.cmake
@@ -34,7 +34,7 @@
     set(Boost_USE_STATIC_LIBS ON)
     set(Boost_USE_STATIC_RUNTIME ON)
   endif()
-  find_package(Boost 1.64 EXACT COMPONENTS ${MYPROJECT_BOOST_LIBS} REQUIRED)
+  find_package(Boost 1.68 EXACT COMPONENTS ${MYPROJECT_BOOST_LIBS} REQUIRED)
   include_directories(${Boost_INCLUDE_DIRS})
   link_directories(${Boost_LIBRARY_DIRS})
   if(WIN32)


Remove unused compiler flag,

Remove unused compiler flag,

for C, not C++.
reduces compilation messages

--- CommonCompilerConfig.cmake
+++ CommonCompilerConfig.cmake
@@ -261,7 +261,7 @@

   set(shared_compile_flags "${shared_compile_flags} ${stdlib_common} -fdiagnostics-show-option")
   set (internal_compiler_warning_flags "${internal_compiler_warning_flags} -Werror -Wextra -Wreturn-type -Wunused -Wno-unused-variable -Wno-unused-parameter -Wno-missing-field-initializers")
-  set (external_compiler_warning_flags "${external_compiler_warning_flags} -Wno-unused-variable -Wno-unused-parameter -Wno-incompatible-pointer-types -Wno-deprecated-declarations")
+  set (external_compiler_warning_flags "${external_compiler_warning_flags} -Wno-unused-variable -Wno-unused-parameter -Wno-deprecated-declarations")

   CHECK_CXX_COMPILER_FLAG(-m${BITNESS} compiler_supports_machine_option)
   if (compiler_supports_machine_option)


CMSIS-DSP: Corrected wrong table in fft.cmake

--- CMSIS/DSP/Source/fft.cmake
+++ CMSIS/DSP/Source/fft.cmake
@@ -224,7 +224,7 @@
 endif()

 if (CONFIGTABLE AND RFFT_F32_64)
-    target_compile_definitions(${PROJECT} PUBLIC ARM_TABLE_REALCOEF_Q31)
+    target_compile_definitions(${PROJECT} PUBLIC ARM_TABLE_REALCOEF_F32)
     # For cfft_radix4_init
     target_compile_definitions(${PROJECT} PUBLIC ARM_TABLE_BITREV_1024)
     target_compile_definitions(${PROJECT} PUBLIC ARM_TABLE_TWIDDLECOEF_F32_4096)


BUG: fix a typo in gdal cmake conf file

BUG: fix a typo in gdal cmake conf file

--- SuperBuild/CMake/External_gdal.cmake
+++ SuperBuild/CMake/External_gdal.cmake
@@ -148,7 +148,7 @@
 endif()

 if(WIN32)
-  set(GDAL_URL "https://download.osgeo.org/gdal/3.2.2/gdal-3.2.2.tar.xz"
+  set(GDAL_URL "https://download.osgeo.org/gdal/3.2.2/gdal-3.2.2.tar.xz")
   set(GDAL_MD5 c656be582f7beb528c66486cd1fca7a2)
 else()
   set(GDAL_URL "https://download.osgeo.org/gdal/3.4.0/gdal-3.4.0.tar.xz")


BUG: mantis-1274: use autoconf on *nix. cmake build isn't mature

--- SuperBuild/CMake/External_glut.cmake
+++ SuperBuild/CMake/External_glut.cmake
@@ -2,10 +2,24 @@

 if(APPLE)
   message(FATAL_ERROR "Cannot activate GLUT on OSX. See manits issue #1194")
-  retunr()
+  return()
 endif()

 SETUP_SUPERBUILD(GLUT)
+
+if(UNIX)
+set(GLUT_PATCH_COMMAND ${CMAKE_COMMAND}
+  -E copy
+  ${CMAKE_SOURCE_DIR}/patches/GLUT/CMakeLists.txt
+  ${GLUT_SB_SRC}
+)
+
+set(GLUT_CONFIGURE_COMMAND  "${SB_ENV_CONFIGURE_CMD};${GLUT_SB_SRC}/configure" )
+
+else(MSVC)
+  set(GLUT_PATCH_COMMAND)
+  set(GLUT_CONFIGURE_COMMAND ${SB_CMAKE_COMMAND} ${SB_CMAKE_CACHE_ARGS})
+endif()

 ExternalProject_Add(GLUT
   PREFIX GLUT
@@ -14,11 +28,8 @@
   BINARY_DIR ${GLUT_SB_BUILD_DIR}
   INSTALL_DIR ${SB_INSTALL_PREFIX}
   DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
-  PATCH_COMMAND ${CMAKE_COMMAND} -E copy
-  ${CMAKE_SOURCE_DIR}/patches/GLUT/CMakeLists.txt
-  ${GLUT_SB_SRC}
-  CMAKE_CACHE_ARGS ${SB_CMAKE_CACHE_ARGS}
-  CMAKE_COMMAND ${SB_CMAKE_COMMAND}
+  PATCH_COMMAND ${GLUT_PATCH_COMMAND}
+  CONFIGURE_COMMAND ${GLUT_CONFIGURE_COMMAND}
   )

 set(_SB_GLUT_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)


fbcode_builder: support installing thrift generated header files

Summary:
Update add_thrift_cpp2_library() to add a PUBLIC_HEADER property to the
generated library target, so that the generated headers can be installed using
an `install()` call.  Also add a `HEADER_INSTALL_DIR` property which indicates
the directory they should be installed into.  A `INCLUDE_DIR` argument was
added to customize the include installation path, should anyone care to do so.

This also removes code that was previously incorrectly installing the
generated headers into the source tree.

Reviewed By: wez

Differential Revision: D16853404

fbshipit-source-id: 6f640b2bd347c99804e074fca0209dda37c8a9cf

--- build/fbcode_builder/CMake/ThriftCppLibrary.cmake
+++ build/fbcode_builder/CMake/ThriftCppLibrary.cmake
@@ -4,10 +4,26 @@

 include(FBCMakeParseArgs)

+# Generate a C++ library from a thrift file
+#
+# Parameters:
+# - SERVICES <svc1> [<svc2> ...]
+#   The names of the services defined in the thrift file.
+# - DEPENDS <dep1> [<dep2> ...]
+#   A list of other thrift C++ libraries that this library depends on.
+# - OPTIONS <opt1> [<opt2> ...]
+#   A list of options to pass to the thrift compiler.
+# - INCLUDE_DIR <path>
+#   The sub-directory where generated headers will be installed.
+#   Defaults to "include" if not specified.  The caller must still call
+#   install() to install the thrift library if desired.
 function(add_thrift_cpp2_library LIB_NAME THRIFT_FILE)
   # Parse the arguments
+  set(one_value_args INCLUDE_DIR)
   set(multi_value_args SERVICES DEPENDS OPTIONS)
-  fb_cmake_parse_args(ARG "" "" "${multi_value_args}" "${ARGN}")
+  fb_cmake_parse_args(
+    ARG "" "${one_value_args}" "${multi_value_args}" "${ARGN}"
+  )

   get_filename_component(base ${THRIFT_FILE} NAME_WE)
   get_filename_component(
@@ -23,6 +39,9 @@
     "${CMAKE_CURRENT_SOURCE_DIR}/${THRIFT_FILE}"
   )
   get_filename_component(include_prefix ${include_prefix} DIRECTORY)
+  if(NOT DEFINED ARG_INCLUDE_DIR)
+    set(ARG_INCLUDE_DIR "include")
+  endif()

   if (NOT "${include_prefix}" STREQUAL "")
     list(APPEND ARG_OPTIONS "include_prefix=${include_prefix}")
@@ -110,19 +129,11 @@
     ${generated_sources}
   )

-  install(
-    FILES ${generated_headers}
-    DESTINATION $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/gen-cpp2
-  )
-
   target_include_directories(
     "${LIB_NAME}"
-    PRIVATE
-      ${CMAKE_SOURCE_DIR}
-      ${CMAKE_BINARY_DIR}
     PUBLIC
-      ${FOLLY_INCLUDE_DIR}
-      ${FBTHRIFT_INCLUDE_DIR}
+      "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>"
+      "$<INSTALL_INTERFACE:${ARG_INCLUDE_DIR}>"
   )
   target_link_libraries(
     "${LIB_NAME}"
@@ -132,14 +143,27 @@
       Folly::folly
   )

+  # Add ${generated_headers} to the PUBLIC_HEADER property for ${LIB_NAME}
+  #
+  # This allows callers to install it using
+  # "install(TARGETS ${LIB_NAME} PUBLIC_HEADER)"
+  # However, note that CMake's PUBLIC_HEADER behavior is rather inflexible,
+  # and does have any way to preserve header directory structure.  Callers
+  # must be careful to use the correct PUBLIC_HEADER DESTINATION parameter
+  # when doing this, to put the files the correct directory themselves.
+  # We define a HEADER_INSTALL_DIR property with the include directory prefix,
+  # so typically callers should specify the PUBLIC_HEADER DESTINATION as
+  # "$<TARGET_PROPERTY:${LIB_NAME},HEADER_INSTALL_DIR>"
+  set_property(
+    TARGET "${LIB_NAME}"
+    PROPERTY PUBLIC_HEADER ${generated_headers}
+  )
+
   set_target_properties(
     "${LIB_NAME}"
     PROPERTIES
       EXPORT_PROPERTIES "THRIFT_INCLUDE_DIRECTORY"
       THRIFT_INCLUDE_DIRECTORY "${CMAKE_SOURCE_DIR}"
+      HEADER_INSTALL_DIR "${ARG_INCLUDE_DIR}/${include_prefix}/gen-cpp2"
   )
-
-  get_property(thrift_include_directory
-    TARGET "${LIB_NAME}"
-    PROPERTY THRIFT_INCLUDE_DIRECTORY)
 endfunction()


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -15,7 +15,7 @@
 SET(KWSYS_DATE_STAMP_YEAR  2010)

 # KWSys version date month component.  Format is MM.
-SET(KWSYS_DATE_STAMP_MONTH 11)
+SET(KWSYS_DATE_STAMP_MONTH 12)

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


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   11)
+SET(KWSYS_DATE_STAMP_DAY   12)


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   03)
+SET(KWSYS_DATE_STAMP_DAY   04)


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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


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

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   15)
+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 04)

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


fix windows libusb build error

fix windows libusb build error

--- thirdparty/thirdparty.cmake
+++ thirdparty/thirdparty.cmake
@@ -386,8 +386,8 @@
     ${libusb_root}/msvc/config.h

     # platform specific implementation
-    ${libusb_dir}/os/windows_usb.h
-    ${libusb_dir}/os/windows_usb.c
+    ${libusb_dir}/os/windows_winusb.h
+    ${libusb_dir}/os/windows_winusb.c

     ${libusb_dir}/os/threads_windows.h
     ${libusb_dir}/os/threads_windows.c


vigra.cmake: Removed extra period in libpython.

--- vigra.cmake
+++ vigra.cmake
@@ -92,7 +92,7 @@

         -DPYTHON_EXECUTABLE=${PYTHON_EXE}
         -DPYTHON_INCLUDE_PATH=${PYTHON_PREFIX}/include
-        -DPYTHON_LIBRARIES=${PYTHON_PREFIX}/lib/libpython.2.7.${BUILDEM_PLATFORM_DYLIB_EXTENSION}
+        -DPYTHON_LIBRARIES=${PYTHON_PREFIX}/lib/libpython2.7.${BUILDEM_PLATFORM_DYLIB_EXTENSION}
         -DPYTHON_NUMPY_INCLUDE_DIR=${PYTHON_PREFIX}/lib/python2.7/site-packages/numpy/core/include
         -DPYTHON_SPHINX=${PYTHON_PREFIX}/bin/sphinx-build


Minor CPack tweak

Minor CPack tweak

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

--- CPackConfig.cmake
+++ CPackConfig.cmake
@@ -26,9 +26,6 @@
 set(CPACK_RESOURCE_FILE_LICENSE ${Equalizer_SOURCE_DIR}/LICENSE.txt)
 set(CPACK_RESOURCE_FILE_README ${Equalizer_SOURCE_DIR}/RELNOTES.txt)

-if(EQ_REVISION AND NOT EQUALIZER_RELEASE)
-  set(CPACK_PACKAGE_VERSION_PATCH ${CPACK_PACKAGE_VERSION_PATCH}.${EQ_REVISION})
-endif()
 if(EQUALIZER_NIGHTLY)
   set(CPACK_PACKAGE_VERSION_PATCH
       ${CPACK_PACKAGE_VERSION_PATCH}-${EQUALIZER_BUILD_ARCH})
@@ -36,6 +33,7 @@
 if(EQUALIZER_PACKAGE_VERSION)
   set(CPACK_PACKAGE_VERSION_PATCH
       ${CPACK_PACKAGE_VERSION_PATCH}-${EQUALIZER_PACKAGE_VERSION})
+  set(CPACK_RPM_PACKAGE_RELEASE ${EQUALIZER_PACKAGE_VERSION})
 endif()

 set(CPACK_COMPONENTS_ALL colib codev eqlib eqdev man doc apps examples tools data vmmlib)
@@ -101,10 +99,6 @@

 set(CPACK_OSX_PACKAGE_VERSION "${EQ_OSX_VERSION}")

-if(EQ_REVISION)
-  set(CPACK_RPM_PACKAGE_RELEASE ${EQ_REVISION})
-endif()
-
 if(MSVC)
   set(CPACK_GENERATOR "NSIS")
 endif(MSVC)


change cdash site ip address

change cdash site ip address

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -1,7 +1,7 @@
-set(CTEST_PROJECT_NAME "DRC")
-set(CTEST_NIGHTLY_START_TIME "22:00:00 EDT")
+set(CTEST_PROJECT_NAME "director")
+set(CTEST_NIGHTLY_START_TIME "00:00:00 EDT")

 set(CTEST_DROP_METHOD "http")
-set(CTEST_DROP_SITE "kobol.csail.mit.edu")
-set(CTEST_DROP_LOCATION "/cd/submit.php?project=Director")
+set(CTEST_DROP_SITE "128.30.27.135")
+set(CTEST_DROP_LOCATION "/submit.php?project=director")
 set(CTEST_DROP_SITE_CDASH TRUE)


ENH: Use existing my.cdash.org dashboard.

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -8,6 +8,6 @@
 set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")

 set(CTEST_DROP_METHOD "http")
-set(CTEST_DROP_SITE "testing.psychiatry.uiowa.edu")
+set(CTEST_DROP_SITE "my.cdash.org")
 set(CTEST_DROP_LOCATION "/CDash/submit.php?project=ANTS")
 set(CTEST_DROP_SITE_CDASH TRUE)


[t:4871] don't run stress-gc2.tdb under valgrind

git-svn-id: b5c078ec0b4d3a50497e9dd3081db18a5b4f16e5@44656 c7de825b-a66e-492c-adef-691d508d4ae1

--- CTestCustom.cmake
+++ CTestCustom.cmake
@@ -28,6 +28,7 @@
   ydb/preload-db-nested.tdb
   ydb/recovery_fileops_unit.tdb
   ydb/stress-gc.tdb
+  ydb/stress-gc2.tdb
   ydb/stress-test.bdb
   ydb/stress-test.tdb
   ydb/test-prepare.tdb


Clean up.

Clean up.

--- CTestCustom.cmake
+++ CTestCustom.cmake
@@ -13,8 +13,3 @@
 	${CTEST_CUSTOM_WARNING_EXCEPTION}
 	"ranlib: file: .* has no symbols"
 )
-
-# Ignore ctypes test on alpine linux.
-if(EXISTS "/etc/alpine-release")
-#  set(CTEST_CUSTOM_TESTS_IGNORE python-ctypes)
-endif()


line length (#174)

line length (#174)

* line length

* updated

* Fix spelling

--- rosidl_cmake/cmake/rosidl_target_interfaces.cmake
+++ rosidl_cmake/cmake/rosidl_target_interfaces.cmake
@@ -41,8 +41,9 @@
   endif()
   set(typesupport_target "${interface_target}__${typesupport_name}")
   if(NOT TARGET ${typesupport_target})
-    message(FATAL_ERROR "rosidl_target_interfaces() the second argument concattenated "
-      "with the third argument using double underscores must be a valid target name")
+    message(FATAL_ERROR
+      "rosidl_target_interfaces() the second argument concatenated with the "
+      "third argument using double underscores must be a valid target name")
   endif()

   add_dependencies(${target} ${interface_target})


[cmake] Clean up OPENSIM_ADD_TESTS.

[cmake] Clean up OPENSIM_ADD_TESTS.

--- cmake/OpenSimMacros.cmake
+++ cmake/OpenSimMacros.cmake
@@ -184,7 +184,7 @@
             add_executable(${TEST_NAME} ${test_program}
                 ${OSIMADDTESTS_SOURCES})
             target_link_libraries(${TEST_NAME} ${OSIMADDTESTS_LINKLIBS})
-            add_test(${TEST_NAME} ${TEST_PATH}/${TEST_NAME})
+            add_test(NAME ${TEST_NAME} COMMAND ${TEST_NAME})
             set_target_properties(${TEST_NAME} PROPERTIES
                 PROJECT_LABEL "Tests - ${TEST_NAME}")

@@ -194,8 +194,7 @@
         foreach(data_file ${OSIMADDTESTS_DATAFILES})
             # This command re-copies the data files if they are modified;
             # custom commands don't do this.
-            configure_file("${data_file}" "${CMAKE_CURRENT_BINARY_DIR}"
-                COPYONLY)
+            file(COPY "${data_file}" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
         endforeach()

         #if(UNIX)


update cinn commit id tag to the newest one for fix some bugs (#36890)

update cinn commit id tag to the newest one for fix some bugs

--- cmake/external/cinn.cmake
+++ cmake/external/cinn.cmake
@@ -27,7 +27,7 @@
 include(ExternalProject)
 set(CINN_SOURCE_DIR ${THIRD_PARTY_PATH}/CINN)
 # TODO(zhhsplendid): Modify git tag after we have release tag
-set(CINN_GIT_TAG cb030430d76f42f7310d09608f9b22959ecbcb51)
+set(CINN_GIT_TAG 2122413fc74f4020ff4397b54488a793529d581b)
 set(CINN_OPTIONAL_ARGS -DPY_VERSION=${PY_VERSION} -DWITH_CUDA=${WITH_GPU} -DWITH_CUDNN=${WITH_GPU} -DPUBLISH_LIBS=ON -DWITH_TESTING=ON)
 set(CINN_BUILD_COMMAND $(MAKE) cinnapi -j)
 ExternalProject_Add(


fix cmake error message. (#29421)

fix cmake error message. (#29421)

--- cmake/inference_lib.cmake
+++ cmake/inference_lib.cmake
@@ -322,7 +322,7 @@
                 "WITH_TENSORRT: ${TENSORRT_FOUND}\n" "TensorRT version: v${TENSORRT_MAJOR_VERSION}\n")
     endif()
     if(WITH_LITE)
-        file(APPEND ${version_file} "WITH_LITE: ${WITH_LITE}\n" "LITE_GIT_TAG: ${LITE_GIT_TAG}\n"})
+        file(APPEND ${version_file} "WITH_LITE: ${WITH_LITE}\n" "LITE_GIT_TAG: ${LITE_GIT_TAG}\n")
     endif()

 endfunction()


pure R based benchmark script

pure R based benchmark script

--- cmake/vSMCFunctions.cmake
+++ cmake/vSMCFunctions.cmake
@@ -50,7 +50,7 @@
 FUNCTION (COPY_DIRECTORY basename dirname fullpath)
     FILE (GLOB_RECURSE dirfiles ${fullpath}/*)
     ADD_CUSTOM_COMMAND (
-        OUTPUT ${PROJECT_BINARY_DIR}/${dirname} DEPENDS dirfiles
+        OUTPUT ${PROJECT_BINARY_DIR}/${dirname} DEPENDS ${dirfiles}
         COMMAND ${CMAKE_COMMAND} ARGS -E copy_directory
         ${fullpath} ${PROJECT_BINARY_DIR}/${dirname})
     ADD_CUSTOM_TARGET (${basename}-${dirname}


Added Visual Studio 2013 to FindFBX.

Added Visual Studio 2013 to FindFBX.

--- FindFBX.cmake
+++ FindFBX.cmake
@@ -52,7 +52,7 @@
     find_library(${_name}
         NAMES ${_lib}
         HINTS ${FBX_SEARCH_LOCATIONS}
-        PATH_SUFFIXES lib/${fbx_compiler}/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()


ENH: change to test to detect error

ENH: change to test to detect error

--- CI/main_ci.cmake
+++ CI/main_ci.cmake
@@ -73,7 +73,7 @@
             CAPTURE_CMAKE_ERROR _build_error
             )

-if ( _build_rv EQUAL -1 )
+if ( NOT _build_rv EQUAL 0 )
   message( SEND_ERROR "An error occurs during ctest_build:
     ${_build_error}")
 endif()


New version: 0.4.9

New version: 0.4.9

--- VERSION.cmake
+++ VERSION.cmake
@@ -1,3 +1,3 @@
 SET(HAWKEY_MAJOR "0")
 SET(HAWKEY_MINOR "4")
-SET(HAWKEY_PATCH "8")
+SET(HAWKEY_PATCH "9")


BUG: cmake/SuperBuild: Ensure svn and git paths are propagated

This commit fixes issue #126 by completing the patch initially integrated in
b3ea5fa (BUG: cmake/SuperBuild: Only propagate svn and git paths if valid values)

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -77,6 +77,7 @@
     -DCMAKE_CXX_FLAGS_INIT:STRING=${CMAKE_CXX_FLAGS_INIT}
     -DCMAKE_C_FLAGS_INIT:STRING=${CMAKE_C_FLAGS_INIT}
     -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
+    ${DCMQI_EP_CMAKE_CACHE_ARGS}
   SOURCE_DIR ${DCMQI_SOURCE_DIR}
   BINARY_DIR ${DCMQI_BINARY_DIR}/${PROJECT_NAME_LC}-build
   PREFIX ${PROJECT_NAME_LC}-prefix


BUG: Fix typo errors in SuperBuild.cmake

Use PYTHON_LIBRARY instead of DPYTHON_LIBRARY
Use PYTHON_INCLUDE_DIR instead of DPYTHON_INCLUDE_DIR

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -391,8 +391,8 @@
     -DCTK_KWSTYLE_EXECUTABLE:FILEPATH=${CTK_KWSTYLE_EXECUTABLE}
     -DDCMTK_DIR:PATH=${DCMTK_DIR} # FindDCMTK expects DCMTK_DIR
     -DVTK_DIR:PATH=${VTK_DIR}     # FindVTK expects VTK_DIR
-    -DPYTHON_INCLUDE_DIR:PATH=${DPYTHON_INCLUDE_DIR}    # FindPythonQt expects PYTHON_INCLUDE_DIR
-    -DPYTHON_LIBRARY:FILEPATH=${DPYTHON_LIBRARY}        # FindPythonQt expects PYTHON_LIBRARY
+    -DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR}    # FindPythonQt expects PYTHON_INCLUDE_DIR
+    -DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY}        # FindPythonQt expects PYTHON_LIBRARY
     -DPYTHONQT_INSTALL_DIR:PATH=${PYTHONQT_INSTALL_DIR} # FindPythonQt expects PYTHONQT_INSTALL_DIR
   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
   BINARY_DIR ${CMAKE_BINARY_DIR}/CTK-build


BUG: Build_3DErrorMetric was set instead of Build_ModelToModelDistance

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -206,7 +206,7 @@
     ${COMMON_EXTERNAL_PROJECT_ARGS}
     -D${LOCAL_PROJECT_NAME}_SUPERBUILD:BOOL=OFF
     -DBuild_Static:BOOL=ON
-    -DBuild_3DErrorMetric:BOOL=ON
+    -DBuild_ModelToModelDistance:BOOL=ON
     -DBuild_3DMeshMetric:BOOL=ON
   INSTALL_COMMAND ""
   )


COMP: APPEND_STRING is not available in CMake < 2.8.6.

--- BlueBerry/CMake/MacroCreateCTKPlugin.cmake
+++ BlueBerry/CMake/MacroCreateCTKPlugin.cmake
@@ -98,13 +98,14 @@
   )

   # Set compiler flags
-  SET(_plugin_compile_flags )
+  GET_TARGET_PROPERTY(_plugin_compile_flags ${PLUGIN_TARGET} COMPILE_FLAGS)
+  IF(NOT _plugin_compile_flags)
+    SET(_plugin_compile_flags "")
+  ENDIF()
   IF(WIN32)
     SET(_plugin_compile_flags "${_plugin_compile_flags} -DPOCO_NO_UNWINDOWS -DWIN32_LEAN_AND_MEAN")
   ENDIF()
-
-  SET_PROPERTY(TARGET ${PLUGIN_TARGET} APPEND_STRING
-               PROPERTY COMPILE_FLAGS "${_plugin_compile_flags}"
+  SET_TARGET_PROPERTIES(${PLUGIN_TARGET} PROPERTIES COMPILE_FLAGS "${_plugin_compile_flags}")

   SET(_PLUGIN_META_FILES "${CMAKE_CURRENT_SOURCE_DIR}/manifest_headers.cmake")
   IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugin.xml")


Don't remove - and = characters, since it would lead to ambiguous flags.

For example, -ftemplate-depth=50 and -ftemplate-depth-50 would get
the same cache entry, leading to problems when checking for both.

--- CMake/mitkFunctionCheckCompilerFlags.cmake
+++ CMake/mitkFunctionCheckCompilerFlags.cmake
@@ -43,7 +43,7 @@
   # the same variable name skip the compilation step.
   # For that same reason, ctkFunctionCheckCompilerFlags function appends a unique suffix to
   # the HAS_FLAG variable. This suffix is created using a 'clean version' of the flag to test.
-  string(REGEX REPLACE "[,= \\$\\+\\*\\{\\}\\(\\)\\#-]" "" suffix ${CXX_FLAG_TO_TEST})
+  string(REGEX REPLACE "[, \\$\\+\\*\\{\\}\\(\\)\\#]" "" suffix ${CXX_FLAG_TO_TEST})
   CHECK_CXX_ACCEPTS_FLAG(${CXX_FLAG_TO_TEST} HAS_FLAG_${suffix})

   if(HAS_FLAG_${suffix})
@@ -64,7 +64,7 @@
   # the same variable name skip the compilation step.
   # For that same reason, ctkFunctionCheckCompilerFlags function appends a unique suffix to
   # the HAS_FLAG variable. This suffix is created using a 'clean version' of the flag to test.
-  string(REGEX REPLACE "[,= \\$\\+\\*\\{\\}\\(\\)\\#-]" "" suffix ${FLAG_TO_TEST})
+  string(REGEX REPLACE "[, \\$\\+\\*\\{\\}\\(\\)\\#]" "" suffix ${FLAG_TO_TEST})
   CHECK_CXX_COMPILER_FLAG(${FLAG_TO_TEST} HAS_CXX_FLAG_${suffix})

   if(HAS_CXX_FLAG_${suffix})


Modified FindTBB.cmake to cope with TBB 3 paths

--HG--
branch : v1-7

--- CMake/Packages/FindTBB.cmake
+++ CMake/Packages/FindTBB.cmake
@@ -62,13 +62,21 @@
   foreach (dir ${TBB_PREFIX_PATH})
     if (CMAKE_CL_64)
       list(APPEND TBB_LIB_SEARCH_PATH ${dir}/ia64/${COMPILER_PREFIX}/lib)
+      list(APPEND TBB_LIB_SEARCH_PATH ${dir}/lib/ia64/${COMPILER_PREFIX})
       list(APPEND TBB_LIB_SEARCH_PATH ${dir}/intel64/${COMPILER_PREFIX}/lib)
+      list(APPEND TBB_LIB_SEARCH_PATH ${dir}/lib/intel64/${COMPILER_PREFIX})
     else ()
       list(APPEND TBB_LIB_SEARCH_PATH ${dir}/ia32/${COMPILER_PREFIX}/lib)
+      list(APPEND TBB_LIB_SEARCH_PATH ${dir}/lib/ia32/${COMPILER_PREFIX})
     endif ()
   endforeach ()
 endif ()

+foreach (dir ${TBB_PREFIX_PATH})
+  list(APPEND TBB_LIB_SEARCH_PATH ${dir}/$ENV{TBB_ARCH_PLATFORM}/lib)
+  list(APPEND TBB_LIB_SEARCH_PATH ${dir}/lib/$ENV{TBB_ARCH_PLATFORM})
+  list(APPEND TBB_LIB_SEARCH_PATH ${dir}/lib)
+endforeach ()

 set(TBB_LIBRARY_NAMES tbb)


Enable NLM's midas server as download

Enable NLM's midas server as download

Change-Id: Ic147c2243a1d792bd896d099d9c4b6f723a7ff7c

--- CMake/sitkExternalData.cmake
+++ CMake/sitkExternalData.cmake
@@ -36,6 +36,7 @@
 if(NOT SITK_FORBID_DOWNLOADS)
   list(APPEND ExternalData_URL_TEMPLATES
     # Data published by MIDAS
+    "https://placid.nlm.nih.gov/api/rest?method=midas.bitstream.download&checksum=%(hash)&algorithm=%(algo)"
     "http://midas3.kitware.com/midas/api/rest?method=midas.bitstream.download&checksum=%(hash)&algorithm=%(algo)"
     "https://midas3.kitware.com/midas/api/rest?method=midas.bitstream.download&checksum=%(hash)&algorithm=%(algo)"


Fix ExternalData Path to in source location

--- CMake/sitkExternalData.cmake
+++ CMake/sitkExternalData.cmake
@@ -19,7 +19,7 @@
 endif()
 list(APPEND ExternalData_OBJECT_STORES
   # Local data store populated by the ITK pre-commit hook
-  "${SimpleITK_SOURCE_DIR}/../.ExternalData"
+  "${SimpleITK_SOURCE_DIR}/.ExternalData"
   )

 set(ExternalData_BINARY_ROOT ${CMAKE_BINARY_DIR}/ExternalData)


STYLE: UseITK: Set TransformIO factory and module name using convention.

See #3393

Change-Id: Ia42653e902e8b4d6004dd564a530c0746dc2f503

--- CMake/UseITK.cmake
+++ CMake/UseITK.cmake
@@ -110,6 +110,37 @@
 endif()

 #-----------------------------------------------------------------------------
+# TransformIO
+#-----------------------------------------------------------------------------
+
+# a list of transform IOs to be registered when the corresponding modules are enabled
+set(LIST_OF_TRANSFORMIO_FORMATS
+  HDF5
+  Matlab
+  MINC
+  Txt
+  )
+
+# Exceptions:
+
+set(Txt_transform_module_name ITKIOTransformInsightLegacy)
+set(Txt_transform_factory_name TxtTransformIO)
+
+foreach(TransformFormat ${LIST_OF_TRANSFORMIO_FORMATS})
+  if (NOT ${TransformFormat}_transform_module_name )
+    set(${TransformFormat}_transform_module_name ITKIOTransform${TransformFormat})
+  endif()
+  if (NOT ${TransformFormat}_transform_factory_name)
+    set(${TransformFormat}_transform_factory_name ${TransformFormat}TransformIO)
+  endif()
+endforeach()
+
+if(NOT ITK_NO_IO_FACTORY_REGISTER_MANAGER)
+  _configure_IOFactoryRegisterManager("Transform" "${LIST_OF_TRANSFORMIO_FORMATS}")
+endif()
+
+
+#-----------------------------------------------------------------------------
 if(NOT ITK_NO_IO_FACTORY_REGISTER_MANAGER)

   set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS ITK_IO_FACTORY_REGISTER_MANAGER)


Adding Gear2D_VERSION cmake variable to FindGear2D.cmake

--- FindGear2D.cmake
+++ FindGear2D.cmake
@@ -1,8 +1,9 @@
-# FindGear2D.cmake, version 1.0
+# FindGear2D.cmake, version 1.0.1
 # Locate Gear2D library
 # This module defines
 # Gear2D_LIBRARY, the name of the library to link against
 # Gear2D_FOUND, if it was found
+# Gear2D_VERSION, version of found library
 # Gear2D_INCLUDE_DIR, where to find gear2d.h
 # Gear2D_LINK_DIR, where to find gear2d.so/gear2d.dll

@@ -68,11 +69,12 @@

 IF(Gear2D_FOUND)
 	get_filename_component(Gear2D_LINK_DIR ${Gear2D_LIBRARY} PATH)
+	execute_process(COMMAND gear2d -v OUTPUT_VARIABLE Gear2D_VERSION)
 	IF (NOT Gear2D_FIND_QUIETLY)
-		MESSAGE(STATUS "Found Gear2D: ${Gear2D_LIBRARY} at ${Gear2D_LINK_DIR}")
+		MESSAGE(STATUS "Found Gear2D: ${Gear2D_LIBRARY} version ${Gear2D_VERSION}")
 	ENDIF (NOT Gear2D_FIND_QUIETLY)
 ELSE(Gear2D_FOUND)
 	IF (Gear2D_FIND_REQUIRED)
 		MESSAGE(FATAL_ERROR "Could not find Gear2D")
 	ENDIF (Gear2D_FIND_REQUIRED)
-ENDIF(Gear2D_FOUND)+ENDIF(Gear2D_FOUND)


Fixup package name

Fixup package name

Bundled install now includes complete "git describe" string.
The date is only included in the installer name is that is NOT a release

--- Superbuild/Projects/veloview.bundle.common.cmake
+++ Superbuild/Projects/veloview.bundle.common.cmake
@@ -31,12 +31,18 @@
 set(CPACK_PACKAGE_VERSION_MAJOR ${VV_VERSION_MAJOR})
 set(CPACK_PACKAGE_VERSION_MINOR ${VV_VERSION_MINOR})
 set(CPACK_PACKAGE_VERSION_PATCH ${VV_VERSION_PATCH})
-if (VV_VERSION_SUFFIX)
+if (NOT VV_VERSION_IS_RELEASE)
   set(CPACK_PACKAGE_VERSION_PATCH ${VV_VERSION_PATCH}-${VV_VERSION_PATCH_EXTRA})
 else()
 endif()

 set(CPACK_RESOURCE_FILE_LICENSE "${VeloViewSuperBuild_SOURCE_DIR}/LICENSE")

-set(CPACK_PACKAGE_FILE_NAME
-    "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_FULL}-${PACKAGE_TIMESTAMP}-${package_suffix}")
+if (NOT VV_VERSION_IS_RELEASE)
+  set(CPACK_PACKAGE_FILE_NAME
+      "${CPACK_PACKAGE_NAME}-${VV_VERSION_FULL}-${PACKAGE_TIMESTAMP}-${package_suffix}")
+else()
+  set(CPACK_PACKAGE_FILE_NAME
+      "${CPACK_PACKAGE_NAME}-${VV_VERSION_FULL}-${package_suffix}")
+endif()
+message("Bundled package name will be: ${CPACK_PACKAGE_FILE_NAME}" )


COMP: Temp. disabled ToolManagerTest.

COMP: Temp. disabled ToolManagerTest.

--- Modules/Segmentation/Testing/files.cmake
+++ Modules/Segmentation/Testing/files.cmake
@@ -7,7 +7,7 @@
 #  mitkOverwriteSliceFilterObliquePlaneTest.cpp
   mitkContourModelTest.cpp
   mitkContourModelIOTest.cpp
-  mitkToolManagerTest.cpp
+#  mitkToolManagerTest.cpp
 )

 set(MODULE_IMAGE_TESTS


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Modules/ThirdParty/KWSys/src/KWSys/kwsysDateStamp.cmake
+++ Modules/ThirdParty/KWSys/src/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   18)
+SET(KWSYS_DATE_STAMP_DAY   19)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Modules/ThirdParty/KWSys/src/KWSys/kwsysDateStamp.cmake
+++ Modules/ThirdParty/KWSys/src/KWSys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 09)

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


Use canonical INCLUDE(FindDoxygen) line to find doxygen executable

--- ApiDoxygen.cmake
+++ ApiDoxygen.cmake
@@ -1,9 +1,4 @@
-
-FIND_PROGRAM(DOXYGEN_EXECUTABLE doxygen
-    PATHS "C:/Program Files/doxygen/bin"
-    ENV PATH
-    NO_DEFAULT_PATH
-    )
+INCLUDE(FindDoxygen)

 IF(DOXYGEN_EXECUTABLE-NOTFOUND)
 ELSE(DOXYGEN_EXECUTABLE-NOTFOUND)


ENH: try sending an error

ENH: try sending an error

--- CI/main_ci.cmake
+++ CI/main_ci.cmake
@@ -72,8 +72,8 @@
             CAPTURE_CMAKE_ERROR _build_error]
             )

-if ( _configure_rv EQUAL -1 )
-  message("An error occurs during ctest_build:
+if ( _build_rv EQUAL -1 )
+  message( SEND_ERROR "An error occurs during ctest_build:
     ${_build_error}")
 endif()


CHG (#1179): send output of public dartclients to different drop location

--- DartConfig.cmake
+++ DartConfig.cmake
@@ -4,7 +4,7 @@
 # never use kitware dashboard, since it doesn't work at the moment (10.10.2007)
 SET (DROP_METHOD xmlrpc)
 SET (DROP_SITE "http://makalu:8081")
-SET (DROP_LOCATION "MITK")
+SET (DROP_LOCATION "MITK-public")
 SET (NIGHTLY_START_TIME "21:00:00 CET")
 SET (DART_TESTING_TIMEOUT 900)


ENH: Support for the Continuous build email notification

--- DartConfig.cmake
+++ DartConfig.cmake
@@ -19,3 +19,10 @@

 # copy over the testing logo
 CONFIGURE_FILE(${VTK_SOURCE_DIR}/TestingLogo.gif ${VTK_BINARY_DIR}/Testing/HTML/TestingResults/Icons/Logo.gif COPYONLY)
+
+# Continuous email delivery variables
+SET (DELIVER_CONTINUOUS_EMAIL "Off")
+SET (CONTINUOUS_FROM "lorensen@crd.ge.com")
+SET (SMTP_MAILHOST "public.kitware.com")
+SET (CONTINUOUS_MONITOR_LIST "lorensen@crd.ge.com millerjv@crd.ge.com")
+SET (CONTINUOUS_BASE_URL "http://public.kitware.com/VTK")


Disable GNUModules for unsupported platforms gracefully

--- GNUModules.cmake
+++ GNUModules.cmake
@@ -58,7 +58,8 @@
 elseif(LSB_DISTRIBUTOR_ID MATCHES "Ubuntu")
   set(MODULE_PLATFORM "ubuntu${LSB_RELEASE}-${CMAKE_SYSTEM_PROCESSOR}")
 else()
-  message(FATAL_ERROR "Unknown LSB distributor for GNUModules")
+  message(STATUS "Unsupported platform for GNUModules")
+  return()
 endif()
 set(MODULE_COMPILER "${MODULE_COMPILER_NAME}${MODULE_COMPILER_VERSION}")
 set(MODULE_ARCHITECTURE "$platform/$compiler")


solved a little cmake problem when trying to build with tests enable

--- RageCommon.cmake
+++ RageCommon.cmake
@@ -92,9 +92,9 @@

 	SET(ENABLE_TESTS OFF CACHE BOOL "Wether or not you want the project to include the tests and enable automatic testing")

-	IF (ENABLE_TESTS)
+	IF(ENABLE_TESTS)
 		ENABLE_TESTING()
-		ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIRECTORY}/test)
+		ADD_SUBDIRECTORY(test)
 	ENDIF(ENABLE_TESTS)
 ENDMACRO(RAGE_TEST)


Common.cmake: add definition for project version, use capitalized name

--- Common.cmake
+++ Common.cmake
@@ -16,7 +16,8 @@
 endif(NOT CMAKE_BUILD_TYPE)

 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
-add_definitions(-D${CMAKE_PROJECT_NAME}_VERSION=${VERSION})
+string(TOUPPER ${CMAKE_PROJECT_NAME} UPPER_PROJECT_NAME)
+add_definitions(-D${UPPER_PROJECT_NAME}_VERSION=${VERSION})
 if(NOT VERSION_ABI)
   if(RELEASE_VERSION)
     set(VERSION_ABI ${RELEASE_VERSION})


rust.cmake: fix RELEASE handling

rust.cmake: fix RELEASE handling

Cmake's list operator operates on the current scope so we were not
setting --release on the cargo cmd line.

Change-Id: I91aa8489869c3190d60c3f2dee374b3d9388ebda
GitOrigin-RevId: 36fa241862c1cb94b736be89d09e8127fefdfc4d

--- apps/system/rust.cmake
+++ apps/system/rust.cmake
@@ -15,10 +15,6 @@
   -Z unstable-options
   -Z avoid-dev-deps
   CACHE INTERNAL "cargo cmd line arguments")
-
-if("${RELEASE}")
-    list(APPEND CARGO_OPTIONS "--release")
-endif()

 # add_library but for rust libraries. Invokes cargo in the SOURCE_DIR that is provided,
 # all build output is placed in BUILD_DIR or CMAKE_CURRENT_BINARY_DIR if BUILD_DIR isn't provided.
@@ -46,6 +42,10 @@
         set(RUST_TARGET "riscv32imac-unknown-none-elf")
     endif()

+    if("${RELEASE}")
+        set(CARGO_RELEASE "--release")
+    endif()
+
     add_custom_target(
         ${lib_name}_custom
         BYPRODUCTS
@@ -57,7 +57,7 @@
             ${CMAKE_COMMAND} -E env RUSTFLAGS=${RUSTFLAGS}
             cargo +nightly-2021-08-05 build
             --target ${RUST_TARGET}
-            ${CARGO_OPTIONS}
+            ${CARGO_OPTIONS} ${CARGO_RELEASE}
             --target-dir ${RUST_BUILD_DIR}
             --out-dir ${RUST_BUILD_DIR}
     )


BUG: ITKCommon publically depends on ITKDoubleConversion.

The itkNumberToString.h header in ITKCommon #include's the double-conversion.h
header from the ITKDoubleConversion module. Elevate the dependency
specification from a private dependency to a public dependency so dependent
modules can find double-conversion.h.  This was detected by the IOSTL module:

In file included from /home/matt/src/ITK/Modules/IO/Mesh/include/itkMeshIOBase.h:35:0,
                 from /home/matt/src/ITKSTLMeshIO/include/itkSTLMeshIO.h:23,
                 from /home/matt/src/ITKSTLMeshIO/src/itkSTLMeshIO.cxx:19:
/home/matt/src/ITK/Modules/Core/Common/include/itkNumberToString.h:21:31: fatal error: double-conversion.h: No such file or directory
 #include "double-conversion.h"

Change-Id: I89d4182b0c948327d00d0a46693e874cf82d5bf8

--- Modules/Core/Common/itk-module.cmake
+++ Modules/Core/Common/itk-module.cmake
@@ -8,7 +8,7 @@

 itk_module(ITKCommon
   ENABLE_SHARED
-  PRIVATE_DEPENDS
+  DEPENDS
     ITKDoubleConversion
   COMPILE_DEPENDS
     ITKKWSys


Support external ExternalProjects and pass MITK_EXTENSION_DIRS to MITK-build

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -216,7 +216,17 @@
 # Include external projects
 include(CMakeExternals/MITKData.cmake)
 foreach(p ${external_projects})
-  include(CMakeExternals/${p}.cmake)
+  if(EXISTS CMakeExternals/${p}.cmake)
+    include(CMakeExternals/${p}.cmake)
+  else()
+    foreach(MITK_EXTENSION_DIR ${MITK_EXTENSION_DIRS})
+      set(MITK_CMAKE_EXTERNALS_EXTENSION_DIR ${MITK_EXTENSION_DIR}/CMakeExternals)
+      if(EXISTS ${MITK_CMAKE_EXTERNALS_EXTENSION_DIR}/${p}.cmake)
+        include(${MITK_CMAKE_EXTERNALS_EXTENSION_DIR}/${p}.cmake)
+        break()
+      endif()
+    endforeach()
+  endif()

   list(APPEND mitk_superbuild_ep_args
        -DMITK_USE_${p}:BOOL=${MITK_USE_${p}}
@@ -382,6 +392,7 @@
     -DMITK_WHITELIST:STRING=${MITK_WHITELIST}
     -DMITK_WHITELISTS_EXTERNAL_PATH:STRING=${MITK_WHITELISTS_EXTERNAL_PATH}
     -DMITK_WHITELISTS_INTERNAL_PATH:STRING=${MITK_WHITELISTS_INTERNAL_PATH}
+    -DMITK_EXTENSION_DIRS:STRING=${MITK_EXTENSION_DIRS}
     -DMITK_ACCESSBYITK_INTEGRAL_PIXEL_TYPES:STRING=${MITK_ACCESSBYITK_INTEGRAL_PIXEL_TYPES}
     -DMITK_ACCESSBYITK_FLOATING_PIXEL_TYPES:STRING=${MITK_ACCESSBYITK_FLOATING_PIXEL_TYPES}
     -DMITK_ACCESSBYITK_COMPOSITE_PIXEL_TYPES:STRING=${MITK_ACCESSBYITK_COMPOSITE_PIXEL_TYPES}


Turn on some standard configuration

Turn on some standard configuration

--- Platform/m68hc11-elf.cmake
+++ Platform/m68hc11-elf.cmake
@@ -16,4 +16,4 @@
 set(HCS12 1)

 set(CMAKE_EXE_LINKER_FLAGS "-Wl,-Map=test.map")
-
+set(CMAKE_C_FLAGS "-Os -fomit-frame-pointer -mshort -ffixed-z -m68hcs12")


removes from compile isam and visualization

this code is duplicated in pronto and was being compiled twice. less svn!

--- software/externals/cmake/externals.cmake
+++ software/externals/cmake/externals.cmake
@@ -166,8 +166,8 @@
   common_utils
   frsm
   jpeg-utils
-  isam_include
-  visualization
+  #isam_include
+  #visualization
   #velodyne
   kinect
   microstrain_comm


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Modules/ThirdParty/KWSys/src/KWSys/kwsysDateStamp.cmake
+++ Modules/ThirdParty/KWSys/src/KWSys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 09)

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Modules/ThirdParty/KWSys/src/KWSys/kwsysDateStamp.cmake
+++ Modules/ThirdParty/KWSys/src/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   10)
+SET(KWSYS_DATE_STAMP_DAY   11)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Modules/ThirdParty/KWSys/src/KWSys/kwsysDateStamp.cmake
+++ Modules/ThirdParty/KWSys/src/KWSys/kwsysDateStamp.cmake
@@ -15,7 +15,7 @@
 SET(KWSYS_DATE_STAMP_YEAR  2011)

 # KWSys version date month component.  Format is MM.
-SET(KWSYS_DATE_STAMP_MONTH 07)
+SET(KWSYS_DATE_STAMP_MONTH 08)

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


Fixed Log4CXX for windows

Fixed Log4CXX for windows

--- CMakeModules/FindLOG4CXX.cmake
+++ CMakeModules/FindLOG4CXX.cmake
@@ -48,10 +48,10 @@
   FIND_LIBRARY( LOG4CXX_XML_LIBRARY_DEBUG
                NAMES xmld.lib
                PATHS "${LOG4CXX_ROOT}/lib/Debug")
-  SET(LOG4CXX_LIBRARY debug LOG4CXX_LIBRARY_DEBUG optimized LOG4CXX_LIBRARY_RELEASE)
-  SET(APR_LIBRARY debug APR_LIBRARY_DEBUG optimized APR_LIBRARY_RELEASE)
-  SET(APRUTIL_LIBRARY debug APRUTIL_LIBRARY_DEBUG optimized APRUTIL_LIBRARY_RELEASE)
-  SET(LOG4CXX_XML_LIBRARY debug LOG4CXX_XML_LIBRARY_DEBUG optimized LOG4CXX_XML_RELEASE)
+  SET(LOG4CXX_LIBRARY debug ${LOG4CXX_LIBRARY_DEBUG} optimized ${LOG4CXX_LIBRARY_RELEASE})
+  SET(APR_LIBRARY debug ${APR_LIBRARY_DEBUG} optimized ${APR_LIBRARY_RELEASE})
+  SET(APRUTIL_LIBRARY debug ${APRUTIL_LIBRARY_DEBUG} optimized ${APRUTIL_LIBRARY_RELEASE})
+  SET(LOG4CXX_XML_LIBRARY debug ${LOG4CXX_XML_LIBRARY_DEBUG} optimized ${LOG4CXX_XML_RELEASE})

 else (WIN32)

@@ -76,9 +76,9 @@
   SET(LOG4CXX_LIBRARIES ${LOG4CXX_LIBRARIES} WS2_32.Lib MsWSock.Lib AdvAPI32.Lib odbc32.lib)
 endif(WIN32)

-IF (LOG4CXX_INCLUDE_DIR AND LOG4CXX_LIBRARY)
+IF (LOG4CXX_INCLUDE_DIR AND LOG4CXX_LIBRARIES)
   SET(LOG4CXX_FOUND TRUE)
-ELSE (LOG4CXX_INCLUDE_DIR AND LOG4CXX_LIBRARY)
+ELSE (LOG4CXX_INCLUDE_DIR AND LOG4CXX_LIBRARIES)
   SET( LOG4CXX_FOUND FALSE )
-ENDIF (LOG4CXX_INCLUDE_DIR AND LOG4CXX_LIBRARY)
+ENDIF (LOG4CXX_INCLUDE_DIR AND LOG4CXX_LIBRARIES)


Fixing some ParaView build issues

Fixing some ParaView build issues

--- Resources/CMake/ParaViewPluginIncludeMXADataModel.cmake
+++ Resources/CMake/ParaViewPluginIncludeMXADataModel.cmake
@@ -47,9 +47,9 @@
     SET (Boost_FIND_QUIETLY TRUE)
     SET (Boost_USE_FILESYSTEM FALSE)
     SET (Boost_USE_SYSTEM FALSE)
-    #SET (Boost_USE_UNIT_TEST_FRAMEWORK TRUE)
-    #SET (Boost_USE_TEST_EXEC_MONITOR TRUE)
-    #SET (Boost_USE_PROGRAM_OPTIONS TRUE)
+    SET (Boost_USE_UNIT_TEST_FRAMEWORK FALSE)
+    SET (Boost_USE_TEST_EXEC_MONITOR FALSE)
+    SET (Boost_USE_PROGRAM_OPTIONS FALSE)
     #set (Boost_USE_MULTITHREADED TRUE)

     FIND_PACKAGE(Boost 1.36 )


SuperBuild: fix geos build

SuperBuild: fix geos build

--- SuperBuild/CMake/External_geos.cmake
+++ SuperBuild/CMake/External_geos.cmake
@@ -15,6 +15,8 @@
   -DBUILD_TESTING:BOOL=OFF
   -DGEOS_ENABLE_TESTS:BOOL=OFF
   -DProject_WC_REVISION:STRING=99999
+  -DGEOS_BUILD_PACKAGED:BOOL=OFF
+  -DGEOS_ENABLE_MACOSX_FRAMEWORK:BOOL=OFF
   CMAKE_COMMAND ${SB_CMAKE_COMMAND} )

 SUPERBUILD_UPDATE_CMAKE_VARIABLES(GEOS FALSE)


build: fix pythonarchlib for non /usr installs #7015

--- build/cmake/CondorConfigure.cmake
+++ build/cmake/CondorConfigure.cmake
@@ -113,7 +113,7 @@
             set(PYTHON_QUERY_PART_08 "print(sysconfig.get_config_var('LIBDIR'));")
             set(PYTHON_QUERY_PART_09 "print(sysconfig.get_config_var('MULTIARCH'));")
             set(PYTHON_QUERY_PART_10 "print(sysconfig.get_config_var('LDLIBRARY'));")
-            set(PYTHON_QUERY_PART_11 "print(sysconfig.get_python_lib()[5:]);")
+            set(PYTHON_QUERY_PART_11 "print(sysconfig.get_python_lib(plat_specific=True, prefix=''));")
 	    set(PYTHON_QUERY_PART_12 "print(sysconfig.get_config_var('SO'));")

             set(PYTHON_QUERY_COMMAND "${PYTHON_QUERY_PART_01}${PYTHON_QUERY_PART_02}${PYTHON_QUERY_PART_03}${PYTHON_QUERY_PART_04}${PYTHON_QUERY_PART_05}${PYTHON_QUERY_PART_06}${PYTHON_QUERY_PART_07}${PYTHON_QUERY_PART_08}${PYTHON_QUERY_PART_09}${PYTHON_QUERY_PART_10}${PYTHON_QUERY_PART_11}${PYTHON_QUERY_PART_12}")
@@ -166,7 +166,7 @@
             set(PYTHON_QUERY_PART_08 "print(sysconfig.get_config_var('LIBDIR'));")
             set(PYTHON_QUERY_PART_09 "print(sysconfig.get_config_var('MULTIARCH'));")
             set(PYTHON_QUERY_PART_10 "print(sysconfig.get_config_var('LDLIBRARY'));")
-            set(PYTHON_QUERY_PART_11 "print(sysconfig.get_python_lib()[5:]);")
+            set(PYTHON_QUERY_PART_11 "print(sysconfig.get_python_lib(plat_specific=True, prefix=''));")
 	    set(PYTHON_QUERY_PART_12 "print(sysconfig.get_config_var('SO'));")

             set(PYTHON_QUERY_COMMAND "${PYTHON_QUERY_PART_01}${PYTHON_QUERY_PART_02}${PYTHON_QUERY_PART_03}${PYTHON_QUERY_PART_04}${PYTHON_QUERY_PART_05}${PYTHON_QUERY_PART_06}${PYTHON_QUERY_PART_07}${PYTHON_QUERY_PART_08}${PYTHON_QUERY_PART_09}${PYTHON_QUERY_PART_10}${PYTHON_QUERY_PART_11}${PYTHON_QUERY_PART_12}")


[cmake] Remove line of code that is setting LLVM_BINARY_DIR to CMAKE_BINARY_DIR (i.e., SWIFT_BINARY_DIR).

This bug was in tree before I began to make my changes. I uncovered the bug when
I was thinking about whether or not this line of code was dead and thus looked
at how it was used.

rdar://26154980

--- cmake/modules/SwiftSharedCMakeConfig.cmake
+++ cmake/modules/SwiftSharedCMakeConfig.cmake
@@ -230,7 +230,6 @@

   set(LLVM_MAIN_INCLUDE_DIR "${LLVM_MAIN_SRC_DIR}/include")
   set(CLANG_MAIN_INCLUDE_DIR "${CLANG_MAIN_SRC_DIR}/include")
-  set(LLVM_BINARY_DIR ${CMAKE_BINARY_DIR})
   set(CMARK_MAIN_INCLUDE_DIR "${CMARK_MAIN_SRC_DIR}/src")
   set(CMARK_BUILD_INCLUDE_DIR "${PATH_TO_CMARK_BUILD}/src")


COMP: KWStyle shadow, format-nonliteral and autological-compare warning.

- Use the latest KWStyle to remove shadow, format-nonliteral and
  autological-compare warning messages.

Change-Id: I996abfd401d3dae831284fddc6c7cc41d7efafb6

--- 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 afb7bec7d7b41b7515bded2e00ebd4e037423949
+  GIT_TAG 3bf3cbbf5226e3cf0e0383dffa264c9396825ad7
   UPDATE_COMMAND ""
   DOWNLOAD_DIR ${KWStyle_SOURCE_DIR}
   SOURCE_DIR ${KWStyle_SOURCE_DIR}


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   04)
+SET(KWSYS_DATE_STAMP_DAY   05)


Use cmake's message() correctly

Use cmake's message() correctly

--- cmake/modules/VisionarayUseFramework.cmake
+++ cmake/modules/VisionarayUseFramework.cmake
@@ -18,7 +18,7 @@
     )

     if(${FRAMEWORK_${name}} STREQUAL FRAMEWORK_${name}-NOTFOUND)
-        message(ERROR ": Framework ${name} not found")
+        message(FATAL_ERROR ": Framework ${name} not found")
     else()
         set(__VSNRAY_LINK_LIBRARIES ${__VSNRAY_LINK_LIBRARIES} ${FRAMEWORK_${name}}/${name} PARENT_SCOPE)
     endif()


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   28)
+SET(KWSYS_DATE_STAMP_DAY   29)


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   02)
+SET(KWSYS_DATE_STAMP_DAY   03)


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

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


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   16)
+SET(KWSYS_DATE_STAMP_DAY   17)


Remove PREFIX_PATH

Remove PREFIX_PATH

--- Packaging/Files/build_examples.cmake
+++ Packaging/Files/build_examples.cmake
@@ -46,7 +46,6 @@
   COMMAND ${CMAKE_COMMAND}
   -DCMAKE_INSTALL_PREFIX=${PKG_DIR}
   -DCMAKE_BUILD_TYPE=RelWithDebInfo
-  -DCMAKE_PREFIX_PATH=${PKG_DIR}
   ${cmake_gen}
   ${SRC_DIR}
   WORKING_DIRECTORY ${TEST_DIR}


[C++] Archive generated coverage data

[C++] Archive generated coverage data

--- cpp/CMake/code-coverage/CodeCoverage.cmake
+++ cpp/CMake/code-coverage/CodeCoverage.cmake
@@ -18,6 +18,7 @@
 FIND_PROGRAM( LCOV_PATH lcov )
 FIND_PROGRAM( GENHTML_PATH genhtml )
 FIND_PROGRAM( GCOVR_PATH gcovr PATHS ${CMAKE_SOURCE_DIR}/tests)
+FIND_PROGRAM( TAR_PATH tar )

 IF(NOT GCOV_PATH)
 	MESSAGE(FATAL_ERROR "gcov not found! Aborting...")
@@ -65,6 +66,7 @@
 		COMMAND ${LCOV_PATH} --remove ${_outputname}.info 'libs/*' '${CMAKE_SOURCE_DIR}/tests/*' '/usr/*' 'ThirdParty/*' --output-file ${_outputname}.info.cleaned
 		COMMAND ${GENHTML_PATH} -o ${_outputname} ${_outputname}.info.cleaned
 		COMMAND ${CMAKE_COMMAND} -E remove ${_outputname}.info ${_outputname}.info.cleaned
+                COMMAND ${TAR_PATH} -cjf joynr-cpp-coverage.bz2 ${CMAKE_BINARY_DIR}/coverage

 		DEPENDS ${_testrunner}
 		WORKING_DIRECTORY ${CMAKE_BINARY_DIR}


ios.toolchain.cmake: remove obsolete the armv7 (32-bit) target

--- cmake-toolchains/ios.toolchain.cmake
+++ cmake-toolchains/ios.toolchain.cmake
@@ -13,7 +13,6 @@

 set(CMAKE_SYSTEM_NAME iOS)
 set(CMAKE_OSX_SYSROOT "iphoneos")
-set(CMAKE_OSX_ARCHITECTURES "armv7;arm64;x86_64")
 set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos;-iphonesimulator")
 set(CMAKE_XCODE_GENERATE_SCHEME 1)


Follow renaming of python to pyroot also for setting default value

--- cmake/modules/RootBuildOptions.cmake
+++ cmake/modules/RootBuildOptions.cmake
@@ -235,7 +235,7 @@
  set(pgsql_defvalue ON)
  set(pythia6_defvalue ON)
  set(pythia8_defvalue ON)
- set(python_defvalue ON)
+ set(pyroot_defvalue ON)
  set(qt5web_defvalue ON)
  set(r_defvalue ON)
  set(roofit_defvalue ON)


yaml-cpp: Fix URL (SHA1 mismatch)

yaml-cpp: Fix URL (SHA1 mismatch)

[skip ci]

--- cmake/projects/yaml-cpp/hunter.cmake
+++ cmake/projects/yaml-cpp/hunter.cmake
@@ -12,7 +12,7 @@
   VERSION
   "0.5.3"
   URL
-  "https://github.com/hunter-packages/yaml-cpp/archive/release-0.5.3-hunter-p2.tar.gz"
+  "https://github.com/hunter-packages/yaml-cpp/releases/download/release-0.5.3-hunter-p2/release-0.5.3-hunter-p2.tar.gz"
   SHA1
   ee1fe3713409de48b203f6b631c1284190d95671
   )