Actually check for memory errors/slowness in *tpqt4/the test*, not /bin/sh

This was totally ridiculous...!

--- cmake/modules/TpQt4Macros.cmake
+++ cmake/modules/TpQt4Macros.cmake
@@ -327,14 +327,14 @@
     list(APPEND _telepathy_qt4_test_cases test-${_name})

     # Valgrind and Callgrind targets
-    _tpqt4_add_check_targets(${_fancyName} ${_name} ${SH} ${CMAKE_CURRENT_BINARY_DIR}/runGenericTest.sh ${CMAKE_CURRENT_BINARY_DIR}/test-${_name})
+    _tpqt4_add_check_targets(${_fancyName} ${_name} ${CMAKE_CURRENT_BINARY_DIR}/runGenericTest.sh ${CMAKE_CURRENT_BINARY_DIR}/test-${_name})
 endmacro(tpqt4_add_generic_unit_test _fancyName _name)

 macro(tpqt4_add_dbus_unit_test _fancyName _name)
     tpqt4_generate_moc_i(${_name}.cpp ${CMAKE_CURRENT_BINARY_DIR}/_gen/${_name}.cpp.moc.hpp)
     add_executable(test-${_name} ${_name}.cpp ${CMAKE_CURRENT_BINARY_DIR}/_gen/${_name}.cpp.moc.hpp)
     target_link_libraries(test-${_name} ${QT_LIBRARIES} ${QT_QTTEST_LIBRARY} telepathy-qt4 tp-qt4-tests ${ARGN})
-    set(with_session_bus ${SH} ${CMAKE_CURRENT_BINARY_DIR}/runDbusTest.sh)
+    set(with_session_bus ${CMAKE_CURRENT_BINARY_DIR}/runDbusTest.sh)
     add_test(${_fancyName} ${with_session_bus} ${CMAKE_CURRENT_BINARY_DIR}/test-${_name})
     list(APPEND _telepathy_qt4_test_cases test-${_name})

@@ -342,13 +342,13 @@
     _tpqt4_add_check_targets(${_fancyName} ${_name} ${with_session_bus} ${CMAKE_CURRENT_BINARY_DIR}/test-${_name})
 endmacro(tpqt4_add_dbus_unit_test _fancyName _name)

-macro(_tpqt4_add_check_targets _fancyName _name)
+macro(_tpqt4_add_check_targets _fancyName _name _runnerScript)
     set_tests_properties(${_fancyName}
         PROPERTIES
             FAIL_REGULAR_EXPRESSION "^FAIL!")

     # Standard check target
-    add_custom_target(check-${_fancyName} ${ARGN})
+    add_custom_target(check-${_fancyName} ${SH} ${_runnerScript} ${ARGN})
     add_dependencies(check-${_fancyName} test-${_name})

     # Lcov target
@@ -360,7 +360,7 @@

     add_custom_command(
         TARGET  check-valgrind-${_fancyName}
-        COMMAND G_SLICE=always-malloc valgrind
+        COMMAND G_SLICE=always-malloc ${SH} ${_runnerScript} /usr/bin/valgrind
                 --tool=memcheck
                 --leak-check=full
                 --leak-resolution=high
@@ -379,7 +379,7 @@
     add_dependencies(check-callgrind-${_fancyName} test-${_name})
     add_custom_command(
         TARGET  check-callgrind-${_fancyName}
-        COMMAND valgrind
+        COMMAND ${SH} ${_runnerScript} /usr/bin/valgrind
                 --tool=callgrind
                 --dump-instr=yes
                 --log-file=${CMAKE_CURRENT_BINARY_DIR}/test-${_fancyName}.callgrind.log


Fix to avoid "phantom" libraries from being copied to URI_PATH

--- cmake_modules/ZorbaModule.cmake
+++ cmake_modules/ZorbaModule.cmake
@@ -182,6 +182,7 @@

   # Now, deal with associated C++ source for external functions.

+  SET (module_lib_target)
   IF(MODULE_EXTRA_SOURCES OR EXISTS "${SOURCE_FILE}.src/")
     # all the cpp files found in the ${module_name}.xq.src directory
     # are added to the sources list, as are any cpp files found in any


reset glowl version to release tag

reset glowl version to release tag

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

     add_external_headeronly_project(glowl
       GIT_REPOSITORY https://github.com/invor/glowl.git
-      GIT_TAG 467c2bbfd733d357c1e639a3939a7ab99ba6d86a
+      GIT_TAG "v0.4e"
       INCLUDE_DIR "include")

   # json


fix typo so that mercurial repos are checked out to the correct tag

fixes #2068

--- software/externals/cmake/externals.cmake
+++ software/externals/cmake/externals.cmake
@@ -247,7 +247,7 @@
 macro(add_mercurial_external proj)
     ExternalProject_Add(${proj}
       HG_REPOSITORY ${${proj}_url}
-      HG_TAG ${${proj}_revision}
+      HG_TAG ${${proj}_hg_tag}
       DEPENDS ${${proj}_depends}
       SOURCE_DIR ${DRCExternals_SOURCE_DIR}/${proj}
       ${${proj}_external_args}


fpta-cmake: fix minor typo.

fpta-cmake: fix minor typo.

--- cmake.fpta/os.cmake
+++ cmake.fpta/os.cmake
@@ -48,7 +48,7 @@
   # In Mac OS, the dynamic linker recognizes
   # @loader_path, @executable_path and @rpath tokens, ex:
   #   '@loder_path/lit.dylib'
-  # means load lit from the same dir the requesting binary lives in.
+  # means load lib from the same dir the requesting binary lives in.
   # Since our dynamic libraries aren't intended for static linking,
   # this is pretty much irrelevant. Disable CMake rpath features
   # altogether. Suppresses a few warnings.


Only compare rpm versions in FindRPM is any version was found

Prevents errors...

--- cmake/FindRPM.cmake
+++ cmake/FindRPM.cmake
@@ -27,8 +27,10 @@
 )

 set(RPM_VERSION ${RPM_PKGCONF_VERSION})
-string(COMPARE GREATER "4.6" ${RPM_VERSION} RPM46_FOUND)
-string(COMPARE GREATER "4.7" ${RPM_VERSION} RPM47_FOUND)
+if(RPM_VERSION)
+	string(COMPARE GREATER "4.6" ${RPM_VERSION} RPM46_FOUND)
+	string(COMPARE GREATER "4.7" ${RPM_VERSION} RPM47_FOUND)
+endif()

 # Set the include dir variables and the libraries and let libfind_process do the rest.
 # NOTE: Singular variables for this library, plural for libraries this this lib depends on.


Fixed cmake install path in case of empty architecture (#322)

--- cmake/cxxopts.cmake
+++ cmake/cxxopts.cmake
@@ -87,7 +87,12 @@

 # Helper function to ecapsulate install logic
 function(cxxopts_install_logic)
-    string(REPLACE "/${CMAKE_LIBRARY_ARCHITECTURE}" "" CMAKE_INSTALL_LIBDIR_ARCHIND "${CMAKE_INSTALL_LIBDIR}")
+    if(CMAKE_LIBRARY_ARCHITECTURE)
+        string(REPLACE "/${CMAKE_LIBRARY_ARCHITECTURE}" "" CMAKE_INSTALL_LIBDIR_ARCHIND "${CMAKE_INSTALL_LIBDIR}")
+    else()
+        # On some systems (e.g. NixOS), `CMAKE_LIBRARY_ARCHITECTURE` can be empty
+        set(CMAKE_INSTALL_LIBDIR_ARCHIND "${CMAKE_INSTALL_LIBDIR}")
+    endif()
     set(CXXOPTS_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR_ARCHIND}/cmake/cxxopts" CACHE STRING "Installation directory for cmake files, relative to ${CMAKE_INSTALL_PREFIX}.")
     set(version_config "${PROJECT_BINARY_DIR}/cxxopts-config-version.cmake")
     set(project_config "${PROJECT_BINARY_DIR}/cxxopts-config.cmake")


Updating SimpleITK version for Examples

Updating SimpleITK version for Examples

Change-Id: I514b61d75e430adfe9d1e0a3042b5a98ab88f609

--- SuperBuild/External_SimpleITKExamples.cmake
+++ SuperBuild/External_SimpleITKExamples.cmake
@@ -18,7 +18,7 @@
     --no-warn-unused-cli
     -C "${CMAKE_CURRENT_BINARY_DIR}/${proj}-build/CMakeCacheInit.txt"
     ${ep_common_args}
-    -DSimpleITK_DIR:PATH=${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/SimpleITK-0.8/
+    -DSimpleITK_DIR:PATH=${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/SimpleITK-0.9/
     -DCMAKE_SKIP_RPATH:BOOL=ON
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
   BUILD_COMMAND ${BUILD_COMMAND_STRING}


Add thread component to fftw3

Add thread component to fftw3

--- modules/FindFFTW3.cmake
+++ modules/FindFFTW3.cmake
@@ -23,9 +23,9 @@
   return()
 endif()

-if(fftw3_FIND_COMPONENTS)
-    set(FFTW3_FIND_COMPONENTS ${fftw3_FIND_COMPONENTS})
-endif()
+# if(fftw3_FIND_COMPONENTS)
+#     set(FFTW3_FIND_COMPONENTS ${fftw3_FIND_COMPONENTS})
+# endif()
 if(NOT FFTW3_FIND_COMPONENTS)
     set(FFTW3_FIND_COMPONENTS SINGLE DOUBLE LONGDOUBLE)
 endif()
@@ -34,6 +34,7 @@
 list(FIND FFTW3_FIND_COMPONENTS SINGLE LOOK_FOR_SINGLE)
 list(FIND FFTW3_FIND_COMPONENTS DOUBLE LOOK_FOR_DOUBLE)
 list(FIND FFTW3_FIND_COMPONENTS LONGDOUBLE LOOK_FOR_LONGDOUBLE)
+list(FIND FFTW3_FIND_COMPONENTS THREADED LOOK_FOR_THREADED)

 if(WIN32)
   set(HINT_DIRS ${FFTW3_DIRECTORY} $ENV{FFTW3_DIRECTORY})
@@ -87,6 +88,10 @@
   if(LOOK_FOR_LONGDOUBLE GREATER -1)
     find_library(FFTW3_LONGDOUBLE_LIBRARY NAMES libfftw3l-3 HINTS ${HINT_DIRS})
   endif()
+  # if(LOOK_FOR_THREADED GREATER -1)
+  #   # FIXME What's the case for windows?
+  #   find_library(FFTW3_THREADED_LIBRARY NAMES libfftw3l-3 HINTS ${HINT_DIRS})
+  # endif()
 else()
   set(HINT_DIRS ${PC_FFTW3_LIBDIR} ${PC_FFTW3_LIBRARY_DIRS}
                 $ENV{FFTW3_LIBRARY_DIR} ${FFTW3_LIBRARY_DIR} )
@@ -98,6 +103,9 @@
   endif()
   if(LOOK_FOR_LONGDOUBLE GREATER -1)
     find_library(FFTW3_LONGDOUBLE_LIBRARY NAMES fftw3l HINTS ${HINT_DIRS})
+  endif()
+  if(LOOK_FOR_THREADED GREATER -1)
+    find_library(FFTW3_THREADED_LIBRARY NAMES fftw3f_threads HINTS ${HINT_DIRS})
   endif()
 endif(WIN32)

@@ -116,6 +124,10 @@
   set(FFTW3_LIBRARIES ${FFTW3_LIBRARIES} ${FFTW3_LONGDOUBLE_LIBRARY})
   set(FFTW3_LONGDOUBLE_FOUND TRUE)
 endif(FFTW3_LONGDOUBLE_LIBRARY MATCHES fftw3l)
+if(FFTW3_THREADED_LIBRARY MATCHES fftw3l)
+  set(FFTW3_LIBRARIES ${FFTW3_LIBRARIES} ${FFTW3_THREADED_LIBRARY})
+  set(FFTW3_THREADED_FOUND TRUE)
+endif(FFTW3_THREADED_LIBRARY MATCHES fftw3f_threads)

 if(FFTW3_SINGLE_FOUND AND FFTW3_INCLUDE_DIR)
     find_version(FFTW3_VERSION_STRING ${FFTW3_SINGLE_LIBRARY} f)
@@ -123,6 +135,8 @@
     find_version(FFTW3_VERSION_STRING ${FFTW3_DOUBLE_LIBRARY} "")
 elseif(FFTW3_LONGDOUBLE_FOUND AND FFTW3_INCLUDE_DIR)
     find_version(FFTW3_VERSION_STRING ${FFTW3_LONGDOUBLE_LIBRARY} "l")
+elseif(FFTW3_THREADED_FOUND AND FFTW3_INCLUDE_DIR)  # TODO What happens when you ask for double and threaded?
+    find_version(FFTW3_VERSION_STRING ${FFTW3_THREADED_LIBRARY} "t") # TODO is this ok?
 endif()

 include(FindPackageHandleStandardArgs)
@@ -154,7 +168,7 @@
       IMPORTED_LOCATION "${FFTW3_DOUBLE_LIBRARY}"
       INTERFACE_INCLUDE_DIRECTORIES "${FFTW3_INCLUDE_DIR}")
   endif()
-  if(FFTW3_LONGDOUBLE_LIBRARY MATCHES fftw3)
+  if(FFTW3_LONGDOUBLE_LIBRARY MATCHES fftw3l)
     if(FFTW3_LONGDOUBLE_LIBRARY MATCHES "\.a$")
       add_library(fftw3::longdouble STATIC IMPORTED GLOBAL)
     else()
@@ -164,4 +178,15 @@
       IMPORTED_LOCATION "${FFTW3_LONGDOUBLE_LIBRARY}"
       INTERFACE_INCLUDE_DIRECTORIES "${FFTW3_INCLUDE_DIR}")
   endif()
+  # TODO do I need this?
+  # if(FFTW3_THREADED_LIBRARY MATCHES fftw3_threads)
+  #   if(FFTW3_THREADED_LIBRARY MATCHES "\.a$")
+  #     add_library(fftw3::threaded STATIC IMPORTED GLOBAL)
+  #   else()
+  #     add_library(fftw3::threaded SHARED IMPORTED GLOBAL)
+  #   endif()
+  #   set_target_properties(fftw3::threaded PROPERTIES
+  #     IMPORTED_LOCATION "${FFTW3_THREADED_LIBRARY}"
+  #     INTERFACE_INCLUDE_DIRECTORIES "${FFTW3_INCLUDE_DIR}")
+  # endif()
 endif()


Update FW to latest develop

Update FW to latest develop

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

 # "full commit hash of device side binary"
-set(DEPTHAI_DEVICE_SIDE_COMMIT "4edb4923933e4cf2750f1958e4dee77de2cdca3f")
+set(DEPTHAI_DEVICE_SIDE_COMMIT "ebd8f842de48304a24a07bb62e7f9b8854e78601")

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


Build built-in LZMA with O3 optimization level

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -209,6 +209,7 @@
       set(LIBLZMA_CFLAGS "${LIBLZMA_CFLAGS} -isysroot ${CMAKE_OSX_SYSROOT}")
     endif()
     set(LIBLZMA_LIBRARIES ${CMAKE_BINARY_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}lzma${CMAKE_STATIC_LIBRARY_SUFFIX})
+    set(LIBLZMA_CFLAGS "${LIBLZMA_CFLAGS} -O3")
     ExternalProject_Add(
       LZMA
       URL ${CMAKE_SOURCE_DIR}/core/lzma/src/xz-${lzma_version}.tar.gz


Use the source tarfile for the built in Davix instead of the GIT branch.

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -722,11 +722,8 @@
     ExternalProject_Add(
       DAVIX
       PREFIX DAVIX
-      #URL http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/davix-embedded-${DAVIX_VERSION}.tar.gz
-      GIT_REPOSITORY http://git.cern.ch/pub/davix  GIT_TAG 0_3_0_branch
-      UPDATE_COMMAND git submodule update --recursive
+      URL http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/davix-embedded-${DAVIX_VERSION}.tar.gz
       INSTALL_DIR ${CMAKE_BINARY_DIR}/DAVIX-install
-      #PATCH_COMMAND patch -p1 -i ${CMAKE_SOURCE_DIR}/cmake/patches/davix-${DAVIX_VERSION}.patch
       CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
                  -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
                  -DBOOST_EXTERNAL=OFF
@@ -740,7 +737,6 @@
                  -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
                  -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
     )
-    #--TODO we need to install the dynamic library or build the static (which currently fails)
     if(${SYSCTL_OUTPUT} MATCHES x86_64)
       set(_LIBDIR "lib64")
     else()


Delete Find3Delight.cmake

Delete Find3Delight.cmake

--- config/cmake/Find3Delight.cmake
+++ config/cmake/Find3Delight.cmake
@@ -1,86 +0,0 @@
-#==========
-#
-# Copyright (c) 2010, Dan Bethell.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#
-#     * Neither the name of Dan Bethell nor the names of any
-#       other contributors to this software may be used to endorse or
-#       promote products derived from this software without specific prior
-#       written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#==========
-#
-# Variables defined by this module:
-#   3Delight_FOUND
-#   3Delight_INCLUDE_DIR
-#   3Delight_COMPILE_FLAGS
-#   3Delight_LIBRARIES
-#   3Delight_LIBRARY_DIR
-#
-# Usage:
-#   FIND_PACKAGE( 3Delight )
-#   FIND_PACKAGE( 3Delight REQUIRED )
-#
-# Note:
-# You can tell the module where 3Delight is installed by setting
-# the 3Delight_INSTALL_PATH (or setting the DELIGHT environment
-# variable before calling FIND_PACKAGE.
-#
-# E.g.
-#   SET( 3Delight_INSTALL_PATH "/usr/local/3delight-9.0.0/Linux-x86_64" )
-#   FIND_PACKAGE( 3Delight REQUIRED )
-#
-#==========
-
-# our includes
-FIND_PATH( 3Delight_INCLUDE_DIR ri.h
-  $ENV{DELIGHT}/include
-  ${3Delight_INSTALL_PATH}/include
-  )
-
-# our compilation flags
-SET( 3Delight_COMPILE_FLAGS "-DDELIGHT" )
-IF( DELIGHT_PRE_9_0_45 )
-    SET( 3Delight_COMPILE_FLAGS "${3Delight_COMPILE_FLAGS} -DDELIGHT_PRE_9_0_45" )
-ENDIF( DELIGHT_PRE_9_0_45 )
-
-# our library itself
-FIND_LIBRARY( 3Delight_LIBRARIES 3delight
-  $ENV{DELIGHT}/lib
-  ${3Delight_INSTALL_PATH}/lib
-  )
-
-# our library path
-GET_FILENAME_COMPONENT( 3Delight_LIBRARY_DIR ${3Delight_LIBRARIES} PATH )
-
-# did we find everything?
-INCLUDE( FindPackageHandleStandardArgs )
-FIND_PACKAGE_HANDLE_STANDARD_ARGS( "_3Delight" DEFAULT_MSG
-  3Delight_INCLUDE_DIR
-  3Delight_COMPILE_FLAGS
-  3Delight_LIBRARIES
-  3Delight_LIBRARY_DIR
-  )


rm trailing whitespace

rm trailing whitespace


rm whitespace

rm whitespace

--- modules/math_libs.cmake
+++ modules/math_libs.cmake
@@ -509,7 +509,7 @@
     endif()
     if (LAPACK_TYPE MATCHES MKL OR
         BLAS_TYPE MATCHES MKL)
-        # fix for MKL static linking
+        # fix for MKL static linking
         set(MATH_LIBS ${MATH_LIBS} -ldl)
     endif()
 endif()


hunter_download: fix location of HUNTER_PACKAGE_SOURCE_DIR

--- cmake/modules/hunter_download.cmake
+++ cmake/modules/hunter_download.cmake
@@ -62,20 +62,20 @@
   #   * HUNTER_PACKAGE_HOME_DIR
   if(HUNTER_DOWNLOAD_SCHEME_INSTALL)
     set(${root_name} "${HUNTER_INSTALL_PREFIX}")
-    set(HUNTER_PACKAGE_SOURCE_DIR "${HUNTER_TOOLCHAIN_ID_PATH}/Build")
+    set(HUNTER_PACKAGE_HOME_DIR "${HUNTER_TOOLCHAIN_ID_PATH}/Build")
     set(
-        HUNTER_PACKAGE_SOURCE_DIR
-        "${HUNTER_PACKAGE_SOURCE_DIR}/${HUNTER_PACKAGE_NAME}"
+        HUNTER_PACKAGE_HOME_DIR
+        "${HUNTER_PACKAGE_HOME_DIR}/${HUNTER_PACKAGE_NAME}"
     )
     if(HUNTER_PACKAGE_COMPONENT)
       set(
-          HUNTER_PACKAGE_SOURCE_DIR
-          "${HUNTER_PACKAGE_SOURCE_DIR}/${HUNTER_PACKAGE_COMPONENT}"
+          HUNTER_PACKAGE_HOME_DIR
+          "${HUNTER_PACKAGE_HOME_DIR}/${HUNTER_PACKAGE_COMPONENT}"
       )
     endif()
-    set(HUNTER_PACKAGE_DONE_STAMP "${HUNTER_PACKAGE_SOURCE_DIR}/DONE")
-    set(HUNTER_PACKAGE_BUILD_DIR "${HUNTER_PACKAGE_SOURCE_DIR}/Build")
-    set(HUNTER_PACKAGE_HOME_DIR "${HUNTER_PACKAGE_SOURCE_DIR}")
+    set(HUNTER_PACKAGE_DONE_STAMP "${HUNTER_PACKAGE_HOME_DIR}/DONE")
+    set(HUNTER_PACKAGE_BUILD_DIR "${HUNTER_PACKAGE_HOME_DIR}/Build")
+    set(HUNTER_PACKAGE_SOURCE_DIR "${HUNTER_PACKAGE_HOME_DIR}/Source")
     hunter_status_debug("Install to: ${HUNTER_INSTALL_PREFIX}")
   else()
     set(HUNTER_PACKAGE_SOURCE_DIR "${HUNTER_PACKAGE_DOWNLOAD_DIR}/Unpacked")
@@ -289,7 +289,13 @@
   hunter_find_stamps("${HUNTER_PACKAGE_BUILD_DIR}")

   file(REMOVE_RECURSE "${HUNTER_PACKAGE_BUILD_DIR}")
+  if(HUNTER_DOWNLOAD_SCHEME_INSTALL)
+    # Unpacked directory not needed (save some disk space)
+    file(REMOVE_RECURSE "${HUNTER_PACKAGE_SOURCE_DIR}")
+  endif()
+
   file(REMOVE "${HUNTER_PACKAGE_HOME_DIR}/CMakeLists.txt")
   file(REMOVE "${HUNTER_DOWNLOAD_TOOLCHAIN}")
+
   file(WRITE "${HUNTER_PACKAGE_DONE_STAMP}" "")
 endfunction()


hunter_download: unpack-only use same layout as build/install type

For easy cache implementation let unpack-only packages to have the same
layout (also good for Visual Studio 2005 with relative paths)

--- cmake/modules/hunter_download.cmake
+++ cmake/modules/hunter_download.cmake
@@ -92,35 +92,36 @@
   #   * HUNTER_PACKAGE_DONE_STAMP
   #   * HUNTER_PACKAGE_BUILD_DIR
   #   * HUNTER_PACKAGE_HOME_DIR
+  set(HUNTER_PACKAGE_HOME_DIR "${HUNTER_TOOLCHAIN_ID_PATH}/Build")
+  set(
+      HUNTER_PACKAGE_HOME_DIR
+      "${HUNTER_PACKAGE_HOME_DIR}/${HUNTER_PACKAGE_NAME}"
+  )
+  if(hunter_has_component)
+    set(
+        HUNTER_PACKAGE_HOME_DIR
+        "${HUNTER_PACKAGE_HOME_DIR}/__${HUNTER_PACKAGE_COMPONENT}"
+    )
+  endif()
+  set(HUNTER_PACKAGE_DONE_STAMP "${HUNTER_PACKAGE_HOME_DIR}/DONE")
+  if(hunter_has_binary_dir)
+    set(
+        HUNTER_PACKAGE_BUILD_DIR
+        "${HUNTER_BINARY_DIR}/${HUNTER_PACKAGE_NAME}"
+    )
+    if(hunter_has_component)
+      set(
+          HUNTER_PACKAGE_BUILD_DIR
+          "${HUNTER_PACKAGE_BUILD_DIR}/__${HUNTER_PACKAGE_COMPONENT}"
+      )
+    endif()
+  else()
+    set(HUNTER_PACKAGE_BUILD_DIR "${HUNTER_PACKAGE_HOME_DIR}/Build")
+  endif()
+  set(HUNTER_PACKAGE_SOURCE_DIR "${HUNTER_PACKAGE_HOME_DIR}/Source")
+
   if(HUNTER_DOWNLOAD_SCHEME_INSTALL)
     set(${root_name} "${HUNTER_INSTALL_PREFIX}")
-    set(HUNTER_PACKAGE_HOME_DIR "${HUNTER_TOOLCHAIN_ID_PATH}/Build")
-    set(
-        HUNTER_PACKAGE_HOME_DIR
-        "${HUNTER_PACKAGE_HOME_DIR}/${HUNTER_PACKAGE_NAME}"
-    )
-    if(hunter_has_component)
-      set(
-          HUNTER_PACKAGE_HOME_DIR
-          "${HUNTER_PACKAGE_HOME_DIR}/__${HUNTER_PACKAGE_COMPONENT}"
-      )
-    endif()
-    set(HUNTER_PACKAGE_DONE_STAMP "${HUNTER_PACKAGE_HOME_DIR}/DONE")
-    if(hunter_has_binary_dir)
-      set(
-          HUNTER_PACKAGE_BUILD_DIR
-          "${HUNTER_BINARY_DIR}/${HUNTER_PACKAGE_NAME}"
-      )
-      if(hunter_has_component)
-        set(
-            HUNTER_PACKAGE_BUILD_DIR
-            "${HUNTER_PACKAGE_BUILD_DIR}/__${HUNTER_PACKAGE_COMPONENT}"
-        )
-      endif()
-    else()
-      set(HUNTER_PACKAGE_BUILD_DIR "${HUNTER_PACKAGE_HOME_DIR}/Build")
-    endif()
-    set(HUNTER_PACKAGE_SOURCE_DIR "${HUNTER_PACKAGE_HOME_DIR}/Source")
     hunter_status_debug("Install to: ${HUNTER_INSTALL_PREFIX}")
   else()
     if(hunter_has_component)
@@ -129,11 +130,7 @@
           " ${HUNTER_PACKAGE_NAME} ${HUNTER_PACKAGE_COMPONENT}"
       )
     endif()
-    set(HUNTER_PACKAGE_SOURCE_DIR "${HUNTER_PACKAGE_DOWNLOAD_DIR}/Unpacked")
     set(${root_name} "${HUNTER_PACKAGE_SOURCE_DIR}")
-    set(HUNTER_PACKAGE_DONE_STAMP "${HUNTER_PACKAGE_DOWNLOAD_DIR}/Stamp/DONE")
-    set(HUNTER_PACKAGE_BUILD_DIR "${HUNTER_PACKAGE_DOWNLOAD_DIR}/Build")
-    set(HUNTER_PACKAGE_HOME_DIR "${HUNTER_PACKAGE_DOWNLOAD_DIR}")
     hunter_status_debug("Unpack to: ${HUNTER_PACKAGE_SOURCE_DIR}")
   endif()

@@ -165,15 +162,13 @@
   hunter_lock_directory(
       "${HUNTER_PACKAGE_DOWNLOAD_DIR}" HUNTER_ALREADY_LOCKED_DIRECTORIES
   )
-  if(HUNTER_DOWNLOAD_SCHEME_INSTALL)
+  hunter_lock_directory(
+      "${HUNTER_TOOLCHAIN_ID_PATH}" HUNTER_ALREADY_LOCKED_DIRECTORIES
+  )
+  if(hunter_has_binary_dir)
     hunter_lock_directory(
-        "${HUNTER_TOOLCHAIN_ID_PATH}" HUNTER_ALREADY_LOCKED_DIRECTORIES
-    )
-    if(hunter_has_binary_dir)
-      hunter_lock_directory(
-          "${HUNTER_BINARY_DIR}" HUNTER_ALREADY_LOCKED_DIRECTORIES
-      )
-    endif()
+        "${HUNTER_BINARY_DIR}" HUNTER_ALREADY_LOCKED_DIRECTORIES
+    )
   endif()

   # While locking other instance can finish package building


fixing bug in eigen fetched stuff

fixing bug in eigen fetched stuff

--- cmake/mtao_fetch_dependencies.cmake
+++ cmake/mtao_fetch_dependencies.cmake
@@ -24,7 +24,7 @@
 if(NOT Eigen3_FOUND)
         set(BUILD_TESTING OFF)
         fetch_dep(eigen https://gitlab.com/libeigen/eigen.git bcbaad6d874d451817457ae0603f953cda3c0c06 OFF)
-        set(EIGEN_INCLUDE_DIR ${eigen_SOURCE_DIR})
+        set(EIGEN3_INCLUDE_DIR ${eigen_SOURCE_DIR})
         if(EIGEN3_FOUND AND NOT TARGET Eigen3::Eigen)
             add_library(Eigen3::Eigen INTERFACE IMPORTED GLOBAL)
             set_target_properties(Eigen3::Eigen PROPERTIES


install embededed nanoflann fix for cmake<=3.10

Older versions of cmake didn't have `--install`

--- cmakemodules/script_nanoflann.cmake
+++ cmakemodules/script_nanoflann.cmake
@@ -46,7 +46,7 @@
     set(CMAKE_MRPT_HAS_NANOFLANN_SYSTEM 0)

     # install the embedded copy too (we need nanoflann-config.cmake, etc.)
-    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} --install \"${nanoflann_EMBEDDED_BUILD_DIR}\")")
+    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} --build \"${nanoflann_EMBEDDED_BUILD_DIR}\" --target install)")
 endif()

 if ($ENV{VERBOSE})


update download URL for geotrans data

update download URL for geotrans data

* see issue https://github.com/smanders/externpro/issues/188

--- projects/geotranz.cmake
+++ projects/geotranz.cmake
@@ -4,7 +4,7 @@
 xpProOption(geotranz)
 set(VER 2.4.2)
 set(REPO https://github.com/smanders/geotranz)
-set(DLCSV ftp://downloads.osgeo.org/pub/geotiff/tables)
+set(DLCSV https://download.osgeo.org/geotiff/tables)
 set(DLDIR data)
 set(PRO_GEOTRANZ
   NAME geotranz


Fix luajit makefile change merge

Fix luajit makefile change merge

--- external/luajit.cmake
+++ external/luajit.cmake
@@ -17,10 +17,8 @@
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
 	set(LUAJIT_CFLAGS ${LUAJIT_CFLAGS} -O0 -g -DLUA_USE_APICHECK) # -DLUAJIT_USE_GDBJIT -DLUA_USE_ASSERT
 	set(LUAJIT_CCDEBUG ${LUAJIT_CCDEBUG} -g)
-	set(LUAJIT_CCDEBUG ${LUAJIT_CCDEBUG} -g)
 elseif(CMAKE_BUILD_TYPE STREQUAL Memcheck)
 	set(LUAJIT_CFLAGS ${LUAJIT_CFLAGS} -O0 -g -DLUAJIT_USE_VALGRIND -DLUA_USE_APICHECK) # -DLUAJIT_USE_GDBJIT
-	set(LUAJIT_CCDEBUG ${LUAJIT_CCDEBUG} -g)
 	set(LUAJIT_CCDEBUG ${LUAJIT_CCDEBUG} -g)
 elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
 	set(LUAJIT_CFLAGS ${LUAJIT_CFLAGS} -g)


install: fix constraints wrapper file name

Signed-off-by: Karol Gugala <38af71640571ee4b5093d4f69ffca1ac454f2948@antmicro.com>


ENH: TinyXML version parsing

ENH: TinyXML version parsing


revert flags.cmake

revert flags.cmake

--- cmake/flags.cmake
+++ cmake/flags.cmake
@@ -65,9 +65,9 @@
 set(COMMON_FLAGS
     -fPIC
     -fno-omit-frame-pointer
-#   -Wall
-#   -Wextra
-#   -Werror
+    -Wall
+    -Wextra
+    -Werror
     -Wnon-virtual-dtor
     -Wdelete-non-virtual-dtor
     -Wno-unused-parameter


Silence hook update commands

Silence hook update commands

--- cmake/hooks.cmake
+++ cmake/hooks.cmake
@@ -22,10 +22,12 @@
   TARGET  hooks-update
   COMMAND "${GIT_EXECUTABLE}"
           fetch
+          --quiet
           origin
           remotes/origin/hooks
   COMMAND "${GIT_EXECUTABLE}"
           merge
+          --quiet
           FETCH_HEAD
   WORKING_DIRECTORY
           "${hooks_directory}"


update terra to 1.0.0-beta1 (#53)

update terra to 1.0.0-beta1 (#53)

--- cmake/terra.cmake
+++ cmake/terra.cmake
@@ -1,15 +1,15 @@
 include(ExternalProject)

 # Use this version of terra.
-set(terra_RELEASE_DATE "2016-03-25")
-set(terra_RELEASE_HASH "332a506")
+set(terra_RELEASE_DATE "1.0.0-beta1")
+set(terra_RELEASE_HASH "2e2032e")

 if("${CMAKE_SYSTEM_NAME}" MATCHES "Windows")
     set(terra_SYSTEM_NAME "Windows")
     set(terra_SHARED_LIBS_DIR "bin")
     set(terra_LIBRARY_NAME "terra.dll")
     set(terra_IMPLIB_NAME "terra.lib")
-    set(terra_MD5 "d4358ccd3a3dcb312a407026e39cd1e5")
+    set(terra_MD5 "d4875c96521f89d8d45e1f3a083f60a4")
 elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
     set(terra_SYSTEM_NAME "OSX")
     set(terra_SHARED_LIBS_DIR "lib")


Copy BDMGlyphFilter.so to right directory

Directory lib/pv_plugin does not exist.
Copy operation created a file called pv_plugin with the contents
of BDMGlyphFilter.so

--- cmake/utils.cmake
+++ cmake/utils.cmake
@@ -92,6 +92,7 @@
 endfunction(ListToString)

 function(BuildParaViewPlugin)
+  file(MAKE_DIRECTORY ${CMAKE_INSTALL_PVPLUGINDIR})
   add_custom_target(BDMGlyphFilter
     WORKING_DIRECTORY ${CMAKE_BDM_PVPLUGINDIR}
     COMMAND ${LAUNCHER} ${CMAKE_COMMAND} -B build


If building own version of boost, try to minimise looking for other versions

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -176,6 +176,14 @@
 option(USE_ITK "Use ITK" OFF)
 if (USE_ITK)
   option(USE_SYSTEM_ITK "Build using an external version of ITK" OFF)
+endif()
+
+# Boost
+if (NOT USE_SYSTEM_Boost)
+  set(NO_CONFIG ON)
+  set(NO_SYSTEM_PATHS ON)
+  mark_as_superbuild(NO_CONFIG)
+  mark_as_superbuild(NO_SYSTEM_PATHS)
 endif()

 ## build list of dependencies, based on options above


[ImageManip] - update FW

[ImageManip] - update FW

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

 # "full commit hash of device side binary"
-set(DEPTHAI_DEVICE_SIDE_COMMIT "2041e04ea0a021f4534d630baf14813696f56311")
+set(DEPTHAI_DEVICE_SIDE_COMMIT "e483189a46ece011aca33e693eddddbce0236f50")

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


Updated FW

Updated FW

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

 # "full commit hash of device side binary"
-set(DEPTHAI_DEVICE_SIDE_COMMIT "50cb2094d34e9d313dd3a5a9398b700b1ef15932")
+set(DEPTHAI_DEVICE_SIDE_COMMIT "17a656f6a154a0f58f7da73fcda7e5b7e9925c2a")

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


aerocore2 config remove telemetry modules, FW and GND controllers

--- cmake/configs/nuttx_aerocore2_default.cmake
+++ cmake/configs/nuttx_aerocore2_default.cmake
@@ -11,7 +11,7 @@
 	drivers/differential_pressure
 	drivers/distance_sensor
 	#drivers/magnetometer
-	drivers/telemetry
+	#drivers/telemetry

 	drivers/device
 	drivers/stm32
@@ -83,10 +83,10 @@
 	#
 	# Vehicle Control
 	#
-	modules/fw_att_control
-	modules/fw_pos_control_l1
-	modules/gnd_att_control
-	modules/gnd_pos_control
+	#modules/fw_att_control
+	#modules/fw_pos_control_l1
+	#modules/gnd_att_control
+	#modules/gnd_pos_control
 	modules/mc_att_control
 	modules/mc_pos_control
 	modules/vtol_att_control


px4fmu-v2:Removed commented out unit_test module removed on master

--- cmake/configs/nuttx_px4fmu-v2_default.cmake
+++ cmake/configs/nuttx_px4fmu-v2_default.cmake
@@ -85,7 +85,6 @@
 	#modules/commander/commander_tests
 	#lib/controllib/controllib_test
 	#modules/mavlink/mavlink_tests
-	#modules/unit_test
 	#modules/uORB/uORB_tests
 	#systemcmds/tests


fix typo

fix typo

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -1795,7 +1795,7 @@
   if(NOT "$ENV{OPENUI5DIR}" STREQUAL "" AND EXISTS "$ENV{OPENUI5DIR}/resources/sap-ui-core-nojQuery.js")
      # create symbolic link on existing openui5 installation
      # should be used only for debug purposes to be able try different openui5 version
-     $ cannot be used for installation purposes
+     # cannot be used for installation purposes
      message(STATUS "openui5 - use from $ENV{OPENUI5DIR}, only for debug purposes")
      file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/ui5)
      execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink


Remove warnings building LZMA

Remove warnings building LZMA

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -93,12 +93,17 @@
     set(LZMA_LIBRARIES ${CMAKE_BINARY_DIR}/LZMA/src/LZMA/lib/liblzma.lib)
     set(LZMA_INCLUDE_DIR ${CMAKE_BINARY_DIR}/LZMA/src/LZMA/include)
   else()
+    if(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
+      set(LZMA_CFLAGS "-Wno-format-nonliteral")
+    elseif( CMAKE_CCC_COMPILER_ID STREQUAL Intel)
+      set(LZMA_CFLAGS "-wd188 -wd181 -wd1292 -wd10006 -wd10156 -wd2259 -wd981 -wd128")
+    endif()
     ExternalProject_Add(
       LZMA
       URL ${CMAKE_SOURCE_DIR}/core/lzma/src/xz-${lzma_version}.tar.gz
       URL_MD5 858405e79590e9b05634c399497f4ba7
       INSTALL_DIR ${CMAKE_BINARY_DIR}
-      CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix <INSTALL_DIR> --with-pic --disable-shared
+      CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix <INSTALL_DIR> --with-pic --disable-shared CFLAGS=${LZMA_CFLAGS}
       BUILD_IN_SOURCE 1)
     set(LZMA_LIBRARIES -L${CMAKE_BINARY_DIR}/lib -llzma)
     set(LZMA_INCLUDE_DIR ${CMAKE_BINARY_DIR}/include)


Fix build of google-test on Windows

Fix build of google-test on Windows


fixed minimum jsonrpccpp required version

--- cmake/EthDependencies.cmake
+++ cmake/EthDependencies.cmake
@@ -49,8 +49,9 @@
 message(" - Jsoncpp lib   : ${JSONCPP_LIBRARIES}")

 # TODO get rid of -DETH_JSONRPC
+# TODO add EXACT once we commit ourselves to cmake 3.x
 if (JSONRPC)
-	find_package (json_rpc_cpp 0.4 EXACT REQUIRED)
+	find_package (json_rpc_cpp 0.4 REQUIRED)
 	message (" - json-rpc-cpp header: ${JSON_RPC_CPP_INCLUDE_DIRS}")
 	message (" - json-rpc-cpp lib   : ${JSON_RPC_CPP_LIBRARIES}")
 	add_definitions(-DETH_JSONRPC)


pango_python: add force-reinstall option for pip target.

--- cmake/MakePythonWheel.cmake
+++ cmake/MakePythonWheel.cmake
@@ -85,7 +85,7 @@
     add_custom_target(
         "${python_module}_pip_install"
         DEPENDS "${python_module}_wheel"
-        COMMAND ${Python_EXECUTABLE} -mpip install "${wheel_filename}"
+        COMMAND ${Python_EXECUTABLE} -mpip install "${wheel_filename}" --force-reinstall
         COMMENT "Installing for selected Python '${Python_EXECUTABLE}'"
     )


ARROW-3715: [C++]: Fix typo in gflags_ep CMake config

Author: Sylvain Joubert <Sylvain Joubert>

Closes #2904 from sjoubert/fix_gflags_ep_option and squashes the following commits:

5ebf6cc9 <Sylvain Joubert> : Fix typo in gflags_ep CMake config

--- cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -580,7 +580,7 @@
                           -DBUILD_STATIC_LIBS=ON
                           -DBUILD_PACKAGING=OFF
                           -DBUILD_TESTING=OFF
-                          -BUILD_CONFIG_TESTS=OFF
+                          -DBUILD_CONFIG_TESTS=OFF
                           -DINSTALL_HEADERS=ON
                           -DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_CXX_FLAGS}
                           -DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_C_FLAGS}


paraview: disable new plugin

paraview: disable new plugin

--- projects/paraview.cmake
+++ projects/paraview.cmake
@@ -45,6 +45,7 @@
     -DPARAVIEW_BUILD_PLUGIN_ForceTime:BOOL=FALSE
     -DPARAVIEW_BUILD_PLUGIN_GMVReader:BOOL=FALSE
     -DPARAVIEW_BUILD_PLUGIN_H5PartReader:BOOL=FALSE
+    -DPARAVIEW_BUILD_PLUGIN_LagrangianParticleTracker:BOOL=FALSE
     -DPARAVIEW_BUILD_PLUGIN_MantaView:BOOL=FALSE
     -DPARAVIEW_BUILD_PLUGIN_MobileRemoteControl:BOOL=FALSE
     -DPARAVIEW_BUILD_PLUGIN_Moments:BOOL=FALSE


Disable paraview's embedded documentation

Tomviz doesn't use this documentation and the superbuild often fails
with it enabled unless the path to the qhelpgenerator executable is
manually specified.

--- projects/paraview.cmake
+++ projects/paraview.cmake
@@ -7,6 +7,9 @@
 if (QT_HELP_GENERATOR)
   list(APPEND paraview_extra_cmake_args
     -DQT_HELP_GENERATOR:FILEPATH=${QT_HELP_GENERATOR})
+else()
+  list(APPEND paraview_extra_cmake_args
+    -DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION:BOOL=OFF)
 endif()
 if (QT_XMLPATTERNS_EXECUTABLE)
   list(APPEND paraview_extra_cmake_args


Add TRELLIS_PROGRAM_PREFIX

Add TRELLIS_PROGRAM_PREFIX

--- ecp5/family.cmake
+++ ecp5/family.cmake
@@ -1,5 +1,7 @@
 if (NOT EXTERNAL_CHIPDB)
     set(devices 25k 45k 85k)
+
+    set(TRELLIS_PROGRAM_PREFIX "" CACHE STRING "Name prefix for trellis")

     if (NOT DEFINED TRELLIS_INSTALL_PREFIX)
         message(STATUS "TRELLIS_INSTALL_PREFIX not defined using -DTRELLIS_INSTALL_PREFIX=/path-prefix/to/prjtrellis-installation. Defaulted to ${CMAKE_INSTALL_PREFIX}")
@@ -8,8 +10,8 @@

     if (NOT DEFINED PYTRELLIS_LIBDIR)
         find_library(PYTRELLIS pytrellis.so
-            PATHS ${TRELLIS_INSTALL_PREFIX}/lib/trellis
-            PATH_SUFFIXES trellis
+            PATHS ${TRELLIS_INSTALL_PREFIX}/lib/${TRELLIS_PROGRAM_PREFIX}trellis
+            PATH_SUFFIXES ${TRELLIS_PROGRAM_PREFIX}trellis
             DOC "Location of pytrellis library")

         if ("${PYTRELLIS}" STREQUAL "PYTRELLIS-NOTFOUND")
@@ -27,9 +29,9 @@
     target_include_directories(ecp5_chipdb PRIVATE ${family}/)

     if (CMAKE_HOST_WIN32)
-        set(ENV_CMD ${CMAKE_COMMAND} -E env "PYTHONPATH=\"${PYTRELLIS_LIBDIR}\;${TRELLIS_INSTALL_PREFIX}/share/trellis/util/common\;${TRELLIS_INSTALL_PREFIX}/share/trellis/timing/util\"")
+        set(ENV_CMD ${CMAKE_COMMAND} -E env "PYTHONPATH=\"${PYTRELLIS_LIBDIR}\;${TRELLIS_INSTALL_PREFIX}/share/${TRELLIS_PROGRAM_PREFIX}trellis/util/common\;${TRELLIS_INSTALL_PREFIX}/share/${TRELLIS_PROGRAM_PREFIX}trellis/timing/util\"")
     else()
-        set(ENV_CMD ${CMAKE_COMMAND} -E env "PYTHONPATH=${PYTRELLIS_LIBDIR}\:${TRELLIS_INSTALL_PREFIX}/share/trellis/util/common:${TRELLIS_INSTALL_PREFIX}/share/trellis/timing/util")
+        set(ENV_CMD ${CMAKE_COMMAND} -E env "PYTHONPATH=${PYTRELLIS_LIBDIR}\:${TRELLIS_INSTALL_PREFIX}/share/${TRELLIS_PROGRAM_PREFIX}trellis/util/common:${TRELLIS_INSTALL_PREFIX}/share/${TRELLIS_PROGRAM_PREFIX}trellis/timing/util")
     endif()

     if (MSVC)


ENH: Update DTIProcess

ENH: Update DTIProcess

This version fixes and issue with VTK package discovery and dependencies

--- SuperBuild/External_DTIProcess.cmake
+++ SuperBuild/External_DTIProcess.cmake
@@ -73,12 +73,12 @@
     -DDTIProcess_SUPERBUILD:BOOL=OFF
     -DEXECUTABLES_ONLY:BOOL=ON
     -DSubversion_SVN_EXECUTABLE:PATH=${SVNCOMMAND}
-    -D
+    -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/${proj}-install
     )

   ### --- End Project specific additions
   set( ${proj}_REPOSITORY ${git_protocol}://github.com/NIRALUser/DTIProcessToolkit.git)
-  set( ${proj}_GIT_TAG  863e5da765bb1177d34134b2d65f9212915410d1 )
+  set( ${proj}_GIT_TAG  da1615225b72eb99d9b3d3cebe075112d0c4008c )
   ExternalProject_Add(${proj}
     GIT_REPOSITORY ${${proj}_REPOSITORY}
     GIT_TAG ${${proj}_GIT_TAG}
@@ -93,13 +93,10 @@
     CMAKE_ARGS
       ${CMAKE_OSX_EXTERNAL_PROJECT_ARGS}
       ${COMMON_EXTERNAL_PROJECT_ARGS}
-      ${${proj}_CMAKE_OPTIONS}
-      ## We really do want to install to remove uncertainty about where the tools are
-      ## (on Windows, tools might be in subfolders, like "Release", "Debug",...)
-      -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/${proj}-install
+      ${${proj}_CMAKE_OPTIONS}
     DEPENDS
       ${${proj}_DEPENDENCIES}
-  )
+  )
   set(${extProjName}_DIR ${EXTERNAL_BINARY_DIRECTORY}/${proj}-build)
 else()
   if(${USE_SYSTEM_${extProjName}})


Specify machine link.

Specify machine link.

--- cmake/BuildFlags.cmake
+++ cmake/BuildFlags.cmake
@@ -99,7 +99,12 @@
   $<$<CXX_COMPILER_ID:MSVC>:    # MSVC Link Flags
     /NOLOGO         # Suppresses the startup banner.
     /DYNAMICBASE    # Specifies whether to generate an executable image that can be randomly rebased at load time by using the address space layout randomization (ASLR) feature.
-    /MACHINE:X86    # Specifies the target platform.
+    $<$<STREQUAL:"${CSE_BUILD_ARCHITECTURE}","32">:
+      /MACHINE:X86    # Specifies the target platform.
+    >
+    $<$<STREQUAL:"${CSE_BUILD_ARCHITECTURE}","64">:
+      /MACHINE:X64    # Specifies the target platform.
+    >
     $<$<CONFIG:Release>:        # MSVC Release Link Flags
       /LTCG         # Specifies link-time code generation.
       /DEBUG	      # Creates debugging information.


Updating FindGear2D

Updating FindGear2D

--- cmake/FindGear2D.cmake
+++ cmake/FindGear2D.cmake
@@ -11,14 +11,16 @@
 if (NOT Gear2D_FOUND)

 if (WIN32)
-  message(STATUS "Trying windoze $ENV{PROGRAMFILES}")
+  #message(STATUS "Trying windoze $ENV{PROGRAMFILES} and $ENV{PROGRAMFILES(X86)}")
   find_path(Gear2D_INCLUDE_DIR gear2d.h
     HINTS
     $ENV{GEAR2DDIR}
     PATHS
+	"$ENV{ProgramW6432}\\Gear2D\\include"
     "$ENV{PROGRAMFILES}\\Gear2D\\include"
     "$ENV{PROGRAMFILES(X86)}\\Gear2D\\include"
     "C:\\Gear2D\\include"
+	"$ENV{ProgramW6432}\\Gear2D\\include\\gear2d"
     "$ENV{PROGRAMFILES}\\Gear2D\\include\\gear2d"
     "$ENV{PROGRAMFILES(X86)}\\Gear2D\\include\\gear2d"
     "C:\\Gear2D\\include\\gear2d"
@@ -29,6 +31,7 @@
     HINTS
     $ENV{GEAR2DDIR}
     PATHS
+	"$ENV{ProgramW6432}\\Gear2D\\"
     "$ENV{PROGRAMFILES}\\Gear2D\\"
     "$ENV{PROGRAMFILES(X86)}\\Gear2D\\"
     "C:\\Gear2D\\"
@@ -40,6 +43,7 @@
     HINTS
     $ENV{GEAR2DDIR}
     PATHS
+	"$ENV{ProgramW6432}\\Gear2D\\bin"
     "$ENV{PROGRAMFILES}\\Gear2D\\bin"
     "$ENV{PROGRAMFILES(x86)}\\Gear2D\\bin"
     "C:\\Gear2D\\bin"


Updated FindMatlab with R2016a

Updated FindMatlab with R2016a

--- cmake/FindMatlab.cmake
+++ cmake/FindMatlab.cmake
@@ -228,6 +228,7 @@
 endif()

 set(MATLAB_VERSIONS_MAPPING
+  "R2016a=9.0"
   "R2015b=8.6"
   "R2015a=8.5"
   "R2014b=8.4"


Revert "Remove .local suffix"

Revert "Remove .local suffix"

This reverts commit 76ec86340ceabe6cc326c193f56cfe882226348b.

--- cmake/frc-deploy.cmake
+++ cmake/frc-deploy.cmake
@@ -25,7 +25,7 @@
 # Use FRC_PREFER_TARGET to try a specific target first
 # Can be "mdns", "usb", "static", or an address
 string(TOLOWER "${FRC_PREFER_TARGET}" FRC_PREFER_TARGET)
-set(target_mdns "roboRIO-${TEAM_NUMBER}-FRC")
+set(target_mdns "roboRIO-${TEAM_NUMBER}-FRC.local")
 set(target_usb "172.22.11.2")
 set(target_static "10.${TEAM_NUMBER_HIGH}.${TEAM_NUMBER_LOW}.2")
 set(_target_preferred "${target_${FRC_PREFER_TARGET}}")


Updated listed email address (issue #565).

git-svn-id: 4d207786bcfdcf18f314dcbc6ac3fbe5f8a98c88@441 ac7aa084-b6da-11df-bf42-7fac39f0224f

--- Tudat/External/CMake/FindSpice.cmake
+++ Tudat/External/CMake/FindSpice.cmake
@@ -6,7 +6,7 @@
 # Copyright (c) 2008, 2009 Gael Guennebaud, <g.gael@free.fr>
 # Copyright (c) 2009 Benoit Jacob <jacob.benoit.1@gmail.com>
 # Copyright (c) 2012 Bryan Tong Minh <b.tongminh@student.tudelft.nl>
-# Copyright (c) 2012 Paul Musegaas <p.musegaas@gmail.com>
+# Copyright (c) 2012 Paul Musegaas <p.musegaas@student.tudelft.nl>
 # Copyright (c) 2012 Dominic Dirkx <d.dirkx@tudelft.nl>
 # Redistribution and use is allowed according to the terms of the 2-clause BSD license.


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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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

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


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


PKG: mantis 1193. exception for OpenGL on osx

--- Modules/ThirdParty/OpenGL/otb-module-init.cmake
+++ Modules/ThirdParty/OpenGL/otb-module-init.cmake
@@ -1,8 +1,40 @@
-find_package(OpenGL REQUIRED)
+#detection of OpenGL is apply is bit tricy as we deactivate
+#framework on OSX globally. see mantis #1193
+if(APPLE)
+  set(OPENGL_FOUND FALSE)
+  find_library(OPENGL_gl_LIBRARY OpenGL DOC "OpenGL lib for OSX")
+  find_library(OPENGL_glu_LIBRARY AGL DOC "AGL lib for OSX")
+  find_path(OPENGL_INCLUDE_DIR OpenGL/gl.h DOC "Include for OpenGL on OSX")
+  if(OPENGL_gl_LIBRARY)
+    set( OPENGL_LIBRARIES  ${OPENGL_gl_LIBRARY} ${OPENGL_LIBRARIES})
+    if(OPENGL_glu_LIBRARY)
+      set( OPENGL_GLU_FOUND "YES" )
+      set( OPENGL_LIBRARIES ${OPENGL_glu_LIBRARY} ${OPENGL_LIBRARIES} )
+    else()
+      set( OPENGL_GLU_FOUND "NO" )
+    endif()
+    # This deprecated setting is for backward compatibility with CMake1.4
+    set (OPENGL_LIBRARY ${OPENGL_LIBRARIES})
+  endif()

-mark_as_advanced(OPENGL_INCLUDE_DIR)
-mark_as_advanced(OPENGL_LIBRARY)
+  # This deprecated setting is for backward compatibility with CMake1.4
+  set(OPENGL_INCLUDE_PATH ${OPENGL_INCLUDE_DIR})
+  mark_as_advanced(
+    OPENGL_INCLUDE_DIR
+    OPENGL_LIBRARY
+    OPENGL_glu_LIBRARY
+    OPENGL_gl_LIBRARY
+    )
+  if(NOT OPENGL_LIBRARY OR NOT OPENGL_INCLUDE_DIR)
+    message(FATAL_ERROR "Cannot find OpenGL. Set OPENGL_INCLUDE_DIR and OPENGL_LIBRARY")
+  endif()

-if(NOT OPENGL_FOUND)
- message(FATAL_ERROR "Cannot find OpenGL. Set OPENGL_INCLUDE_DIR and OPENGL_LIBRARY")
-endif()
+  set(OPENGL_FOUND TRUE)
+else(APPLE)
+  find_package(OpenGL REQUIRED)
+  mark_as_advanced(OPENGL_INCLUDE_DIR)
+  mark_as_advanced(OPENGL_LIBRARY)
+  if(NOT OPENGL_FOUND)
+    message(FATAL_ERROR "Cannot find OpenGL. Set OPENGL_INCLUDE_DIR and OPENGL_LIBRARY")
+  endif()
+endif(APPLE)


CMake utilities documentation fix

CMake utilities documentation fix

Add missing example of lcm_install_headers.

--- lcm-cmake/lcmUtilities.cmake
+++ lcm-cmake/lcmUtilities.cmake
@@ -9,6 +9,9 @@
 #                  [DESTINATION <PATH>]
 #                  <FILE> [<FILE>...])
 #     generate bindings for specified LCM type definition files
+#
+#   lcm_install_headers([DESTINATION <PATH>]
+#                       <FILE> [<FILE>...])
 #
 #   lcm_install_python([DESTINATION <PATH>]
 #                      <FILE> [<FILE>...])


Fix errors in Use file

Fix errors in Use file

Fix bug where the headers lists were filled incorrectly when aggregate
headers were requested. Remove export of unused variable.

--- lcm-cmake/lcmUtilities.cmake
+++ lcm-cmake/lcmUtilities.cmake
@@ -56,7 +56,7 @@
       "\n"
     )
     _lcm_parent_list_append(_aggregate_headers ${_header})
-    _lcm_parent_list_append(${VAR} ${_header})
+    _lcm_parent_list_append(${${VAR}} ${_header})
   endif()
 endfunction()

@@ -242,7 +242,6 @@
   # Set output files in parent scope
   _lcm_export(_C_SOURCES)
   _lcm_export(_C_HEADERS)
-  _lcm_export(_CPP_SOURCES)
   _lcm_export(_CPP_HEADERS)
   _lcm_export(_PYTHON_SOURCES)
   _lcm_export(_JAVA_SOURCES)


Updated CTK version to a custom release version which contains the DICOMBrowser fix. The according branch can be downloaded from: https://github.com/AndreasFetzer/CTK/tree/mitk-2105-03-fixes

--- CMakeExternals/CTK.cmake
+++ CMakeExternals/CTK.cmake
@@ -15,7 +15,7 @@

   if(NOT DEFINED CTK_DIR)

-    set(revision_tag d8cd14e7)
+    set(revision_tag abca3189)
     #IF(${proj}_REVISION_TAG)
     #  SET(revision_tag ${${proj}_REVISION_TAG})
     #ENDIF()
@@ -75,7 +75,7 @@
     ExternalProject_Add(${proj}
       LIST_SEPARATOR ${sep}
       URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/CTK_${revision_tag}.tar.gz
-      URL_MD5 2f1255494de6ae19aae3d4dc5f2ea6de
+      URL_MD5 3a3470976debc29e9c9d5aaae12eae1c
       UPDATE_COMMAND ""
       INSTALL_COMMAND ""
       CMAKE_GENERATOR ${gen}


Use VTK 6.1 from mitk.org.

Use VTK 6.1 from mitk.org.

--- CMakeExternals/VTK.cmake
+++ CMakeExternals/VTK.cmake
@@ -60,11 +60,11 @@
      endif()
   endif()

-  set(VTK_URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/vtk-6.0.0.tar.gz)
-  set(VTK_URL_MD5 fa07fb55a905186f7d98807585efb20e)
+  set(VTK_URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/VTK-6.1.0.tar.gz)
+  set(VTK_URL_MD5 25e4dfb3bad778722dcaec80cd5dab7d)

-    ExternalProject_Add(${proj}
+  ExternalProject_Add(${proj}
     SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}-src
     BINARY_DIR ${proj}-build
     PREFIX ${proj}-cmake


ENH: Add ExternalProject build of ImageViewer from ITKApps.

The repository was extracted from ITKApps using git subtree so any
fixes can be easily pushed upstream.  The superbuild is still used to
get an FLTK build (difficult), but the Insight build is re-used.  For
convenience the ImageViewer executable is copied to TubeTK-Build/bin/.

Change-Id: Ia4f6f5b0ff3eea944f90a7988ede1f1d88c7542c

--- CMake/SuperBuild.cmake
+++ CMake/SuperBuild.cmake
@@ -363,6 +363,32 @@

 endif( TubeTK_USE_QT )

+##
+## A conventient 2D/3D image viewer that can handle anisotropic spacing.
+##
+set( ImageViewer_DEPENDS )
+if( NOT USE_SYSTEM_ITK )
+  set( ImageViewer_DEPENDS Insight )
+endif()
+set( proj ImageViewer )
+ExternalProject_Add( ImageViewer
+  GIT_REPOSITORY "${GIT_PROTOCOL}://github.com/TubeTK/ImageViewer.git"
+  GIT_TAG "907f4616cfef89bb69edc06936eed9d96f578da1"
+  SOURCE_DIR "${CMAKE_BINARY_DIR}/ImageViewer"
+  BINARY_DIR ImageViewer-Build
+  CMAKE_GENERATOR ${gen}
+  CMAKE_ARGS
+    "-DCMAKE_BUILD_TYPE:STRING=${build_type}"
+    "-DITK_DIR:PATH=${ITK_DIR}"
+  # For convenience.
+  INSTALL_COMMAND "${CMAKE_COMMAND}"
+    -E
+    copy_if_different
+    "${CMAKE_BINARY_DIR}/ImageViewer-Build/ImageViewer-build/ImageViewer/ImageViewer"
+    "${CMAKE_BINARY_DIR}/TubeTK-Build/bin/ImageViewer"
+  DEPENDS
+    ${ImageViewer_DEPENDS}
+  )

 ##
 ## TubeTK - Normal Build


STYLE:Comment about a wrong glx case (Mac Tiger).

--- CMake/vtkTestGLX.cmake
+++ CMake/vtkTestGLX.cmake
@@ -48,7 +48,8 @@
 #    number of parameters, not (void), which means no parameter.
 #    SunOS follows the spec, Linux does not
 #    extern void (*glXGetProcAddress(const GLubyte *procname))();
-#
+# - Mac Tiger: GLX_ARB_get_proc_address macro is defined but it does not define
+#              __GLXextFuncPtr.
 #
 #
 #message("vtkTestGLX.cmake first line.")


Wrap qrc files added

Wrap qrc files added

--- adm_local/cmake_files/UsePyQt4.cmake
+++ adm_local/cmake_files/UsePyQt4.cmake
@@ -137,3 +137,39 @@
       )
   ENDFOREACH()
 ENDMACRO(PYQT4_WRAP_SIP)
+
+
+####################################################################
+#
+# PYQT4_WRAP_QRC macro
+#
+# Generate Python wrappings for *.qrc files by processing them with pyrcc4.
+#
+# USAGE: PYQT4_WRAP_QRC(output_files qrc_files)
+#
+# ARGUMENTS:
+#   output_files [out] variable where output file names are listed to
+#   qrc_files  [in]  list of *.qrc files
+#
+# NOTES:
+#   - Input files are considered relative to the current source directory.
+#   - Output files are generated in the current build directory.
+#   - Macro automatically adds custom build target to generate output files
+#
+####################################################################
+
+MACRO(PYQT4_WRAP_QRC outfiles)
+  FOREACH(_input ${ARGN})
+    GET_FILENAME_COMPONENT(_input_name ${_input} NAME)
+    STRING(REPLACE ".qrc" "_qrc.py" _input_name ${_input_name})
+    SET(_output ${CMAKE_CURRENT_BINARY_DIR}/${_input_name})
+    ADD_CUSTOM_COMMAND(
+      OUTPUT ${_output}
+      COMMAND ${PYQT_PYRCC_EXECUTABLE} -o ${_output} ${CMAKE_CURRENT_SOURCE_DIR}/${_input}
+      MAIN_DEPENDENCY ${_input}
+      )
+    SET(${outfiles} ${${outfiles}} ${_output})
+  ENDFOREACH()
+  _PYQT4_WRAP_GET_UNIQUE_TARGET_NAME(BUILD_QRC_PY_FILES _uniqueTargetName)
+  ADD_CUSTOM_TARGET(${_uniqueTargetName} ALL DEPENDS ${${outfiles}})
+ENDMACRO(PYQT4_WRAP_QRC)


Incorrect locatation added to cmake_list

--- scripts/AddHunter.cmake
+++ scripts/AddHunter.cmake
@@ -32,7 +32,7 @@
     set(HUNTER_REPOSITORY_cookoff_VERSION "none")
     list(APPEND HUNTER_REPOSITORIES cookoff)
     list(APPEND HUNTER_RECIPE_DIRS "${HUNTER_REPOSITORY_cookoff_DIRECTORY}")
-    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/find")
+    list(APPEND CMAKE_MODULE_PATH "${HUNTER_REPOSITORY_cookoff_DIRECTORY}/find")
   endif()
 endmacro()


Update FW: improved focus for IMX214, lowered range

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

 # "full commit hash of device side binary"
-set(DEPTHAI_DEVICE_SIDE_COMMIT "8ebbc98374f6970e227804c235e87e8801043bf1")
+set(DEPTHAI_DEVICE_SIDE_COMMIT "28e8a2ae69b9c6cebbb6b4cf920f21d5b3d7a8fe")

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


Update FW with xlink thread priority changes

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

 # "full commit hash of device side binary"
-set(DEPTHAI_DEVICE_SIDE_COMMIT "b5960e1d9054fea932bd74bb200cda710362fdec")
+set(DEPTHAI_DEVICE_SIDE_COMMIT "28c625387fce2d731328cb072f959435ab29458b")

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


px4fmu-v2_default: save more flash

px4fmu-v2_default: save more flash

This disables the following modules to save flash:
- mpu9250 driver because the MPU9250 is rarely used on Pixhawks
- Snapdragon RC PWM passthrough which is rarely used and definitely a
  special/custom configuration. Also, it will soon be obsolete with the
  upcoming PWM support on Snapdragon.

--- cmake/configs/nuttx_px4fmu-v2_default.cmake
+++ cmake/configs/nuttx_px4fmu-v2_default.cmake
@@ -18,7 +18,7 @@
 	drivers/boards/px4fmu-v2
 	drivers/rgbled
 	drivers/mpu6000
-	drivers/mpu9250
+	#drivers/mpu9250
 	drivers/lsm303d
 	drivers/l3gd20
 	drivers/hmc5883
@@ -46,7 +46,7 @@
 	drivers/pwm_input
 	drivers/camera_trigger
 	drivers/bst
-	drivers/snapdragon_rc_pwm
+	#drivers/snapdragon_rc_pwm
 	drivers/lis3mdl

 	#


Do not look for ftgl and gl2ps if not needed

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

 #---Check for gl2ps ------------------------------------------------------------------
-if(NOT builtin_gl2ps)
+if(opengl AND NOT builtin_gl2ps)
   message(STATUS "Looking for gl2ps")
   find_Package(gl2ps)
   if(NOT GL2PS_FOUND)
@@ -1016,7 +1016,7 @@
 endif()

 #---Check for ftgl if needed----------------------------------------------------------
-if(NOT builtin_ftgl)
+if(opengl AND NOT builtin_ftgl)
   find_package(FTGL)
   if(NOT FTGL_FOUND)
     if(fail-on-missing)


Quote variable to avoid odd cmake if behavior (#180)

Signed-off-by: Shane Loretz <7fde345e8e2e22c78a1570a4807e4629866dc7de@osrfoundation.org>

--- ament_cmake_target_dependencies/cmake/ament_target_dependencies.cmake
+++ ament_cmake_target_dependencies/cmake/ament_target_dependencies.cmake
@@ -48,7 +48,7 @@
     set(libraries "")
     set(link_flags "")
     foreach(package_name ${ARG_UNPARSED_ARGUMENTS})
-      if(NOT ${${package_name}_FOUND})
+      if(NOT "${${package_name}_FOUND}")
         message(FATAL_ERROR "ament_target_dependencies() the passed package name '${package_name}' was not found before")
       endif()
       list_append_unique(definitions ${${package_name}_DEFINITIONS})


ARROW-2488: [C++] Add Boost 1.67 and 1.68 as recognized versions

I added 1.68 so we won't have to do this again for a little while

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

Closes #2136 from wesm/ARROW-2488 and squashes the following commits:

9f3c1b3e <Wes McKinney> Add Boost 1.67 and 1.68 as recognized versions

--- cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -137,6 +137,8 @@
   set(Boost_USE_STATIC_RUNTIME ON)
 endif()
 set(Boost_ADDITIONAL_VERSIONS
+  "1.68.0" "1.68"
+  "1.67.0" "1.67"
   "1.66.0" "1.66"
   "1.65.0" "1.65"
   "1.64.0" "1.64"


[FIX] The build system sets the architecture to i586 when using MinGW now.

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


Updating SpirePM.cmake.

Updating SpirePM.cmake.

--- src/CMake/SpirePM.cmake
+++ src/CMake/SpirePM.cmake
@@ -276,6 +276,7 @@
     # Clear git repo or git tag, if any.
     set(_ep_git_repo)
     set(_ep_git_tag)
+    set(_ep_update_command "UPDATE_COMMAND" "cmake .")
   endif()

   if (DEFINED _SPM_BINARY_DIR)
@@ -308,6 +309,15 @@
       ${_ep_spire_use_threads}
       ${_ep_spire_output_dirs}
     )
+
+  if (DEFINED _SPM_SOURCE_DIR)
+    # Forces a build even though we are source only.
+    ExternalProject_Add_Step(${name} forcebuild
+      COMMAND ${CMAKE_COMMAND} -E echo
+      ALWAYS 1
+      DEPENDERS build
+      )
+  endif()

   # This target property is used to place compiled modules where they belong.
   set_target_properties(${name} PROPERTIES SPIRE_MODULE_OUTPUT_DIRECTORY "${_SPM_BASE_OUTPUT_DIR}")
@@ -447,6 +457,15 @@
       ${_ep_spire_output_dirs}
     )

+  if (DEFINED _SPM_SOURCE_DIR)
+    # Forces a build even though we are source only.
+    ExternalProject_Add_Step(${target_name} forcebuild
+      COMMAND ${CMAKE_COMMAND} -E echo
+      ALWAYS 1
+      DEPENDERS build
+      )
+  endif()
+
   # We don't need to set SPIRE_INCLUDE_DIRS since it is assumed that the source
   # for our module has been placed in the appropriate location and we can
   # lookup the results using SpireExt/{target_name}.


Only enable tests if there are tests to build/run.

--- tools/cmake/ANHPlugin.cmake
+++ tools/cmake/ANHPlugin.cmake
@@ -109,8 +109,8 @@
     ENDIF()

     # if unit tests have been specified break out the project into a library to make it testable
-    LIST(LENGTH SOURCES _sources_list_length)
-    IF(_sources_list_length GREATER 1)
+    LIST(LENGTH TEST_SOURCES _test_sources_list_length)
+    IF(ENABLE_TEST_REPORT AND _test_sources_list_length GREATER 1)
         SET(__project_library "lib${name}")

         list(REMOVE_ITEM SOURCES ${MAIN_EXISTS})


Renamed CMake macros

Renamed CMake macros

--- build.cmake
+++ build.cmake
@@ -1,2 +1 @@
-
-cm8kr_set_version_for_project(1 0 0 OmniCalibration)
+omni_set_version_for_project(1 0 0 OmniCalibration)


fix compiler flag logic

fix compiler flag logic

--- rosidl_typesupport_opensplice_cpp/cmake/rosidl_typesupport_opensplice_cpp_generate_interfaces.cmake
+++ rosidl_typesupport_opensplice_cpp/cmake/rosidl_typesupport_opensplice_cpp_generate_interfaces.cmake
@@ -87,15 +87,14 @@

 # If not on Windows, disable some warnings with Connext's generated code
 if(NOT WIN32)
-  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    set(_opensplice_compile_flags)
-  elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+  set(_opensplice_compile_flags)
+  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     set(_opensplice_compile_flags
-      "-Wno-unused-but-set-variable "
+      "-Wno-unused-but-set-variable"
     )
   endif()
   if(NOT "${_opensplice_compile_flags} " STREQUAL " ")
-    string(REPLACE ";" " " _opensplice_compile_flags ${_opensplice_compile_flags})
+    string(REPLACE ";" " " _opensplice_compile_flags "${_opensplice_compile_flags}")
     foreach(_gen_file ${_generated_files})
       set_source_files_properties("${_gen_file}"
         PROPERTIES COMPILE_FLAGS ${_opensplice_compile_flags})


cleanup the build/reg_tests directory structure

--- reg_tests/CTestList.cmake
+++ reg_tests/CTestList.cmake
@@ -3,19 +3,19 @@
 #===============================================================================

 # Standard regression test
-function(add_test_r testname)
+function(add_test_r testname )
     add_test(
       ${testname} bash -c "
-      echo ${CMAKE_CURRENT_SOURCE_DIR} &&
-      echo ${CMAKE_BINARY_DIR} &&
-      mkdir -p ${testname}-local &&
-      cp -r ${CMAKE_CURRENT_SOURCE_DIR}/AWT27 ./${testname}-local/AWT27 &&
-      cp ${CMAKE_CURRENT_SOURCE_DIR}/test_files/${testname}/*.fst ${testname}-local &&
-      ${CMAKE_BINARY_DIR}/../install/bin/openfast ${testname}-local/${testname}.fst &&
-      ${CMAKE_CURRENT_SOURCE_DIR}/pass_fail.sh ${testname} ${CMAKE_BINARY_DIR}/reg_tests/${testname}-local/${testname}.outb ${TOLERANCE}"
+        #cp ${CMAKE_CURRENT_SOURCE_DIR}/test_files/${testname}/*.fst ${testname} &&
+        #${CMAKE_INSTALL_PREFIX}/bin/openfast ${testname}/${testname}.fst &&
+        #${CMAKE_CURRENT_SOURCE_DIR}/pass_fail.sh ${testname} ${CMAKE_BINARY_DIR}/reg_tests/${testname}/${testname}.outb ${TOLERANCE}
+
+        cp ${CMAKE_CURRENT_SOURCE_DIR}/test_files/${testname}/*.fst . &&
+        ${CMAKE_INSTALL_PREFIX}/bin/openfast ${testname}.fst &&
+        ${CMAKE_CURRENT_SOURCE_DIR}/pass_fail.sh ${testname} ${CMAKE_BINARY_DIR}/reg_tests/${testname}.outb ${TOLERANCE}
+      "
     )
-    #set_tests_properties(${testname} PROPERTIES TIMEOUT 1000 PROCESSORS ${np} WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/test_files/${testname}" LABELS "regression")
-    #file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test_files/${testname})
+    set_tests_properties(${testname} PROPERTIES TIMEOUT 1000 WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" LABELS "regression")
 endfunction(add_test_r)

 #===============================================================================
@@ -23,3 +23,4 @@
 #===============================================================================

 add_test_r(Test01)
+add_test_r(Test02)


Adding USE_GLEW and GLEW_STATIC to the cmgui_congifure file https://tracker.physiomeproject.org/show_bug.cgi?id=1203

git-svn-id: 4705079bc6b8aadf675e3696f5c015a6aa4916e3@8075 3c1deb5b-d424-0410-962d-aba41a686d42

--- source/configure/cmgui_configure.h.cmake
+++ source/configure/cmgui_configure.h.cmake
@@ -36,6 +36,7 @@
 #cmakedefine USE_PERL_INTERPRETER
 #cmakedefine USE_XML2
 #cmakedefine USE_NETGEN
+#cmakedefine USE_GLEW
 #cmakedefine USE_PNG
 #cmakedefine USE_TIFF

@@ -43,6 +44,7 @@
 #cmakedefine NETSCAPE_HELP
 #cmakedefine FE_VALUE_IS_DOUBLE
 #cmakedefine HAVE_VFSCANF
+#cmakedefine GLEW_STATIC
 #cmakedefine OPTIMISED
 #cmakedefine DEBUG
 #cmakedefine MEMORY_CHECKING


Small MinGW fixes

Small MinGW fixes

--- Shared/CMake/JamomaPlatformSpecific.cmake
+++ Shared/CMake/JamomaPlatformSpecific.cmake
@@ -61,17 +61,17 @@
 		SET(CPACK_GENERATOR "NSIS")
 	endif()
 elseif(WIN32)
+	add_definitions(-DTT_PLATFORM_WIN)
+	add_definitions(-DWIN_VERSION)
+
 	if(MINGW)
-		add_definitions(-DTT_PLATFORM_WIN)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-unknown-pragmas -Wno-conversion -Wno-deprecated-declarations -Wno-trigraphs")
 	else()
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996 /wd4275 /wd4273 /wd4068 /LD /MD")
-		add_definitions(-DTT_PLATFORM_WIN)
-		add_definitions(-DWIN_VERSION)
 		add_definitions(-DIDL=0)
 	endif()

-	# C'est en supposant qu'on compile sur une machine 64-bits... Comment le tester?
+	# This assumes that we're building on a 64 bit machine... but this should not be used anymore anyway.
 	if(CMAKE_SIZEOF_VOID_P EQUAL 4)
 		set(WIN32_PROGRAMFILES "C:\\Program Files (x86)")
 	else()


Do not default to static libraries with -Dminimal=ON

This became a problem after 0c160b9072bcf8438a52a954a6a2d0b0f50cb7ef.

--- cmake/modules/RootBuildOptions.cmake
+++ cmake/modules/RootBuildOptions.cmake
@@ -299,7 +299,7 @@

 #---Apply minimal or gminimal------------------------------------------------------------------
 foreach(opt ${root_build_options})
-  if(NOT opt MATCHES "thread|cling|builtin_llvm|builtin_clang|builtin_ftgl|explicitlink")
+  if(NOT opt MATCHES "thread|cling|builtin_llvm|builtin_clang|builtin_ftgl|shared|explicitlink")
     if(minimal)
       set(${opt}_defvalue OFF)
     elseif(gminimal AND NOT opt MATCHES "x11|cocoa")


Do not force enabling of asserts option

Do not force enabling of asserts option

If the option is disabled on the command line with -Dasserts=OFF,
the build system should respect that and not re-enable it behind
the user's back. If not specified on the command line, it will
still be set if the build type is Debug or dev=ON.

--- cmake/modules/RootBuildOptions.cmake
+++ cmake/modules/RootBuildOptions.cmake
@@ -80,6 +80,7 @@
 ROOT_BUILD_OPTION(alien OFF "Enable support for AliEn (requires libgapiUI from ALICE)")
 ROOT_BUILD_OPTION(arrow OFF "Enable support for Apache Arrow")
 ROOT_BUILD_OPTION(asimage ON "Enable support for image processing via libAfterImage")
+ROOT_BUILD_OPTION(asserts OFF "Enable asserts (defaults to ON for CMAKE_BUILD_TYPE=Debug and/or dev=ON)")
 ROOT_BUILD_OPTION(builtin_afterimage OFF "Build bundled copy of libAfterImage")
 ROOT_BUILD_OPTION(builtin_cfitsio OFF "Build CFITSIO internally (requires network)")
 ROOT_BUILD_OPTION(builtin_clang ON "Build bundled copy of Clang")
@@ -196,7 +197,6 @@
 option(roottest "Build roottest if roottest exists in root or if it is a sibling directory." OFF)
 option(testing "Enable testing with CTest" OFF)
 option(asan "Build ROOT with address sanitizer instrumentation" OFF)
-option(asserts "Enable asserts (is ON for CMAKE_BUILD_TYPE=Debug and dev=ON)" OFF)

 set(gcctoolchain "" CACHE PATH "Set path to GCC toolchain used to build llvm/clang")

@@ -363,13 +363,13 @@
 #---webgui by default always build together with root7-----------------------------------------
 set(webgui_defvalue ${root7_defvalue})

+#---Enable asserts for Debug builds and for the dev mode---------------------------------------
+if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR dev)
+  set(asserts_defvalue ON)
+endif()
+
 #---Define at moment the options with the selected default values------------------------------
 ROOT_APPLY_OPTIONS()
-
-#---Enable asserts for Debug builds and for the dev mode---------------------------------------
-if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR dev)
-  set(asserts ON CACHE BOOL "" FORCE)
-endif()

 #---roottest option implies testing
 if(roottest OR rootbench)


ffmpeg/3.4: update FFmpeg wrapper

ffmpeg/3.4: update FFmpeg wrapper

- FFmpeg 3.4.7

--- 3rdparty/ffmpeg/ffmpeg.cmake
+++ 3rdparty/ffmpeg/ffmpeg.cmake
@@ -1,8 +1,8 @@
-# Binaries branch name: ffmpeg/3.4_20191118
-# Binaries were created for OpenCV: 3f431a16a38be35e52b4887a3591d23030d34fc5
-ocv_update(FFMPEG_BINARIES_COMMIT "548e3c997a80d65f710b9048f1d33371e3a203ac")
-ocv_update(FFMPEG_FILE_HASH_BIN32 "168635a192fc2d2ae7d7d40150f0b349")
-ocv_update(FFMPEG_FILE_HASH_BIN64 "cbc25f8f2954475b127c7558558c18e6")
+# Binaries branch name: ffmpeg/3.4_20200310
+# Binaries were created for OpenCV: 4966186e10e2a940514d8c20447ca4a828af5f46
+ocv_update(FFMPEG_BINARIES_COMMIT "e81ccda615672833b578c6cefdb859ad69c560ba")
+ocv_update(FFMPEG_FILE_HASH_BIN32 "301ae2000e25f800ab8e0065f277ad28")
+ocv_update(FFMPEG_FILE_HASH_BIN64 "d87ce032289c3f811d02f0c3d8dbe366")
 ocv_update(FFMPEG_FILE_HASH_CMAKE "3b90f67f4b429e77d3da36698cef700c")

 function(download_win_ffmpeg script_var)


Set /source-charset:utf-8 for MSVC

Set /source-charset:utf-8 for MSVC

--- .cmake/Modules/Properties.cmake
+++ .cmake/Modules/Properties.cmake
@@ -20,6 +20,7 @@

 if (MSVC)
   set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO")
+  set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /source-charset:utf-8")
 else ()
   if (WIN32)
     set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-no-undefined")


modules: more FindSDL2 updates.

modules: more FindSDL2 updates.

--- modules/FindSDL2.cmake
+++ modules/FindSDL2.cmake
@@ -9,9 +9,8 @@
 #
 # Additionally these variables are defined for internal usage:
 #
-#  SDL2_LIBRARY             - SDL2 library
-#  SDL2_LIBRARY_DEBUG       - SDL2 debug library
-#  SDL2_LIBRARY_RELEASE     - SDL2 release library
+#  SDL2_LIBRARY_DEBUG       - SDL2 debug library, if found
+#  SDL2_LIBRARY_RELEASE     - SDL2 release library, if found
 #  SDL2_INCLUDE_DIR         - Root include dir
 #

@@ -20,6 +19,7 @@
 #
 #   Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
 #             Vladimír Vondruš <mosra@centrum.cz>
+#   Copyright © 2018 Jonathan Hale <squareys@googlemail.com>
 #
 #   Permission is hereby granted, free of charge, to any person obtaining a
 #   copy of this software and associated documentation files (the "Software"),
@@ -62,6 +62,9 @@
     find_library(SDL2_LIBRARY_DEBUG
         NAMES SDL2d
         PATH_SUFFIXES ${_SDL_LIBRARY_PATH_SUFFIX})
+    # FPHSA needs one of the _DEBUG/_RELEASE variables to check that the
+    # library was found -- using SDL_LIBRARY, which will get populated by
+    # select_library_configurations() below.
     set(SDL2_LIBRARY_NEEDED SDL2_LIBRARY)
     set(_SDL2_PATH_SUFFIXES SDL2)
 endif()


ENH: Define CPACK_PACKAGE_CONTACT.

ENH: Define CPACK_PACKAGE_CONTACT.

DEB packages can be created with this definition.

Change-Id: Iaacfffbe35fe5c549d5c4944580fe6dcfce80dff

--- CMake/ITKModuleEnablement.cmake
+++ CMake/ITKModuleEnablement.cmake
@@ -161,6 +161,7 @@

 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Insight Toolkit version ${ITK_VERSION_MAJOR}")
 set(CPACK_PACKAGE_VENDOR "ISC")
+set(CPACK_PACKAGE_CONTACT "Insight Software Consortium <community@itk.org>")
 set(CPACK_PACKAGE_VERSION_MAJOR "${ITK_VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR "${ITK_VERSION_MINOR}")
 set(CPACK_PACKAGE_VERSION_PATCH "${ITK_VERSION_PATCH}")


[OS X] Remove unnecessary dependency lib copies. Resolves strange errors during CMake configuration.

--- CMake/InstallDependencies.cmake
+++ CMake/InstallDependencies.cmake
@@ -114,13 +114,6 @@
 		install(FILES ${OIS_LIBRARY_REL} DESTINATION lib/release CONFIGURATIONS Release)
 		install(FILES ${OIS_LIBRARY_REL} DESTINATION lib/minsizerel CONFIGURATIONS MinSizeRel)
 	  endif ()
-	elseif(APPLE)
-#        install(FILES
-#          ${OGRE_DEP_DIR}/lib/$(PLATFORM_NAME)/$(CONFIGURATION)/libOIS.a
-#          DESTINATION lib/$(PLATFORM_NAME)/$(CONFIGURATION)
-#        )
-      install_debug(libOIS.a)
-      install_release(libOIS.a)
 	endif ()
 	  endif ()

@@ -155,15 +148,6 @@
     if (OGRE_BUILD_RENDERSYSTEM_GLES2)
       install_debug(libGLESv2.dll)
 	  install_release(libEGL.dll)
-    endif ()
-  elseif(APPLE)
-    # copy the dependency libs to the right places
-    install_debug(libOIS.a)
-    install_release(libOIS.a)
-
-    if (OGRE_BUILD_PLUGIN_CG)
-      install_debug(Cg.framework)
-      install_release(Cg.framework)
     endif ()
   endif ()

@@ -284,16 +268,6 @@
       copy_release(libEGL.dll)
       copy_release(libGLESv2.dll)
     endif ()
-
-  elseif(APPLE AND NOT OGRE_BUILD_PLATFORM_APPLE_IOS)
-    # copy the required libs and frameworks to the build directory (configure_file is the only copy-like op I found in CMake)
-    copy_debug(libOIS.a)
-    copy_release(libOIS.a)
-
-    if (OGRE_BUILD_PLUGIN_CG)
-      copy_debug(Cg.framework)
-      copy_release(Cg.framework)
-    endif ()
   endif ()

 endif ()


Don't attempt to copy OIS dll files on Windows when not required to (CMake)

--HG--
branch : v1-9

--- CMake/InstallDependencies.cmake
+++ CMake/InstallDependencies.cmake
@@ -241,12 +241,14 @@

   if (WIN32)
     # copy the required DLLs to the build directory (configure_file is the only copy-like op I found in CMake)
-    if(NOT OGRE_BUILD_PLATFORM_WINRT)
-      file(COPY ${OIS_BINARY_DBG} DESTINATION ${OGRE_BINARY_DIR}/bin/debug)
-    	file(COPY ${OIS_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/release)
-    	file(COPY ${OIS_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/relwithdebinfo)
-    	file(COPY ${OIS_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/minsizerel)
-    endif ()
+	if( OGRE_BUILD_SAMPLES OR OGRE_BUILD_TESTS )
+		if(NOT OGRE_BUILD_PLATFORM_WINRT)
+		  file(COPY ${OIS_BINARY_DBG} DESTINATION ${OGRE_BINARY_DIR}/bin/debug)
+			file(COPY ${OIS_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/release)
+			file(COPY ${OIS_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/relwithdebinfo)
+			file(COPY ${OIS_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/minsizerel)
+		endif ()
+	endif()

     if (OGRE_BUILD_PLUGIN_CG)
       # if MinGW or NMake, the release/debug cg.dll's would conflict, so just pick one


xpSourceListAppend always look for miscFiles .codereview

* see issue https://github.com/smanders/externpro/issues/177#issuecomment-384072986

--- modules/xpfunmac.cmake
+++ modules/xpfunmac.cmake
@@ -962,28 +962,30 @@
       endif()
       list(APPEND masterSrcList ${f})
     endforeach()
-  else()
-    file(GLOB miscFiles LIST_DIRECTORIES false
-      ${_dir}/.git ${_dir}/.gitattributes ${_dir}/.gitmodules
-      ${_dir}/*clang-format
-      ${_dir}/README.md
-      )
-    if(miscFiles)
-      list(APPEND masterSrcList ${miscFiles})
-      file(RELATIVE_PATH relPath ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-      string(REPLACE "/" "" custTgt .CMake${relPath})
+  endif()
+  file(GLOB miscFiles LIST_DIRECTORIES false
+    ${_dir}/.git ${_dir}/.gitattributes ${_dir}/.gitmodules
+    ${_dir}/*clang-format
+    ${_dir}/README.md
+    ${_dir}/version.cmake
+    )
+  if(miscFiles)
+    list(APPEND masterSrcList ${miscFiles})
+    file(RELATIVE_PATH relPath ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+    string(REPLACE "/" "" custTgt .CMake${relPath})
+    if(NOT TARGET ${custTgt})
       add_custom_target(${custTgt} SOURCES ${miscFiles}) # creates utility project in MSVC
       set_property(TARGET ${custTgt} PROPERTY FOLDER ${folder})
     endif()
-    if(EXISTS ${_dir}/.codereview)
-      file(RELATIVE_PATH relPath ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-      string(REPLACE "/" "" custTgt .codereview${relPath})
-      if(NOT TARGET ${custTgt})
-        file(GLOB crFiles "${_dir}/.codereview/*")
-        list(APPEND masterSrcList ${crFiles})
-        add_custom_target(${custTgt} SOURCES ${crFiles}) # creates utility project in MSVC
-        set_property(TARGET ${custTgt} PROPERTY FOLDER ${folder})
-      endif()
+  endif()
+  if(EXISTS ${_dir}/.codereview)
+    file(RELATIVE_PATH relPath ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+    string(REPLACE "/" "" custTgt .codereview${relPath})
+    if(NOT TARGET ${custTgt})
+      file(GLOB crFiles "${_dir}/.codereview/*")
+      list(APPEND masterSrcList ${crFiles})
+      add_custom_target(${custTgt} SOURCES ${crFiles}) # creates utility project in MSVC
+      set_property(TARGET ${custTgt} PROPERTY FOLDER ${folder})
     endif()
   endif()
   if(NOT ${CMAKE_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR})


add CXX standard to CUDA cmake file as well

--- CMake/GOMCCUDASetup.cmake
+++ CMake/GOMCCUDASetup.cmake
@@ -18,6 +18,8 @@

 set(CMAKE_CUDA_STANDARD 14)
 set(CMAKE_CUDA_STANDARD_REQUIRED true)
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED true)

 include_directories(${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
 message(${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})


Remove wrong double quotes

Remove wrong double quotes

--- CMake/mitkInstallRules.cmake
+++ CMake/mitkInstallRules.cmake
@@ -76,18 +76,18 @@
     set(_prefix ".lib")
     if(APPLE)
       set(_ext ".dylib")
-      set(_configs "CONFIGURATIONS Release")
+      set(_configs CONFIGURATIONS Release)
       install(FILES "${_qmake_path}/../plugins/platforms/${_prefix}qcocoa${_ext}"
-             DESTINATION "bin/plugins/platforms"
-             ${_configs})
+              DESTINATION "bin/plugins/platforms"
+              ${_configs})
       get_filename_component(ABS_DIR_HELPERS "${_qmake_path}/../lib/QtWebEngineCore.framework/Helpers" REALPATH)
       MITK_INSTALL_HELPER_APP(EXECUTABLES "${ABS_DIR_HELPERS}/QtWebEngineProcess")
     else()
       set(_ext "so")
       set(_configs "")
       install(FILES "${_qmake_path}/../plugins/platforms/${_prefix}qxcb${_ext}"
-             DESTINATION "bin/plugins/platforms"
-             ${_configs})
+              DESTINATION "bin/plugins/platforms"
+              ${_configs})
       install(FILES "${_qmake_path}/../plugins/xcbglintegrations/${_prefix}qxcb-glx-integration${_ext}"
               DESTINATION "bin/plugins/xcbglintegrations"
               ${_configs})


FW update: don't apply threshold filtering on confidence map

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

 # "full commit hash of device side binary"
-set(DEPTHAI_DEVICE_SIDE_COMMIT "d6dcfcffe55822364c1a4d261e6a53048fdc800f")
+set(DEPTHAI_DEVICE_SIDE_COMMIT "78b9e769d74a08356339cbfcdf9a0979ff7ebb56")

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


Fix build breakage with builtin_veccore=ON

The breakage was introduced by PR #567, the reference commit is
5a4e4ba67b4bdb8e640d658eb0f13898a5470aa7. The build rules added for
mathcore are not enough to find VecCore headers from the external
project located in the build directory, and do not add the proper
definitions necessary to enable the required backends.

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -1443,6 +1443,20 @@
     REQUIRED_VARS VecCore_INCLUDE_DIRS
     VERSION_VAR VecCore_VERSION)

+  # The following few lines are a temporary fix for a breakage introduced
+  # recently in math/mathcore VecCore integration. Once the proper solution
+  # is found, the lines below should be removed from here and added to the
+  # proper targets.
+  add_definitions(${VecCore_DEFINITIONS})
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VecCore_DEFINITIONS}")
+  include_directories(SYSTEM BEFORE ${VecCore_INCLUDE_DIRS})
+
+  # Copy Vc and VecCore headers to build directory, otherwise dictionary generation breaks
+  add_custom_command(TARGET VECCORE POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${VecCore_INCLUDE_DIRS}/ ${CMAKE_BINARY_DIR}/include)
+
+  ### End of temporary fix
+
   install(DIRECTORY ${VecCore_ROOTDIR}/ DESTINATION ".")
 endif()


Change the libsuffix for DAVIX library installation (CMake)

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -719,7 +719,7 @@
       DAVIX
       URL http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/davix-${DAVIX_VERSION}.tar.gz
       INSTALL_DIR ${CMAKE_BINARY_DIR}
-      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DLIB_SUFFIX=
     )
     set(DAVIX_INCLUDE_DIR ${CMAKE_BINARY_DIR}/include/davix)
     set(DAVIX_LIBRARY -L${CMAKE_BINARY_DIR}/lib64 -ldavix)


changed default cdash settings

changed default cdash settings

--- src/CTestConfig.cmake
+++ src/CTestConfig.cmake
@@ -7,9 +7,9 @@

 # Generic information about CDASH site
 set(CTEST_PROJECT_NAME "OpenMC")
-set(CTEST_NIGHTLY_START_TIME "03:00:00 UTC")
+set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")
 set(CTEST_DROP_METHOD "http")
-set(CTEST_DROP_SITE "54.83.201.173")
+set(CTEST_DROP_SITE "openmc.mit.edu")
 set(CTEST_DROP_LOCATION "/cdash/submit.php?project=OpenMC")
 set(CTEST_DROP_SITE_CDASH TRUE)


added boost libraries linged for testing

--- src/cmake/tests.cmake
+++ src/cmake/tests.cmake
@@ -5,7 +5,7 @@
 foreach(app but_uts but_mts but_its)
   target_link_libraries(${app} but)
   target_link_libraries(${app} gmock_main gmock gtest)
-  target_link_libraries(${app} boost_serialization)
+  target_link_libraries(${app} boost_thread boost_serialization boost_chrono)
   add_test(NAME run_${app}
            COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${app}
                    --gtest_shuffle


ARROW-14240: [C++] Fix wrong nlohmann-json header path

Closes #11349 from kou/cpp-nlohmann-json-fix-path

Authored-by: Sutou Kouhei <73218711cdd5d5c30ac66da3cc4d9d9204caf34b@clear-code.com>
Signed-off-by: Sutou Kouhei <73218711cdd5d5c30ac66da3cc4d9d9204caf34b@clear-code.com>

--- cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -3563,7 +3563,7 @@
         ${EP_COMMON_CMAKE_ARGS} -DCMAKE_CXX_STANDARD=11
         "-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>" -DBUILD_TESTING=OFF)

-    set(NLOHMANN_JSON_BUILD_BYPRODUCTS ${NLOHMANN_JSON_PREFIX}/include/json.hpp)
+    set(NLOHMANN_JSON_BUILD_BYPRODUCTS ${NLOHMANN_JSON_PREFIX}/include/nlohmann/json.hpp)

     externalproject_add(nlohmann_json_ep
                         ${EP_LOG_OPTIONS}


Be smarter about whether Boost is required or not

--- CMake/Dependencies.cmake
+++ CMake/Dependencies.cmake
@@ -96,7 +96,12 @@
 	find_package(Boost COMPONENTS ${OGRE_BOOST_COMPONENTS} QUIET)
 endif()
 # Optional Boost libs (Boost_${COMPONENT}_FOUND
-macro_log_feature(Boost_FOUND "boost" "Boost (general)" "http://boost.org" FALSE "" "")
+if(OGRE_BUILD_COMPONENT_PROPERTY)
+	set(OGRE_BOOST_REQUIRED TRUE)
+else ()
+	set(OGRE_BOOST_REQUIRED FALSE)
+endif()
+macro_log_feature(Boost_FOUND "boost" "Boost (general)" "http://boost.org" ${OGRE_BOOST_REQUIRED} "" "")
 macro_log_feature(Boost_THREAD_FOUND "boost-thread" "Used for threading support" "http://boost.org" FALSE "" "")


Add fc_target_copy_resource/fc_copy_sources build message

Includes optional verbosity param for tracking down "two rules for..."
ninja/etc warnings.

--- cMake/FreeCadMacros.cmake
+++ cMake/FreeCadMacros.cmake
@@ -41,6 +41,11 @@
 ENDMACRO(COPY_IF_DIFFERENT FROM_DIR TO_DIR FILES TARGETS TAGS)

 MACRO (fc_copy_sources target_name outpath)
+	if(BUILD_VERBOSE_GENERATION)
+		set(fc_details " (fc_copy_sources called from ${CMAKE_CURRENT_SOURCE_DIR})")
+	else()
+		set(fc_details "")
+	endif()
 	foreach(it ${ARGN})
 		get_filename_component(infile ${it} ABSOLUTE)
 		get_filename_component(outfile "${outpath}/${it}" ABSOLUTE)
@@ -50,6 +55,7 @@
 			COMMAND   "${CMAKE_COMMAND}" -E copy "${infile}" "${outfile}"
 			TARGET    ${target_name}
 			OUTPUTS   "${outfile}"
+			COMMENT "Copying ${infile} to ${outfile}${fc_details}"
 		)
 	endforeach(it)
 	ADD_CUSTOM_COMMAND(
@@ -60,6 +66,11 @@
 ENDMACRO(fc_copy_sources)

 MACRO (fc_target_copy_resource target_name inpath outpath)
+	if(BUILD_VERBOSE_GENERATION)
+		set(fc_details " (fc_target_copy_resource called from ${CMAKE_CURRENT_SOURCE_DIR})")
+	else()
+		set(fc_details "")
+	endif()
 	foreach(it ${ARGN})
 		get_filename_component(infile "${inpath}/${it}" ABSOLUTE)
 		get_filename_component(outfile "${outpath}/${it}" ABSOLUTE)
@@ -69,6 +80,7 @@
 			COMMAND   "${CMAKE_COMMAND}" -E copy "${infile}" "${outfile}"
 			TARGET    ${target_name}
 			OUTPUTS   "${outfile}"
+			COMMENT "Copying ${infile} to ${outfile}${fc_details}"
 		)
 	endforeach(it)
 	ADD_CUSTOM_COMMAND(
@@ -156,7 +168,7 @@
 		set(TOOL_PATH "${CMAKE_SOURCE_DIR}/src/Tools/PythonToCPP.py")
 		file(TO_NATIVE_PATH "${TOOL_PATH}" TOOL_NATIVE_PATH)
 		file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${BASE_NAME}.py" SOURCE_NATIVE_PATH)
-		 add_custom_command(
+		add_custom_command(
 		 		OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE}"
 		 		COMMAND "${PYTHON_EXECUTABLE}" "${TOOL_NATIVE_PATH}" "${SOURCE_NATIVE_PATH}" "${OUTPUT_FILE}"
 				MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/${BASE_NAME}.py"


fixed cmake error introduced during rebase

--- cmake/DetectOptions.cmake
+++ cmake/DetectOptions.cmake
@@ -148,6 +148,7 @@
 endif()
 if(DATASPACES_FOUND)
   set(ADIOS2_HAVE_DataSpaces TRUE)
+endif()

 # HDF5
 if(ADIOS2_USE_HDF5 STREQUAL AUTO)


Fix issue #549

Fix issue #549

Apparently, with -O0 (or no -O option) Clang adds the
noinline attribute to each C function in kernel library,
which makes it impossible to inline later, however
trivial it might be.

--- cmake/bitcode_rules.cmake
+++ cmake/bitcode_rules.cmake
@@ -127,7 +127,7 @@
         "-I" "${CMAKE_SOURCE_DIR}/lib/kernel/sleef/arch"
         "-I" "${CMAKE_SOURCE_DIR}/lib/kernel/sleef/libm"
         "-I" "${CMAKE_SOURCE_DIR}/lib/kernel/sleef/include"
-        "-xc" "-o" "${BC_FILE}" "-c" "${FULL_F_PATH}"
+        "-O1" "-xc" "-o" "${BC_FILE}" "-c" "${FULL_F_PATH}"
         COMMENT "Building SLEEF to LLVM bitcode ${BC_FILE}"
         VERBATIM)
 endfunction()


ffmpeg disable lzma

ffmpeg disable lzma

fixes https://github.com/smanders/externpro/issues/163

--- projects/ffmpeg.cmake
+++ projects/ffmpeg.cmake
@@ -72,7 +72,7 @@
     set(XP_CONFIGURE_BASE ${CMAKE_COMMAND} -E env PKG_CONFIG_PATH=${STAGE_DIR}/share/cmake
       PATH=${STAGE_DIR}/bin:$ENV{PATH} # prepend path to yasm
       <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> #--enable-shared --disable-static
-      --enable-libopenh264 --disable-bzlib --disable-iconv --disable-libxcb --disable-zlib
+      --enable-libopenh264 --disable-bzlib --disable-iconv --disable-libxcb --disable-lzma --disable-zlib
       )
     set(XP_CONFIGURE_Debug ${XP_CONFIGURE_BASE} --enable-debug=1)
     set(XP_CONFIGURE_Release ${XP_CONFIGURE_BASE} --disable-debug)


Updating ITK revision in Superbuild

Updating ITK revision in Superbuild

This updated revision is needed for the Logical operator functors.

--- SuperBuild/External_ITKv4.cmake
+++ SuperBuild/External_ITKv4.cmake
@@ -17,7 +17,7 @@
 # NOTE: it is very important to update the ITK_DIR path with the
 # A version in the ITK 4.3 development which contains a patch for
 # SignedDanielssonDistanceMap
-set(ITK_TAG_COMMAND GIT_TAG af8d6ee5f9fa46a916b8b46e03a0b10b38b23e80 )
+set(ITK_TAG_COMMAND GIT_TAG 13413feff842253c98304886e34e3e6a434c37f8 )

 if( ${ITK_WRAPPING} OR ${BUILD_SHARED_LIBS} )
   set( ITK_BUILD_SHARED_LIBS ON )


Use find_package to check for curl on Linux (#2094)

--- platforms/linux/config.cmake
+++ platforms/linux/config.cmake
@@ -28,6 +28,8 @@
 include(FindPkgConfig)
 pkg_check_modules(FONTCONFIG REQUIRED "fontconfig")

+find_package(CURL REQUIRED)
+
 add_executable(tangram
   platforms/linux/src/linuxPlatform.cpp
   platforms/linux/src/main.cpp
@@ -55,7 +57,7 @@
   ${GLFW_LIBRARIES}
   ${OPENGL_LIBRARIES}
   ${FONTCONFIG_LDFLAGS}
-  -lcurl
+  ${CURL_LIBRARIES}
   -pthread
   # only used when not using external lib
   -ldl


[FIX] Build System: fixed linking flags

[FIX] Build System: fixed linking flags

--- util/cmake/SeqAnBuildSystem.cmake
+++ util/cmake/SeqAnBuildSystem.cmake
@@ -500,7 +500,7 @@

     # Supress unused parameter warnings for demos.
     if (CMAKE_COMPILER_IS_GNUCXX OR COMPILER_IS_CLANG)
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter" PARENT_SCOPE)
     endif (CMAKE_COMPILER_IS_GNUCXX OR COMPILER_IS_CLANG)

     # Add flags for SeqAn.
@@ -533,10 +533,10 @@

         get_filename_component (FILE_NAME "${ENTRY}" NAME)
         if (CUDA_FOUND AND "${FILE_NAME}" MATCHES "\\.cu$")
-            set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_SEQAN_CUDA}")
+            set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_SEQAN_CUDA}" PARENT_SCOPE)
             cuda_add_executable(${PREFIX}${BIN_NAME} ${ENTRY})
         else (CUDA_FOUND AND "${FILE_NAME}" MATCHES "\\.cu$")
-            set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_SEQAN}")
+            set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_SEQAN}" PARENT_SCOPE)
             add_executable(${PREFIX}${BIN_NAME} ${ENTRY})
         endif ()
         target_link_libraries (${PREFIX}${BIN_NAME} ${SEQAN_LIBRARIES})
@@ -545,7 +545,7 @@
     endforeach (ENTRY ${ENTRIES})

     # Reset original flags.
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_ORIG}")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_ORIG}" PARENT_SCOPE)
 endmacro (seqan_build_demos_develop)

 function (seqan_register_demos)


Added debug message for proper build with Travis.

--- cmake/DOConfigureCompiler.cmake
+++ cmake/DOConfigureCompiler.cmake
@@ -29,6 +29,7 @@
 elseif (CMAKE_COMPILER_IS_GNUCXX)
   execute_process(COMMAND "${CMAKE_CXX_COMPILER} -dumpversion"
     OUTPUT_VARIABLE GCC_VERSION)
+  do_substep_message("GNU compiler version: ${GCC_VERSION}")
   if (GCC_VERSION VERSION_LESS 4.5)
     message(FATAL_ERROR "GNU compiler version lower than 4.5 are not supported anymore: C++0x features (auto and lambda) are needed.")
   elseif (GCC_VERSION VERSION_LESS 4.7)


cmake: bintools: gnu: Update GDB executable names for Zephyr SDK 0.15

The Zephyr SDK 0.15.0 release has changed the default GDB executable to
be Python-less and introduced an alternate Python-capable variant
called `gdb-py` (note that the Zephyr SDK previously provided
`gdb-no-py` instead).

This commit updates the CMake toolchain detection routine to attempt
using the Python-capable GDB variant (gdb-py) first and, if it is not
available or fails to launch due to a missing libpython dependency,
use the Python-less GDB variant (gdb).

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

--- cmake/bintools/gnu/target.cmake
+++ cmake/bintools/gnu/target.cmake
@@ -11,7 +11,7 @@
 find_program(CMAKE_NM      ${CROSS_COMPILE}nm      PATHS ${TOOLCHAIN_HOME} NO_DEFAULT_PATH)
 find_program(CMAKE_STRIP   ${CROSS_COMPILE}strip   PATHS ${TOOLCHAIN_HOME} NO_DEFAULT_PATH)

-find_program(CMAKE_GDB     ${CROSS_COMPILE}gdb     PATHS ${TOOLCHAIN_HOME} NO_DEFAULT_PATH)
+find_program(CMAKE_GDB     ${CROSS_COMPILE}gdb-py  PATHS ${TOOLCHAIN_HOME} NO_DEFAULT_PATH)

 if(CMAKE_GDB)
   execute_process(
@@ -20,12 +20,13 @@
     OUTPUT_QUIET
     ERROR_QUIET
     )
-  if (${GDB_CFG_ERR})
-    # Failed to execute GDB, likely because of Python deps
-    find_program(CMAKE_GDB_NO_PY  ${CROSS_COMPILE}gdb-no-py  PATHS ${TOOLCHAIN_HOME} NO_DEFAULT_PATH)
-    if (CMAKE_GDB_NO_PY)
-      set(CMAKE_GDB ${CMAKE_GDB_NO_PY} CACHE FILEPATH "Path to a program." FORCE)
-    endif()
+endif()
+
+if(NOT CMAKE_GDB OR GDB_CFG_ERR)
+  find_program(CMAKE_GDB_NO_PY ${CROSS_COMPILE}gdb PATHS ${TOOLCHAIN_HOME} NO_DEFAULT_PATH)
+
+  if(CMAKE_GDB_NO_PY)
+    set(CMAKE_GDB ${CMAKE_GDB_NO_PY} CACHE FILEPATH "Path to a program." FORCE)
   endif()
 endif()


Refs #1597. Fixed cmake error with spaces

--- cmake/dev/compile_example.cmake
+++ cmake/dev/compile_example.cmake
@@ -2,7 +2,7 @@
     if(NOT (EPROSIMA_INSTALLER AND (MSVC OR MSVC_IDE)))

         file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/config/fastrtpsConfig.cmake
-            "include(${PROJECT_BINARY_DIR}/cmake/config/fastrtpsTargets.cmake)\n"
+            "include(\"${PROJECT_BINARY_DIR}/cmake/config/fastrtpsTargets.cmake\")\n"
             )

         # Separate CMAKE_PREFIX_PATH


update Decibel cmake to reflect latest SVN changes

svn path=/trunk/KDE/kdenetwork/cmake/modules/FindDecibel.cmake; revision=590315

--- cmake/modules/FindDecibel.cmake
+++ cmake/modules/FindDecibel.cmake
@@ -23,8 +23,8 @@

 INCLUDE(UsePkgConfig)

-PKGCONFIG(telepathy-qt _TelepathyIncDir _TelepathyLinkDir _TelepathyLinkFlags _TelepathyCflags)
-PKGCONFIG(tapioca-qt _TapiocaIncDir _TapiocaLinkDir _TapiocaLinkFlags _TapiocaCflags)
+PKGCONFIG(QtTelepathy _TelepathyIncDir _TelepathyLinkDir _TelepathyLinkFlags _TelepathyCflags)
+PKGCONFIG(QtTapioca _TapiocaIncDir _TapiocaLinkDir _TapiocaLinkFlags _TapiocaCflags)

 set(QT_TELEPATHY_INCLUDE_DIR ${_TelepathyIncDir})
 set(QT_TAPIOCA_INCLUDE_DIR ${_TapiocaIncDir})


no need to look in KDE4 locations for includes and libs

svn path=/trunk/kdesupport/akonadi/; revision=953248

--- cmake/modules/FindSoprano.cmake
+++ cmake/modules/FindSoprano.cmake
@@ -43,7 +43,6 @@
     NAMES
     soprano/soprano.h
     PATHS
-    ${KDE4_INCLUDE_DIR}
     ${INCLUDE_INSTALL_DIR}
     )

@@ -52,7 +51,6 @@
     NAMES
     sopranoindex
     PATHS
-    ${KDE4_LIB_DIR}
     ${LIB_INSTALL_DIR}
     )

@@ -61,7 +59,6 @@
     NAMES
     sopranoclient
     PATHS
-    ${KDE4_LIB_DIR}
     ${LIB_INSTALL_DIR}
     )

@@ -69,7 +66,6 @@
     WIN32_DEBUG_POSTFIX d
     NAMES soprano
     PATHS
-    ${KDE4_LIB_DIR}
     ${LIB_INSTALL_DIR}
   )

@@ -78,7 +74,6 @@
     NAMES
     sopranoserver
     PATHS
-    ${KDE4_LIB_DIR}
     ${LIB_INSTALL_DIR}
     )


Removed remnant target library dependencies from LLVMLibDeps.cmake

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

--- cmake/modules/LLVMLibDeps.cmake
+++ cmake/modules/LLVMLibDeps.cmake
@@ -35,8 +35,6 @@
 set(MSVC_LIB_DEPS_LLVMMC LLVMSupport LLVMSystem)
 set(MSVC_LIB_DEPS_LLVMMCDisassembler LLVMARMAsmParser LLVMARMCodeGen LLVMARMInfo LLVMAlphaAsmPrinter LLVMAlphaCodeGen LLVMAlphaInfo LLVMBlackfinAsmPrinter LLVMBlackfinCodeGen LLVMBlackfinInfo LLVMCBackend LLVMCBackendInfo LLVMCellSPUAsmPrinter LLVMCellSPUCodeGen LLVMCellSPUInfo LLVMCppBackend LLVMCppBackendInfo LLVMMBlazeAsmPrinter LLVMMBlazeCodeGen LLVMMBlazeInfo LLVMMC LLVMMCParser LLVMMSP430AsmPrinter LLVMMSP430CodeGen LLVMMSP430Info LLVMMipsAsmPrinter LLVMMipsCodeGen LLVMMipsInfo LLVMPIC16AsmPrinter LLVMPIC16CodeGen LLVMPIC16Info LLVMPowerPCAsmPrinter LLVMPowerPCCodeGen LLVMPowerPCInfo LLVMSparcAsmPrinter LLVMSparcCodeGen LLVMSparcInfo LLVMSupport LLVMSystem LLVMSystemZAsmPrinter LLVMSystemZCodeGen LLVMSystemZInfo LLVMX86AsmParser LLVMX86CodeGen LLVMX86Disassembler LLVMX86Info LLVMXCoreAsmPrinter LLVMXCoreCodeGen LLVMXCoreInfo)
 set(MSVC_LIB_DEPS_LLVMMCParser LLVMMC LLVMSupport)
-set(MSVC_LIB_DEPS_LLVMMSIL LLVMAnalysis LLVMCodeGen LLVMCore LLVMMSILInfo LLVMScalarOpts LLVMSupport LLVMTarget LLVMTransformUtils LLVMipa)
-set(MSVC_LIB_DEPS_LLVMMSILInfo LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMMSP430AsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMMSP430Info LLVMSupport LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMMSP430CodeGen LLVMCodeGen LLVMCore LLVMMC LLVMMSP430Info LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMMSP430Info LLVMSupport)


NSIS: Use KillProc plugin when remote-quit is not available

--- win/installer.nsi.cmake
+++ win/installer.nsi.cmake
@@ -82,7 +82,8 @@
         ExecWait '"$INSTDIR\${APP_SHORTNAME}.exe" --quit'
         Goto notrunning
       quitmanually:
-        MessageBox MB_OK "Please ensure that ${APP_LONGNAME} is closed and click OK to continue."
+        KillProcDLL::KillProc "${APP_SHORTNAME}.exe"
+        Sleep 1000
   notrunning:

   ; The current version is able to remote-quit


SVN_SILENT made messages (.desktop file)

--- src/vlc.desktop.cmake
+++ src/vlc.desktop.cmake
@@ -19,6 +19,7 @@
 Name[es]=VLC
 Name[et]=VLC
 Name[hu]=VLC
+Name[ko]=VLC
 Name[nb]=VLC
 Name[nds]=VLC
 Name[nl]=VLC
@@ -48,6 +49,7 @@
 Comment[es]=Motor VLC para Phonon
 Comment[et]=Phononi VLC taustaprogramm
 Comment[hu]=Phonon VLC-backend
+Comment[ko]=Phonon VLC 백엔드
 Comment[nb]=Phonon VLC-motor
 Comment[nds]=VLC-Hülpprogramm för Phonon
 Comment[nl]=VLC-backend van Phonon


SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

--- src/vlc.desktop.cmake
+++ src/vlc.desktop.cmake
@@ -10,5 +10,100 @@
 InitialPreference=20

 Name=VLC
+Name[ast]=VLC
+Name[bg]=VLC
+Name[bs]=VLC
+Name[ca]=VLC
+Name[ca@valencia]=VLC
+Name[cs]=VLC
+Name[da]=VLC
+Name[de]=VLC
+Name[el]=VLC
+Name[en_GB]=VLC
+Name[es]=VLC
+Name[et]=VLC
+Name[eu]=VLC
+Name[fa]=وی‌ال‌سی (VLC)
+Name[fi]=VLC
+Name[fr]=VLC
+Name[ga]=VLC
+Name[gl]=VLC
+Name[hu]=VLC
+Name[id]=VLC
+Name[it]=VLC
+Name[kk]=VLC
+Name[ko]=VLC
+Name[lt]=VLC
+Name[mr]=व्ही-एल-सी
+Name[nb]=VLC
+Name[nds]=VLC
+Name[nl]=VLC
+Name[nn]=VLC
+Name[pa]=VLC
+Name[pl]=VLC
+Name[pt]=VLC
+Name[pt_BR]=VLC
+Name[ro]=VLC
+Name[ru]=VLC
+Name[sk]=VLC
+Name[sl]=VLC
+Name[sr]=ВЛЦ
+Name[sr@ijekavian]=ВЛЦ
+Name[sr@ijekavianlatin]=VLC
+Name[sr@latin]=VLC
+Name[sv]=VLC
+Name[tr]=VLC
+Name[ug]=VLC
+Name[uk]=VLC
+Name[x-test]=xxVLCxx
+Name[zh_CN]=VLC
+Name[zh_TW]=VLC

 Comment=Phonon VLC backend
+Comment[bg]=Ядро VLC за Phonon
+Comment[bs]=VLC kao pozadina za Phonon
+Comment[ca]=Dorsal del VLC pel Phonon
+Comment[ca@valencia]=Dorsal del VLC pel Phonon
+Comment[cs]=Podpůrná vrstva VLC
+Comment[da]=Phonon VLC-motor
+Comment[de]=Phonon-Treiber für VLC
+Comment[el]=Σύστημα υποστήριξης Phonon VLC
+Comment[en_GB]=Phonon VLC backend
+Comment[es]=Motor VLC para Phonon
+Comment[et]=Phononi VLC taustaprogramm
+Comment[eu]=Phonon-en VLC bizkarraldekoa
+Comment[fa]=پسانه‌ی وی‌ال‌سی برای فنون (Phonon VLC backend)
+Comment[fi]=Phonon VLC -taustajärjestelmä
+Comment[fr]=Module VLC pour Phonon
+Comment[ga]=Inneall VLC Phonon
+Comment[gl]=Infraestrutura de VLC para Phonon
+Comment[hu]=Phonon VLC-backend
+Comment[id]=Backend phonon VLC
+Comment[it]=Motore VLC di Phonon
+Comment[kk]=Phonon VLC тетігі
+Comment[ko]=Phonon VLC 백엔드
+Comment[lt]=Phonon VLC galinė sąsaja
+Comment[mr]=फोनॉन व्ही-एल-सी बॅकएन्ड
+Comment[nb]=Phonon VLC-motor
+Comment[nds]=VLC-Hülpprogramm för Phonon
+Comment[nl]=VLC-backend van Phonon
+Comment[nn]=VLC-motor for Phonon
+Comment[pa]=ਫੋਨੋਨ VLC ਬੈਕਐਂਡ
+Comment[pl]=Silnik VLC dla Phonon
+Comment[pt]=Infra-estrutura do VLC para o Phonon
+Comment[pt_BR]=Infraestrutura do VLC para o Phonon
+Comment[ro]=Suportul VLC pentru Phonon
+Comment[ru]=Механизм VLC для Phonon
+Comment[sk]=Backend Phonon VLC
+Comment[sl]=Zaledje VLC za Phonon
+Comment[sr]=ВЛЦ као позадина Фонона
+Comment[sr@ijekavian]=ВЛЦ као позадина Фонона
+Comment[sr@ijekavianlatin]=VLC kao pozadina Phonona
+Comment[sr@latin]=VLC kao pozadina Phonona
+Comment[sv]=Phonon VLC-gränssnitt
+Comment[tr]=Phonon VLC arka ucu
+Comment[ug]=Phonon VLC ئارقا ئۇچى
+Comment[uk]=Модуль VLC Phonon
+Comment[x-test]=xxPhonon VLC backendxx
+Comment[zh_CN]= Phonon VLC 后端
+Comment[zh_TW]=Phonon VLC 後端介面


modules: proper bug link.

modules: proper bug link.

--- modules/FindSDL2.cmake
+++ modules/FindSDL2.cmake
@@ -96,7 +96,7 @@
         add_library(SDL2::SDL2 UNKNOWN IMPORTED)

         # Work around BUGGY framework support on OSX
-        # https://cmake.org/Bug/view.php?id=13765
+        # https://cmake.org/Bug/view.php?id=14105
         if(CORRADE_TARGET_APPLE AND ${SDL2_LIBRARY} MATCHES "\\.framework$")
             set_property(TARGET SDL2::SDL2 PROPERTY IMPORTED_LOCATION ${SDL2_LIBRARY}/SDL2)
         else()


add --respectcase to wxInclude args

add --respectcase to wxInclude args

--- modules/xpfunmac.cmake
+++ modules/xpfunmac.cmake
@@ -1134,7 +1134,7 @@
       set(op ${CMAKE_CURRENT_BINARY_DIR}/Resources/${of}.hrc)
       add_custom_command(OUTPUT ${op}
         COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/Resources
-        COMMAND $<TARGET_FILE:${WXINCLUDE_EXE}> --const --appendtype --wxnone --output-file=${op} ${nm}
+        COMMAND $<TARGET_FILE:${WXINCLUDE_EXE}> --const --appendtype --wxnone --respectcase --output-file=${op} ${nm}
         WORKING_DIRECTORY ${dr} DEPENDS ${in}
         )
       list(APPEND outList ${op})