add numpy dependency

add numpy dependency

--- tensorflow/contrib/cmake/tf_c.cmake
+++ tensorflow/contrib/cmake/tf_c.cmake
@@ -12,6 +12,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
+
+# 1. Resolve the installed version of Python (for Python.h and python).
+# TODO(mrry): Parameterize the build script to enable Python 3 building.
+if(NOT PYTHON_INCLUDE_DIR)
+  set(PYTHON_NOT_FOUND false)
+  exec_program("${PYTHON_EXECUTABLE}"
+    ARGS "-c \"import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())\""
+    OUTPUT_VARIABLE PYTHON_INCLUDE_DIR
+    RETURN_VALUE PYTHON_NOT_FOUND)
+  if(${PYTHON_NOT_FOUND})
+    message(FATAL_ERROR
+            "Cannot get Python include directory. Is distutils installed?")
+  endif(${PYTHON_NOT_FOUND})
+endif(NOT PYTHON_INCLUDE_DIR)
+
+# 2. Resolve the installed version of NumPy (for numpy/arrayobject.h).
+if(NOT NUMPY_INCLUDE_DIR)
+  set(NUMPY_NOT_FOUND false)
+  exec_program("${PYTHON_EXECUTABLE}"
+    ARGS "-c \"import numpy; print(numpy.get_include())\""
+    OUTPUT_VARIABLE NUMPY_INCLUDE_DIR
+    RETURN_VALUE NUMPY_NOT_FOUND)
+  if(${NUMPY_NOT_FOUND})
+    message(FATAL_ERROR
+            "Cannot get NumPy include directory: Is NumPy installed?")
+  endif(${NUMPY_NOT_FOUND})
+endif(NOT NUMPY_INCLUDE_DIR)
+
 ########################################################
 # tf_c_framework library
 ########################################################
@@ -38,6 +66,12 @@
     "${tensorflow_source_dir}/tensorflow/c/python_api.cc"
     "${tensorflow_source_dir}/tensorflow/c/python_api.h"
   )
+
+  target_include_directories(tf_c_python_api PUBLIC
+        ${PYTHON_INCLUDE_DIR}
+        ${NUMPY_INCLUDE_DIR}
+    )
+
   add_dependencies(
     tf_c_python_api
     tf_c


ffmpeg/4.x: update FFmpeg wrapper 2022.05

- FFmpeg 4.4.2
- libvpx 1.11

--- 3rdparty/ffmpeg/ffmpeg.cmake
+++ 3rdparty/ffmpeg/ffmpeg.cmake
@@ -1,8 +1,8 @@
-# Binaries branch name: ffmpeg/4.x_20211220
-# Binaries were created for OpenCV: 0e274fc4bed8a64ba4f1c201a21304286e217afc
-ocv_update(FFMPEG_BINARIES_COMMIT "4d348507d156ec797a88a887cfa7f9129a35afac")
-ocv_update(FFMPEG_FILE_HASH_BIN32 "eece4ec8304188117ffc7d5dfd0fc0ae")
-ocv_update(FFMPEG_FILE_HASH_BIN64 "20deefbfe023c8b8d11a52e5a6527c6a")
+# Binaries branch name: ffmpeg/4.x_20220524
+# Binaries were created for OpenCV: d6e9616256b46bd59be0a93d397f6ab958d39cd2
+ocv_update(FFMPEG_BINARIES_COMMIT "65ec04d4573dcdfa4531f0b9e67f35d8ffff873e")
+ocv_update(FFMPEG_FILE_HASH_BIN32 "5573e2262ad1298e603122b7759fc2f6")
+ocv_update(FFMPEG_FILE_HASH_BIN64 "5f9e2b2e04c15f080f40e844de80c867")
 ocv_update(FFMPEG_FILE_HASH_CMAKE "8862c87496e2e8c375965e1277dee1c7")

 function(download_win_ffmpeg script_var)


SuperBuild: if there is no args to patch, use -ut

--- SuperBuild/CMake/patch.cmake
+++ SuperBuild/CMake/patch.cmake
@@ -7,19 +7,23 @@
 separate_arguments(DOT_DIFF_FILES)
 list(SORT DOT_DIFF_FILES)

+if(NOT PATCH_ARGS)
+  set(PATCH_ARGS "-ut")
+endif()
+
 foreach(dot_diff_file ${DOT_DIFF_FILES})
   message("Input patch file: ${dot_diff_file}")
   execute_process(
     COMMAND
-    ${CMAKE_COMMAND} -E chdir ${SOURCE_DIR}
-    ${PATCH_PROGRAM} "-p1" "-i" "${dot_diff_file}" "${PATCH_ARGS}"
+    ${CMAKE_COMMAND} -E chdir ${SOURCE_DIR}
+    ${PATCH_PROGRAM} "${PATCH_ARGS}" "-p1" "-i" "${dot_diff_file}"
     RESULT_VARIABLE patch_rv
     OUTPUT_VARIABLE patch_ov
     OUTPUT_STRIP_TRAILING_WHITESPACE
     ERROR_STRIP_TRAILING_WHITESPACE)
-
+
   set(PATCHING_FAILED FALSE)
-
+
   if(NOT "${patch_rv}" STREQUAL "0")
     if( NOT "${patch_ov}" MATCHES "previously applied")
       set(PATCHING_FAILED TRUE)
@@ -29,14 +33,13 @@
   if( "${patch_ov}" MATCHES "FAILED")
     set(PATCHING_FAILED TRUE)
   endif()
-
+
   if(PATCHING_FAILED)
     message(FATAL_ERROR "${PATCH_PROGRAM} returned non-zero exit status \n ${patch_ov} \n")
   else()
-    message("${patch_ov}")
+    message("${patch_ov}")
   endif()
-
+
   unset(patch_rv)
   unset(patch_ov)
 endforeach()
-


Restore PYTHONBIN CMake variable.

Restore PYTHONBIN CMake variable.

--- salome_adm/cmake_files/FindSalomePythonInterp.cmake
+++ salome_adm/cmake_files/FindSalomePythonInterp.cmake
@@ -40,6 +40,8 @@

 IF(SALOMEPYTHONINTERP_FOUND)
   SET(PYTHON_PYTHONPATH "${PYTHON_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
+  GET_FILENAME_COMPONENT(_python_bin "${PYTHON_EXECUTABLE}" NAME )
+  SET(PYTHONBIN "${_python_bin}" CACHE STRING "Name of Python interpreter")
   SALOME_ACCUMULATE_ENVIRONMENT(PATH ${PYTHON_EXECUTABLE})
   SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${PYTHON_PYTHONPATH})
 ENDIF()


[cmake] call windeploytqt for qt applications on windows

--- cmake/radium_setup_functions.cmake
+++ cmake/radium_setup_functions.cmake
@@ -8,6 +8,10 @@
 # 3.13: install target from different directory
 #       see https://github.com/STORM-IRIT/Radium-Engine/pull/550#issuecomment-637415860
 cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
+
+if (MSVC OR MSVC_IDE OR MINGW)
+    include( Windeployqt )
+endif()

 include(CMakeParseArguments)
 # Introduction of two customs properties in the buildchain
@@ -381,6 +385,15 @@
     else ()
         message(STATUS " Configuring application ${ARGS_NAME} as a command line application")
         configure_cmdline_Radium_app(${ARGN})
+    endif ()
+
+    get_target_property(IsUsingQt ${ARGS_NAME} LINK_LIBRARIES)
+    list(FIND IsUsingQt "Qt5::Core" QTCOREIDX)
+    if(NOT QTCOREIDX EQUAL -1)
+        if (MSVC OR MSVC_IDE OR MINGW)
+            message(STATUS " Preparing call to WinDeployQT for application ${ARGS_NAME}")
+            windeployqt( ${ARGS_NAME} bin )
+        endif ()
     endif ()
 endfunction()


cmake: llvm: Make the setup for host installed clang easier

The logic is practically intact and is the following:

1. Use any host installed llvm/clang in the path in case
   ZEPHYR_TOOLCHAIN_VARIANT=llvm is requested alone.
2. This can be further restricted with TOOLCHAIN_HOME.
3. And can be further overridden with CLANG_ROOT_DIR,
   like previously.

So, only the unconditional restriction to /usr is lifted.

Together with fixing the unconditional set of TOOLCHAIN_HOME
by host tools for non-toolchain needs, this makes the logic
more flexible.

Now, after the logic is controllable by TOOLCHAIN_HOME, 3)
might be an extra, but is left intact for backward compatibility.

Signed-off-by: Oleg Zhurakivskyy <cdb82bfa180f8df716a77d2c2557196a597a233c@intel.com>

--- cmake/toolchain/llvm/generic.cmake
+++ cmake/toolchain/llvm/generic.cmake
@@ -1,9 +1,8 @@
 # SPDX-License-Identifier: Apache-2.0

-set(CLANG_ROOT $ENV{CLANG_ROOT_DIR})
-set_ifndef(CLANG_ROOT /usr)
-
-set(TOOLCHAIN_HOME ${CLANG_ROOT}/bin/)
+if(DEFINED $ENV{CLANG_ROOT_DIR})
+  set(TOOLCHAIN_HOME ${CLANG_ROOT}/bin/)
+endif()

 set(COMPILER clang)
 set(LINKER ld) # TODO: Use lld eventually rather than GNU ld
@@ -18,3 +17,7 @@
 set(CMAKE_C_COMPILER_TARGET   ${triple})
 set(CMAKE_ASM_COMPILER_TARGET ${triple})
 set(CMAKE_CXX_COMPILER_TARGET ${triple})
+
+if("${ARCH}" STREQUAL "posix")
+  set(TOOLCHAIN_HAS_NEWLIB OFF CACHE BOOL "True if toolchain supports newlib")
+endif()


COMP: display header files as hierarchy target sources.

--- CMake/vtkWrapHierarchy.cmake
+++ CMake/vtkWrapHierarchy.cmake
@@ -170,7 +170,7 @@

       COMMENT "Hierarchy Wrapping - checking vtk${KIT}Hierarchy.txt"
       ${verbatim}
-      SOURCES ${SOURCES}
+      SOURCES ${INPUT_FILES}
       )
     # Set target-level dependencies to build in the correct order
     ADD_DEPENDENCIES(${TARGET} vtkWrapHierarchy ${OTHER_HIERARCHY_TARGETS})


razorqt-panel: use MODULE type for plugin libraries

Since plugins are modules loaded dynamically at runtime, use the MODULE
type in add_library() instead of SHARED type.

This fixes build errors on configurations where '-Wl,--no-undefined' is
used to build SHARED libraries but not MODULE libraries.

--- BuildPlugin.cmake
+++ BuildPlugin.cmake
@@ -28,7 +28,7 @@
     qt4_add_resources(QRC_SOURCES ${RESOURCES})
     qt4_wrap_ui(UI_SOURCES ${UIS})

-    add_library(${Name} SHARED ${HEADERS} ${SOURCES} ${MOC_SOURCES} ${QM_FILES} ${QRC_SOURCES} ${UIS})
+    add_library(${Name} MODULE ${HEADERS} ${SOURCES} ${MOC_SOURCES} ${QM_FILES} ${QRC_SOURCES} ${UIS})
     target_link_libraries(${Name} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${LIBRARIES})

     install(TARGETS ${Name} DESTINATION ${PLUGIN_DIR})


Adds supports for INSTALL_EMBEDDED_BUNDLES argument for add_celix_container.

--- cmake/cmake_celix/ContainerPackaging.cmake
+++ cmake/cmake_celix/ContainerPackaging.cmake
@@ -69,6 +69,7 @@
   These bundle will be configured for run level 3. See 'celix_container_bundles' for more info.
 - INSTALL_BUNDLES: A list of bundles for the Celix container to install (but not start).
 - EMBEDDED_BUNDLES: TODO
+- INSTALL_EMBEDDED_BUNDLES: TODO
 - PROPERTIES: A list of configuration properties, these can be used to configure the Celix framework and/or bundles.
   Normally this will be EMBEDED_PROPERTIES, but if the USE_CONFIG option is used this will be RUNTIME_PROPERTIES.
   See the framework library or bundles documentation about the available configuration options.
@@ -88,6 +89,7 @@
     [BUNDLES <bundle1> <bundle2> ...]
     [INSTALL_BUNDLES <bundle1> <bundle2> ...]
     [EMBEDDED_BUNDLES <bundle1> <bundle2> ...]
+    [INSTALL_EMBEDDED_BUNDLES <bundle1> <bundle2> ...]
     [PROPERTIES "prop1=val1" "prop2=val2" ...]
     [EMBEDDED_PROPERTIES "prop1=val1" "prop2=val2" ...]
     [RUNTIME_PROPERTIES "prop1=val1" "prop2=val2" ...]
@@ -108,6 +110,7 @@
     [BUNDLES <bundle1> <bundle2> ...]
     [INSTALL_BUNDLES <bundle1> <bundle2> ...]
     [EMBEDDED_BUNDLES <bundle1> <bundle2> ...]
+    [INSTALL_EMBEDDED_BUNDLES <bundle1> <bundle2> ...]
     [PROPERTIES "prop1=val1" "prop2=val2" ...]
     [EMBEDDED_PROPERTIES "prop1=val1" "prop2=val2" ...]
     [RUNTIME_PROPERTIES "prop1=val1" "prop2=val2" ...]
@@ -128,6 +131,7 @@
     [BUNDLES <bundle1> <bundle2> ...]
     [INSTALL_BUNDLES <bundle1> <bundle2> ...]
     [EMBEDDED_BUNDLES <bundle1> <bundle2> ...]
+    [INSTALL_EMBEDDED_BUNDLES <bundle1> <bundle2> ...]
     [PROPERTIES "prop1=val1" "prop2=val2" ...]
     [EMBEDDED_PROPERTIES "prop1=val1" "prop2=val2" ...]
     [RUNTIME_PROPERTIES "prop1=val1" "prop2=val2" ...]
@@ -140,7 +144,7 @@

     set(OPTIONS NO_COPY C CXX FAT USE_CONFIG)
     set(ONE_VAL_ARGS GROUP NAME LAUNCHER LAUNCHER_SRC DIR)
-    set(MULTI_VAL_ARGS BUNDLES INSTALL_BUNDLES EMBEDDED_BUNDLES PROPERTIES EMBEDDED_PROPERTIES RUNTIME_PROPERTIES)
+    set(MULTI_VAL_ARGS BUNDLES INSTALL_BUNDLES EMBEDDED_BUNDLES INSTALL_EMBEDDED_BUNDLES PROPERTIES EMBEDDED_PROPERTIES RUNTIME_PROPERTIES)
     cmake_parse_arguments(CONTAINER "${OPTIONS}" "${ONE_VAL_ARGS}" "${MULTI_VAL_ARGS}" ${ARGN})

     ##### Check arguments #####
@@ -335,6 +339,7 @@
     celix_container_bundles(${CONTAINER_TARGET} LEVEL 3 ${CONTAINER_BUNDLES})
     celix_container_embed_bundles(${CONTAINER_TARGET} LEVEL 3 ${CONTAINER_EMBEDDED_BUNDLES})
     celix_container_bundles(${CONTAINER_TARGET} INSTALL ${CONTAINER_INSTALL_BUNDLES})
+    celix_container_embed_bundles(${CONTAINER_TARGET} INSTALL ${CONTAINER_INSTALL_EMBEDDED_BUNDLES})
     if (CONTAINER_USE_CONFIG)
         celix_container_runtime_properties(${CONTAINER_TARGET} ${CONTAINER_PROPERTIES})
     else ()
@@ -543,7 +548,7 @@
     list(GET ARGN 0 CONTAINER_TARGET)
     list(REMOVE_AT ARGN 0)

-    set(OPTIONS )
+    set(OPTIONS INSTALL)
     set(ONE_VAL_ARGS LEVEL)
     set(MULTI_VAL_ARGS )
     cmake_parse_arguments(BUNDLES "${OPTIONS}" "${ONE_VAL_ARGS}" "${MULTI_VAL_ARGS}" ${ARGN})
@@ -553,7 +558,11 @@
         set(BUNDLES_LEVEL 3)
     endif ()

-    get_target_property(BUNDLES ${CONTAINER_TARGET} "CONTAINER_BUNDLES_LEVEL_${BUNDLES_LEVEL}")
+    if (BUNDLES_INSTALL)
+        get_target_property(BUNDLES ${CONTAINER_TARGET} "CONTAINER_BUNDLES_INSTALL")
+    else () #bundle level 0,1,2,3,4,5 or 6
+        get_target_property(BUNDLES ${CONTAINER_TARGET} "CONTAINER_BUNDLES_LEVEL_${BUNDLES_LEVEL}")
+    endif ()

     foreach(BUNDLE IN ITEMS ${BUNDLES_LIST})
         if (TARGET ${BUNDLE})
@@ -569,7 +578,11 @@
         list(APPEND BUNDLES "embedded://${NAME}")
     endforeach()

-    set_target_properties(${CONTAINER_TARGET} PROPERTIES "CONTAINER_BUNDLES_LEVEL_${BUNDLES_LEVEL}" "${BUNDLES}")
+    if (BUNDLES_INSTALL)
+        set_target_properties(${CONTAINER_TARGET} PROPERTIES "CONTAINER_BUNDLES_INSTALL" "${BUNDLES}")
+    else () #bundle level 0,1,2,3,4,5 or 6
+        set_target_properties(${CONTAINER_TARGET} PROPERTIES "CONTAINER_BUNDLES_LEVEL_${BUNDLES_LEVEL}" "${BUNDLES}")
+    endif ()
 endfunction()

 function(deploy_properties)


Improve comment

Improve comment

--- cmake/modules/hunter_load_from_cache.cmake
+++ cmake/modules/hunter_load_from_cache.cmake
@@ -102,8 +102,8 @@
         hunter_internal_error("Bad format: ${dep_entry}")
       endif()

-      # Load cache.sha1 file from cache if package is cached
-      # This function will not install anything, just cache checking
+      # Load cache.sha1 file from cache to home directory if package is cached
+      # This function will not really install anything, just for cache checking
       hunter_cache_run(PACKAGE "${package}" COMPONENT "${component}")

       # Read


update

update

--- cmake/SetupProjectVariables.cmake
+++ cmake/SetupProjectVariables.cmake
@@ -41,8 +41,8 @@

   # GLM
   SET(GLM_INCLUDE_DIR "~/Projects/others/glm-regnirpsj-git")
+
   # GLI
-
   SET(GLI_INCLUDE_DIR "~/Projects/others/gli-regnirpsj-git")
 ENDIF()


update

update

--- share/hugh/cmake/CMakeAddons_SetupVariables.cmake
+++ share/hugh/cmake/CMakeAddons_SetupVariables.cmake
@@ -62,7 +62,7 @@
   set(GLM_ROOT_DIR "C:/Tools/glm/glm-git")
 elseif(CMAKE_HOST_UNIX)
   set(GLI_ROOT_DIR "/home/jsd/Projects/others/gli-git")
-  set(GLM_ROOT_DIR "/home/jsd/Projects/others/glm-regnirpsj-git")
+  set(GLM_ROOT_DIR "/home/jsd/Projects/others/glm-git")
 endif()
 if(DEFINED ENV{GLI_ROOT_DIR})
   set(GLI_ROOT_DIR $ENV{GLI_ROOT_DIR})


Allow Linux compiling with correct EBP frame pointer.

--- indra/cmake/00-Common.cmake
+++ indra/cmake/00-Common.cmake
@@ -263,6 +263,13 @@

   set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
   set(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CMAKE_CXX_FLAGS_RELEASE}")
+
+  # <FS:ND> Build without frame pointer if requested. Otherwise profiling might not work reliable. N.B. Win32 uses FP based calling by default.
+  if( NO_OMIT_FRAMEPOINTER )
+    set(CMAKE_CXX_FLAGS_RELEASE "-fno-omit-frame-pointer ${CMAKE_CXX_FLAGS_RELEASE}")
+  endif( NO_OMIT_FRAMEPOINTER )
+  # </FS:ND>
+
 endif (LINUX)


Use numdiff with -s ' \n\t' per default. The problem with the overquotation
still has to be resolved :-/

git-svn-id: 59f82343654cec32357d3b049d399063e4e4cfc7@30752 0785d39b-7218-0410-832d-ea1e28bc413d

--- tests/cmake/setup_testsuite.cmake
+++ tests/cmake/setup_testsuite.cmake
@@ -93,21 +93,17 @@
     )
 ENDIF()

-# TODO: we really want numdiff -a 1e-6 -q -s ' \t\n'
-# but quotings will break
-IF(NOT NUMDIFF_EXECUTABLE MATCHES "-NOTFOUND")
-  SET_IF_EMPTY(TEST_DIFF "${NUMDIFF_EXECUTABLE} -a 1e-6 -q")
+IF("${TEST_DIFF}" STREQUAL "")
+  IF(NOT NUMDIFF_EXECUTABLE MATCHES "-NOTFOUND")
+      SET(TEST_DIFF ${NUMDIFF_EXECUTABLE} -a 1e-6 -q -s ' \\t\\n')
+  ELSE()
+      SET(TEST_DIFF ${DIFF_EXECUTABLE})
+  ENDIF()
 ELSE()
-  SET_IF_EMPTY(TEST_DIFF "${DIFF_EXECUTABLE}")
+  # TODO: I have no idea how to prepare a custom string comming possibly
+  # through two layers of command line into a list...
+  SEPARATE_ARGUMENTS(TEST_DIFF UNIX_COMMAND ${TEST_DIFF})
 ENDIF()
-
-#
-# "Son, we have to talk about quotings". Avoid overquoting. Due to the fact
-# that TEST_DIFF might be passed to the command line as a string, we have
-# to set it up this way :-/
-#
-
-SEPARATE_ARGUMENTS(TEST_DIFF UNIX_COMMAND ${TEST_DIFF})

 #
 # Set a default time limit of 180 seconds:


Added an error message if find_package(Poppler) is called before find_package(Qt)

--- FindPoppler.cmake
+++ FindPoppler.cmake
@@ -18,6 +18,11 @@
    # in cache already
    SET(Poppler_FIND_QUIETLY TRUE)
 endif ( POPPLER_LIBRARIES )
+
+if (NOT QT_VERSION_MAJOR)
+  message(SEND_ERROR "QT_VERSION_MAJOR is undefined. Run find_package(Qt) before find_package(Poppler).")
+  return()
+endif()

 # use pkg-config to get the directories and then use these values
 # in the FIND_PATH() and FIND_LIBRARY() calls


Adjusting expat include directory for newer expat build system.

--- Resources/MXAFindExpat.cmake
+++ Resources/MXAFindExpat.cmake
@@ -7,7 +7,7 @@

 # Look for the header file.
 SET(EXPAT_INCLUDE_SEARCH_DIRS
-  $ENV{EXPAT_INSTALL}/include
+  $ENV{EXPAT_INSTALL}/include/expat
 )

 SET (EXPAT_LIB_SEARCH_DIRS


CMake: Bugfix: The tests for SSE2 and AVX depend on certain cpu instruction sets being enabled.

  - therefore, run these tests with the full set of compiler flags
  - rerun them if the flags change

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

--- deal.II/cmake/checks/check_01_cpu_features.cmake
+++ deal.II/cmake/checks/check_01_cpu_features.cmake
@@ -42,6 +42,27 @@

 IF(DEAL_II_ALLOW_PLATFORM_INTROSPECTION)
+
+  #
+  # These tests depend on certain cpu instruction sets being enabled, so
+  # use the user supplied compiler flags for the tests as well:
+  #
+  SET(CMAKE_REQUIRED_FLAGS "${CMAKE_CXX_FLAGS_SAVED}")
+
+
+  #
+  # Take care that the following tests are rerun if CMAKE_REQUIRED_FLAGS
+  # changes..
+  #
+  IF(NOT "${CMAKE_REQUIRED_FLAGS}" STREQUAL "${DEAL_II_CHECK_CPU_FEATURES_SAVED}")
+    UNSET(DEAL_II_HAVE_SSE2 CACHE)
+    UNSET(DEAL_II_HAVE_AVX CACHE)
+  ENDIF()
+  SET(DEAL_II_CHECK_CPU_FEATURES_SAVED
+    "${CMAKE_REQUIRED_FLAGS}" CACHE INTERNAL "" FORCE
+    )
+
+
   #
   # Check whether the compiler allows for vectorization and that
   # vectorization actually works on the given CPU. For this test, we use
@@ -114,8 +135,9 @@
     }
     "
     DEAL_II_HAVE_AVX)
+
+  SET(CMAKE_REQUIRED_FLAGS "")
 ENDIF()
-

 IF(DEAL_II_HAVE_SSE2)
   IF(DEAL_II_HAVE_AVX)
@@ -126,3 +148,4 @@
 ELSE()
   SET(DEAL_II_COMPILER_VECTORIZATION_LEVEL 0)
 ENDIF()
+


[iOS] Use Dwarf debug info format in debug builds rather than Dwarf with dSYM to speed up compilation (Apple does the same in iOS templates)

--- CMake/Utils/OgreConfigTargets.cmake
+++ CMake/Utils/OgreConfigTargets.cmake
@@ -178,6 +178,7 @@
     set_target_properties(${TARGETNAME} PROPERTIES XCODE_ATTRIBUTE_GCC_UNROLL_LOOPS "YES")
     set_target_properties(${TARGETNAME} PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "iPhone Developer")
     set_target_properties(${TARGETNAME} PROPERTIES XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES")
+    set_target_properties(${TARGETNAME} PROPERTIES XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "dwarf$<$<NOT:$<CONFIG:Debug>>:-with-dsym>")
   endif(OGRE_BUILD_PLATFORM_APPLE_IOS)

   if(NOT OGRE_STATIC AND (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang"))


Fix git external update

Fix git external update

--- GitExternal.cmake
+++ GitExternal.cmake
@@ -35,7 +35,7 @@
         WORKING_DIRECTORY "${DIR}")
     endforeach()

-    execute_process(COMMAND "${GIT_EXECUTABLE}" pull
+    execute_process(COMMAND "${GIT_EXECUTABLE}" fetch --all
       RESULT_VARIABLE nok ERROR_VARIABLE error
       WORKING_DIRECTORY "${DIR}")
     if(nok)


[FIX] Installing include/seqan.h for libraries but not for apps.

git-svn-id: a7f2a8f7432d210e972fb03898013d213e2b549b@13727 e6417c60-b987-48fd-844e-b20f0fcc1017

--- util/cmake/SeqAnBuildSystem.cmake
+++ util/cmake/SeqAnBuildSystem.cmake
@@ -216,17 +216,12 @@
         file (GLOB HEADERS
               RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
               include/seqan/[A-z]*/[A-z]*.h
-              include/seqan/[A-z]*.h)
+              include/seqan/[A-z]*.h
+              include/seqan.h)
         foreach (HEADER ${HEADERS})
             get_filename_component (_DESTINATION ${HEADER} PATH)
             install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${HEADER} DESTINATION ${_DESTINATION})
         endforeach ()
-    endif ()
-
-    # Install global super header from extras.
-    get_filename_component (_PART_NAME "${CMAKE_CURRENT_SOURCE_DIR}" NAME)
-    if (${_PART_NAME} STREQUAL "extras" AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/include/seqan.h)
-      install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/seqan.h DESTINATION include)
     endif ()

     # Get list of header and super header files.


cmake-modules:
* modified search path for gUSBAmp C api so it will find it on 64bit Windows

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

--- trunk/cmake-modules/FindThirdPartyGUSBampCAPI.cmake
+++ trunk/cmake-modules/FindThirdPartyGUSBampCAPI.cmake
@@ -4,7 +4,7 @@
 # Adds include path
 # ---------------------------------
 IF(WIN32)
-	FIND_PATH(PATH_GUSBampCAPI API/gUSBamp.h PATHS "C:/Program Files/gtec/gUSBampCAPI" $ENV{OpenViBE_dependencies})
+	FIND_PATH(PATH_GUSBampCAPI API/gUSBamp.h PATHS "C:/Program Files/gtec/gUSBampCAPI" "C:/Program Files (x86)/gtec/gUSBampCAPI" $ENV{OpenViBE_dependencies})
 	IF(PATH_GUSBampCAPI)
 		MESSAGE(STATUS "  Found gUSBampCAPI...")
 		INCLUDE_DIRECTORIES(${PATH_GUSBampCAPI}/API)


teach ConfigurePackages to find qt property browser

--- CMakeModules/ConfigurePackages.cmake
+++ CMakeModules/ConfigurePackages.cmake
@@ -180,8 +180,8 @@

 macro (configure_qtpropertybrowser)
     sagase_configure_package (QT_PROPERTY_BROWSER
-        NAMES QtPropertyBrowser
-        COMPONENTS QtPropertyBrowser
+        NAMES QtPropertyBrowser QtSolutions_PropertyBrowser-2.5
+        COMPONENTS QtPropertyBrowser QtSolutions_PropertyBrowser-2.5
         PREFIXES ${ENV_NAALI_DEP_PATH})

     sagase_configure_report (QT_PROPERTY_BROWSER)


Internal change

Internal change

PiperOrigin-RevId: 314726884
Change-Id: I87ca9ab781c88826cf09617c9d36f8c589ca57df

--- copts.cmake
+++ copts.cmake
@@ -14,6 +14,7 @@

 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_EXTENSIONS FALSE)

 set(CMAKE_SKIP_BUILD_RPATH TRUE)
 set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
@@ -23,6 +24,7 @@

 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")  # GCC
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")  # Clang or Apple Clang
+  add_compile_options(-Wno-nullability-completeness)
 elseif(MSVC)  # Visual Studio
   add_definitions(-D_CRT_SECURE_NO_WARNINGS)


Fix c++14 extension warnings

Fix c++14 extension warnings

--- CMake/hoomd/HOOMDCFlagsSetup.cmake
+++ CMake/hoomd/HOOMDCFlagsSetup.cmake
@@ -27,12 +27,10 @@
     if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")

         set(_common_options "-march=${GCC_ARCH} -Wall -Wno-unknown-pragmas")
-        set(_common_cxx_options "-march=${GCC_ARCH} -Wall -Wno-unknown-pragmas")
+        set(_common_cxx_options "-march=${GCC_ARCH} -Wall -Wno-unknown-pragmas -std=c++11")

-        include(CheckCXXCompilerFlag)
-        check_cxx_compiler_flag("-Wno-c++14-extensions" HAS_WCPP14_EXTENSIONS)
-        if (HAS_WCPP14_EXTENSIONS)
-            set(_common_cxx_options "${_common_options} -Wno-c++14-extensions")
+        if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+            set(_common_cxx_options "${_common_cxx_options} -Wno-c++14-extensions")
         endif()

         # default flags for g++
@@ -41,10 +39,10 @@
         set(CMAKE_C_FLAGS_RELEASE "${_common_options} -O3 -funroll-loops -DNDEBUG" CACHE STRING "Flags used by the compiler during release builds." FORCE)
         set(CMAKE_C_FLAGS_RELWITHDEBINFO "${_common_options} -g -O3 -funroll-loops -DNDEBUG" CACHE STRING "Flags used by the compiler during release builds with debug info." FORCE)

-        set(CMAKE_CXX_FLAGS_DEBUG "${_common_cxx_options} -g -std=c++11" CACHE STRING "Flags used by the compiler during debug builds." FORCE)
-        set(CMAKE_CXX_FLAGS_MINSIZEREL "${_common_cxx_options} -Os -DNDEBUG -std=c++11" CACHE STRING "Flags used by the compiler during minimum size release builds." FORCE)
-        set(CMAKE_CXX_FLAGS_RELEASE "${_common_cxx_options} -O3 -funroll-loops -DNDEBUG -std=c++11" CACHE STRING "Flags used by the compiler during release builds." FORCE)
-        set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${_common_cxx_options} -g -O3 -funroll-loops -DNDEBUG -std=c++11" CACHE STRING "Flags used by the compiler during release builds with debug info." FORCE)
+        set(CMAKE_CXX_FLAGS_DEBUG "${_common_cxx_options} -g" CACHE STRING "Flags used by the compiler during debug builds." FORCE)
+        set(CMAKE_CXX_FLAGS_MINSIZEREL "${_common_cxx_options} -Os -DNDEBUG" CACHE STRING "Flags used by the compiler during minimum size release builds." FORCE)
+        set(CMAKE_CXX_FLAGS_RELEASE "${_common_cxx_options} -O3 -funroll-loops -DNDEBUG" CACHE STRING "Flags used by the compiler during release builds." FORCE)
+        set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${_common_cxx_options} -g -O3 -funroll-loops -DNDEBUG" CACHE STRING "Flags used by the compiler during release builds with debug info." FORCE)

     elseif(CMAKE_CXX_COMPILER MATCHES "icpc")
         # default flags for intel


include: Fix macro names to avoid conflicts

--- include/cmocka_version.h.cmake
+++ include/cmocka_version.h.cmake
@@ -18,20 +18,20 @@
 #define _CMOCKA_VERSION_H

 /* cmocka version macros */
-#define CMOCKA_VERSION_INT(a, b, c) ((a) << 16 | (b) << 8 | (c))
-#define CMOCKA_VERSION_DOT(a, b, c) a ##.## b ##.## c
-#define CMOCKA_VERSION(a, b, c) CMOCKA_VERSION_DOT(a, b, c)
+#define CM_VERSION_INT(a, b, c) ((a) << 16 | (b) << 8 | (c))
+#define CM_VERSION_DOT(a, b, c) a ##.## b ##.## c
+#define CM_VERSION(a, b, c) CMOCKA_VERSION_DOT(a, b, c)

 /* cmocka version */
 #define CMOCKA_VERSION_MAJOR  @cmocka_VERSION_MAJOR@
 #define CMOCKA_VERSION_MINOR  @cmocka_VERSION_MINOR@
 #define CMOCKA_VERSION_MICRO  @cmocka_VERSION_PATCH@

-#define CMOCKA_VERSION_INT CMOCKA_VERSION_INT(CMOCKA_VERSION_MAJOR, \
-                                           CMOCKA_VERSION_MINOR, \
-                                           CMOCKA_VERSION_MICRO)
-#define CMOCKA_VERSION     CMOCKA_VERSION(CMOCKA_VERSION_MAJOR, \
-                                       CMOCKA_VERSION_MINOR, \
-                                       CMOCKA_VERSION_MICRO)
+#define CMOCKA_VERSION_INT CM_VERSION_INT(CMOCKA_VERSION_MAJOR, \
+                                          CMOCKA_VERSION_MINOR, \
+                                          CMOCKA_VERSION_MICRO)
+#define CMOCKA_VERSION     CM_VERSION(CMOCKA_VERSION_MAJOR, \
+                                      CMOCKA_VERSION_MINOR, \
+                                      CMOCKA_VERSION_MICRO)

 #endif /* _CMOCKA_VERSION_H */


add viewer channel to compile time feedback

--- indra/cmake/BuildVersion.cmake
+++ indra/cmake/BuildVersion.cmake
@@ -33,7 +33,7 @@
               message("Revision not set, 'hg' not found (${MERCURIAL}), using ${VIEWER_VERSION_REVISION}")
            endif (DEFINED MERCURIAL)
         endif (DEFINED ENV{revision})
-        message("Building Version ${VIEWER_SHORT_VERSION} ${VIEWER_VERSION_REVISION}")
+        message("Building '${VIEWER_CHANNEL}' Version ${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}")
     else ( EXISTS ${VIEWER_VERSION_BASE_FILE} )
         message(SEND_ERROR "Cannot get viewer version from '${VIEWER_VERSION_BASE_FILE}'")
     endif ( EXISTS ${VIEWER_VERSION_BASE_FILE} )


add biexponential signal fit functor to files.cmake

--- Modules/DiffusionImaging/DiffusionCore/files.cmake
+++ Modules/DiffusionImaging/DiffusionCore/files.cmake
@@ -57,6 +57,7 @@
   # MultishellProcessing
   Algorithms/Reconstruction/MultishellProcessing/itkADCAverageFunctor.cpp
   Algorithms/Reconstruction/MultishellProcessing/itkKurtosisFitFunctor.cpp
+  Algorithms/Reconstruction/MultishellProcessing/itkBiExpFitFunctor.cpp

   # Function Collection
   mitkDiffusionFunctionCollection.cpp
@@ -87,6 +88,7 @@
   Algorithms/Reconstruction/MultishellProcessing/itkDWIvoxelFunctor.h
   Algorithms/Reconstruction/MultishellProcessing/itkADCAverageFunctor.h
   Algorithms/Reconstruction/MultishellProcessing/itkKurtosisFitFunctor.h
+  Algorithms/Reconstruction/MultishellProcessing/itkBiExpFitFunctor.h

   # IO Datastructures
   IODataStructures/DiffusionWeightedImages/mitkDiffusionImage.h


Fix the cmake file for linking sfml

Fix the cmake file for linking sfml

--- SFML-2.3.2/share/SFML/cmake/Modules/FindSFML.cmake
+++ SFML-2.3.2/share/SFML/cmake/Modules/FindSFML.cmake
@@ -98,9 +98,9 @@
     math(EXPR SFML_REQUESTED_VERSION "${SFML_FIND_VERSION_MAJOR} * 10000 + ${SFML_FIND_VERSION_MINOR} * 100 + ${SFML_FIND_VERSION_PATCH}")

     # if we could extract them, compare with the requested version number
-    if (SFML_VERSION_MINOR)
+    if (SFML_VERSION_MAJOR)
         # transform version numbers to an integer
-        math(EXPR SFML_VERSION "${SFML_VERSION_MAJOR} * 10000 + ${SFML_VERSION_MINOR} * 100 + ${SFML_VERSION_PATCH}")
+		math(EXPR SFML_VERSION "${SFML_VERSION_MAJOR} * 10000 + ${SFML_VERSION_MINOR} * 100")

         # compare them
         if(SFML_VERSION LESS SFML_REQUESTED_VERSION)


Revert "BUG: update git tag for the TemporalGapFilling remote module"

This reverts commit 55c8a4cb5da5eacb07fb58e6f45b83e2bb2596bb.

--- Modules/Remote/temporal-gapfilling.remote.cmake
+++ Modules/Remote/temporal-gapfilling.remote.cmake
@@ -25,6 +25,6 @@
 A more detailed description can be found on the project website:
 https://gitlab.orfeo-toolbox.org/jinglada/temporalgapfilling
 "
-  GIT_REPOSITORY https://gitlab.orfeo-toolbox.org/ctraizet/temporalgapfilling.git
-  GIT_TAG cd0aa8b18369140a270ec64659543a53167ef641
+  GIT_REPOSITORY https://gitlab.orfeo-toolbox.org/jinglada/temporalgapfilling.git
+  GIT_TAG master
 )


"Export" aggregate headers

"Export" aggregate headers

Fix minor bug where aggregate headers were not added to the caller's
list of generated headers.

--- lcm-cmake/lcmUtilities.cmake
+++ lcm-cmake/lcmUtilities.cmake
@@ -29,6 +29,12 @@
 endmacro()

 #------------------------------------------------------------------------------
+macro(_lcm_parent_list_append VAR)
+  list(APPEND ${VAR} ${ARGN})
+  set(${VAR} "${${VAR}}" PARENT_SCOPE)
+endmacro()
+
+#------------------------------------------------------------------------------
 macro(_lcm_export VAR)
   if(DEFINED ${VAR})
     set(${${VAR}} "${${${VAR}}}" PARENT_SCOPE)
@@ -36,7 +42,7 @@
 endmacro()

 #------------------------------------------------------------------------------
-function(_lcm_create_aggregate_header NAME)
+function(_lcm_create_aggregate_header NAME VAR)
   set(_header "${_DESTINATION}/${NAME}")
   list(FIND _aggregate_headers "${_header}" _index)
   if(_index EQUAL -1)
@@ -46,8 +52,8 @@
       "#define ${_guard}\n"
       "\n"
     )
-    list(APPEND _aggregate_headers ${_header})
-    set(_aggregate_headers "${_aggregate_headers}" PARENT_SCOPE)
+    _lcm_parent_list_append(_aggregate_headers ${_header})
+    _lcm_parent_list_append(${VAR} ${_header})
   endif()
 endfunction()

@@ -160,10 +166,10 @@
         string(REPLACE "." "/" _package_dir "${_package}")
         string(REPLACE "." "_" _package_pre "${_package}")
         if(DEFINED _C_HEADERS AND _CREATE_C_AGGREGATE_HEADER)
-          _lcm_create_aggregate_header("${_package_dir}.h")
+          _lcm_create_aggregate_header("${_package_dir}.h" _C_HEADERS)
         endif()
         if(DEFINED _CPP_HEADERS AND _CREATE_CPP_AGGREGATE_HEADER)
-          _lcm_create_aggregate_header("${_package_dir}.hpp")
+          _lcm_create_aggregate_header("${_package_dir}.hpp" _CPP_HEADERS)
         endif()
       elseif(_line MATCHES "^ *(struct|enum) +")
         # Get type name


ENH: add IO to Include and Link directories.

--- itkCMakeOptions.cmake
+++ itkCMakeOptions.cmake
@@ -8,6 +8,7 @@
 ${ITK_BINARY_DIR}
 ${ITK_SOURCE_DIR}/Code/Numerics
 ${ITK_SOURCE_DIR}/Code/Common
+${ITK_SOURCE_DIR}/Code/IO
 ${ITK_BINARY_DIR}/Code/Numerics/vxl
 ${ITK_SOURCE_DIR}/Code/Numerics/vxl
 ${ITK_BINARY_DIR}/Code/Numerics/vxl/vcl
@@ -21,6 +22,7 @@
 ${ITK_BINARY_DIR}/Utilities/zlib
 ${ITK_BINARY_DIR}/Utilities/png
 ${ITK_BINARY_DIR}/Code/Common
+${ITK_BINARY_DIR}/Code/IO
 ${ITK_BINARY_DIR}/Code/Numerics/vxl )

 # use the distributed version of SGI's experimental C++ Standard Library


Update FindGLEW.cmake :
* add support for static glew under Windows
* set GLEW_FOUND to FALSE or TRUE
* replace GLEW_ROOT_PATH env. variable with GLEW_ROOT

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

--- cmake/Modules/FindGLEW.cmake
+++ cmake/Modules/FindGLEW.cmake
@@ -26,13 +26,13 @@
   ELSE(CYGWIN)

     FIND_PATH( GLEW_INCLUDE_DIR GL/glew.h
-      $ENV{GLEW_ROOT_PATH}/include
+      $ENV{GLEW_ROOT}/include
     )

     FIND_LIBRARY( GLEW_GLEW_LIBRARY
-      NAMES glew glew32
+      NAMES glew glew32 glew32s
       PATHS
-      $ENV{GLEW_ROOT_PATH}/lib
+      $ENV{GLEW_ROOT}/lib
       ${OPENGL_LIBRARY_DIR}
     )

@@ -69,7 +69,7 @@

 ENDIF (WIN32)

-SET( GLEW_FOUND "NO" )
+SET( GLEW_FOUND FALSE )
 IF(GLEW_INCLUDE_DIR)
   IF(GLEW_GLEW_LIBRARY)
     # Is -lXi and -lXmu required on all platforms that have it?
@@ -78,7 +78,7 @@
       ${GLEW_GLEW_LIBRARY}
       ${GLEW_cocoa_LIBRARY}
     )
-    SET( GLEW_FOUND "YES" )
+    SET( GLEW_FOUND TRUE )

 #The following deprecated settings are for backwards compatibility with CMake1.4
     SET (GLEW_LIBRARY ${GLEW_LIBRARIES})
@@ -91,6 +91,9 @@
   IF(NOT GLEW_FIND_QUIETLY)
     MESSAGE(STATUS "Found Glew: ${GLEW_LIBRARIES}")
   ENDIF(NOT GLEW_FIND_QUIETLY)
+  IF(GLEW_GLEW_LIBRARY MATCHES glew32s)
+    ADD_DEFINITIONS(-DGLEW_STATIC)
+  ENDIF(GLEW_GLEW_LIBRARY MATCHES glew32s)
 ELSE(GLEW_FOUND)
   IF(GLEW_FIND_REQUIRED)
     MESSAGE(FATAL_ERROR "Could not find Glew")


BSL_OVERRIDES_STD fix

BSL_OVERRIDES_STD fix

--- cmake/bde_override_std.cmake
+++ cmake/bde_override_std.cmake
@@ -5,6 +5,6 @@
     bde_assert_no_extra_args()

     bde_interface_target_compile_definitions(
-        ${interfaceTarget} PUBLIC BDE_OVERRIDES_STD
+        ${interfaceTarget} PRIVATE BSL_OVERRIDES_STD
     )
 endfunction()


build to toplevel buildspace dirs

build to toplevel buildspace dirs

--- cmake/catkin_workspace.cmake
+++ cmake/catkin_workspace.cmake
@@ -3,6 +3,11 @@
   assert_file_exists(${catkin_EXTRAS_DIR}/topologically_traverse.py.in "${catkin_EXTRAS_DIR}")
   assert_file_exists(${catkin_EXTRAS_DIR}/topologically_traverse.cmake.em "file nto found")
   include_directories(${CMAKE_BINARY_DIR}/gen/cpp)
+
+  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
   em_expand(
     ${catkin_EXTRAS_DIR}/topologically_traverse.py.in
     ${CMAKE_CURRENT_BINARY_DIR}/topologically_traverse.py


android toolchain: fixed cmake syntax warning

--- cmake/AndroidToolchain.cmake
+++ cmake/AndroidToolchain.cmake
@@ -722,7 +722,7 @@
 # verify that target ABI is supported
 list( FIND ANDROID_SUPPORTED_ABIS "${ANDROID_ABI}" __androidAbiIdx )
 if( __androidAbiIdx EQUAL -1 )
- string( REPLACE ";" "\", \"", PRINTABLE_ANDROID_SUPPORTED_ABIS  "${ANDROID_SUPPORTED_ABIS}" )
+ string( REPLACE ";" "\", \"" PRINTABLE_ANDROID_SUPPORTED_ABIS  "${ANDROID_SUPPORTED_ABIS}" )
  message( FATAL_ERROR "Specified ANDROID_ABI = \"${ANDROID_ABI}\" is not supported by this cmake toolchain or your NDK/toolchain.
    Supported values are: \"${PRINTABLE_ANDROID_SUPPORTED_ABIS}\"
    " )


Fix typo in FindYajl.cmake

Fix typo in FindYajl.cmake

--- cmake/Modules/FindYajl.cmake
+++ cmake/Modules/FindYajl.cmake
@@ -9,7 +9,7 @@
 pkg_check_modules(PC_YAJL QUIET yajl)
 set(YAJL_DEFINITIONS ${PC_YAJL_CFLAGS_OTHER})

-find_path(YAJL_INCLUDE_DIR yail/yajl_parse.h
+find_path(YAJL_INCLUDE_DIR yajl/yajl_parse.h
     HINTS ${PC_YAJL_INCLUDEDIR} ${PC_YAJL_INCLUDE_DIRS})

 find_library(YAJL_LIBRARY yajl


Fixed ArduPlane prototype issues.

Fixed ArduPlane prototype issues.


[cmake] fix: CMAKE_C_STANDARD_LIBRARIES/CMAKE_CXX_STANDARD_LIBRARIES should be a string, not a list

--- cmake/axl_std_settings.cmake
+++ cmake/axl_std_settings.cmake
@@ -535,8 +535,8 @@

 			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${_WRAPPER_FLAGS}")
 			set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${_WRAPPER_FLAGS}")
-			set(CMAKE_C_STANDARD_LIBRARIES ${CMAKE_C_STANDARD_LIBRARIES} -laxl_glibc)
-			set(CMAKE_CXX_STANDARD_LIBRARIES ${CMAKE_CXX_STANDARD_LIBRARIES} -laxl_glibc)
+			set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -laxl_glibc")
+			set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -laxl_glibc")
 		endif()
 	endif()


cmake build reworked: qore creates cmake support files during configuration; modules using cmake just do not use FindQore.cmake in internal trees but use system-wide QoreConfig.cmake

git-svn-id: c381eb9f627c28a79cc9f3203180146498b8623d@6201 1b0b35fe-f740-4c1b-b404-a338b32e513b

--- cmake/modules/FindQore.cmake
+++ cmake/modules/FindQore.cmake
@@ -1,150 +0,0 @@
-#
-# Cmake module for Qore programming language
-#
-# (c) 2009 Qore Technologies, http://qoretechnologies.com
-#
-# QORE_FOUND - system has it
-# QORE_INCLUDE_DIR
-# QORE_LIBRARY
-# QORE_MODULES_DIR
-#
-# QORE_EXECUTABLE
-# QORE_QPP_EXECUTABLE
-#
-
-SET(QORE_FOUND FALSE)
-
-
-MACRO (QORE_WRAP_QPP _cpp_files _inputs )
-  message(STATUS "QPP: ${QORE_QPP_EXECUTABLE}")
-  message(STATUS "QPP2: ${_inputs}")
-
-  FOREACH (it ${_inputs})
-    message(STATUS "QPP1: ${it}")
-    GET_FILENAME_COMPONENT(_outfile ${it} NAME_WE)
-    GET_FILENAME_COMPONENT(_infile ${it} ABSOLUTE)
-    SET(_cppfile ${CMAKE_CURRENT_BINARY_DIR}/${_outfile}.cpp)
-    SET(_doxfile ${CMAKE_CURRENT_BINARY_DIR}/${_outfile}.dox.h)
-    message(STATUS "QPP processing: ${_infile} -> ${_cppfile} ${_doxfile}")
-    ADD_CUSTOM_COMMAND(OUTPUT ${_cppfile} ${_doxfile}
-      COMMAND ${QORE_QPP_EXECUTABLE}
-      ARGS --output=${_cppfile} --dox-output=${_doxfile} ${_infile}
-      MAIN_DEPENDENCY ${_infile}
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-      )
-    SET(${_cpp_files} ${${_cpp_files}} ${_cppfile})
-  ENDFOREACH (it)
-
-  message(STATUS "QPP files: ${${_cpp_files}}")
-
-ENDMACRO (QORE_WRAP_QPP)
-
-
-
-FIND_PATH (QORE_INCLUDE_DIR qore/Qore.h
-    /usr/include
-    /usr/include/qore
-    /usr/local/include
-    /usr/local/include/qore
-    /opt/qore/include/qore
-    /opt/qore/include
-    ${QORE_INCLUDE_PATH}
-)
-
-FIND_LIBRARY (QORE_LIBRARY
-    NAMES libqore libqore.so libqore.dylib
-    PATHS
-      /usr/lib
-      /usr/local/lib
-	  /opt/qore/lib
-	  ${QORE_LIBRARY_PATH}
-    )
-
-IF (QORE_LIBRARY AND QORE_INCLUDE_DIR)
-    SET(QORE_LIBRARIES ${QORE_LIBRARY})
-    SET(QORE_FOUND TRUE)
-ENDIF (QORE_LIBRARY AND QORE_INCLUDE_DIR)
-
-
-# get Qore version form 'qore --short-version' command etc
-FIND_PROGRAM(QORE_EXECUTABLE NAMES qore DOC "Searching for qore executable")
-IF (NOT QORE_EXECUTABLE)
-    MESSAGE( FATAL_ERROR "Cannot find 'qore' executable. Check if it's in your PATH" )
-ENDIF (NOT QORE_EXECUTABLE)
-
-FIND_PROGRAM(QORE_QPP_EXECUTABLE NAMES qpp DOC "Searching for qore qpp preprocessor")
-IF (NOT QORE_QPP_EXECUTABLE)
-    MESSAGE( FATAL_ERROR "Cannot find 'qpp' executable. Check if it's in your PATH" )
-ENDIF (NOT QORE_QPP_EXECUTABLE)
-
-
-IF (QORE_MIN_VERSION)
-    #now parse the parts of the user given version string into variables
-    # qore version is taken from qore executable - format major.minor.patch-build
-    STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" req_qore_version "${QORE_MIN_VERSION}")
-    IF (NOT req_qore_version)
-        MESSAGE( FATAL_ERROR "Invalid Qore version string given: \"${QORE_MIN_VERSION}\", expected e.g. \"0.7.3\"")
-    ENDIF (NOT req_qore_version)
-
-    # now parse the parts of the user given version string into variables
-    STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" req_qore_major_v "${QORE_MIN_VERSION}")
-    STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" req_qore_minor_v "${QORE_MIN_VERSION}")
-    STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" req_qore_patch_v "${QORE_MIN_VERSION}")
-
-    EXEC_PROGRAM(${QORE_EXECUTABLE} ARGS "--short-version" OUTPUT_VARIABLE QORE_VERSION)
-    IF (NOT QORE_VERSION)
-        MESSAGE( FATAL_ERROR "Unknown Qore version. No data taken from 'qore --short-version'" )
-    ELSE (NOT QORE_VERSION)
-        MESSAGE( STATUS "Qore version: ${QORE_VERSION}" )
-    ENDIF (NOT QORE_VERSION)
-
-    # compare requested version with the one found
-    STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+\\-[0-9]+" "\\1" qore_major_v "${QORE_VERSION}")
-    STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+\\-[0-9]+" "\\1" qore_minor_v "${QORE_VERSION}")
-    STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)\\-[0-9]+" "\\1" qore_patch_v "${QORE_VERSION}")
-    # compute an overall version number which can be compared at once
-    MATH(EXPR req_v "${req_qore_major_v}*10000 + ${req_qore_minor_v}*100 + ${req_qore_patch_v}")
-    MATH(EXPR found_v "${qore_major_v}*10000 + ${qore_minor_v}*100 + ${qore_patch_v}")
-    #MESSAGE (STATUS "${req_qore_major_v} ${req_qore_minor_v} ${req_qore_patch_v}")
-    #MESSAGE (STATUS "${qore_major_v} ${qore_minor_v} ${qore_patch_v}")
-    # and decide finally
-    IF (found_v LESS req_v)
-        SET (QORE_FOUND FALSE)
-        MESSAGE (STATUS "Requested Qore version is bigger than found. ${QORE_MIN_VERSION} vs ${QORE_VERSION}" )
-    ENDIF (found_v LESS req_v)
-
-ENDIF (QORE_MIN_VERSION)
-
-# module install dir
-EXEC_PROGRAM(${QORE_EXECUTABLE} ARGS "--module-dir" OUTPUT_VARIABLE QORE_MODULES_DIR)
-IF (NOT QORE_MODULES_DIR)
-    MESSAGE( FATAL_ERROR "Unknown Qore modules location. No data taken from 'qore --module-dir'" )
-ELSE (NOT QORE_MODULES_DIR)
-    MESSAGE( STATUS "Qore modules dir: ${QORE_MODULES_DIR}" )
-ENDIF (NOT QORE_MODULES_DIR)
-
-# module API version
-IF (NOT QORE_API_VERSION)
-    EXEC_PROGRAM(${QORE_EXECUTABLE} ARGS "--latest-module-api" OUTPUT_VARIABLE QORE_API_VERSION)
-ENDIF (NOT QORE_API_VERSION)
-IF (NOT QORE_API_VERSION)
-    MESSAGE( FATAL_ERROR "Unknown Qore module API version. No data taken from 'qore --latest-module-api'. It can be specified manually with -DQORE_API_VERSION")
-ELSE (NOT QORE_API_VERSION)
-    MESSAGE( STATUS "Qore module API version: ${QORE_API_VERSION}")
-ENDIF (NOT QORE_API_VERSION)
-
-
-IF (QORE_FOUND)
-    MESSAGE(STATUS "Found Qore lib: ${QORE_LIBRARY}")
-    MESSAGE(STATUS "      includes: ${QORE_INCLUDE_DIR}")
-ELSE (QORE_FOUND)
-    MESSAGE(STATUS "E! Found Qore lib: ${QORE_LIBRARY}")
-    MESSAGE(STATUS "E!      includes: ${QORE_INCLUDE_DIR}")
-
-  IF (Qore_FIND_REQUIRED)
-    MESSAGE(FATAL_ERROR "Could not find Qore library")
-  ENDIF (Qore_FIND_REQUIRED)
-ENDIF (QORE_FOUND)
-
-MARK_AS_ADVANCED(QORE_INCLUDE_DIR QORE_LIBRARY)
-


Suppressed some warnings

Suppressed some warnings

--- cmake_modules/compiler.cmake
+++ cmake_modules/compiler.cmake
@@ -242,7 +242,7 @@
      set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
      set(CMAKE_CXX_FLAGS_DEBUG "-Og -g")

-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra -Wno-unused-parameter -Wno-unused-variable -Woverloaded-virtual -Wold-style-cast -Wnon-virtual-dtor")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra -Wno-unused-parameter -Wno-unused-variable -Woverloaded-virtual -Wold-style-cast -Wnon-virtual-dtor -Wimplicit-fallthrough -Wunused-but-set-variable -Wsign-compare")

      # MinGW fixes
      if (MINGW AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)


Modified path handling and removed broken tests requiring test data [skip ci]

--- cmake_modules/yolo/YOLOProjectAddTestCase.cmake
+++ cmake_modules/yolo/YOLOProjectAddTestCase.cmake
@@ -1,6 +1,18 @@
 include(CMakeParseArguments)

 set(TESTS_REQUIRING_TEST_DATA
+        # Fails remotely
+        test_aerodynamics_AerodynamicMomentAndAerodynamicForce
+        test_aerodynamics_TabulatedAtmosphere
+        test_aerodynamics_ControlSurfaceIncrements
+        test_aerodynamics_WindModel
+        test_ephemerides_ApproximatePlanetPositions
+        test_ephemerides_TabulatedEphemeris
+        test_spice_SpiceInterface
+        test_simulation_EnvironmentModelSetup
+        test_simulation_AccelerationModelSetup
+        test_io_BasicInputOutput
+        # Fails locally
         test_aerodynamics_AerodynamicCoefficientsFromFile
         test_basic_astro_EmpiricalAcceleration
         test_earth_orientation_EarthOrientationCalculator


Try to add LDFLAGS to gdal to allow packaging

--- SuperBuild/CMake/External_gdal.cmake
+++ SuperBuild/CMake/External_gdal.cmake
@@ -52,6 +52,7 @@
   #we don't do any framework build on osx. So let's be sure on case of gdal
   if(APPLE)
     list(APPEND GDAL_SB_CONFIG "--with-macosx-framework=no")
+    list(APPEND GDAL_SB_CONFIG "LDFLAGS=-headerpad")
   endif()

   # PATCH_COMMAND ${CMAKE_COMMAND} -E touch ${GDAL_SB_SRC}/config.rpath


Superbuild: GLUT: fix windows build

Superbuild: GLUT: fix windows build

--- SuperBuild/CMake/External_glut.cmake
+++ SuperBuild/CMake/External_glut.cmake
@@ -8,17 +8,20 @@
 SETUP_SUPERBUILD(GLUT)

 if(UNIX)
-set(GLUT_PATCH_COMMAND ${CMAKE_COMMAND}
+
+  set(GLUT_PATCH_COMMAND)
+
+  set(GLUT_CONFIGURE_COMMAND  "${SB_ENV_CONFIGURE_CMD};${GLUT_SB_SRC}/configure" ${SB_CONFIGURE_ARGS})
+
+else(MSVC)
+
+  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" ${SB_CONFIGURE_ARGS})
-
-else(MSVC)
-  set(GLUT_PATCH_COMMAND)
-  set(GLUT_CONFIGURE_COMMAND ${SB_CMAKE_COMMAND} ${SB_CMAKE_CACHE_ARGS})
+  set(GLUT_CONFIGURE_COMMAND ${SB_CMAKE_COMMAND} ${SB_CMAKE_CACHE_ARGS} ${GLUT_SB_SRC} )
 endif()

 ExternalProject_Add(GLUT


cmake: Trim IDF_VER to fit a 32-bit field

--- tools/cmake/idf_functions.cmake
+++ tools/cmake/idf_functions.cmake
@@ -223,11 +223,13 @@
 function(idf_get_git_revision)
     git_describe(IDF_VER_GIT "${IDF_PATH}")
     if(EXISTS "${IDF_PATH}/version.txt")
-        file(STRINGS "${IDF_PATH}/version.txt" IDF_VER)
+        file(STRINGS "${IDF_PATH}/version.txt" IDF_VER_T)
         set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${IDF_PATH}/version.txt")
     else()
-        set(IDF_VER ${IDF_VER_GIT})
-    endif()
+        set(IDF_VER_T ${IDF_VER_GIT})
+    endif()
+    # cut IDF_VER to required 32 characters.
+    string(SUBSTRING "${IDF_VER_T}" 0 31 IDF_VER)
     message(STATUS "IDF_VER: ${IDF_VER}")
     add_definitions(-DIDF_VER=\"${IDF_VER}\")
     git_submodule_check("${IDF_PATH}")


FIX: enable passing multiple libraries to LINK_LIB_TO_FUNCTIONALITY

--- CMake/FunctionalityHelpers.cmake
+++ CMake/FunctionalityHelpers.cmake
@@ -103,7 +103,7 @@

 MACRO(LINK_LIB_TO_FUNCTIONALITY FUNCTIONALITY LIBRARY)
   IF(BUILD_ALL_FUNCTIONALITIES OR BUILD_${FUNCTIONALITY})
-    TARGET_LINK_LIBRARIES(${FUNCTIONALITY} ${LIBRARY})
+    TARGET_LINK_LIBRARIES(${FUNCTIONALITY} ${LIBRARY} ${ARGN})
   ENDIF(BUILD_ALL_FUNCTIONALITIES OR BUILD_${FUNCTIONALITY})
 ENDMACRO(LINK_LIB_TO_FUNCTIONALITY FUNCTIONALITY LIBRARY)


Add compute 70 to the build list

Add compute 70 to the build list

--- CMake/hoomd/HOOMDCUDASetup.cmake
+++ CMake/hoomd/HOOMDCUDASetup.cmake
@@ -42,7 +42,9 @@
 # setup CUDA compile options
 if (ENABLE_CUDA)
     # setup nvcc to build for all CUDA architectures. Allow user to modify the list if desired
-    if (CUDA_VERSION VERSION_GREATER 7.99)
+    if (CUDA_VERSION VERSION_GREATER 8.99)
+        set(CUDA_ARCH_LIST 30 35 50 60 70 CACHE STRING "List of target sm_ architectures to compile CUDA code for. Separate with semicolons.")
+    elseif (CUDA_VERSION VERSION_GREATER 7.99)
         set(CUDA_ARCH_LIST 30 35 50 60 CACHE STRING "List of target sm_ architectures to compile CUDA code for. Separate with semicolons.")
     elseif (CUDA_VERSION VERSION_GREATER 6.99)
         set(CUDA_ARCH_LIST 30 35 50 CACHE STRING "List of target sm_ architectures to compile CUDA code for. Separate with semicolons.")
@@ -61,10 +63,6 @@

     if (_cuda_min_arch LESS 20)
         message(SEND_ERROR "SM1x builds are not supported")
-    endif ()
-
-    if (_cuda_max_arch GREATER 69)
-        message(SEND_ERROR "HOOMD does not support SM7x builds")
     endif ()

     # only generage ptx code for the maximum supported CUDA_ARCH (saves on file size)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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

 # 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
@@ -15,7 +15,7 @@
 SET(KWSYS_DATE_STAMP_YEAR  2009)

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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

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


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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


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


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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

 # 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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


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

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


GLES2 render system: Fixed win32 GLES2+EGL lib find.

--- CMake/Packages/FindOpenGLES2.cmake
+++ CMake/Packages/FindOpenGLES2.cmake
@@ -31,7 +31,8 @@
       SET (OPENGLES2_gl_LIBRARY import32 CACHE STRING "OpenGL ES 2.x library for win32")
     ELSE(BORLAND)
 	  #MS compiler - todo - fix the following line:
-      SET (OPENGLES_gl_LIBRARY ${OGRE_SOURCE_DIR}/Dependencies/lib/release/libGLESv2.lib CACHE STRING "OpenGL ES 2.x library for win32")
+      SET (OPENGLES2_gl_LIBRARY ${OGRE_DEPENDENCIES_DIR}/lib/release/libGLESv2.lib CACHE STRING "OpenGL ES 2.x library for win32")
+      SET (EGL_egl_LIBRARY      ${OGRE_DEPENDENCIES_DIR}/lib/release/libEGL.lib CACHE STRING "EGL library for win32")
     ENDIF(BORLAND)

   ENDIF (CYGWIN)


Updated to work with python frameworks on mac os X.

This doesn't operate with python frameworks in a
fully apple-centric way. I opted to keep maximal
compatibility enforcing between the python interpreter
and the python libs by forcing linkage to the python
libs specified by the interpreter.

git-svn-id: ffca00f6b2b5e7f8fb5019f1580256971ea3f277@2810 fa922fa7-2fde-0310-acd8-f43f465a7996

--- CMake/hoomd/HOOMDPythonSetup.cmake
+++ CMake/hoomd/HOOMDPythonSetup.cmake
@@ -39,12 +39,16 @@
 endif (ENABLE_STATIC)
 message(STATUS "searching for first: " ${_python_lib_first})

+# add a blank suffix to the beginning to find the Python framework
+set(_old_suffixes ${CMAKE_FIND_LIBRARY_SUFFIXES})
+set(CMAKE_FIND_LIBRARY_SUFFIXES ";${CMAKE_FIND_LIBRARY_SUFFIXES}")
 find_library(PYTHON_LIBRARY
              NAMES ${_python_lib_first} python${_python_version_no_dots} python${_python_version}
              HINTS ${_python_prefix_hint} ${_python_static_hint}
              PATH_SUFFIXES lib64 lib libs
              NO_DEFAULT_PATH
              )
+set(${CMAKE_FIND_LIBRARY_SUFFIXES} _old_suffixes)

 message(STATUS "python library " ${PYTHON_LIBRARY})


fixed: check if collada is found before adding import lib

git-svn-id: 6c7e10cdde2c115f53707ba8ec4efe535f92d362@2013 4683daeb-ad0f-0410-a623-93161e962ae5

--- CMake/ConfigurePackages.cmake
+++ CMake/ConfigurePackages.cmake
@@ -256,7 +256,10 @@
         FIND_PACKAGE(Collada)

         SET(OSG_COLLADA_TARGETS)
-        OSG_ADD_IMPORT_LIB(OSG_COLLADA_TARGETS COLLADA_LIBRARY)
+
+		IF(COLLADA_FOUND)
+          OSG_ADD_IMPORT_LIB(OSG_COLLADA_TARGETS COLLADA_LIBRARY)
+		ENDIF(COLLADA_FOUND)

     ELSE(NOT OSG_USE_OSGSUPPORT_LIBS)


ENH: typo in cmake warning message

ENH: typo in cmake warning message

--- CMake/OTBModuleExternal.cmake
+++ CMake/OTBModuleExternal.cmake
@@ -38,7 +38,7 @@
 endif()

 if(OTB_BUILD_MODULE_AS_STANDALONE)
-  message(STATUS "You are building this module as a standalone CMake project. Beware that dependecies to other remote modules will not be tracked.")
+  message(STATUS "You are building this module as a standalone CMake project. Beware that dependencies to other remote modules will not be tracked.")
   include(OTBStandaloneModuleMacros)
 else()


Update MITK Data revision tag

Update MITK Data revision tag

--- CMakeExternals/MITKData.cmake
+++ CMakeExternals/MITKData.cmake
@@ -13,7 +13,7 @@

 if(BUILD_TESTING)

-  set(revision_tag 6001ab9c) # first 8 characters of hash-tag
+  set(revision_tag 2c453a13) # first 8 characters of hash-tag
 #                  ^^^^^^^^  these are just to check correct length of hash part

   ExternalProject_Add(${proj}


Fix XERCESC_LIBRARY_DEBUG condition in CMake

--- CMakeModules/FindXerces.cmake
+++ CMakeModules/FindXerces.cmake
@@ -65,13 +65,13 @@

 IF(XERCESC_FOUND)

- IF(${XERCESC_LIBRARY_DEBUG})
+ IF(XERCESC_LIBRARY_DEBUG)
    SET(XERCESC_LIBRARIES
           optimized ${XERCESC_LIBRARY}
           debug ${XERCESC_LIBRARY_DEBUG})
-  ELSE(${XERCESC_LIBRARY_DEBUG})
+  ELSE(XERCESC_LIBRARY_DEBUG)
     SET(XERCESC_LIBRARIES	${XERCESC_LIBRARY})
-  ENDIF(${XERCESC_LIBRARY_DEBUG})
+  ENDIF(XERCESC_LIBRARY_DEBUG)

 FIND_PATH(XERCESC_XVERHPPPATH NAMES XercesVersion.hpp PATHS
  ${XERCESC_INCLUDE}


Remove legacy MacOS conditions

Remove legacy MacOS conditions

--- cmake-scripts/FindSDL2.cmake
+++ cmake-scripts/FindSDL2.cmake
@@ -231,24 +231,18 @@
   endif()
 endif()

-# SDL2 may require threads on your system.
-# The Apple build may not need an explicit flag because one of the
-# frameworks may already provide it.
-# But for non-OSX systems, I will use the CMake Threads package.
-if(NOT APPLE)
-  find_package(Threads QUIET)
-  if(NOT Threads_FOUND)
-    set(SDL2_THREADS_NOT_FOUND "Could NOT find Threads (Threads is required by SDL2).")
-    if(SDL2_FIND_REQUIRED)
-      message(FATAL_ERROR ${SDL2_THREADS_NOT_FOUND})
-    else()
-        if(NOT SDL2_FIND_QUIETLY)
-          message(STATUS ${SDL2_THREADS_NOT_FOUND})
-        endif()
-      return()
-    endif()
-    unset(SDL2_THREADS_NOT_FOUND)
-  endif()
+find_package(Threads QUIET)
+if(NOT Threads_FOUND)
+  set(SDL2_THREADS_NOT_FOUND "Could NOT find Threads (Threads is required by SDL2).")
+  if(SDL2_FIND_REQUIRED)
+    message(FATAL_ERROR ${SDL2_THREADS_NOT_FOUND})
+  else()
+      if(NOT SDL2_FIND_QUIETLY)
+        message(STATUS ${SDL2_THREADS_NOT_FOUND})
+      endif()
+    return()
+  endif()
+  unset(SDL2_THREADS_NOT_FOUND)
 endif()

 # MinGW needs an additional link flag, -mwindows
@@ -267,22 +261,8 @@
     unset(_SDL2_MAIN_INDEX)
   endif()

-  # For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
-  # CMake doesn't display the -framework Cocoa string in the UI even
-  # though it actually is there if I modify a pre-used variable.
-  # I think it has something to do with the CACHE STRING.
-  # So I use a temporary variable until the end so I can set the
-  # "real" variable in one-shot.
-  if(APPLE)
-    set(SDL2_LIBRARIES ${SDL2_LIBRARIES} -framework Cocoa)
-  endif()
-
-  # For threads, as mentioned Apple doesn't need this.
-  # In fact, there seems to be a problem if I used the Threads package
-  # and try using this line, so I'm just skipping it entirely for OS X.
-  if(NOT APPLE)
-    set(SDL2_LIBRARIES ${SDL2_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-  endif()
+
+  set(SDL2_LIBRARIES ${SDL2_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})

   # For MinGW library
   if(MINGW)
@@ -339,17 +319,10 @@
                           IMPORTED_LOCATION "${SDL2_LIBRARY}"
                           INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}")

-    if(APPLE)
-      # For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
-      # For more details, please see above.
-      set_property(TARGET SDL2::Core APPEND PROPERTY
-                   INTERFACE_LINK_OPTIONS -framework Cocoa)
-    else()
       # For threads, as mentioned Apple doesn't need this.
       # For more details, please see above.
       set_property(TARGET SDL2::Core APPEND PROPERTY
                    INTERFACE_LINK_LIBRARIES Threads::Threads)
-    endif()
   endif()

   # SDL2::Main target


Fixed bug in configsafeguards...

Fixed bug in configsafeguards...

--- cmake/ConfigSafeGuards.cmake
+++ cmake/ConfigSafeGuards.cmake
@@ -5,8 +5,8 @@

 # guard against bad build-type strings
 if (NOT CMAKE_BUILD_TYPE)
-    message(STATUS "No build type selected, default to Debug")
-    set(CMAKE_BUILD_TYPE "Debug")
+    message(STATUS "No build type selected, default to Release")
+    set(CMAKE_BUILD_TYPE "Release")
 endif()

 string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_tolower)


TableGen.cmake: Fix to work without LLVM_COMMON_DEPENDS.

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

--- cmake/modules/TableGen.cmake
+++ cmake/modules/TableGen.cmake
@@ -50,7 +50,9 @@
   if( TABLEGEN_OUTPUT )
     add_custom_target(${target}
       DEPENDS ${TABLEGEN_OUTPUT})
-    add_dependencies(${target} ${LLVM_COMMON_DEPENDS})
+    if (LLVM_COMMON_DEPENDS)
+      add_dependencies(${target} ${LLVM_COMMON_DEPENDS})
+    endif ()
     set_target_properties(${target} PROPERTIES FOLDER "Tablegenning")
   endif( TABLEGEN_OUTPUT )
 endfunction()


added ${${proj}_EP_ARGS_DIRS} in NIFTYREG

--- SuperBuild/External_NIFTYREG.cmake
+++ SuperBuild/External_NIFTYREG.cmake
@@ -54,6 +54,7 @@
     ${${proj}_EP_ARGS}
     GIT_REPOSITORY "${${proj}_URL_MODIFIED}"
     GIT_TAG "${${proj}_TAG_MODIFIED}"
+    ${${proj}_EP_ARGS_DIRS}
     CMAKE_ARGS
       -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=${CMAKE_POSITION_INDEPENDENT_CODE}
       -DCMAKE_PREFIX_PATH=${SUPERBUILD_INSTALL_DIR}
@@ -76,11 +77,7 @@
         message(STATUS "USING the system ${externalProjName}, set ${externalProjName}_DIR=${${externalProjName}_DIR}")
     endif()
     ExternalProject_Add_Empty(${proj} DEPENDS "${${proj}_DEPENDENCIES}"
-      SOURCE_DIR ${${proj}_SOURCE_DIR}
-      BINARY_DIR ${${proj}_BINARY_DIR}
-      DOWNLOAD_DIR ${${proj}_DOWNLOAD_DIR}
-      STAMP_DIR ${${proj}_STAMP_DIR}
-      TMP_DIR ${${proj}_TMP_DIR}
+        ${${proj}_EP_ARGS_DIRS}
     )
   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   27)
+SET(KWSYS_DATE_STAMP_DAY   28)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


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

 # 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

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


COMP: Need to propagate ITKGDCM

COMP: Need to propagate ITKGDCM

ITKGDCM needs to be propagated for external builds
fatal error: 'gdcmSerieHelper.h' file not found errors occur
in external applications builds.

Change-Id: Ie59bf129e5c6b0aaf832040f904aaecafc4fc738

--- Modules/IO/GDCM/itk-module.cmake
+++ Modules/IO/GDCM/itk-module.cmake
@@ -4,8 +4,9 @@

 itk_module(ITKIOGDCM
   ENABLE_SHARED
+  DEPENDS
+    ITKGDCM
   PRIVATE_DEPENDS
-    ITKGDCM
     ITKIOImageBase
   TEST_DEPENDS
     ITKTestKernel


Updated FindCorrade.cmake from Corrade repository.

--- modules/FindCorrade.cmake
+++ modules/FindCorrade.cmake
@@ -7,20 +7,26 @@
 #  CORRADE_INCLUDE_DIR              - Include dir for Corrade
 #  CORRADE_INTERCONNECT_LIBRARIES   - Corrade Interconnect library and
 #   dependent libraries
-#  CORRADE_UTILITY_LIBRARIES        - Corrade Utility library and dependent
-#   libraries
-#  CORRADE_PLUGINMANAGER_LIBRARIES  - Corrade Plugin manager library and
+#  CORRADE_UTILITY_LIBRARIES        - Corrade Utility library and
 #   dependent libraries
-#  CORRADE_TESTSUITE_LIBRARIES      - Corrade TestSuite library and dependent
-#   libraries
+#  CORRADE_PLUGINMANAGER_LIBRARIES  - Corrade PluginManager library and
+#   dependent libraries
+#  CORRADE_TESTSUITE_LIBRARIES      - Corrade TestSuite library and
+#   dependent libraries
 #  CORRADE_RC_EXECUTABLE            - Corrade resource compiler executable
 # Additionally these variables are defined for internal usage:
+#  CORRADE_INTERCONNECT_LIBRARY     - Corrade Interconnect library (w/o
+#   dependencies)
 #  CORRADE_UTILITY_LIBRARY          - Corrade Utility library (w/o
 #   dependencies)
 #  CORRADE_PLUGINMANAGER_LIBRARY    - Corrade Plugin manager library (w/o
 #   dependencies)
 #  CORRADE_TESTSUITE_LIBRARY        - Corrade TestSuite library (w/o
 #   dependencies)
+# Corrade configures the compiler to use C++11 standard. Additionally you can
+# use CORRADE_CXX_FLAGS to enable additional pedantic set of warnings and enable
+# hidden visibility by default.
+#
 # If Corrade library is found, these macros and functions are defined:
 #
 #
@@ -42,9 +48,7 @@
 # generates resource file with group group_name from given files in current
 # build directory. Argument name is name under which the resources can be
 # explicitly loaded. Variable 'name' contains compiled resource filename,
-# which is then used for compiling library / executable.
-#
-# Example usage:
+# which is then used for compiling library / executable. Example usage:
 #  corrade_add_resource(name group_name file1 ALIAS alias1 file2 file3)
 #  add_executable(app source1 source2 ... ${name})
 #
@@ -62,13 +66,10 @@
 #                            plugin_name metadata_file
 #                            sources...)
 # The macro adds preprocessor directive CORRADE_STATIC_PLUGIN. Additional
-# libraries can be linked in via target_link_libraries(plugin_name ...).
-#
-# Plugin library name will be added at the end of static_plugins_variable and
-# the variable is meant to be used for linking plugins to main
-# executable/library, e.g:
+# libraries can be linked in via target_link_libraries(plugin_name ...). Plugin
+# library name will be appended to static_plugins_variable and the variable is
+# meant to be used for linking plugins to main executable/library, e.g:
 #  target_link_libraries(app lib1 lib2 ... ${static_plugins_variable})
-#
 # This variable is set with parent scope to be available in parent directory.
 # If there are more intermediate directories between plugin directory and main
 # executable directory, the variable can be propagated to parent scope like
@@ -124,7 +125,9 @@
 set(CORRADE_INTERCONNECT_LIBRARIES ${CORRADE_INTERCONNECT_LIBRARY} ${CORRADE_UTILITY_LIBRARIES})
 set(CORRADE_PLUGINMANAGER_LIBRARIES ${CORRADE_PLUGINMANAGER_LIBRARY} ${CORRADE_UTILITY_LIBRARIES})
 set(CORRADE_TESTSUITE_LIBRARIES ${CORRADE_TESTSUITE_LIBRARY} ${CORRADE_UTILITY_LIBRARIES})
-mark_as_advanced(CORRADE_UTILITY_LIBRARY CORRADE_PLUGINMANAGER_LIBRARY CORRADE_TESTSUITE_LIBRARY)
+mark_as_advanced(CORRADE_UTILITY_LIBRARY
+    CORRADE_INTERCONNECT_LIBRARY
+    CORRADE_PLUGINMANAGER_LIBRARY
+    CORRADE_TESTSUITE_LIBRARY)

-include(CorradeMacros)
-include(CorradeLibSuffix)
+include(UseCorrade)


COMP: remove Mosaic.remote.cmake

COMP: remove Mosaic.remote.cmake

--- Modules/Remote/Mosaic.remote.cmake
+++ Modules/Remote/Mosaic.remote.cmake
@@ -1,29 +0,0 @@
-#
-# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
-#
-# This file is part of Orfeo Toolbox
-#
-#     https://www.orfeo-toolbox.org/
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#Contact: Rémi Cresson <remi.cresson@teledetection.fr>
-otb_fetch_module(Mosaic
-  "This module provides one application dedicated to images mosaicking
-A more detailed description can be found on the project website:
-https://github.com/remicres/otb-mosaic
-"
-  GIT_REPOSITORY https://github.com/remicres/otb-mosaic.git
-  GIT_TAG 2e113fd35f1fafebefa976581b47b300f5fb8bc5
-)


Patch in order to compile when no there is no .svn.

--- src/CMake/LibmvVersion.cmake
+++ src/CMake/LibmvVersion.cmake
@@ -1,16 +1,18 @@

 SET(LIBMV_VERSION_MAJOR 0)
 SET(LIBMV_VERSION_MINOR 0)
+SET(LIBMV_VERSION_PATCH 9) #or the svn revision

 # The standard GNU version numbering scheme is major.minor.revision
-FIND_PACKAGE(Subversion)
-IF(Subversion_FOUND)
-  Subversion_WC_INFO(${CMAKE_CURRENT_SOURCE_DIR} ER)
-  SET(SUBVERSION_REVISION ${ER_WC_REVISION})
-  SET(LIBMV_VERSION_PATCH ${SUBVERSION_REVISION})
-ELSE(Subversion_FOUND)
-  SET(LIBMV_VERSION_PATCH 0)
-ENDIF(Subversion_FOUND)
+IF (EXISTS ${LIBMV_SOURCE_DIR}/.svn)
+  # Probably a SVN workspace, determine revision level
+  FIND_PACKAGE(Subversion)
+  IF(Subversion_FOUND)
+    Subversion_WC_INFO(${LIBMV_SOURCE_DIR} ER)
+    SET(SUBVERSION_REVISION ${ER_WC_REVISION})
+    SET(LIBMV_VERSION_PATCH ${SUBVERSION_REVISION})
+  ENDIF(Subversion_FOUND)
+ENDIF (EXISTS ${LIBMV_SOURCE_DIR}/.svn)

 # Built from svn
 SET(LIBMV_VERSION "${LIBMV_VERSION_MAJOR}.${LIBMV_VERSION_MINOR}.${LIBMV_VERSION_PATCH}")


fbcode_builder: add a license header to FBBuildOptions.cmake

Summary:
Add a license header to satisfy the open source linter. Use the same
header the other .cmake files have.

Reviewed By: mhlakhani

Differential Revision: D17404782

fbshipit-source-id: 66679d72c9e680f8bb8b27869e981a046b3520cf

--- build/fbcode_builder/CMake/FBBuildOptions.cmake
+++ build/fbcode_builder/CMake/FBBuildOptions.cmake
@@ -1,3 +1,5 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+
 function (fb_activate_static_library_option)
   option(USE_STATIC_DEPS_ON_UNIX
     "If enabled, use static dependencies on unix systems. This is generally discouraged."


Try to pass ltsan again to travis

Try to pass ltsan again to travis

--- Testing/script/travis_script.cmake
+++ Testing/script/travis_script.cmake
@@ -82,7 +82,7 @@
   endif()
   if(${MERCURY_MEMORYCHECK_TYPE} MATCHES "ThreadSanitizer")
     set(MERCURY_MEMCHECK_FLAGS "-O1 -fsanitize=thread -fno-omit-frame-pointer -fPIC -pie")
-    set(ENV{LDFLAGS} "-L/usr/lib/x86_64-linux-gnu -ltsan")
+    set(ENV{LDFLAGS} "/usr/lib/x86_64-linux-gnu/libtsan.so.0")
   endif()

   # needed by mercury_common.cmake


Remove verosity in kitchen, clean up message for ccmake.

--- kitchen/kitchen.cmake
+++ kitchen/kitchen.cmake
@@ -8,8 +8,6 @@
   if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/ecto)
     MESSAGE(FATAL_ERROR "Expecting ecto as a subdirectory of your toplevel project!")
   endif()
-
-  message("PROJECTS: ${ARGN}")
   set(KITCHEN_PROJECTS "ecto;${ARGN}")

   set(ECTO_KITCHEN_VERSION 11.07.0)
@@ -38,7 +36,7 @@
     @ONLY)

   string(REPLACE ";" " " KITCHEN_PROJECTS_STR "${KITCHEN_PROJECTS}")
-  message("Initializing kitchen with projects ${KITCHEN_PROJECTS_STR}")
+  message(STATUS "Initializing kitchen with projects ${KITCHEN_PROJECTS_STR}")
   configure_file(${ecto_kitchen_SOURCE_DIR}/ecto/kitchen/util/python_path.sh.in
     ${CMAKE_BINARY_DIR}/python_path.sh
     @ONLY


Removed obsolete configuration options.

Removed obsolete configuration options.

--- cmake/bn.cmake
+++ cmake/bn.cmake
@@ -9,13 +9,11 @@

 message("   ** Available multiple precision arithmetic methods (default = COMBA;COMBA;MONTY;SLIDE;STEIN;BASIC):")
 message("      BN_METHD=BASIC    Schoolbook multiplication.")
-message("      BN_METHD=COMBA    Comba multiplication.")
-message("      BN_METHD=KnMUL    Karatsuba for (n > 0) steps and MUL multiplication.\n")
+message("      BN_METHD=COMBA    Comba multiplication.\n")

 message("      BN_METHD=BASIC    Schoolbook squaring.")
 message("      BN_METHD=COMBA    Comba squaring.")
-message("      BN_METHD=KnSQR    Karatsuba for (n > 0) steps and SQR squaring.\n")
-message("      BN_METHD=MULTP    Reuse multiplication for squaring.")
+message("      BN_METHD=MULTP    Reuse multiplication for squaring.\n")

 message("      BN_METHD=BASIC    Division-based modular reduction.")
 message("      BN_METHD=BARRT    Barrett modular reduction.")


Some minor cleaning up of our common CMake file for LLVM [ci skip].

--- src/plugins/3rdparty/LLVM/cmake/common.cmake
+++ src/plugins/3rdparty/LLVM/cmake/common.cmake
@@ -2,30 +2,28 @@
     # Retrieve some LLVM settings

     IF(WIN32)
+        SET(LLVM_DEFINITIONS)
+    ELSE()
         SET(LLVM_DEFINITIONS
-            _SCL_SECURE_NO_WARNINGS
-            # Note: this is required to build LLVM in debug mode...
+            __STDC_CONSTANT_MACROS
+            __STDC_LIMIT_MACROS
         )
-    ELSEIF(NOT APPLE)
-        SET(LLVM_DEFINITIONS
-            __STDC_FORMAT_MACROS
-            # Note: this is required to address a couple of issues with PRIx64
-            #       in [LLVM]/lib/CodeGen/AsmPrinter/AsmPrinter.cpp...
-        )
+
+        IF(NOT APPLE)
+            LIST(APPEND LLVM_DEFINITIONS
+                __STDC_FORMAT_MACROS
+                # Note: this is to address a couple of issues with PRIx64 in
+                #       [LLVM]/lib/CodeGen/AsmPrinter/AsmPrinter.cpp...
+            )
+        ENDIF()
     ENDIF()

-    LIST(APPEND LLVM_DEFINITIONS
-        __STDC_CONSTANT_MACROS
-        __STDC_LIMIT_MACROS
-    )
-
     # Ignore some warnings on Windows
+    # Note: we have nothing to do with them, so...

     IF(WIN32)
         SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4244")
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4138 /wd4180 /wd4244 /wd4291 /wd4351 /wd4355 /wd4551 /wd4624 /wd4722")
-        # Note: some warnings get generated, but we have nothing to do with
-        #       them, so...
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4355 /wd4291 /wd4351 /wd4624 /wd4996")
     ENDIF()
 ENDMACRO()


Split off candidate-3.10 branch

Split off candidate-3.10 branch

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

--- version.cmake
+++ version.cmake
@@ -3,8 +3,8 @@
 ###
 set ( HPCC_PROJECT "community" )
 set ( HPCC_MAJOR 3 )
-set ( HPCC_MINOR 9 )
-set ( HPCC_POINT 0 )
-set ( HPCC_MATURITY "trunk" )
+set ( HPCC_MINOR 10 )
+set ( HPCC_POINT 1 )
+set ( HPCC_MATURITY "closedown" )
 set ( HPCC_SEQUENCE 1 )
 ###


Split off 8.4.46

Split off 8.4.46

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

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


Nagios Monitoring 6.2.0-1 Gold

Nagios Monitoring 6.2.0-1 Gold

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

--- version.cmake
+++ version.cmake
@@ -5,6 +5,6 @@
 set ( HPCC_MAJOR 6 )
 set ( HPCC_MINOR 2 )
 set ( HPCC_POINT 0 )
-set ( HPCC_MATURITY "rc" )
+set ( HPCC_MATURITY "release" )
 set ( HPCC_SEQUENCE 1 )
 ###


[ioninja] release 3.5.5

[ioninja] release 3.5.5

[axl] release 5.5.3
[jancy] release 1.6.3

--- version.cmake
+++ version.cmake
@@ -1,6 +1,6 @@
 set (VERSION_MAJOR     1)
 set (VERSION_MINOR     6)
-set (VERSION_REVISION  2)
+set (VERSION_REVISION  3)
 set (VERSION_TAG)

 set (VERSION_FILE_SUFFIX "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")


Fix for tracking nuttx config changes.

Fix for tracking nuttx config changes.

--- cmake/nuttx/px4_impl_nuttx.cmake
+++ cmake/nuttx/px4_impl_nuttx.cmake
@@ -231,6 +231,7 @@
 		DEPENDS nuttx_copy_${CONFIG}.stamp __nuttx_patch_${CONFIG})

 	# export
+	file(GLOB_RECURSE config_files ${CMAKE_SOURCE_DIR}/nuttx-configs/${CONFIG}/*)
 	add_custom_command(OUTPUT ${CONFIG}.export
 		COMMAND ${ECHO} Configuring NuttX for ${CONFIG}
 		COMMAND ${MAKE} -C${nuttx_src}/nuttx -j${THREADS}
@@ -244,7 +245,7 @@
 			-r CONFIG_ARCH_BOARD=${CONFIG} export
 		COMMAND ${CP} -r ${nuttx_src}/nuttx/nuttx-export.zip
 			${CONFIG}.export
-		DEPENDS ${DEPENDS} __nuttx_copy_${CONFIG})
+		DEPENDS ${config_files} ${DEPENDS} __nuttx_copy_${CONFIG})

 	# extract
 	add_custom_command(OUTPUT nuttx_export_${CONFIG}.stamp


Setting default arch on Mac to 64-bit.

Setting default arch on Mac to 64-bit.

--- test/min-lib-unittest.cmake
+++ test/min-lib-unittest.cmake
@@ -23,7 +23,8 @@
 #SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage")

 if (APPLE)
-	set(CMAKE_OSX_ARCHITECTURES x86_64;i386)
+	#set(CMAKE_OSX_ARCHITECTURES x86_64;i386)
+	set(CMAKE_OSX_ARCHITECTURES x86_64)
 endif ()

 add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp)


Apply patch from Dan Zwell  http://launchpadlibrarian.net/27838407/cxxtestgen_perl2.patch from  https://bugs.launchpad.net/bugs/386231

--- lib/FindCxxtest.cmake
+++ lib/FindCxxtest.cmake
@@ -11,37 +11,36 @@
 # Find path to the cxxtestgen.py script (NB: this stuff should move to FindCXXTEST.cmake)
 # CXXTEST_BIN_DIR enviroment variable must have been defined already

-
 # cxxtest has a Python version and a Perl version. First, look
 # for the Python version.
 FIND_PACKAGE(PythonInterp)
-FIND_PATH(CXXTEST_BIN_DIR cxxtestgen.py
+FIND_PATH(CXXTEST_PYTHON_BIN_DIR cxxtestgen.py
 	$ENV{CXXTEST_BIN_DIR}
 	/usr/bin
 	/usr/local/bin
 	DOC "Where is cxxtest located?"
 )
-IF (PYTHONINTERP_FOUND AND CXXTEST_BIN_DIR)
+IF (PYTHONINTERP_FOUND AND CXXTEST_PYTHON_BIN_DIR)
 	SET(CXXTEST_FOUND 1)
-	SET(CXXTEST_GEN "${CXXTEST_BIN_DIR}/cxxtestgen.py")
-ELSE (PYTHONINTERP_FOUND AND CXXTEST_BIN_DIR)
+	SET(CXXTEST_GEN "${CXXTEST_PYTHON_BIN_DIR}/cxxtestgen.py")
+ELSE (PYTHONINTERP_FOUND AND CXXTEST_PYTHON_BIN_DIR)

 	# The python version wasn't found--search for the perl version.
-	FIND_PATH(CXXTEST_BIN_DIR cxxtestgen.pl
+	FIND_PATH(CXXTEST_PERL_BIN_DIR cxxtestgen.pl
 		$ENV{CXXTEST_BIN_DIR}
 		/usr/bin
 		/usr/local/bin
 		DOC "Where is cxxtest located?"
 	)
-	IF (CXXTEST_BIN_DIR)
+	IF (CXXTEST_PERL_BIN_DIR)
 		SET(CXXTEST_FOUND 1)
-		SET(CXXTEST_GEN "${CXXTEST_BIN_DIR}/cxxtestgen.pl")
-	ELSE (CXXTEST_BIN_DIR)
+		SET(CXXTEST_GEN "${CXXTEST_PERL_BIN_DIR}/cxxtestgen.pl")
+	ELSE (CXXTEST_PERL_BIN_DIR)
 		# There is no cxxtest, either in Perl or Python
 		SET(CXXTEST_FOUND 0)
-	ENDIF (CXXTEST_BIN_DIR)
+	ENDIF (CXXTEST_PERL_BIN_DIR)

-ENDIF (PYTHONINTERP_FOUND AND CXXTEST_BIN_DIR)
+ENDIF (PYTHONINTERP_FOUND AND CXXTEST_PYTHON_BIN_DIR)

 IF (WIN32)
 	FIND_PATH(CXXTEST_INCLUDE_DIR "TestSuite.h"


flags.cmake

flags.cmake

--- flags.cmake
+++ flags.cmake
@@ -10,9 +10,9 @@
 SET(CMAKE_CXX_FLAGS_DEBUG " -ggdb -O0")
 SET(CMAKE_ASM_FLAGS_DEBUG " -ggdb")

-SET(CMAKE_C_FLAGS_RELEASE " -g0 -O3")
-SET(CMAKE_CXX_FLAGS_RELEASE " -g0 -O3")
-SET(CMAKE_ASM_FLAGS_RELEASE " -g0")
+SET(CMAKE_C_FLAGS_RELEASE " -ggdb -O3 -Wno-unused-variable -Wno-unused-parameter")
+SET(CMAKE_CXX_FLAGS_RELEASE " -ggdb -O3")
+SET(CMAKE_ASM_FLAGS_RELEASE " -ggdb")

 IF(CMAKE_COMPILER_IS_GNUCC)
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fmessage-length=0")


cmake/boost_thread-config: add dependency to pthread

Change-Id: Ie6c5819e374bf0e6992275b97e9d3791c5355721

--- cmake/qibuild/modules/boost_thread-config.cmake
+++ cmake/qibuild/modules/boost_thread-config.cmake
@@ -9,5 +9,5 @@
 clean(BOOST_THREAD)
 fpath(BOOST_THREAD boost/config.hpp)
 boost_flib(THREAD "thread")
-qi_set_global(BOOST_THREAD_DEPENDS "BOOST_DATE_TIME")
+qi_set_global(BOOST_THREAD_DEPENDS "BOOST_DATE_TIME;PTHREAD")
 export_lib(BOOST_THREAD)


Improving FindCapu CMake script

Improving FindCapu CMake script

Change-Id: I82472dc627f525fcf42308c5ef8f2a589e9868b9

git-svn-id: 413dc58a15145b085e84d1a9a38cb4ab1fc93382@1482741 13f79535-47bb-0310-9956-ffa450edef68

--- binding-cpp/runtime/FindCapu.cmake
+++ binding-cpp/runtime/FindCapu.cmake
@@ -58,9 +58,12 @@
             BINARY_DIR "${CAPU_CMAKE_BUILD_DIR}"
             DOWNLOAD_COMMAND ""
             UPDATE_COMMAND ""
-            INSTALL_COMMAND "install"
+            INSTALL_DIR "${CAPU_PROJECT_DIR}/deliverable"
             CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}
                        -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+                       -DBUILD_DynamicTestLibraryProject:BOOL=1
+                       -DBUILD_GoogleMock:BOOL=0
+                       -DCONFIG_BUILD_UNITTESTS:BOOL=0
         )
     ENDIF()


cmake: fix handling of CMAKE_MODULE_LINKER_FLAGS

--- cmake/OpenCVCompilerOptions.cmake
+++ cmake/OpenCVCompilerOptions.cmake
@@ -225,9 +225,11 @@
         if(APPLE)
           set(OPENCV_EXTRA_EXE_LINKER_FLAGS "${OPENCV_EXTRA_EXE_LINKER_FLAGS} -Wl,-dead_strip")
           set(OPENCV_EXTRA_SHARED_LINKER_FLAGS "${OPENCV_EXTRA_SHARED_LINKER_FLAGS} -Wl,-dead_strip")
+          set(OPENCV_EXTRA_MODULE_LINKER_FLAGS "${OPENCV_EXTRA_MODULE_LINKER_FLAGS} -Wl,-dead_strip")
         else()
           set(OPENCV_EXTRA_EXE_LINKER_FLAGS "${OPENCV_EXTRA_EXE_LINKER_FLAGS} -Wl,--gc-sections")
           set(OPENCV_EXTRA_SHARED_LINKER_FLAGS "${OPENCV_EXTRA_SHARED_LINKER_FLAGS} -Wl,--gc-sections")
+          set(OPENCV_EXTRA_MODULE_LINKER_FLAGS "${OPENCV_EXTRA_MODULE_LINKER_FLAGS} -Wl,--gc-sections")
         endif()
       endif()
     endif()
@@ -279,6 +281,7 @@
     set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} /Zi")
     set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug")
     set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug")
+    set(OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE} /debug")
   endif()

   # Remove unreferenced functions: function level linking
@@ -346,6 +349,7 @@
     if(HAVE_LINK_AS_NEEDED)
       set(OPENCV_EXTRA_EXE_LINKER_FLAGS "${OPENCV_EXTRA_EXE_LINKER_FLAGS} ${_option}")
       set(OPENCV_EXTRA_SHARED_LINKER_FLAGS "${OPENCV_EXTRA_SHARED_LINKER_FLAGS} ${_option}")
+      set(OPENCV_EXTRA_MODULE_LINKER_FLAGS "${OPENCV_EXTRA_MODULE_LINKER_FLAGS} ${_option}")
     endif()
   endif()
 endif()
@@ -364,6 +368,9 @@
   set(CMAKE_SHARED_LINKER_FLAGS         "${CMAKE_SHARED_LINKER_FLAGS} ${OPENCV_EXTRA_SHARED_LINKER_FLAGS}")
   set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE}")
   set(CMAKE_SHARED_LINKER_FLAGS_DEBUG   "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} ${OPENCV_EXTRA_SHARED_LINKER_FLAGS_DEBUG}")
+  set(CMAKE_MODULE_LINKER_FLAGS         "${CMAKE_MODULE_LINKER_FLAGS} ${OPENCV_EXTRA_MODULE_LINKER_FLAGS}")
+  set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} ${OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE}")
+  set(CMAKE_MODULE_LINKER_FLAGS_DEBUG   "${CMAKE_MODULE_LINKER_FLAGS_DEBUG} ${OPENCV_EXTRA_MODULE_LINKER_FLAGS_DEBUG}")
 endif()

 if(MSVC)


added: ARCH detection for unix, too

added: ARCH detection for unix, too

--- cmake/SetupProjectVariables.cmake
+++ cmake/SetupProjectVariables.cmake
@@ -5,6 +5,12 @@
 # Copyright (C) 2014 University of Hull                                                            #
 #                                                                                #
 ####################################################################################################
+
+SET(ARCH "unknown")
+
+IF(UNIX)
+  EXECUTE_PROCESS(COMMAND uname -m OUTPUT_VARIABLE ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
+ENDIF()

 # 32-bit vs. 64-bit platform
 # unfortunatly, M$ are completely inconsistent in how they name directories (e.g., x64 vs. amd64),
@@ -22,8 +28,6 @@
   IF(WIN64)
     SET(ARCH x64)
   ENDIF()
-
-  MESSAGE(STATUS "Setting architecture to ${ARCH}")
 ENDIF()

 # Boost
@@ -72,7 +76,7 @@
   ADD_DEFINITIONS("-DUKACHULLDCS_ALL_TRACE")
 ENDIF()

-IF(VERBOSE)
+IF(TRUE OR VERBOSE)
   MESSAGE(STATUS "Project ${CMAKE_PROJECT_NAME} defaults:\n"
     "   ARCH                  = ${ARCH}\n"
     "   CMAKE_INSTALL_PREFIX  = ${CMAKE_INSTALL_PREFIX}\n"


Improve the name of pcm and rootmap in the multidict case

- Remove the lib prefix before the rootmap name
- Remove the G__ if any in the name of the pcm

--- cmake/modules/RootNewMacros.cmake
+++ cmake/modules/RootNewMacros.cmake
@@ -303,8 +303,8 @@
     set(library_name ${libprefix}${ARG_MODULE}${libsuffix})
     if(ARG_MULTIDICT)
       set(newargs -s ${library_output_dir}/${library_name} -multiDict)
-      set(pcm_name ${library_output_dir}/${libprefix}${ARG_MODULE}_${dictionary}_rdict.pcm)
-      set(rootmap_name ${library_output_dir}/${libprefix}${deduced_arg_module}.rootmap)
+      set(pcm_name ${library_output_dir}/${libprefix}${ARG_MODULE}_${deduced_arg_module}_rdict.pcm)
+      set(rootmap_name ${library_output_dir}/${deduced_arg_module}.rootmap)
     else()
       set(newargs -s ${library_output_dir}/${library_name})
       set(pcm_name ${library_output_dir}/${libprefix}${ARG_MODULE}_rdict.pcm)
@@ -745,7 +745,7 @@
         COMMAND ${CMAKE_COMMAND} -E copy ${src} ${dst}
         COMMENT "Copying header ${src} to /include"
         DEPENDS ${src})
-      list(APPEND dst_list ${dst})
+      list(APPEND dst_list ${dst})
     endforeach()
     set_property(GLOBAL APPEND PROPERTY ROOT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/${d})
   endforeach()


add --amdgpu-target=gfx90a (#9820)

add --amdgpu-target=gfx90a (#9820)

--- cmake/onnxruntime_providers.cmake
+++ cmake/onnxruntime_providers.cmake
@@ -1106,6 +1106,9 @@

   # Generate GPU code for GFX9 Generation
   list(APPEND HIP_CLANG_FLAGS --amdgpu-target=gfx906 --amdgpu-target=gfx908)
+  if (ROCM_VERSION_DEV_INT GREATER_EQUAL 50000)
+    list(APPEND HIP_CLANG_FLAGS --amdgpu-target=gfx90a)
+  endif()

   #onnxruntime_add_shared_library_module(onnxruntime_providers_rocm ${onnxruntime_providers_rocm_src})
   hip_add_library(onnxruntime_providers_rocm MODULE ${onnxruntime_providers_rocm_src})


folly: WindowsStore configuration

folly: WindowsStore configuration

--- cmake/projects/folly/hunter.cmake
+++ cmake/projects/folly/hunter.cmake
@@ -44,7 +44,17 @@

 set(__hunter_folly_args FOLLY_POD_CONFIGURATION=ON)

-if(IOS OR ANDROID)
+if("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
+  set(__hunter_folly_windows_store TRUE)
+else()
+  set(__hunter_folly_windows_store FALSE)
+endif()
+
+if(__hunter_folly_windows_store)
+  list(APPEND __hunter_folly_args FOLLY_USE_GLOG=OFF)
+endif()
+
+if(IOS OR ANDROID OR __hunter_folly_windows_store)
   # Fix 'try_run'
   list(
       APPEND


COMP (#3403): deactivate test, failing because of some ZIP CRC error

--- Modules/SceneSerialization/Testing/files.cmake
+++ Modules/SceneSerialization/Testing/files.cmake
@@ -1,6 +1,6 @@

 SET(MODULE_TESTS
   mitkPropertySerializationTest.cpp
-  mitkSceneIOTest.cpp
+  #mitkSceneIOTest.cpp
 )


The Python script “python.platform()” returns the string “i686” under Linux 32-bit.

--- Packaging/Python/btkPackagePythonBinding.cmake
+++ Packaging/Python/btkPackagePythonBinding.cmake
@@ -75,7 +75,7 @@
   IF(ARCH_64_BIT)
     SET(RPM_ARCH "x86_64")
   ELSE(ARCH_64_BIT)
-    SET(RPM_ARCH "i386")
+    SET(RPM_ARCH "i686")
   ENDIF(ARCH_64_BIT)
   # The next line force the installation to /usr/local/lib/pythonx.y/dist-packages
   # but the script linux-post-install.sh will move the installed files to an existing python


Added install prefix to json search path

--- cmake/CMakeModules/FindJsonCpp.cmake
+++ cmake/CMakeModules/FindJsonCpp.cmake
@@ -16,7 +16,7 @@
 set(OSSIM_HAS_JSONCPP 0)

 find_path( JSONCPP_INCLUDE_DIR json/json.h
-          PATHS "${CMAKE_INSTALL_PREFIX}" "/usr/include/jsoncpp" )
+          PATHS "${CMAKE_INSTALL_PREFIX}" "${CMAKE_INSTALL_PREFIX}/include/jsoncpp" "/usr/include/jsoncpp" )

 find_library( JSONCPP_LIBRARY NAMES "jsoncpp")


Define ARGSTACK and CALLSTACK only when needed for testing shared libs

--- cmake/CheckSharedLibraryExists.cmake
+++ cmake/CheckSharedLibraryExists.cmake
@@ -28,9 +28,12 @@
                 SET(CALLSTACK "${CALLSTACK},NULL")
                 MATH(EXPR CURARG "${CURARG} + 1")
             ENDWHILE(${ARGCOUNT} GREATER ${CURARG})
+            SET(MACRO_CHECK_LIBRARY_EXISTS_DEFINITION
+                "-D_WIN32 -DARGSTACK=\"${ARGSTACK}\" -DCALLSTACK=\"${CALLSTACK}\" ${MACRO_CHECK_LIBRARY_EXISTS_DEFINITION}")
+        ELSE(${ARGCOUNT} GREATER 0)
+            SET(MACRO_CHECK_LIBRARY_EXISTS_DEFINITION
+                "-D_WIN32 ${MACRO_CHECK_LIBRARY_EXISTS_DEFINITION}")
         ENDIF(${ARGCOUNT} GREATER 0)
-        SET(MACRO_CHECK_LIBRARY_EXISTS_DEFINITION
-            "-D_WIN32 -DARGSTACK=\"${ARGSTACK}\" -DCALLSTACK=\"${CALLSTACK}\" ${MACRO_CHECK_LIBRARY_EXISTS_DEFINITION}")
     ENDIF(WIN32)
     MESSAGE(STATUS "Looking for ${FUNCTION} in ${LIBRARY}")
     SET(CHECK_LIBRARY_EXISTS_LIBRARIES ${LIBRARY})


[cmake] Disable RPATH by default on Windows

--- cmake/modules/RootBuildOptions.cmake
+++ cmake/modules/RootBuildOptions.cmake
@@ -307,6 +307,7 @@
   set(davix_defvalue OFF)
   set(pyroot_legacy_defvalue OFF)
   set(roottest_defvalue OFF)
+  set(rpath_defvalue OFF)
   set(runtime_cxxmodules_defvalue OFF)
   set(testing_defvalue OFF)
   set(vdt_defvalue OFF)


COMP: update find_package for boost

COMP: update find_package for boost

--- Modules/ThirdParty/Boost/otb-module-init.cmake
+++ Modules/ThirdParty/Boost/otb-module-init.cmake
@@ -1,19 +1,20 @@
 # Required
 message(STATUS "Looking for required Boost headers")
-find_package ( Boost
-  1.35.0
-  REQUIRED
-  )

+# Mandatory components
+# - date_time -> ossim plugins
+set(OTB_Boost_COMPONENTS date_time)
 # Optional components
 # Boost (OPTIONAL_COMPONENTS does not work with Boost find_package)
 # unit_test_framework component is used only in GdalAdapters module
 if (BUILD_TESTING)
-  set(OTB_Boost_OPTIONAL_COMPONENTS unit_test_framework)
-  message(STATUS "Looking for optional Boost components : ${OTB_Boost_OPTIONAL_COMPONENTS}")
-  find_package ( Boost
-    QUIET
-    1.35.0
-    COMPONENTS ${OTB_Boost_OPTIONAL_COMPONENTS}
-    )
+  list(APPEND OTB_Boost_COMPONENTS unit_test_framework)
 endif()
+
+#Quiet find package to avoid message "Could not find boost" because unit_testing_framework is not installed
+#message(STATUS "Looking for optional Boost components : ${OTB_Boost_OPTIONAL_COMPONENTS}")
+find_package ( Boost
+  REQUIRED
+  1.35.0
+  COMPONENTS ${OTB_Boost_COMPONENTS}
+  )


FindCOIN update.

FindCOIN update.

--- src/CMake/FindCOIN.cmake
+++ src/CMake/FindCOIN.cmake
@@ -2,6 +2,7 @@

 IF(NOT DEFINED COIN_ROOT_DIR)
     SET(COIN_ROOT_DIR "$ENV{COIN_ROOT_DIR}")
+    MESSAGE("\tCOIN Root Dir: ${COIN_INCLUDE_DIR}")
 ENDIF(NOT DEFINED COIN_ROOT_DIR)

 MESSAGE(STATUS "COIN_ROOT_DIR hint is : ${COIN_ROOT_DIR}")
@@ -30,7 +31,7 @@
   HINTS "${COIN_INCLUDE_DIR}/../../lib/"
   HINTS "${COIN_ROOT_DIR}/lib"
 )
-#MESSAGE("\tCOIN CBC: ${COIN_CBC_LIBRARY}")
+MESSAGE("\tCOIN CBC: ${COIN_CBC_LIBRARY}")

 FIND_LIBRARY(COIN_CBC_SOLVER_LIBRARY
   NAMES CbcSolver libCbcSolver
@@ -67,11 +68,12 @@
 )
 #MESSAGE("\tCOIN OSI: ${COIN_OSI_LIBRARY}")

-FIND_LIBRARY(COIN_OSI_CBC_LIBRARY
-  NAMES OsiCbc libOsiCbc
-  HINTS ${COIN_INCLUDE_DIR}/../../lib/
-  HINTS "${COIN_ROOT_DIR}/lib"
-)
+# FIXME Uncomment for COIN 2.7+, leave commented for earlier versions -A.
+#FIND_LIBRARY(COIN_OSI_CBC_LIBRARY
+#  NAMES OsiCbc libOsiCbc
+#  HINTS ${COIN_INCLUDE_DIR}/../../lib/
+#  HINTS "${COIN_ROOT_DIR}/lib"
+#)
 #MESSAGE("\tCOIN OSI CBC: ${COIN_OSI_CBC_LIBRARY}")

 FIND_LIBRARY(COIN_OSI_CLP_LIBRARY
@@ -104,7 +106,8 @@
   COIN_CLP_LIBRARY
   COIN_COIN_UTILS_LIBRARY
   COIN_OSI_LIBRARY
-  COIN_OSI_CBC_LIBRARY
+# FIXME Uncomment for COIN 2.7+, leave commented for earlier versions -A.
+#  COIN_OSI_CBC_LIBRARY
   COIN_OSI_CLP_LIBRARY
   COIN_ZLIB_LIBRARY
   COIN_BZ2_LIBRARY
@@ -119,7 +122,11 @@
   IF(COIN_BZ2_LIBRARY)
     SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARIES};${COIN_BZ2_LIBRARY}")
   ENDIF(COIN_BZ2_LIBRARY)
-  SET(COIN_CBC_LIBRARIES "${COIN_CBC_LIBRARY};${COIN_CBC_SOLVER_LIBRARY};${COIN_CGL_LIBRARY};${COIN_OSI_LIBRARY};${COIN_OSI_CBC_LIBRARY};${COIN_OSI_CLP_LIBRARY};${COIN_CLP_LIBRARIES}")
+
+  # FIXME Use first line for COIN 2.7+, use the second for earlier versions -A.
+  #SET(COIN_CBC_LIBRARIES "${COIN_CBC_LIBRARY};${COIN_CBC_SOLVER_LIBRARY};${COIN_CGL_LIBRARY};${COIN_OSI_LIBRARY};${COIN_OSI_CBC_LIBRARY};${COIN_OSI_CLP_LIBRARY};${COIN_CLP_LIBRARIES}")
+  SET(COIN_CBC_LIBRARIES "${COIN_CBC_LIBRARY};${COIN_CBC_SOLVER_LIBRARY};${COIN_CGL_LIBRARY};${COIN_OSI_LIBRARY};${COIN_OSI_CLP_LIBRARY};${COIN_CLP_LIBRARIES}")
+
   SET(COIN_LIBRARIES ${COIN_CBC_LIBRARIES})
 ENDIF(COIN_FOUND)


ENH: Bump MinimalPathExtraction module to v1.2.2 (#3535)

* ENH: Bump MinimalPathExtraction module to v1.2.2

# Changes

* COMP: Remove inclusion of .hxx files as headers by @hjmjohnson in
* https://github.com/InsightSoftwareConsortium/ITKMinimalPathExtraction/pull/86
* COMP: Modules need updated version of ITK by @hjmjohnson in
* https://github.com/InsightSoftwareConsortium/ITKMinimalPathExtraction/pull/87
* BUG: Set FastMarching targets prior to reach mode by @aylward in
* https://github.com/InsightSoftwareConsortium/ITKMinimalPathExtraction/pull/90
* ENH: Bump ITK and replace http with https using script by @tbirdso in
* https://github.com/InsightSoftwareConsortium/ITKMinimalPathExtraction/pull/89
* ENH: Update Python package for itk-5.3rc4 by @thewtex in
* https://github.com/InsightSoftwareConsortium/ITKMinimalPathExtraction/pull/88
* ENH: Bump ITK to v5.3rc04(.post2) by @aylward in
* https://github.com/InsightSoftwareConsortium/ITKMinimalPathExtraction/pull/93

* @tbirdso made their first contribution in
* https://github.com/InsightSoftwareConsortium/ITKMinimalPathExtraction/pull/89

**Full Changelog**:
https://github.com/InsightSoftwareConsortium/ITKMinimalPathExtraction/compare/v1.2.0...v1.2.1

* ENH: Bump MinimalPathExtraction to v1.2.2

v1.2.1 had a minor bug that would have prevented it from correctly
resolving future versions of ITK

See
https://github.com/InsightSoftwareConsortium/ITKMinimalPathExtraction/releases/tag/v1.2.2

--- Modules/Remote/MinimalPathExtraction.remote.cmake
+++ Modules/Remote/MinimalPathExtraction.remote.cmake
@@ -47,5 +47,5 @@
 "
   MODULE_COMPLIANCE_LEVEL 2
   GIT_REPOSITORY ${git_protocol}://github.com/InsightSoftwareConsortium/ITKMinimalPathExtraction.git
-  GIT_TAG 72ef4ad37a341f6c5f1b0fe1c10e454a27980309
+  GIT_TAG v1.2.2
   )


[style] fix extra whitespace in CMake code

--- rosidl_typesupport_connext_cpp/cmake/rosidl_typesupport_connext_cpp_generate_interfaces.cmake
+++ rosidl_typesupport_connext_cpp/cmake/rosidl_typesupport_connext_cpp_generate_interfaces.cmake
@@ -68,13 +68,13 @@

 # If not on Windows, disable some warnings with Connext's generated code
 if(NOT WIN32)
-  if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     set(_connext_compile_flags
       "-Wno-tautological-compare "
       "-Wno-return-type-c-linkage "
       "-Wno-deprecated-register "
     )
-  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+  elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     set(_connext_compile_flags
       "-Wno-unused-variable "
       "-Wno-unused-but-set-variable "


Fix typo

Fix typo

cmake supports ` --no-warn-unused-cli` so I assume that is what this should be

--- scripts/PackageLookup.cmake
+++ scripts/PackageLookup.cmake
@@ -331,7 +331,7 @@
             ${name} reCMake
             COMMAND
                 ${CMAKE_COMMAND} -C "${cmakefile}"
-                    --no-varn-unused-cli "${CMAKE_SOURCE_DIR}"
+                    --no-warn-unused-cli "${CMAKE_SOURCE_DIR}"
             WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
             ${recursive_UNPARSED_ARGUMENTS}
         )


Change the variable name back to STRIP_LIBS to avoid variable name clash with other macro.

--- Source/CMake/Modules/Urho3D-CMake-magic.cmake
+++ Source/CMake/Modules/Urho3D-CMake-magic.cmake
@@ -278,8 +278,8 @@
     include_directories (${LIBS} ${INCLUDE_DIRS_ONLY})
     # Link libraries
     define_dependency_libs (${TARGET_NAME})
-    string (REGEX REPLACE \\.\\./|ThirdParty/|Engine/|Extras/|/include|/src "" LIB_NAME "${LIBS};${LINK_LIBS_ONLY}")
-    target_link_libraries (${TARGET_NAME} ${LIB_NAME} ${ABSOLUTE_PATH_LIBS})
+    string (REGEX REPLACE \\.\\./|ThirdParty/|Engine/|Extras/|/include|/src "" STRIP_LIBS "${LIBS};${LINK_LIBS_ONLY}")
+    target_link_libraries (${TARGET_NAME} ${STRIP_LIBS} ${ABSOLUTE_PATH_LIBS})
 endmacro ()

 # Macro for setting up a library target