Build with debug information for lldb on iOS platform (#302)

* Support build with debug information for LLDB (xCode debugger)
* Support —enable-debug as well

--- scripts/iOS.cmake
+++ scripts/iOS.cmake
@@ -52,9 +52,14 @@
 	set (EMBED_OPTIONS "-fembed-bitcode")
 endif(NOT DEFINED IOS_DISABLE_BITCODE)

-# Hidden visibilty is required for cxx on iOS
-set (CMAKE_C_FLAGS_INIT "${EMBED_OPTIONS}")
-set (CMAKE_CXX_FLAGS_INIT "-fvisibility=hidden -fvisibility-inlines-hidden ${EMBED_OPTIONS}")
+if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR ENABLE_DEBUG)
+	set(IOS_DEBUG_OPTIONS "-glldb -gmodules")
+else()
+	set(IOS_DEBUG_OPTIONS "-fvisibility=hidden -fvisibility-inlines-hidden")
+endif()
+
+set (CMAKE_C_FLAGS_INIT "${IOS_DEBUG_OPTIONS} ${EMBED_OPTIONS}")
+set (CMAKE_CXX_FLAGS_INIT "${IOS_DEBUG_OPTIONS} ${EMBED_OPTIONS}")

 set (CMAKE_C_LINK_FLAGS "-Wl,-search_paths_first ${EMBED_OPTIONS} ${CMAKE_C_LINK_FLAGS}")
 set (CMAKE_CXX_LINK_FLAGS "-Wl,-search_paths_first ${EMBED_OPTIONS} ${CMAKE_CXX_LINK_FLAGS}")


ENH: updating git path

ENH: updating git path

--- Testing/Dashboard/pxDashboardCommon.cmake
+++ Testing/Dashboard/pxDashboardCommon.cmake
@@ -92,7 +92,7 @@
 if( NOT DEFINED CTEST_GIT_COMMAND )
   find_program( CTEST_GIT_COMMAND
     NAMES git git.cmd
-    HINTS "C:/Program Files (x86)/Git/bin/" )
+    HINTS "C:/Program Files/Git/bin/" )
 endif()
 if( NOT DEFINED CTEST_GIT_COMMAND )
   message( FATAL_ERROR "No Git Found." )


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


i#58 MacOS: improve asm setup on Mac by using CMake 2.8.3's NASM support

SVN-Revision: 2554

--- make/cpp2asm_support.cmake
+++ make/cpp2asm_support.cmake
@@ -98,11 +98,16 @@
   # For i#801 workaround
   cmake_minimum_required(VERSION 2.8.8)
 else ()
-  # Require 2.6.4 to avoid cmake bug #8639, unless this var is
-  # properly set (which it is for DR b/c it has a workaround):
-  if (NOT "${CMAKE_ASM_SOURCE_FILE_EXTENSIONS}" MATCHES "asm")
-    cmake_minimum_required(VERSION 2.6.4)
-  endif ()
+  if (APPLE)
+    # We want ASM NASM support
+    cmake_minimum_required(VERSION 2.8.3)
+  else (APPLE)
+    # Require 2.6.4 to avoid cmake bug #8639, unless this var is
+    # properly set (which it is for DR b/c it has a workaround):
+    if (NOT "${CMAKE_ASM_SOURCE_FILE_EXTENSIONS}" MATCHES "asm")
+      cmake_minimum_required(VERSION 2.6.4)
+    endif ()
+  endif (APPLE)
 endif ()

 ##################################################
@@ -159,11 +164,16 @@
   # CMake does not support assembly with VS generators
   # (http://public.kitware.com/Bug/view.php?id=11536)
   # so we have to add our own custom commands and targets
-  enable_language(ASM)
+  if (APPLE)
+    # NASM support was added in 2.8.3.  It clears ASM_DIALECT for us.
+    enable_language(ASM_NASM)
+  else (APPLE)
+    enable_language(ASM)
+  endif (APPLE)
 endif ()

 if (APPLE)
-  # See above: we can't use CMAKE_ASM_COMPILER and require nasm.
+  # XXX: we may be able to avoid some of this given CMake 2.8.3's NASM support.
   find_program(NASM nasm DOC "path to nasm assembler")
   if (NOT NASM)
     message(FATAL_ERROR "nasm assembler not found: required to build")
@@ -257,7 +267,7 @@

 if (APPLE)
   # Despite the docs, -o does not work: cpp prints to stdout.
-  set(CMAKE_ASM_COMPILE_OBJECT
+  set(CMAKE_ASM_NASM_COMPILE_OBJECT
     "${CMAKE_CPP} ${CMAKE_CPP_FLAGS} <FLAGS> <DEFINES> -E <SOURCE> > <OBJECT>.s"
     "<CMAKE_COMMAND> -Dfile=<OBJECT>.s -P \"${cpp2asm_newline_script_path}\""
     "<NASM> ${ASM_FLAGS} -o <OBJECT> <OBJECT>.s"


Update common.cmake for apple and linux/clang features On apple, link with CoreFoundation to allow for Instrumentation testing via Xcode. On Linux with Clang, use libstdc++. On other platforms use libc++. Link with the project library after all additional libraries to catch cross-dependencies.

--- common.cmake
+++ common.cmake
@@ -49,7 +49,11 @@
         set(CMAKE_CXX_FLAGS_RELEASE        "${CMAKE_CXX_FLAGS_RELEASE} -O4 -DNDEBUG")
         set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g")

-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+        if( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" )
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libstdc++")
+        else()
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+        endif()
     elseif(${CMAKE_MAKE_PROGRAM} MATCHES "(msdev|devenv|nmake|MSBuild)")
         add_definitions("/W3")
     else ()


use dynamic libaio for ha_xtradb.so

use dynamic libaio for ha_xtradb.so

--- cmake/build_configurations/mysql_release.cmake
+++ cmake/build_configurations/mysql_release.cmake
@@ -148,12 +148,12 @@
       ENDIF()

       # Remove libaio dependency from mysqld
-      SET(XTRADB_PREFER_STATIC_LIBAIO 1)
+      #SET(XTRADB_PREFER_STATIC_LIBAIO 1)

       # Unfortunately, linking shared libmysqld with static aio
       # does not work,  unless we add also dynamic one. This also means
       # libmysqld.so will depend on libaio.so
-      SET(LIBMYSQLD_SO_EXTRA_LIBS aio)
+      #SET(LIBMYSQLD_SO_EXTRA_LIBS aio)
     ENDIF()

     # Enable fast mutexes on Linux


SVN_SILENT made messages (.desktop file)

--- src/vlc.desktop.cmake
+++ src/vlc.desktop.cmake
@@ -29,6 +29,7 @@
 Name[kk]=VLC
 Name[ko]=VLC
 Name[lt]=VLC
+Name[mr]=व्ही-एल-सी
 Name[nb]=VLC
 Name[nds]=VLC
 Name[nl]=VLC
@@ -72,6 +73,7 @@
 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


fixed reference images

fixed reference images

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -16,7 +16,7 @@

 set(CTEST_PROJECT_NAME "Embree")
 set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
-set(TEST_MODELS_HASH 6d2b2b387b475dbd5869cd77bfaf1c66c07874da)
+set(TEST_MODELS_HASH 41af469d0c81988f3c9de9d242e46fd9f548b3c9)

 IF (NOT CTEST_DROP_SITE)
   set(CTEST_DROP_METHOD "http")


CMake: Changing the definition of TRELLIS_ROOT to point to root of lib, share containing trellis libs and data

two other commit message of squashed commits:
CMake: Search for user lib inside trellis instead of libtrellis

CMake: Fix missing path component for share contents

--- ecp5/family.cmake
+++ ecp5/family.cmake
@@ -2,13 +2,13 @@
     set(devices 25k 45k 85k)

     if (NOT DEFINED TRELLIS_ROOT)
-        message(STATUS "TRELLIS_ROOT not defined using -DTRELLIS_ROOT=/path/to/prjtrellis. Default to /usr/local/share/trellis")
-        set(TRELLIS_ROOT "/usr/local/share/trellis")
+        message(STATUS "TRELLIS_ROOT not defined using -DTRELLIS_ROOT=/path/to/prjtrellis. Default to /usr/local")
+        set(TRELLIS_ROOT "/usr/local")
     endif()

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

@@ -27,9 +27,9 @@
     target_include_directories(ecp5_chipdb PRIVATE ${family}/)

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

     if (MSVC)


REMOVE set(CMAKE_LEGACY_CYGWIN_WIN32 0)  # Remove when CMake >= 2.8.4 is required
----

We now install 2.8.7 with OpenViBE new build, and that version or later seems also to be present on current Ubuntu, Mint & Fedoras we support, so we can upgrade to requirement to 2.8.4 if its useful. The main openvibe CmakeLists.txt script currently asks for 2.8.

git-svn-id: 8b72b58fb31a931b6e9a2bd3bb08bc6614045fb1@3410 c330d7e9-fc0c-0410-a5b3-fd85c6f5aa8f

--- test/openVibeTests.cmake
+++ test/openVibeTests.cmake
@@ -1,4 +1,7 @@
-set(CMAKE_LEGACY_CYGWIN_WIN32 0)  # Remove when CMake >= 2.8.4 is required
+# REMOVE if all test is passed
+# set(CMAKE_LEGACY_CYGWIN_WIN32 0)  # Remove when CMake >= 2.8.4 is required
+#------------------------
+
 # to exec test ctest -S thisfile
 # -----------------------------------------------------------
 # -- Get environment


Don't trigger un-necessary events when setting same node

When setupMergeLabels() is being called, it is setting the same color nodes
on the qMRMLLabelComboBox which were being updated for no reason.
Issue #13882

--- CMake/Superbuild/External_Slicer.cmake
+++ CMake/Superbuild/External_Slicer.cmake
@@ -79,7 +79,7 @@
     BINARY_DIR ${${proj}_DIR}
     PREFIX ${proj}${ep_suffix}
     GIT_REPOSITORY "git://public.kitware.com/Bender/Slicer.git"
-    GIT_TAG "c6c75a8497f82acbaee39fe6e4ba2a2d1d0863c8"
+    GIT_TAG "5532d2731280d0e562335c0fead237bee9a83f9b"
     ${bender_external_update}
     INSTALL_COMMAND ""
     CMAKE_GENERATOR ${gen}


fix for generating python bindings with boost 1.55 and gcc

--- CMakeModules/PythonBindingsUtils.cmake
+++ CMakeModules/PythonBindingsUtils.cmake
@@ -19,6 +19,10 @@
     # Gccxml mistakenly thinks that OS X is a 32-bit architecture.
     set(PYOMPL_EXTRA_CFLAGS "-m64")
 endif(APPLE)
+
+if(CMAKE_COMPILER_IS_GNUCXX AND BOOST_VERSION VERSION_GREATER "1.54.0")
+    set(PYOMPL_EXTRA_CFLAGS "${PYOMPL_EXTRA_CFLAGS} -DBOOST_INTEL_CXX_VERSION")
+endif()

 if(PYTHON_FOUND AND Boost_PYTHON_LIBRARY)
     include_directories(${PYTHON_INCLUDE_DIRS})


compiler warning fix for windows

compiler warning fix for windows

--- indra/cmake/00-Common.cmake
+++ indra/cmake/00-Common.cmake
@@ -46,7 +46,7 @@
   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd /MP -D_SCL_SECURE_NO_WARNINGS=1"
       CACHE STRING "C++ compiler debug options" FORCE)
   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
-      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP /Ob2 /Gm -D_SECURE_STL=0"
+      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP /Ob2 -D_SECURE_STL=0"
       CACHE STRING "C++ compiler release-with-debug options" FORCE)
   set(CMAKE_CXX_FLAGS_RELEASE
       "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /Ob2 /Oi /Ot /GF /Gy /arch:SSE2 -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"


cmake: Remove duplicate macro entry.

cmake: Remove duplicate macro entry.

--- extras/buildsystem/cmake/include/vlc_module_funcs.cmake
+++ extras/buildsystem/cmake/include/vlc_module_funcs.cmake
@@ -44,10 +44,6 @@
     set_target_properties(${module_name}_plugin ${ARGN})
 ENDMACRO(vlc_set_module_properties)

-MACRO(vlc_set_module_properties module_name)
-    set_target_properties(${module_name}_plugin ${ARGN})
-ENDMACRO(vlc_set_module_properties)
-
 MACRO(vlc_module_add_link_flags module_name)
     set(VLC_${module_name}_LINK_FLAGS ${VLC_${module_name}_LINK_FLAGS} ${ARGN})
 ENDMACRO(vlc_module_add_link_flags)


boards: up_squared_adsp: Change default flasher

Change default flasher to misc-flasher, allowing to pass
custom flash command.

Signed-off-by: Andrei Emeltchenko <a6565233ddc88e4fb9c66c1d70743223493f2ed4@intel.com>

--- boards/xtensa/up_squared_adsp/board.cmake
+++ boards/xtensa/up_squared_adsp/board.cmake
@@ -1,11 +1,4 @@
 # SPDX-License-Identifier: Apache-2.0

-board_set_flasher_ifnset(intel_s1000)
-board_set_debugger_ifnset(intel_s1000)
-
-board_finalize_runner_args(intel_s1000
-  "--xt-ocd-dir=/opt/tensilica/xocd-12.0.4/xt-ocd"
-  "--ocd-topology=topology_dsp0_flyswatter2.xml"
-  "--ocd-jtag-instr=dsp0_gdb.txt"
-  "--gdb-flash-file=load_elf.txt"
-)
+board_set_flasher_ifnset(misc-flasher)
+board_finalize_runner_args(misc-flasher)


FindGlog: Add support for 'glogd' Debug library (#1479)

Summary:
Glog v0.4.0 when configured with Debug build type adds a 'd' suffix to
the library file. This results in FindGlog.cmake failing to locate it.

Update FindGlog.cmake to use check for 'glogd', and use
select_library_configurations() to set GLOG_LIBRARY to the correct
found filename.

(Note: this has no effect if a non-Debug type is used.)

Pull Request resolved: https://github.com/facebook/folly/pull/1479

Reviewed By: yfeldblum

Differential Revision: D24503510

Pulled By: Orvid

fbshipit-source-id: 705df05a4a3d7df2df8af3bb66c319fb044adbce

--- build/fbcode_builder/CMake/FindGlog.cmake
+++ build/fbcode_builder/CMake/FindGlog.cmake
@@ -7,12 +7,17 @@
 # GLOG_LIBRARIES - link these to use Glog

 include(FindPackageHandleStandardArgs)
+include(SelectLibraryConfigurations)

-find_library(GLOG_LIBRARY glog
+find_library(GLOG_LIBRARY_RELEASE glog
+  PATHS ${GLOG_LIBRARYDIR})
+find_library(GLOG_LIBRARY_DEBUG glogd
   PATHS ${GLOG_LIBRARYDIR})

 find_path(GLOG_INCLUDE_DIR glog/logging.h
   PATHS ${GLOG_INCLUDEDIR})
+
+select_library_configurations(GLOG)

 find_package_handle_standard_args(glog DEFAULT_MSG
   GLOG_LIBRARY


Update to HEXL main (v1.2.3)

Update to HEXL main (v1.2.3)

--- third-party/intel-hexl/intel-hexl.cmake
+++ third-party/intel-hexl/intel-hexl.cmake
@@ -7,7 +7,7 @@
 message(STATUS "INTEL_HEXL_PREBUILT ${INTEL_HEXL_PREBUILT}")

 if (INTEL_HEXL_PREBUILT)  # Skip download from gitlab
-  find_package(HEXL 1.2.2
+  find_package(HEXL 1.2.3
         HINTS ${INTEL_HEXL_HINT_DIR}
         REQUIRED)
   if (NOT TARGET HEXL::hexl)
@@ -27,7 +27,7 @@
     # Download and install Intel HEXL ...
     # ------------------------------------------------------------------------------
     set(INTEL_HEXL_GIT_REPO_URL https://github.com/intel/hexl)
-    set(INTEL_HEXL_GIT_LABEL 1.2.2)
+    set(INTEL_HEXL_GIT_LABEL main) # latest HEXL release is on "main"

     set(INTEL_HEXL_DEBUG OFF) # Set to ON/OFF to toggle debugging
     set(INTEL_HEXL_SHARED_LIB ${BUILD_SHARED}) # Set to ON/OFF to toggle shared library build


CSharp: Fix iOS __Internal thingy. Oops!

--- CMake/Modules/UrhoCommon.cmake
+++ CMake/Modules/UrhoCommon.cmake
@@ -486,9 +486,9 @@
     )
     if (NOT DEFINED SWIG_MODULE_${BIND_TARGET}_DLLIMPORT)
         if (IOS)
+            set (SWIG_MODULE_${BIND_TARGET}_DLLIMPORT __Internal)
+        else ()
             set (SWIG_MODULE_${BIND_TARGET}_DLLIMPORT ${BIND_NATIVE})
-        else ()
-            set (SWIG_MODULE_${BIND_TARGET}_DLLIMPORT __Internal)
         endif ()
     endif ()
     set (SWIG_MODULE_${BIND_TARGET}_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}/${BIND_TARGET}CSharp)


COMP: Add CMAKE_SH definition for Eigen ExternalProject

Required for MinGW-w64 builds, important for Windows and R.

--- CMake/itkExternal_Eigen3.cmake
+++ CMake/itkExternal_Eigen3.cmake
@@ -41,6 +41,7 @@
     "-DCMAKE_INSTALL_DATADIR=${_eigen3_cmake_install_datadir}"
     "-DCMAKE_GENERATOR=${CMAKE_GENERATOR}"
     "-DCMAKE_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET}"
+    "-DCMAKE_SH=${CMAKE_SH}"
     "-DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}"
     "-DCMAKE_GENERATOR_INSTANCE=${CMAKE_GENERATOR_INSTANCE}"
     "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"


Reverting accidentally changed MITK version number.

--- CMake/mitkSetupVariables.cmake
+++ CMake/mitkSetupVariables.cmake
@@ -6,8 +6,8 @@

 # MITK_VERSION
 set(MITK_VERSION_MAJOR "2012")
-set(MITK_VERSION_MINOR "06")
-set(MITK_VERSION_PATCH "00")
+set(MITK_VERSION_MINOR "02")
+set(MITK_VERSION_PATCH "99")
 set(MITK_VERSION_STRING "${MITK_VERSION_MAJOR}.${MITK_VERSION_MINOR}.${MITK_VERSION_PATCH}")
 if(MITK_VERSION_PATCH STREQUAL "99")
   set(MITK_VERSION_STRING "${MITK_VERSION_STRING}-${MITK_REVISION_SHORTID}")


:bug: when installing python extension

:bug: when installing python extension

Bug appears when location variable is empty. It is empty when the extension is
not contained within a package.

--- scripts/PythonModule.cmake
+++ scripts/PythonModule.cmake
@@ -140,7 +140,7 @@
     add_dependencies(${container_target} ${module_target})

     if(${${ext}_INSTALL})
-        install_python(TARGETS ${module_target} DESTINATION ${location})
+        install_python(TARGETS ${module_target} DESTINATION "${location}")
     endif()
 endfunction()


Enforces new policy CMP0054

Enforces new policy CMP0054

For details look at: `cmake --help-policy CMP0054`

This was producing that strings were showing warning deprecation messages
if these had a variable with the same text as a name.

--- modules/FindFFTW3.cmake
+++ modules/FindFFTW3.cmake
@@ -9,6 +9,8 @@
 #                             and PARALLEL: SERIAL, OPENMP, MPI, THREADS.
 #  FFTW3_$KIND_$PARALLEL_LIBRARY - The libraries needed to use.
 #  FFTW3_INCLUDE_DIR_PARALLEL - The FFTW3 include directories for parallels mode.
+
+cmake_policy(SET CMP0054 NEW)

 if(FFTW3_FOUND)
   return()
@@ -79,7 +81,6 @@
     ##   OpenMP
     if(PARALLEL STREQUAL "OPENMP")
       if(OPENMP_C_FLAGS)
-        message(STATUS "OPENMP C Flags: ${OPENMP_C_FLAGS}")
         set_target_properties(fftw3::${kind}::${parallel} PROPERTIES
            IMPORTED_LOCATION "${FFTW3_${KIND}_${PARALLEL}_LIBRARY}"
            INTERFACE_INCLUDE_DIRECTORIES "${FFTW3_INCLUDE_DIR_PARALLEL}"
@@ -89,7 +90,6 @@
     ##  THREADS
     if(PARALLEL STREQUAL "THREADS")
       if(CMAKE_THREAD_LIBS_INIT) # TODO: this is not running
-        message(STATUS "THREAD_LIBS_INITS: ${CMAKE_THREAD_LIBS_INIT}")
         set_target_properties(fftw3::${kind}::${parallel} PROPERTIES
           IMPORTED_LOCATION "${FFTW3_${KIND}_${PARALLEL}_LIBRARY}"
           INTERFACE_INCLUDE_DIRECTORIES "${FFTW3_INCLUDE_DIR_PARALLEL}"


cache math lib result

cache math lib result

--- modules/math_libs.cmake
+++ modules/math_libs.cmake
@@ -332,34 +332,6 @@
 endmacro()

 macro(config_math_service _SERVICE)
-    if(EXISTS $ENV{MATH_ROOT})
-        if("${${_SERVICE}_ROOT}" STREQUAL "")
-            set(${_SERVICE}_ROOT $ENV{MATH_ROOT})
-            message("-- ${_SERVICE} will be searched for based on MATH_ROOT=${${_SERVICE}_ROOT} ")
-        endif()
-    endif()
-
-    if(EXISTS $ENV{${_SERVICE}_ROOT})
-        if("${${_SERVICE}_ROOT}" STREQUAL "")
-            set(${_SERVICE}_ROOT $ENV{${_SERVICE}_ROOT})
-            message("-- ${_SERVICE} will be searched for based on ${_SERVICE}_ROOT=${${_SERVICE}_ROOT}")
-        endif()
-    endif()
-
-    if(EXISTS $ENV{MKL_ROOT})
-        if("${${_SERVICE}_ROOT}" STREQUAL "")
-            set(${_SERVICE}_ROOT $ENV{MKL_ROOT})
-            message("-- ${_SERVICE} will be searched for based on MKL_ROOT=${${_SERVICE}_ROOT}")
-        endif()
-    endif()
-
-    if(EXISTS $ENV{MKLROOT})
-        if("${${_SERVICE}_ROOT}" STREQUAL "")
-            set(${_SERVICE}_ROOT $ENV{MKLROOT})
-            message("-- ${_SERVICE} will be searched for based on MKLROOT=${${_SERVICE}_ROOT}")
-        endif()
-    endif()
-
     if(${_SERVICE}_INCLUDE_DIRS AND ${_SERVICE}_LIBRARIES)
         set(${_SERVICE}_FIND_QUIETLY TRUE)
     endif()
@@ -397,11 +369,6 @@
         find_package_message(${_SERVICE}
             "Found ${_SERVICE}: ${${_SERVICE}_TYPE} (${${_SERVICE}_LIBRARIES})"
             "[${${_SERVICE}_LIBRARIES}]"
-            )
-
-        set(MATH_LIBS
-            ${MATH_LIBS}
-            ${${_SERVICE}_LIBRARIES}
             )
     else()
         add_definitions(-DUSE_BUILTIN_${_SERVICE})
@@ -446,8 +413,6 @@
         message(FATAL_ERROR "Invalid ${_service} library linker language: ${${_service}_LANG}")
     endif()
 endforeach()
-
-set(MATH_LIBS)

 if(NOT MKL_FLAG STREQUAL "off")
     set(EXTERNAL_LIBS ${EXTERNAL_LIBS} -mkl=${MKL_FLAG})
@@ -459,17 +424,57 @@
     add_definitions(-DHAVE_MKL_LAPACK)
     set(BLAS_FOUND TRUE)
     set(LAPACK_FOUND TRUE)
-endif()
-
-if(ENABLE_BLAS STREQUAL "auto" OR ENABLE_LAPACK STREQUAL "auto" AND NOT ${_service}_FOUND)
-    message(STATUS "Math lib search order is ${MATH_LIB_SEARCH_ORDER}")
-endif()
-
-foreach(_service BLAS LAPACK)
-    if(ENABLE_${_service} STREQUAL "auto" AND NOT ${_service}_FOUND)
-        config_math_service(${_service})
-        if(${_service}_FOUND)
-            include_directories(${${_service}_INCLUDE_DIRS})
-        endif()
-    endif()
-endforeach()
+
+    # workaround to avoid warning for unused vars
+    set(_unused ${ENABLE_BLAS})
+    set(_unused ${ENABLE_LAPACK})
+    set(_unused ${MATH_LIB_SEARCH_ORDER})
+    unset(_unused)
+endif()
+
+if("${MATH_LIBS}" STREQUAL "" AND "${MKL_FLAG}" STREQUAL "off")
+    foreach(_service BLAS LAPACK)
+        if(ENABLE_${_service} STREQUAL "auto")
+            if(EXISTS $ENV{MATH_ROOT})
+                if("${${_service}_ROOT}" STREQUAL "")
+                    set(${_service}_ROOT $ENV{MATH_ROOT})
+                    message(STATUS "${_service} will be searched for based on MATH_ROOT=${${_service}_ROOT} ")
+                endif()
+            endif()
+
+            if(EXISTS $ENV{${_service}_ROOT})
+                if("${${_service}_ROOT}" STREQUAL "")
+                    set(${_service}_ROOT $ENV{${_service}_ROOT})
+                    message(STATUS "${_service} will be searched for based on ${_service}_ROOT=${${_service}_ROOT}")
+                endif()
+            endif()
+
+            if(EXISTS $ENV{MKL_ROOT})
+                if("${${_service}_ROOT}" STREQUAL "")
+                    set(${_service}_ROOT $ENV{MKL_ROOT})
+                    message(STATUS "${_service} will be searched for based on MKL_ROOT=${${_service}_ROOT}")
+                endif()
+            endif()
+
+            if(EXISTS $ENV{MKLROOT})
+                if("${${_service}_ROOT}" STREQUAL "")
+                    set(${_service}_ROOT $ENV{MKLROOT})
+                    message(STATUS "${_service} will be searched for based on MKLROOT=${${_service}_ROOT}")
+                endif()
+            endif()
+
+            message(STATUS "Searching for ${_service} using search order ${MATH_LIB_SEARCH_ORDER}")
+            config_math_service(${_service})
+            if(${_service}_FOUND)
+                include_directories(${${_service}_INCLUDE_DIRS})
+            endif()
+        endif()
+    endforeach()
+endif()
+
+set(MATH_LIBS
+    ${MATH_LIBS}
+    ${BLAS_LIBRARIES}
+    ${LAPACK_LIBRARIES}
+    CACHE STRING "Math libraries"
+    )


Switch to slow but reliable non-parallel builds because parallel
builds for wxwidgets have proved to be unreliable both historically
and recently (presumably due to some parallel build race conditions
for wxwidgets that intermittently produce bad results depending on who
wins the race).

svn path=/trunk/; revision=12384

--- cmake/build_projects/wxwidgets/bp.cmake
+++ cmake/build_projects/wxwidgets/bp.cmake
@@ -43,23 +43,29 @@
   determine_msys_path(BP_PATH "${BP_PATH}")
   # Must have all elements of env command in MSYS platform form
   determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  # This flag is still necessary to keep ld step from exhausting
+  # memory with MinGW.  See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43601
+  # for discussion of this.  Apparently the issue was fixed for
+  # MinGW-4.6, but it appears to be back for 4.7.2.
+  set(${BP_PACKAGE}_SET_CXXFLAGS "CXXFLAGS=-fno-keep-inline-dllexport")
 else(MSYS_PLATFORM)
   set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CXXFLAGS)
 endif(MSYS_PLATFORM)
 #message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")

-# The fno-keep-inline-dllexport flag required to work around
-# the memory exhaustion issue discussed in
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43601
-# Still have memory exhaustion issues if you combine that
-# with -O3 so do not use the -O3 optimization flag.
+# Got intermittent failures using ${BP_PARALLEL_MAKE} both
+# historically and recently which are likely due to a parallel make
+# race condition for wxwidgets.  So I have decided to use
+# slow but sure ${BP_MAKE_COMMAND} instead.
+
 ExternalProject_Add(
   build_${BP_PACKAGE}
   URL ${${BP_PACKAGE}_URL}
   URL_MD5 ${${BP_PACKAGE}_URL_MD5}
-  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} CXXFLAGS=-fno-keep-inline-dllexport ${source_PATH}/${BP_CONFIGURE_COMMAND} --enable-shared --enable-unicode --enable-debug --enable-debug_gdb
-  BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND}
-  INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} install
+  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CXXFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND} --enable-shared --enable-unicode --enable-debug --enable-debug_gdb
+  BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_MAKE_COMMAND}
+  INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_MAKE_COMMAND} install
   )

 list(APPEND build_target_LIST build_${BP_PACKAGE})


fix fasm2frames call

fix fasm2frames call

Signed-off-by: Alessandro Comodi <622632e70fd6771cf2cd943f69e5e51ab66adef8@antmicro.com>

--- xc/common/cmake/arch_define.cmake
+++ xc/common/cmake/arch_define.cmake
@@ -137,10 +137,10 @@
         \${PLACE_CONSTR_TOOL_EXTRA_ARGS}"
     BITSTREAM_EXTENSION frames
     BIN_EXTENSION bit
-    FASM_TO_BIT ${PRJRAY_DIR}/prjxray/fasm2frames.py
+    FASM_TO_BIT ${symbiflow-arch-defs_BINARY_DIR}/env/conda/bin/fasm2frames
     FASM_TO_BIT_CMD "${CMAKE_COMMAND} -E env \
     PYTHONPATH=${symbiflow-arch-defs_BINARY_DIR}/env/conda/lib/python3.7/site-packages:${PRJRAY_DIR}:${PRJRAY_DIR}/third_party/fasm \
-    \${PYTHON3} \${FASM_TO_BIT} \
+    \${FASM_TO_BIT} \
         --db-root ${PRJRAY_DB_DIR}/${PRJRAY_ARCH} \
         --sparse \
         --emit_pudc_b_pullup \


retrieve correctly the SDK

retrieve correctly the SDK

--- toolchain/mac.cmake
+++ toolchain/mac.cmake
@@ -1,7 +1,9 @@
 # set target architecture, possible values: armv7, armv6 or arm64
 set(IOS_TARGET_ARCH arm64)
 # set SDK path, should be ok on default installation
-set(CMAKE_IOS_SDK_ROOT /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk)
+execute_process(COMMAND /usr/bin/xcrun -sdk iphoneos --show-sdk-path
+                OUTPUT_VARIABLE CMAKE_IOS_SDK_ROOT
+                OUTPUT_STRIP_TRAILING_WHITESPACE)
 # set path of ranlib tool
 set(RANLIB_PATH /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib)


step7

--- jump/step7/source.cmake
+++ jump/step7/source.cmake
@@ -1,17 +1,17 @@
 SET(SOURCE
-    main.h
-    main.c
-    common.h
-    common.c
-    network.h
-    network.c
-    typedef.h
-    hash.h
-    hash.c
-    link.h
-    link.c
-    msg.h
-    msg.c
-    library.h
-    library.c
+    ${CMAKE_CURRENT_LIST_DIR}/main.h
+    ${CMAKE_CURRENT_LIST_DIR}/main.c
+    ${CMAKE_CURRENT_LIST_DIR}/common.h
+    ${CMAKE_CURRENT_LIST_DIR}/common.c
+    ${CMAKE_CURRENT_LIST_DIR}/network.h
+    ${CMAKE_CURRENT_LIST_DIR}/network.c
+    ${CMAKE_CURRENT_LIST_DIR}/typedef.h
+    ${CMAKE_CURRENT_LIST_DIR}/hash.h
+    ${CMAKE_CURRENT_LIST_DIR}/hash.c
+    ${CMAKE_CURRENT_LIST_DIR}/link.h
+    ${CMAKE_CURRENT_LIST_DIR}/link.c
+    ${CMAKE_CURRENT_LIST_DIR}/msg.h
+    ${CMAKE_CURRENT_LIST_DIR}/msg.c
+    ${CMAKE_CURRENT_LIST_DIR}/library.h
+    ${CMAKE_CURRENT_LIST_DIR}/library.c
 )


fix to handle library wihtout specifying shared or static

--- CMake/Wk/WkBuild.cmake
+++ CMake/Wk/WkBuild.cmake
@@ -164,9 +164,11 @@

 	if(${project_type} STREQUAL "LIBRARY")
 		add_library(${PROJECT_NAME} ${load_type} ${SOURCES})
+		if ( load_type )
 		if(${load_type} STREQUAL "SHARED")
 			set_target_properties(${PROJECT_NAME} PROPERTIES DEFINE_SYMBOL "WK_SHAREDLIB_BUILD")
 		endif(${load_type} STREQUAL "SHARED")
+		endif (load_type)
 	endif(${project_type} STREQUAL "LIBRARY")
 	if(${project_type} STREQUAL "EXECUTABLE")
 		add_executable(${PROJECT_NAME} ${SOURCES})


Fix typo in FindHACD.cmake

Fix typo in FindHACD.cmake

--- indra/cmake/FindHACD.cmake
+++ indra/cmake/FindHACD.cmake
@@ -6,7 +6,7 @@
 #  HACD_LIBRARY, the library needed to use HACD.
 #  HACD_FOUND, If false, do not try to use HACD.

-find_path(HACD_INCLUDE_DIR hadHACD.h
+find_path(HACD_INCLUDE_DIR hacdHACD.h
   PATH_SUFFIXES hacd
   )


Remark Daniel brackets

Remark Daniel brackets

--- CommonLibrary.cmake
+++ CommonLibrary.cmake
@@ -50,8 +50,8 @@
       get_filename_component(PUBLIC_HEADER ${PUBLIC_HEADER} NAME)
     endif()
     if(NOT PUBLIC_HEADER MATCHES "defines.+\\.h" AND
-        PUBLIC_HEADER MATCHES ".*\\.h$" OR
-        PUBLIC_HEADER MATCHES ".*\\.hpp$")
+        (PUBLIC_HEADER MATCHES ".*\\.h$" OR
+        PUBLIC_HEADER MATCHES ".*\\.hpp$"))

       file(APPEND ${PROJECT_GENERATED_HEADER}
         "#include <${PROJECT_INCLUDE_NAME}/${PUBLIC_HEADER}>\n")


[CMake] Cleaning up flags for Darwin builtins

* Setting CMAKE_*_FLAGS_${BUILD_TYPE} isn't really needed since we're setting the same value everywhere
* functions sanitize variables differently from macros, darwin_add_embedded_builtin_libraries should be a macro otherwise it won't alter the variables.

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

--- cmake/Modules/CompilerRTDarwinUtils.cmake
+++ cmake/Modules/CompilerRTDarwinUtils.cmake
@@ -255,16 +255,7 @@
 macro(darwin_add_builtin_libraries)
   set(DARWIN_EXCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Darwin-excludes)

-  if(CMAKE_CONFIGURATION_TYPES)
-    foreach(type ${CMAKE_CONFIGURATION_TYPES})
-      set(CMAKE_C_FLAGS_${type} -O3)
-      set(CMAKE_CXX_FLAGS_${type} -O3)
-    endforeach()
-  else()
-    set(CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE} -O3)
-  endif()
-
-  set(CMAKE_C_FLAGS "-fvisibility=hidden -DVISIBILITY_HIDDEN -Wall -fomit-frame-pointer")
+  set(CMAKE_C_FLAGS "-O3 -fvisibility=hidden -DVISIBILITY_HIDDEN -Wall -fomit-frame-pointer")
   set(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS})
   set(CMAKE_ASM_FLAGS ${CMAKE_C_FLAGS})

@@ -343,7 +334,7 @@
   darwin_add_embedded_builtin_libraries()
 endmacro()

-function(darwin_add_embedded_builtin_libraries)
+macro(darwin_add_embedded_builtin_libraries)
   # this is a hacky opt-out. If you can't target both intel and arm
   # architectures we bail here.
   set(DARWIN_SOFT_FLOAT_ARCHS armv6m armv7m armv7em armv7)
@@ -363,16 +354,8 @@
   endif()

   set(MACHO_SYM_DIR ${CMAKE_CURRENT_SOURCE_DIR}/macho_embedded)
-  if(CMAKE_CONFIGURATION_TYPES)
-    foreach(type ${CMAKE_CONFIGURATION_TYPES})
-      set(CMAKE_C_FLAGS_${type} -Oz)
-      set(CMAKE_CXX_FLAGS_${type} -Oz)
-    endforeach()
-  else()
-    set(CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE} -Oz)
-  endif()
-
-  set(CMAKE_C_FLAGS "-Wall -fomit-frame-pointer -ffreestanding")
+
+  set(CMAKE_C_FLAGS "-Oz -Wall -fomit-frame-pointer -ffreestanding")
   set(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS})
   set(CMAKE_ASM_FLAGS ${CMAKE_C_FLAGS})

@@ -390,8 +373,6 @@
     ${COMPILER_RT_INSTALL_PATH}/lib/macho_embedded)

   set(CFLAGS_armv7 "-target thumbv7-apple-darwin-eabi")
-  set(CFLAGS_armv7em "-target thumbv7-apple-darwin-eabi")
-  set(CFLAGS_armv7m "-target thumbv7-apple-darwin-eabi")
   set(CFLAGS_i386 "-march=pentium")

   darwin_read_list_from_file(common_FUNCTIONS ${MACHO_SYM_DIR}/common.txt)
@@ -450,4 +431,4 @@
                     INSTALL_DIR ${DARWIN_macho_embedded_LIBRARY_INSTALL_DIR})
     endforeach()
   endforeach()
-endfunction()
+endmacro()


CMake: Verbosely error out in DEAL_II_ADD_TEST if build types do not match

--- cmake/macros/macro_deal_ii_add_test.cmake
+++ cmake/macros/macro_deal_ii_add_test.cmake
@@ -48,6 +48,13 @@
 #  - valid build configurations
 #  - expected test stage
 #
+# This macro expects the CMAKE_BUILD_TYPE to be either "Debug", "Release",
+# or "DebugRelease". For the first two build types, this macro will set up
+# one test (linking against the corresponding deal.II library variant). In
+# case of the build type "DebugRelease" two tests against both library
+# variants will be set up. This macro throws a FATAL_ERROR if the deal.II
+# installation does not support the requested library variant(s).
+#
 # The following variables must be set:
 #
 #   NUMDIFF_EXECUTABLE, DIFF_EXECUTABLE
@@ -117,16 +124,32 @@
   ENDIF()

   #
-  # Determine for which build types a test should be defined. Every deal.II
-  # build type (given by the list DEAL_II_BUILD_TYPES) that is a  (case
-  # insensitive) substring of CMAKE_BUILD_TYPE:
-  #
-  SET(_build_types "")
-  FOREACH(_build ${DEAL_II_BUILD_TYPES})
-    STRING(TOLOWER ${_build} _build_lowercase)
-    STRING(TOLOWER ${CMAKE_BUILD_TYPE} _cmake_build_type)
-    IF("${_cmake_build_type}" MATCHES "${_build_lowercase}")
-      LIST(APPEND _build_types ${_build})
+  # Determine for which build types a test should be defined.
+  #
+  # Every deal.II build type (given by the list DEAL_II_BUILD_TYPES) that
+  # is a (case insensitive) substring of CMAKE_BUILD_TYPE:
+  #
+  IF("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+    SET(_build_types DEBUG)
+  ELSEIF("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+    SET(_build_types RELEASE)
+  ELSEIF("${CMAKE_BUILD_TYPE}" STREQUAL "DebugRelease")
+    SET(_build_types DEBUG RELEASE)
+  ELSE()
+    MESSAGE(FATAL_ERROR
+      "\nDEAL_II_ADD_TEST requires CMAKE_BUILD_TYPE to be set to "
+      "\"Debug\", \"Release\", or \"DebugRelease\"\n\n"
+      )
+  ENDIF()
+
+  FOREACH(_build ${_build_types})
+    LIST(FIND DEAL_II_BUILD_TYPES ${_build} _match)
+    IF("${_match}" STREQUAL "-1")
+      MESSAGE(FATAL_ERROR
+        "\nDEAL_II_ADD_TEST cannot set up a test with CMAKE_BUILD_TYPE "
+        "\"${CMAKE_BUILD_TYPE}\". deal.II was build with CMAKE_BUILD_TYPE "
+        "\"${DEAL_II_BUILD_TYPE}\"\n\n"
+        )
     ENDIF()
   ENDFOREACH()


Bump internal micro version

Bump internal micro version

So that we're in sync with libdnf.spec and the CI test checking this
passes.

--- VERSION.cmake
+++ VERSION.cmake
@@ -1,4 +1,4 @@
 set (LIBDNF_MAJOR_VERSION 0)
 set (LIBDNF_MINOR_VERSION 35)
-set (LIBDNF_MICRO_VERSION 5)
+set (LIBDNF_MICRO_VERSION 6)
 set (LIBDNF_VERSION ${LIBDNF_MAJOR_VERSION}.${LIBDNF_MINOR_VERSION}.${LIBDNF_MICRO_VERSION})


The next release of SimpleITK will be 1.0

Update the CMake version file to indicate the targeted release
version.

Change-Id: Ia0514599f879036410956bf9b7616d365437ea65

--- Version.cmake
+++ Version.cmake
@@ -1,15 +1,15 @@
 #
 # ONLY MODIFY TO CHANGE VERSION
 #
-# The number of commits since last this file has changed it used to
+# The number of commits since last this file has changed is used to
 # define "dev" and "post", modification of this file will reset that
 # version.
 #

 # Version info

-set(SimpleITK_VERSION_MAJOR 0)
-set(SimpleITK_VERSION_MINOR 11)
+set(SimpleITK_VERSION_MAJOR 1)
+set(SimpleITK_VERSION_MINOR 0)
 set(SimpleITK_VERSION_PATCH 0)
 #set(SimpleITK_VERSION_TWEAK "")


Update CMake CUDA flags to build code for Ampere architectures

--- CMake/GOMCCUDASetup.cmake
+++ CMake/GOMCCUDASetup.cmake
@@ -43,7 +43,7 @@
     set_target_properties(GPU_NVT PROPERTIES
         CUDA_SEPARABLE_COMPILATION ON
         OUTPUT_NAME ${GPU_NVT_name}
-        CUDA_ARCHITECTURES "35;60;70"
+        CUDA_ARCHITECTURES "35;60;70;80"
         COMPILE_FLAGS "${GPU_NVT_flags}")
 	if (CMAKE_BUILD_TYPE STREQUAL "Debug")
 		message("-- Debug build type detected, GPU_NVT setting CUDA_RESOLVE_DEVICE_SYMBOLS ON")
@@ -63,7 +63,7 @@
     set_target_properties(GPU_GEMC PROPERTIES
         CUDA_SEPARABLE_COMPILATION ON
         OUTPUT_NAME ${GPU_GE_name}
-        CUDA_ARCHITECTURES "35;60;70"
+        CUDA_ARCHITECTURES "35;60;70;80"
         COMPILE_FLAGS "${GPU_GE_flags}")
 	if (CMAKE_BUILD_TYPE STREQUAL "Debug")
 		message("-- Debug build type detected, GPU_GEMC setting CUDA_RESOLVE_DEVICE_SYMBOLS ON")
@@ -83,7 +83,7 @@
     set_target_properties(GPU_GCMC PROPERTIES
         CUDA_SEPARABLE_COMPILATION ON
         OUTPUT_NAME ${GPU_GC_name}
-        CUDA_ARCHITECTURES "35;60;70"
+        CUDA_ARCHITECTURES "35;60;70;80"
         COMPILE_FLAGS "${GPU_GC_flags}")
 	if (CMAKE_BUILD_TYPE STREQUAL "Debug")
 		message("-- Debug build type detected, GPU_GCMC setting CUDA_RESOLVE_DEVICE_SYMBOLS ON")
@@ -103,7 +103,7 @@
     set_target_properties(GPU_NPT PROPERTIES
         CUDA_SEPARABLE_COMPILATION ON
         OUTPUT_NAME ${GPU_NPT_name}
-        CUDA_ARCHITECTURES "35;60;70"
+        CUDA_ARCHITECTURES "35;60;70;80"
         COMPILE_FLAGS "${GPU_NPT_flags}")
 	if (CMAKE_BUILD_TYPE STREQUAL "Debug")
 		message("-- Debug build type detected, GPU_NPT setting CUDA_RESOLVE_DEVICE_SYMBOLS ON")


ENH: tinkering with zlib

ENH: tinkering with zlib

--- CMakeExternals/zlib.cmake
+++ CMakeExternals/zlib.cmake
@@ -4,8 +4,12 @@
 # Set dependency list
 set(${proj}_DEPENDENCIES "")

+message("===> Building zlib!")
+
 # Include dependent projects if any
 ExternalProject_Include_Dependencies(${proj} PROJECT_VAR proj DEPENDS_VAR ${proj}_DEPENDENCIES)
+
+message("===> Building zlib after dependencies!")

 if(${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
   message("===> Using system zlib!")
@@ -21,7 +25,7 @@
 endif()

 if(NOT DEFINED zlib_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
-  message("HERE")
+  message("zlib HERE")
   if(NOT DEFINED git_protocol)
     set(git_protocol "git")
   endif()


PKG: mute output of zip compress

PKG: mute output of zip compress

--- SuperBuild/Packaging/PMacros.cmake
+++ SuperBuild/Packaging/PMacros.cmake
@@ -34,7 +34,7 @@
    set(OTB_INSTALL_DIR              \"${OTB_INSTALL_DIR}\")
    set(PACKAGE_SUPPORT_FILES_DIR    \"${OTB_SOURCE_DIR}/SuperBuild/Packaging/Files\")
    set(CMAKE_INSTALL_PREFIX         \"${CMAKE_INSTALL_PREFIX}\")
-   set(ITK_VERSION_STRING           \"${cache_ITK_VERSION_STRING}\")
+   set(ITK_VERSION_STRING           \"${ITK_VERSION_STRING}\")
    set(PKG_GENERATE_XDK              ${PKG_GENERATE_XDK})
    ${EXTRA_CACHE_CONFIG}
    include(\"${SUPERBUILD_SOURCE_DIR}/Packaging/PackageHelper.cmake\")
@@ -106,7 +106,7 @@
   if(WIN32)
     add_custom_target(PACKAGE-${pkg}
       COMMAND ${ZIP_EXECUTABLE}
-      "-r" "${CMAKE_BINARY_DIR}/${archive_name}.zip" "${archive_name}"
+      "-rq" "${CMAKE_BINARY_DIR}/${archive_name}.zip" "${archive_name}"
       WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}"
       DEPENDS PACKAGE-${pkg}-build
       )


Automatic dicovery for -flto ON/OFF using CMake

--- cmake/flags.cmake
+++ cmake/flags.cmake
@@ -1,16 +1,19 @@
 set(F_CPU 11059200)
 set(CAN_BAUDRATE 204800)

-option(WITH_LTO
-	"Use Link Time Optimizations" ON
-)
-
-if (WITH_LTO)
+# In relation to GCC Bugzilla – Bug 59396
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59396
+# Using gcc with link time optimizations when compiling code with ISR functions
+# leads to gcc throwing a warning by mistake in some versions.
+# This bug should be fixed in gcc version 4.8.3
+execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
+			OUTPUT_VARIABLE GCC_VERSION)
+if (GCC_VERSION VERSION_LESS 4.8.3)
+	message(STATUS "Compiling with out Link Time Optimizations - LTO OFF")
+else()
 	set(LTO "-flto")
 	message(STATUS "Compiling with Link Time Optimizations - LTO ON")
-else()
-	message(STATUS "Compiling with out Link Time Optimizations - LTO OFF")
-endif (WITH_LTO)
+endif()

 # Name of target Micro Controller Unit
 # see the available avr-gcc mmcu options for possible values


Fix path to rosunit (still need to remove it from catkin eventually).

--- cmake/tests.cmake
+++ cmake/tests.cmake
@@ -91,7 +91,7 @@
   # Create a legal test name, in case the target name has slashes in it
   string(REPLACE "/" "_" _testname ${file})
   # We use rostest to call the executable to get process control, #1629
-  append_test_to_cache(catkin-tests "${_chdir_prefix} ${rosunit_exe} --name=${_testname} --time-limit=${_pyunit_TIMEOUT} --package=${PROJECT_NAME} -- ${_file_name} ${_covarg} ${_chdir_suffix}")
+  append_test_to_cache(catkin-tests "${_chdir_prefix} ${ROSUNIT_EXE} --name=${_testname} --time-limit=${_pyunit_TIMEOUT} --package=${PROJECT_NAME} -- ${_file_name} ${_covarg} ${_chdir_suffix}")
 endfunction()

 function(add_gtest exe)
@@ -119,7 +119,7 @@
   string(REPLACE "/" "_" _testname ${exe})
   get_target_property(_exe_path ${exe} RUNTIME_OUTPUT_DIRECTORY)
   # We use rosunit to call the executable to get process control, #1629, #3112
-  append_test_to_cache(catkin-tests "${_chdir_prefix} ${rosunit_exe} --name=${_testname} --time-limit=${_gtest_TIMEOUT} --package=${PROJECT_NAME} ${_exe_path}/${exe} ${_chdir_suffix}")
+  append_test_to_cache(catkin-tests "${_chdir_prefix} ${ROSUNIT_EXE} --name=${_testname} --time-limit=${_gtest_TIMEOUT} --package=${PROJECT_NAME} ${_exe_path}/${exe} ${_chdir_suffix}")
 endfunction()

 function(add_nosetests dir)


Define most plugin tests with add_standard_plugin_tests

--- worker/plugin.cmake
+++ worker/plugin.cmake
@@ -1,13 +1 @@
-get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME)
-
-add_python_test(worker PLUGIN ${PLUGIN})
-
-add_python_style_test(
-    python_static_analysis_${PLUGIN} "${PROJECT_SOURCE_DIR}/plugins/${PLUGIN}/server")
-add_python_style_test(
-    python_static_analysis_${PLUGIN}_tests "${PROJECT_SOURCE_DIR}/plugins/${PLUGIN}/plugin_tests")
-
-add_eslint_test(${PLUGIN}
-    "${PROJECT_SOURCE_DIR}/plugins/${PLUGIN}/web_client")
-add_puglint_test(${PLUGIN}
-    "${PROJECT_SOURCE_DIR}/plugins/${PLUGIN}/web_client/templates")
+add_standard_plugin_tests()


Fix "multiple target" ninja error

Fix "multiple target" ninja error

--- CommonCPPCTest.cmake
+++ CommonCPPCTest.cmake
@@ -50,23 +50,24 @@
     list(APPEND ALL_CPP_TESTS ${PROJECT_NAME}_${NAME})
   endif()

-  add_executable(${PROJECT_NAME}_${NAME} ${FILE})
-  set_target_properties(${PROJECT_NAME}_${NAME} PROPERTIES
-    FOLDER "Tests" OUTPUT_NAME ${NAME})
+  set(TEST_NAME ${PROJECT_NAME}_${NAME})
+  if(NOT TARGET ${NAME}) # Create target without project prefix if possible
+    set(TEST_NAME ${NAME})
+  endif()

-  if(NOT TARGET ${NAME}) # Create target without project prefix if possible
-    add_custom_target(${NAME} DEPENDS ${PROJECT_NAME}_${NAME})
-  endif()
+  add_executable(${TEST_NAME} ${FILE})
+  set_target_properties(${TEST_NAME} PROPERTIES FOLDER "Tests"
+    OUTPUT_NAME ${NAME})

   # Per target INCLUDE_DIRECTORIES if supported
   if(CMAKE_VERSION VERSION_GREATER 2.8.7 AND ${NAME}_INCLUDE_DIRECTORIES)
-    set_target_properties(${PROJECT_NAME}_${NAME} PROPERTIES
+    set_target_properties(${TEST_NAME} PROPERTIES
       INCLUDE_DIRECTORIES "${${NAME}_INCLUDE_DIRECTORIES}")
   endif()

   # Test link libraries
-  target_link_libraries(${PROJECT_NAME}_${NAME}
-                    ${${NAME}_LINK_LIBRARIES} ${TEST_LIBRARIES})
+  target_link_libraries(${TEST_NAME}
+    ${${NAME}_LINK_LIBRARIES} ${TEST_LIBRARIES})
   # Per target test command customisation with
   # ${NAME}_TEST_PREFIX and ${NAME}_TEST_ARGS
   set(RUN_PREFIX ${TEST_PREFIX})
@@ -78,13 +79,13 @@
     set(RUN_ARGS ${${NAME}_TEST_ARGS})
   endif()

-  add_test(NAME ${PROJECT_NAME}_${NAME}
-    COMMAND ${RUN_PREFIX} $<TARGET_FILE:${PROJECT_NAME}_${NAME}> ${RUN_ARGS})
+  add_test(NAME ${TEST_NAME}
+    COMMAND ${RUN_PREFIX} $<TARGET_FILE:${TEST_NAME}> ${RUN_ARGS})

   # Add test labels
   set(TEST_LABELS ${TEST_LABEL} ${${NAME}_TEST_LABEL})
   if(TEST_LABELS)
-    set_tests_properties(${PROJECT_NAME}_${NAME} PROPERTIES
+    set_tests_properties(${TEST_NAME} PROPERTIES
       LABELS "${TEST_LABELS}")
   endif()
 endforeach()


Remove the cmake lua version string test

--- cmake/lua.cmake
+++ cmake/lua.cmake
@@ -1,10 +1,7 @@
-message(STATUS "Looking for Lua >= 5.1")
+message(STATUS "Looking for Lua")
 find_package(Lua QUIET)
 if((NOT ${LUA_FOUND}) OR (NOT DEFINED LUA_INCLUDE_DIR) OR (${LUA_INCLUDE_DIR} MATCHES "LUA_INCLUDE_DIR-NOTFOUND"))
     message(FATAL_ERROR "Lua was not found but is required")
-endif()
-if(${LUA_VERSION_STRING} VERSION_LESS "5.1")
-    message(FATAL_ERROR "Lua version 5.1 or higher is required")
 endif()
 message(STATUS "Found Lua")
 message(STATUS "  Lua include ${LUA_INCLUDE_DIR}")


forward build with openmp to STIR

forward build with openmp to STIR

--- SuperBuild/External_STIR.cmake
+++ SuperBuild/External_STIR.cmake
@@ -61,6 +61,7 @@
         -DCMAKE_INSTALL_PREFIX=${STIR_Install_Dir}
         -DGRAPHICS=None
         -DCMAKE_CXX_STANDARD=11
+        -DSTIR_OPENMP=${BUILD_STIR_WITH_OPENMP}
         # Use 2 variables for ROOT to cover multiple STIR versions
         -DDISABLE_CERN_ROOT_SUPPORT=ON -DDISABLE_CERN_ROOT=ON
    )


Update VMTK to latest version

Update VMTK to latest version

Fixes crashes in centerline computation.

The changes should fix these issues:
https://github.com/vmtk/SlicerExtension-VMTK/issues/41
https://github.com/vmtk/vmtk/issues/382
https://github.com/vmtk/vmtk/issues/430
https://github.com/vmtk/vmtk/issues/431

--- SuperBuild/External_VMTK.cmake
+++ SuperBuild/External_VMTK.cmake
@@ -50,7 +50,7 @@

   ExternalProject_SetIfNotDefined(
     ${CMAKE_PROJECT_NAME}_${proj}_GIT_TAG
-    "27e3784dde5c2e8ad6a4ef21edfd50c72763fcdf"
+    "1373d5b841a49f376f5f21bd3aeb21e831f7571c"
     QUIET
     )


Fix Boost pkg condition for min cmake ver(3.5) (#2737)

* Fix Boost pkg condition for min cmake ver(3.5)

--- CMakeModules/boost_package.cmake
+++ CMakeModules/boost_package.cmake
@@ -7,9 +7,16 @@

 find_package(Boost)

-if(NOT (   Boost_VERSION        VERSION_GREATER_EQUAL 107000
-        OR Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.70
-        OR Boost_VERSION_MACRO  VERSION_GREATER_EQUAL 107000))
+set(Boost_MIN_VER 107000)
+set(Boost_MIN_VER_STR "1.70")
+
+if(NOT
+  ((Boost_VERSION VERSION_GREATER Boost_MIN_VER OR
+    Boost_VERSION VERSION_EQUAL Boost_MIN_VER) OR
+   (Boost_VERSION_STRING VERSION_GREATER Boost_MIN_VER_STR OR
+    Boost_VERSION_STRING VERSION_EQUAL Boost_MIN_VER_STR) OR
+   (Boost_VERSION_MACRO VERSION_GREATER Boost_MIN_VER OR
+    Boost_VERSION_MACRO VERSION_EQUAL Boost_MIN_VER)))
   set(VER 1.70.0)
   set(MD5 e160ec0ff825fc2850ea4614323b1fb5)
   include(ExternalProject)


CUDA needs certain features that are not enabled by default in clang -.-

--- cmake/clang.cmake
+++ cmake/clang.cmake
@@ -1,6 +1,6 @@
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -fPIC -DUNIX -pedantic -std=c99 ${OpenMP_C_FLAGS}")

-set(COMMON_CXX_FLAGS "-Wall -Wno-narrowing -Wno-non-pod-varargs -pedantic -fPIC -DUNIX -D_GNU_SOURCE -D_LIN${BITS} ${OpenMP_CXX_FLAGS}")
+set(COMMON_CXX_FLAGS "-Wall -Wno-narrowing -Wno-non-pod-varargs -pedantic -fPIC -DUNIX -D_GNU_SOURCE -D_LIN${BITS} -fsized-deallocation ${OpenMP_CXX_FLAGS}")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS} -DDEBUG -D_DEBUG -g -ggdb")
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${COMMON_CXX_FLAGS} -DNDEBUG -D_NDEBUG -O3 -g0")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS} -DNDEBUG -D_NDEBUG -O3 -g")


CMake: Correct macOS framework linking (#6522)

target_link_libraries correctly consider "-framework <library>"
as a library, instead of a flag; lets use that instead of
target_link_options.

--- cmake/flags.cmake
+++ cmake/flags.cmake
@@ -141,18 +141,6 @@
       )

       set(macos_cxx_link_options
-        "SHELL:-framework AppKit"
-        "SHELL:-framework Foundation"
-        "SHELL:-framework CoreServices"
-        "SHELL:-framework CoreFoundation"
-        "SHELL:-framework CoreWLAN"
-        "SHELL:-framework CoreGraphics"
-        "SHELL:-framework DiskArbitration"
-        "SHELL:-framework IOKit"
-        "SHELL:-framework OpenDirectory"
-        "SHELL:-framework Security"
-        "SHELL:-framework ServiceManagement"
-        "SHELL:-framework SystemConfiguration"
         -stdlib=libc++
         -lresolv
       )
@@ -163,6 +151,18 @@
         bsm
         xar
         c++abi
+        "-framework AppKit"
+        "-framework Foundation"
+        "-framework CoreServices"
+        "-framework CoreFoundation"
+        "-framework CoreWLAN"
+        "-framework CoreGraphics"
+        "-framework DiskArbitration"
+        "-framework IOKit"
+        "-framework OpenDirectory"
+        "-framework Security"
+        "-framework ServiceManagement"
+        "-framework SystemConfiguration"
       )

       set(osquery_macos_common_defines


avoid build directories in target.cmake INTERFACE_INCLUDE_DIRECTORIES

--- modules/xpfunmac.cmake
+++ modules/xpfunmac.cmake
@@ -749,7 +749,7 @@
       list(APPEND liblist "${${PKG}_LIBRARIES}")
     endif()
     if(DEFINED ${PKG}_INCLUDE_DIR)
-      list(APPEND incdirs "${${PKG}_INCLUDE_DIR}")
+      list(APPEND incdirs "$<BUILD_INTERFACE:${${PKG}_INCLUDE_DIR}>")
     endif()
   endif()
   set(${_libList} ${liblist} PARENT_SCOPE)


additional download support

additional download support

* for projects with multiple downloads
* see issue https://github.com/smanders/externpro/issues/26

--- modules/xpfunmac.cmake
+++ modules/xpfunmac.cmake
@@ -126,14 +126,22 @@
 endfunction()

 function(ipDownload)
-  set(oneValueArgs DLURL DLMD5 DLNAME)
+  set(oneValueArgs DLURL DLMD5 DLNAME DLDIR)
   cmake_parse_arguments(P "" "${oneValueArgs}" "" ${ARGN})
   if(DEFINED P_DLNAME)
     set(fn ${P_DLNAME})
   else()
     get_filename_component(fn ${P_DLURL} NAME)
   endif()
-  set(pkgPath ${DWNLD_DIR}/${fn})
+  if(DEFINED P_DLDIR)
+    if(IS_ABSOLUTE ${P_DLDIR})
+      set(pkgPath ${P_DLDIR}/${fn})
+    else()
+      set(pkgPath ${DWNLD_DIR}/${P_DLDIR}/${fn})
+    endif()
+  else()
+    set(pkgPath ${DWNLD_DIR}/${fn})
+  endif()
   if(NOT TARGET download_${fn})
     add_custom_target(download_${fn} ALL)
     add_custom_command(TARGET download_${fn}
@@ -146,18 +154,35 @@
   endif()
 endfunction()

+function(ipDownloadAdditional add)
+  set(oneValueArgs DLURL${add} DLMD5${add} DLDIR${add})
+  cmake_parse_arguments(X "" "${oneValueArgs}" "" ${ARGN})
+  if(DEFINED X_DLURL${add} AND DEFINED X_DLMD5${add})
+    if(DEFINED X_DLDIR${add})
+      set(downloadDir DLDIR ${X_DLDIR${add}})
+    endif()
+    ipDownload(DLURL ${X_DLURL${add}} DLMD5 ${X_DLMD5${add}} ${downloadDir})
+  endif()
+endfunction()
+
 function(xpDownloadProject)
   set(oneValueArgs DLURL DLMD5)
-  cmake_parse_arguments(R "" "${oneValueArgs}" "" ${ARGN})
+  set(multiValueArgs DLADD)
+  cmake_parse_arguments(R "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
   if(DEFINED R_DLURL AND DEFINED R_DLMD5)
     ipDownload(${ARGN})
+  endif()
+  if(DEFINED R_DLADD)
+    foreach(add ${R_DLADD})
+      ipDownloadAdditional(${add} ${ARGN})
+    endforeach()
   endif()
 endfunction()

 function(ipPatch)
   set(options NPM_INSTALL)
   set(oneValueArgs NAME PARENT SUBDIR PATCH PATCH_STRIP DLURL DLMD5 DLNAME)
-  set(multiValueArgs NPM_FLAGS SIBLINGS)
+  set(multiValueArgs NPM_FLAGS SIBLINGS DLADD)
   cmake_parse_arguments(P "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
   string(TOLOWER ${P_NAME} prj)
   if(DEFINED P_PARENT)
@@ -238,6 +263,41 @@
       )
   endif()
   set_property(TARGET ${tgt} PROPERTY FOLDER ${src_folder})
+  # additional things to download (no extract/patch support, yet)
+  if(DEFINED P_DLADD)
+    foreach(add ${P_DLADD})
+      ipPatchAdditional(${tgt} ${add} ${ARGN})
+    endforeach()
+  endif()
+endfunction()
+
+function(ipPatchAdditional tgt add)
+  set(oneValueArgs DLURL${add} DLMD5${add} DLDIR${add} DLNAME${add})
+  cmake_parse_arguments(X "" "${oneValueArgs}" "" ${ARGN})
+  if(DEFINED X_DLURL${add} AND DEFINED X_DLMD5${add})
+    if(DEFINED X_DLNAME${add})
+      set(fn ${X_DLNAME${add}})
+    else()
+      get_filename_component(fn ${X_DLURL${add}} NAME)
+    endif()
+    if(DEFINED X_DLDIR${add})
+      if(IS_ABSOLUTE ${X_DLDIR${add}})
+        set(pkgPath ${X_DLDIR${add}}/${fn})
+      else()
+        set(pkgPath ${DWNLD_DIR}/${X_DLDIR${add}}/${fn})
+      endif()
+    else()
+      set(pkgPath ${DWNLD_DIR}/${fn})
+    endif()
+    ExternalProject_Add_Step(${tgt} ${tgt}_download_${fn}
+      COMMAND ${CMAKE_COMMAND} -Dpkg_url:STRING=${X_DLURL${add}}
+        -Dpkg_md5:STRING=${X_DLMD5${add}}
+        -Dpkg_dir:STRING=${pkgPath}
+        -P ${MODULES_DIR}/cmsdownload.cmake
+      DEPENDEES download
+      DEPENDERS patch
+      )
+  endif()
 endfunction()

 function(xpPatchProject)


rename, enhance classified repo cmake

rename, enhance classified repo cmake

* sdClassifiedRepo renamed to xpClassifiedRepo and uses cmake_parse_arguments
* xpClassifiedRepo sets XP_CLAS_REPO with PARENT_SCOPE
  * makes this cmake variable visible to calling cmake and subdirectories below calling cmake
  * which makes cmake variable CLASSIFIED_BUILD kind of redundant and unnecessary, so removed
  * CLASS_BUILD definition removed (unnecessary and avoids a global definition)
  * if code needs a definition (CLASS_BUILD) it can do so itself where it needs it
    if(DEFINED XP_CLAS_REPO)
      add_definition(-DCLASS_BUILD)
    endif()
  * used by xpClassifiedSrc and xpClassifiedSrcExc functions
* classified_src cmake macro renamed to xpClassifiedSrc and made a cmake function
* classified_exclusive_src cmake macro renamed to xpClassifiedSrcExc and made a cmake function

see issue https://github.com/smanders/externpro/issues/180

--- modules/xpfunmac.cmake
+++ modules/xpfunmac.cmake
@@ -1297,53 +1297,70 @@
   endif()
 endfunction()

-function(sdClassifiedRepo repo hash dir)
-  # details from VantageShared removed...
-  if(${repo} STREQUAL "isr.git")
-    if(EXISTS ${repo_path}/${repo} AND IS_DIRECTORY ${repo_path}/${repo})
-      set(CLASSIFIED_BUILD ON PARENT_SCOPE)
+function(xpClassifiedRepo)
+  set(options VERBOSE)
+  set(oneValueArgs REPO HASH WORKING_TREE PATH_UNIX PATH_MSW)
+  cmake_parse_arguments(P "${options}" "${oneValueArgs}" "" ${ARGN})
+  if(NOT DEFINED P_REPO OR NOT DEFINED P_HASH OR NOT DEFINED P_WORKING_TREE)
+    message(FATAL_ERROR "xpClassifiedRepo: REPO, HASH, and WORKING_TREE must be specified")
+  endif()
+  if(WIN32 OR CYGWIN)
+    if(NOT DEFINED P_PATH_MSW)
+      message(FATAL_ERROR "xpClassifiedRepo: PATH_MSW must be specified")
+    endif()
+    set(repoPath ${P_PATH_MSW})
+  else()
+    if(NOT DEFINED P_PATH_UNIX)
+      message(FATAL_ERROR "xpClassifiedRepo: PATH_UNIX must be specified")
+    endif()
+    set(repoPath ${P_PATH_UNIX})
+  endif()
+  if(EXISTS ${repoPath}/${P_REPO} AND IS_DIRECTORY ${repoPath}/${P_REPO})
+    if(P_VERBOSE)
       message(STATUS "=====================================================================")
       message(STATUS " Classified repo found. Classified build configuration proceeding... ")
       message(STATUS "=====================================================================")
-      xpGitCheckout(${repo_path}/${repo} ${hash} ${dir})
-      add_definitions(-DCLASS_BUILD)
-    else()
-      message(STATUS "Unclassified build, repo not accessible: ${repo_path}/${repo}")
-    endif()
-  elseif(EXISTS ${repo_path}/${repo} AND IS_DIRECTORY ${repo_path}/${repo})
-    xpGitCheckout(${repo_path}/${repo} ${hash} ${dir})
-  endif()
-endfunction()
-
-macro(classified_src srcGroup srcList)
-  file(RELATIVE_PATH rel_path ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+    endif()
+    xpGitCheckout(${repoPath}/${P_REPO} ${P_HASH} ${P_WORKING_TREE})
+    # make XP_CLAS_REPO available to xpClassifiedSrc and xpClassifiedSrcExc via PARENT_SCOPE
+    set(XP_CLAS_REPO ${P_WORKING_TREE} PARENT_SCOPE)
+  elseif(P_VERBOSE)
+    message(STATUS "Unclassified build, repo not accessible: ${repoPath}/${P_REPO}")
+  endif()
+endfunction()
+
+function(xpClassifiedSrc srcGroup srcList)
+  file(RELATIVE_PATH relPath ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
   foreach(f ${srcList})
-    if(EXISTS ${clas_repo}/${rel_path}/${f})
-      list(APPEND ${srcGroup} ${clas_repo}/${rel_path}/${f})
-      message(STATUS " CLAS: ${clas_repo}/${rel_path}/${f}")
+    if(DEFINED XP_CLAS_REPO AND EXISTS ${XP_CLAS_REPO}/${relPath}/${f})
+      list(APPEND ${srcGroup} ${XP_CLAS_REPO}/${relPath}/${f})
+      message(STATUS " CLAS: ${XP_CLAS_REPO}/${relPath}/${f}")
     else()
       list(APPEND ${srcGroup} ${f})
-      if(EXISTS ${clas_repo})
+      if(DEFINED XP_CLAS_REPO AND EXISTS ${XP_CLAS_REPO})
         message(STATUS " UNCLAS: ${CMAKE_CURRENT_SOURCE_DIR}/${f}")
       endif()
     endif()
   endforeach()
-endmacro()
-
-macro(classified_exclusive_src srcGroup srcList)
-  file(RELATIVE_PATH rel_path ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-  if(EXISTS ${clas_repo}/${rel_path} AND IS_DIRECTORY ${clas_repo}/${rel_path})
-    include_directories(${clas_repo}/${rel_path})
+  set(${srcGroup} ${${srcGroup}} PARENT_SCOPE)
+endfunction()
+
+# exclusive: source only in classified repo, no unclassified version
+function(xpClassifiedSrcExc srcGroup srcList)
+  file(RELATIVE_PATH relPath ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+  if(DEFINED XP_CLAS_REPO AND EXISTS ${XP_CLAS_REPO}/${relPath} AND IS_DIRECTORY ${XP_CLAS_REPO}/${relPath})
+    include_directories(${XP_CLAS_REPO}/${relPath})
   endif()
   foreach(f ${srcList})
-    if(EXISTS ${clas_repo}/${rel_path}/${f})
-      list(APPEND ${srcGroup} ${clas_repo}/${rel_path}/${f})
-      message(STATUS " CLAS_EXCL: ${clas_repo}/${rel_path}/${f}")
-    elseif(EXISTS ${clas_repo})
-      message(STATUS " MISSING: ${clas_repo}/${rel_path}/${f}")
+    if(EXISTS ${XP_CLAS_REPO}/${relPath}/${f})
+      list(APPEND ${srcGroup} ${XP_CLAS_REPO}/${relPath}/${f})
+      message(STATUS " CLAS_EXCL: ${XP_CLAS_REPO}/${relPath}/${f}")
+    elseif(EXISTS ${XP_CLAS_REPO})
+      message(STATUS " MISSING: ${XP_CLAS_REPO}/${relPath}/${f}")
     endif()
   endforeach()
-endmacro()
+  set(${srcGroup} ${${srcGroup}} PARENT_SCOPE)
+endfunction()

 function(xpPostBuildCopy theTarget copyList toPath)
   if(IS_ABSOLUTE ${toPath}) # absolute toPath


Update pyfftw version to match on all OSes

--- versions.cmake
+++ versions.cmake
@@ -66,8 +66,8 @@
     URL_MD5 "c9c60d3f28df1c9d545152734350f9ba")
 else()
   add_revision(pyfftw
-    URL "http://www.paraview.org/files/dependencies/pyFFTW-0.9.2.tar.gz"
-    URL_MD5 34fcbc68afb8ebe5f040a02a8d20d565)
+    URL "https://www.tomviz.org/files/pyFFTW-0.10.4.tar.gz"
+    URL_HASH "SHA512=6848133e30a02ee51bb86613f53a5fdbf9b5a0fea3cab01b8ca7d365f924a966ac9b94f4ed62979d418f9f847369f8c50568ca855e472035fa37e86e630fb9fd" )
 endif()

 add_revision(qt


eds-I#120 - Fails to build with libasan using Clang (undefined symbols)

Related to https://gitlab.gnome.org/GNOME/evolution-data-server/issues/120

--- cmake/modules/SetupBuildFlags.cmake
+++ cmake/modules/SetupBuildFlags.cmake
@@ -78,8 +78,8 @@
 	endif(CMAKE_CXX_COMPILER_ID)

 	if(("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") AND (NOT ${CMAKE_SYSTEM_NAME} MATCHES "BSD"))
-		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-undefined")
-		set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined")
-		set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
+		set(CMAKE_EXE_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_EXE_LINKER_FLAGS}")
+		set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_MODULE_LINKER_FLAGS}")
+		set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}")
 	endif(("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") AND (NOT ${CMAKE_SYSTEM_NAME} MATCHES "BSD"))
 endmacro()


Fix issue #77

Fix issue #77

Add default option 'BUILD_SHARED_LIBS=OFF'

--- cmake/modules/hunter_download.cmake
+++ cmake/modules/hunter_download.cmake
@@ -166,6 +166,15 @@

   # Do not lock hunter directory if package is internal (already locked)
   file(APPEND "${HUNTER_DOWNLOAD_TOOLCHAIN}" "set(HUNTER_SKIP_LOCK YES)\n")
+
+  # Force building of static libraries:
+  # * https://github.com/ruslo/hunter/issues/77
+  file(
+      APPEND
+      "${HUNTER_DOWNLOAD_TOOLCHAIN}"
+      "set(BUILD_SHARED_LIBS OFF CACHE BOOL \"\" FORCE)\n"
+  )
+
   file(
       APPEND
       "${HUNTER_DOWNLOAD_TOOLCHAIN}"


Print value of CMAKE_GENERATOR_TOOLSET

Print value of CMAKE_GENERATOR_TOOLSET

--- cmake/modules/hunter_download.cmake
+++ cmake/modules/hunter_download.cmake
@@ -557,6 +557,7 @@
   )
   string(COMPARE NOTEQUAL "${CMAKE_GENERATOR_TOOLSET}" "" has_toolset)
   if(has_toolset)
+    hunter_status_debug("Add toolset: '${CMAKE_GENERATOR_TOOLSET}'")
     list(APPEND cmd "-T" "${CMAKE_GENERATOR_TOOLSET}")
   endif()


Update msgpack-c package to doesn't compile examples and tests

--- cmake/projects/msgpack/hunter.cmake
+++ cmake/projects/msgpack/hunter.cmake
@@ -13,7 +13,7 @@
   URL
   "https://github.com/hunter-packages/msgpack-c/archive/cpp-1.4.1-hunter-p1.tar.gz"
   SHA1
-  55e5ea871ca5fcbf1be204219cd77da237662360
+  5074d28857661693b71c4bda3f8fc662e4c73990
   )

 hunter_pick_scheme(DEFAULT url_sha1_cmake)


Fixed support for cmake 2.8

Fixed support for cmake 2.8

--- cmake_modules/CMakeRunTargets.cmake
+++ cmake_modules/CMakeRunTargets.cmake
@@ -48,7 +48,8 @@

 if(NOT ${DEFINES} STREQUAL "")
 #message("Adding defines ${DEFINES} to ${ALLO_APP_NAME_SUFFIX}")
-target_compile_definitions("${ALLO_APP_NAME_SUFFIX}" PUBLIC "${DEFINES}")
+#target_compile_definitions("${ALLO_APP_NAME_SUFFIX}" PUBLIC "${DEFINES}")
+set_target_properties("${ALLO_APP_NAME_SUFFIX}" PROPERTIES COMPILE_DEFINITIONS "${DEFINES}")
 endif()

 if(EXISTS "${SOURCE_DIR}/flags.cmake")


fixing travis testing

fixing travis testing

Former-commit-id: 65e7505da3106578c66e3dca86384283f1b5f8ab

--- cmake_modules/Fetch_Arpack-ng.cmake
+++ cmake_modules/Fetch_Arpack-ng.cmake
@@ -3,7 +3,7 @@

 message(STATUS "SEARCHING FOR ARPACK IN SYSTEM...")
 find_library(ARPACK_LIBRARIES
-        NAMES "arpack" "libarpack.a"
+        NAMES "arpack" "libarpack.a" "libarpack.so"
         PATH_SUFFIXES "lib" "lib32" "lib64"
         )

@@ -26,11 +26,11 @@
             -DCMAKE_C_FLAGS=-w
 #            -DCMAKE_CXX_FLAGS=-w
 #            -DCMAKE_FORTRAN_FLAGS=-w
-            -DEXAMPLES=OFF
+            -DEXAMPLES=ON
 #            -DCOVERALLS=OFF
             -DCMAKE_BUILD_TYPE=Release
             -DMPI=OFF
-            -DBUILD_SHARED_LIBS=OFF
+            -DBUILD_SHARED_LIBS=ON
 #            -DICB=OFF
             -DBLAS_LIBRARIES:PATH=${BLAS_LIBRARIES}
             -DLAPACK_LIBRARIES:PATH=${LAPACK_LIBRARIES}
@@ -41,7 +41,7 @@
     set(ARPACK_INCLUDE_DIRS ${INSTALL_DIR}/include)
     add_library(arpack UNKNOWN IMPORTED)
     set_target_properties(arpack PROPERTIES
-            IMPORTED_LOCATION ${INSTALL_DIR}/lib/libarpack${CMAKE_STATIC_LIBRARY_SUFFIX}
+            IMPORTED_LOCATION ${INSTALL_DIR}/lib/libarpack${CMAKE_SHARED_LIBRARY_SUFFIX}
             INTERFACE_LINK_LIBRARIES "${GFORTRAN_LIB};${BLAS_LIBRARIES};${LAPACK_LIBRARIES}"
             INCLUDE_DIRECTORIES ${INSTALL_DIR}/include)
     add_dependencies(arpack library_ARPACK)


Update hunter.cmake

Update hunter.cmake

--- cmake/projects/puffin-buffer/hunter.cmake
+++ cmake/projects/puffin-buffer/hunter.cmake
@@ -30,8 +30,6 @@

 hunter_pick_scheme(DEFAULT url_sha1_cmake)

-hunter_cmake_args(puffin-buffer)
-
 hunter_cmake_args(
     puffin-buffer
     CMAKE_ARGS


[#83] Run conan from the binary dir

[#83] Run conan from the binary dir

--- 3rdParty/conan.cmake
+++ 3rdParty/conan.cmake
@@ -1,9 +1,9 @@
 execute_process(
-    COMMAND conan install --build=outdated
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    COMMAND conan install ${CMAKE_SOURCE_DIR}/3rdParty --build=outdated
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 )

-include(${CMAKE_SOURCE_DIR}/conanbuildinfo.cmake)
+include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
 conan_basic_setup()
 conan_define_targets()
 include(${CONAN_CMAKE-UTILS_ROOT}/conan.cmake)


minor improvements for logging and documentation

--- ctest_ext.cmake
+++ ctest_ext.cmake
@@ -28,18 +28,18 @@
     return()
 endif()
 set(CTEST_EXT_INCLUDED TRUE)
-set(CTEST_EXT_VERSION  0.3)
+set(CTEST_EXT_VERSION  0.4)

 include(CMakeParseArguments)

 ##################################################################################
-# Check commands
+# Variables management commands
 ##################################################################################

 #
 # set_ifndef(<variable> <value>)
 #
-#   Sets <variable> to the value <value>, only if the <variable> is not defined.
+#   Sets `<variable>` to the `<value>`, only if the `<variable>` is not defined.
 #
 function(set_ifndef VAR)
     if(NOT DEFINED ${VAR})
@@ -92,7 +92,7 @@
 #
 # check_if_matches(<variable> <regexp1> <regexp2> ...)
 #
-#   Checks that <variable> matches one of the regular expression from the input list.
+#   Checks that `<variable>` matches one of the regular expression from the input list.
 #
 function(check_if_matches VAR)
     check_vars_def(${VAR})
@@ -110,15 +110,122 @@
     endif()
 endfunction()

+##################################################################################
+# Logging commands
+##################################################################################
+
 #
 # ctest_ext_info(<message>)
 #
-#   Prints <message> to standard output with [CTEST EXT INFO] prefix for better visibility.
+#   Prints `<message>` to standard output with `[CTEST EXT INFO]` prefix for better visibility.
 #
 function(ctest_ext_info)
     message("[CTEST EXT INFO] ${ARGN}")
 endfunction()

+#
+# ctest_ext_note(<message>)
+#
+#   Writes `<message>` both to console and to note file.
+#   The function appends `[CTEST EXT NOTE]` prefix to console output for better visibility.
+#   The note file is used in submit command.
+#
+#   The command will be available after `ctest_ext_start` call.
+#
+#   `CTEST_NOTES_LOG_FILE` variable must be defined.
+#
+function(ctest_ext_note)
+    check_vars_def(CTEST_NOTES_LOG_FILE)
+
+    message("[CTEST EXT NOTE] ${ARGN}")
+    file(APPEND "${CTEST_NOTES_LOG_FILE}" "${ARGN}\n")
+endfunction()
+
+#
+# ctest_ext_dump_notes()
+#
+#   Dumps all CTest Ext launch options to note file.
+#   This is an internal function, which is used by `ctest_ext_start`.
+#
+function(ctest_ext_dump_notes)
+    ctest_ext_info("==========================================================================")
+    ctest_ext_info("CTest configuration information")
+    ctest_ext_info("==========================================================================")
+
+    get_git_repo_info("${CTEST_SOURCE_DIRECTORY}" CTEST_CURRENT_BRANCH CTEST_CURRENT_REVISION)
+
+    ctest_ext_note("Configuration for CTest submission:")
+    ctest_ext_note("")
+
+    ctest_ext_note("CTEST_EXT_VERSION                     : ${CTEST_EXT_VERSION}")
+    ctest_ext_note("CTEST_PROJECT_NAME                    : ${CTEST_PROJECT_NAME}")
+    ctest_ext_note("")
+
+    ctest_ext_note("CTEST_TARGET_SYSTEM                   : ${CTEST_TARGET_SYSTEM}")
+    ctest_ext_note("CTEST_MODEL                           : ${CTEST_MODEL}")
+    ctest_ext_note("")
+
+    ctest_ext_note("CTEST_SITE                            : ${CTEST_SITE}")
+    ctest_ext_note("CTEST_BUILD_NAME                      : ${CTEST_BUILD_NAME}")
+    ctest_ext_note("")
+
+    ctest_ext_note("CTEST_DASHBOARD_ROOT                  : ${CTEST_DASHBOARD_ROOT}")
+    ctest_ext_note("CTEST_SOURCE_DIRECTORY                : ${CTEST_SOURCE_DIRECTORY}")
+    ctest_ext_note("CTEST_BINARY_DIRECTORY                : ${CTEST_BINARY_DIRECTORY}")
+    ctest_ext_note("CTEST_NOTES_LOG_FILE                  : ${CTEST_NOTES_LOG_FILE}")
+    ctest_ext_note("")
+
+    ctest_ext_note("CTEST_WITH_UPDATE                     : ${CTEST_WITH_UPDATE}")
+    ctest_ext_note("CTEST_GIT_COMMAND                     : ${CTEST_GIT_COMMAND}")
+    ctest_ext_note("CTEST_PROJECT_GIT_URL                 : ${CTEST_PROJECT_GIT_URL}")
+    ctest_ext_note("CTEST_PROJECT_GIT_BRANCH              : ${CTEST_PROJECT_GIT_BRANCH}")
+    ctest_ext_note("CTEST_CURRENT_BRANCH                  : ${CTEST_CURRENT_BRANCH}")
+    ctest_ext_note("CTEST_CURRENT_REVISION                : ${CTEST_CURRENT_REVISION}")
+    ctest_ext_note("")
+
+    ctest_ext_note("CTEST_UPDATE_CMAKE_CACHE              : ${CTEST_UPDATE_CMAKE_CACHE}")
+    ctest_ext_note("CTEST_EMPTY_BINARY_DIRECTORY          : ${CTEST_EMPTY_BINARY_DIRECTORY}")
+    ctest_ext_note("CTEST_WITH_TESTS                      : ${CTEST_WITH_TESTS}")
+    ctest_ext_note("CTEST_TEST_TIMEOUT                    : ${CTEST_TEST_TIMEOUT}")
+    ctest_ext_note("CTEST_WITH_MEMCHECK                   : ${CTEST_WITH_MEMCHECK}")
+    ctest_ext_note("CTEST_WITH_COVERAGE                   : ${CTEST_WITH_COVERAGE}")
+    ctest_ext_note("CTEST_WITH_GCOVR                      : ${CTEST_WITH_GCOVR}")
+    ctest_ext_note("CTEST_WITH_LCOV                       : ${CTEST_WITH_LCOV}")
+    ctest_ext_note("CTEST_WITH_SUBMIT                     : ${CTEST_WITH_SUBMIT}")
+    ctest_ext_note("")
+
+    ctest_ext_note("CTEST_CMAKE_GENERATOR                 : ${CTEST_CMAKE_GENERATOR}")
+    ctest_ext_note("CTEST_CONFIGURATION_TYPE              : ${CTEST_CONFIGURATION_TYPE}")
+    ctest_ext_note("CTEST_CMAKE_OPTIONS                   : ${CTEST_CMAKE_OPTIONS}")
+    ctest_ext_note("CTEST_BUILD_FLAGS                     : ${CTEST_BUILD_FLAGS}")
+    ctest_ext_note("")
+
+    ctest_ext_note("CTEST_MEMORYCHECK_COMMAND             : ${CTEST_MEMORYCHECK_COMMAND}")
+    ctest_ext_note("CTEST_MEMORYCHECK_SUPPRESSIONS_FILE   : ${CTEST_MEMORYCHECK_SUPPRESSIONS_FILE}")
+    ctest_ext_note("CTEST_MEMORYCHECK_COMMAND_OPTIONS     : ${CTEST_MEMORYCHECK_COMMAND_OPTIONS}")
+    ctest_ext_note("")
+
+    ctest_ext_note("CTEST_COVERAGE_COMMAND                : ${CTEST_COVERAGE_COMMAND}")
+    ctest_ext_note("CTEST_COVERAGE_EXTRA_FLAGS            : ${CTEST_COVERAGE_EXTRA_FLAGS}")
+    ctest_ext_note("")
+
+    ctest_ext_note("CTEST_GCOVR_EXECUTABLE                : ${CTEST_GCOVR_EXECUTABLE}")
+    ctest_ext_note("CTEST_GCOVR_EXTRA_FLAGS               : ${CTEST_GCOVR_EXTRA_FLAGS}")
+    ctest_ext_note("CTEST_GCOVR_REPORT_DIR                : ${CTEST_GCOVR_REPORT_DIR}")
+    ctest_ext_note("")
+
+    ctest_ext_note("CTEST_LCOV_EXECUTABLE                 : ${CTEST_LCOV_EXECUTABLE}")
+    ctest_ext_note("CTEST_LCOV_EXTRA_FLAGS                : ${CTEST_LCOV_EXTRA_FLAGS}")
+    ctest_ext_note("CTEST_GENHTML_EXECUTABLE              : ${CTEST_GENHTML_EXECUTABLE}")
+    ctest_ext_note("CTEST_GENTHML_EXTRA_FLAGS             : ${CTEST_GENTHML_EXTRA_FLAGS}")
+    ctest_ext_note("CTEST_LCOV_REPORT_DIR                 : ${CTEST_LCOV_REPORT_DIR}")
+    ctest_ext_note("")
+
+    ctest_ext_note("CTEST_NOTES_FILES                     : ${CTEST_NOTES_FILES}")
+    ctest_ext_note("CTEST_UPLOAD_FILES                    : ${CTEST_UPLOAD_FILES}")
+    ctest_ext_note("")
+endfunction()
+
 ##################################################################################
 # System commands
 ##################################################################################
@@ -126,7 +233,7 @@
 #
 # create_tmp_dir(<output_variable> [BASE_DIR <path to base temp directory>])
 #
-#   Creates temporary directory and returns path to it via <output_variable>.
+#   Creates temporary directory and returns path to it via `<output_variable>`.
 #
 #   `BASE_DIR` can be used to specify location for base temporary path,
 #   if it is not defined `TEMP`, `TMP` or `TMPDIR` environment variables will be used.
@@ -496,113 +603,6 @@
 endfunction()

 ##################################################################################
-# CTest Logging commands
-##################################################################################
-
-#
-# ctest_ext_note(<message>)
-#
-#   Writes <message> both to console and to note file.
-#   The function appends "[CTEST EXT NOTE]" prefix to console output for better visibility.
-#   The note file is used in submit command.
-#
-#   The command will be available after `ctest_ext_start` call.
-#
-#   `CTEST_NOTES_LOG_FILE` variable must be defined.
-#
-function(ctest_ext_note)
-    check_vars_def(CTEST_NOTES_LOG_FILE)
-
-    message("[CTEST EXT NOTE] ${ARGN}")
-    file(APPEND "${CTEST_NOTES_LOG_FILE}" "${ARGN}\n")
-endfunction()
-
-#
-# ctest_ext_dump_notes()
-#
-#   Dumps all launch options to note file.
-#   This is an internal function, which is used by `ctest_ext_start`.
-#
-function(ctest_ext_dump_notes)
-    ctest_ext_info("==========================================================================")
-    ctest_ext_info("CTest configuration information")
-    ctest_ext_info("==========================================================================")
-
-    get_git_repo_info("${CTEST_SOURCE_DIRECTORY}" CTEST_CURRENT_BRANCH CTEST_CURRENT_REVISION)
-
-    ctest_ext_note("Configuration for CTest submission:")
-    ctest_ext_note("")
-
-    ctest_ext_note("CTEST_EXT_VERSION                     : ${CTEST_EXT_VERSION}")
-    ctest_ext_note("CTEST_PROJECT_NAME                    : ${CTEST_PROJECT_NAME}")
-    ctest_ext_note("")
-
-    ctest_ext_note("CTEST_TARGET_SYSTEM                   : ${CTEST_TARGET_SYSTEM}")
-    ctest_ext_note("CTEST_MODEL                           : ${CTEST_MODEL}")
-    ctest_ext_note("")
-
-    ctest_ext_note("CTEST_SITE                            : ${CTEST_SITE}")
-    ctest_ext_note("CTEST_BUILD_NAME                      : ${CTEST_BUILD_NAME}")
-    ctest_ext_note("")
-
-    ctest_ext_note("CTEST_DASHBOARD_ROOT                  : ${CTEST_DASHBOARD_ROOT}")
-    ctest_ext_note("CTEST_SOURCE_DIRECTORY                : ${CTEST_SOURCE_DIRECTORY}")
-    ctest_ext_note("CTEST_BINARY_DIRECTORY                : ${CTEST_BINARY_DIRECTORY}")
-    ctest_ext_note("CTEST_NOTES_LOG_FILE                  : ${CTEST_NOTES_LOG_FILE}")
-    ctest_ext_note("")
-
-    ctest_ext_note("CTEST_WITH_UPDATE                     : ${CTEST_WITH_UPDATE}")
-    ctest_ext_note("CTEST_GIT_COMMAND                     : ${CTEST_GIT_COMMAND}")
-    ctest_ext_note("CTEST_PROJECT_GIT_URL                 : ${CTEST_PROJECT_GIT_URL}")
-    ctest_ext_note("CTEST_PROJECT_GIT_BRANCH              : ${CTEST_PROJECT_GIT_BRANCH}")
-    ctest_ext_note("CTEST_CURRENT_BRANCH                  : ${CTEST_CURRENT_BRANCH}")
-    ctest_ext_note("CTEST_CURRENT_REVISION                : ${CTEST_CURRENT_REVISION}")
-    ctest_ext_note("")
-
-    ctest_ext_note("CTEST_UPDATE_CMAKE_CACHE              : ${CTEST_UPDATE_CMAKE_CACHE}")
-    ctest_ext_note("CTEST_EMPTY_BINARY_DIRECTORY          : ${CTEST_EMPTY_BINARY_DIRECTORY}")
-    ctest_ext_note("CTEST_WITH_TESTS                      : ${CTEST_WITH_TESTS}")
-    ctest_ext_note("CTEST_TEST_TIMEOUT                    : ${CTEST_TEST_TIMEOUT}")
-    ctest_ext_note("CTEST_WITH_MEMCHECK                   : ${CTEST_WITH_MEMCHECK}")
-    ctest_ext_note("CTEST_WITH_COVERAGE                   : ${CTEST_WITH_COVERAGE}")
-    ctest_ext_note("CTEST_WITH_GCOVR                      : ${CTEST_WITH_GCOVR}")
-    ctest_ext_note("CTEST_WITH_LCOV                       : ${CTEST_WITH_LCOV}")
-    ctest_ext_note("CTEST_WITH_SUBMIT                     : ${CTEST_WITH_SUBMIT}")
-    ctest_ext_note("")
-
-    ctest_ext_note("CTEST_CMAKE_GENERATOR                 : ${CTEST_CMAKE_GENERATOR}")
-    ctest_ext_note("CTEST_CONFIGURATION_TYPE              : ${CTEST_CONFIGURATION_TYPE}")
-    ctest_ext_note("CTEST_CMAKE_OPTIONS                   : ${CTEST_CMAKE_OPTIONS}")
-    ctest_ext_note("CTEST_BUILD_FLAGS                     : ${CTEST_BUILD_FLAGS}")
-    ctest_ext_note("")
-
-    ctest_ext_note("CTEST_MEMORYCHECK_COMMAND             : ${CTEST_MEMORYCHECK_COMMAND}")
-    ctest_ext_note("CTEST_MEMORYCHECK_SUPPRESSIONS_FILE   : ${CTEST_MEMORYCHECK_SUPPRESSIONS_FILE}")
-    ctest_ext_note("CTEST_MEMORYCHECK_COMMAND_OPTIONS     : ${CTEST_MEMORYCHECK_COMMAND_OPTIONS}")
-    ctest_ext_note("")
-
-    ctest_ext_note("CTEST_COVERAGE_COMMAND                : ${CTEST_COVERAGE_COMMAND}")
-    ctest_ext_note("CTEST_COVERAGE_EXTRA_FLAGS            : ${CTEST_COVERAGE_EXTRA_FLAGS}")
-    ctest_ext_note("")
-
-    ctest_ext_note("CTEST_GCOVR_EXECUTABLE                : ${CTEST_GCOVR_EXECUTABLE}")
-    ctest_ext_note("CTEST_GCOVR_EXTRA_FLAGS               : ${CTEST_GCOVR_EXTRA_FLAGS}")
-    ctest_ext_note("CTEST_GCOVR_REPORT_DIR                : ${CTEST_GCOVR_REPORT_DIR}")
-    ctest_ext_note("")
-
-    ctest_ext_note("CTEST_LCOV_EXECUTABLE                 : ${CTEST_LCOV_EXECUTABLE}")
-    ctest_ext_note("CTEST_LCOV_EXTRA_FLAGS                : ${CTEST_LCOV_EXTRA_FLAGS}")
-    ctest_ext_note("CTEST_GENHTML_EXECUTABLE              : ${CTEST_GENHTML_EXECUTABLE}")
-    ctest_ext_note("CTEST_GENTHML_EXTRA_FLAGS             : ${CTEST_GENTHML_EXTRA_FLAGS}")
-    ctest_ext_note("CTEST_LCOV_REPORT_DIR                 : ${CTEST_LCOV_REPORT_DIR}")
-    ctest_ext_note("")
-
-    ctest_ext_note("CTEST_NOTES_FILES                     : ${CTEST_NOTES_FILES}")
-    ctest_ext_note("CTEST_UPLOAD_FILES                    : ${CTEST_UPLOAD_FILES}")
-    ctest_ext_note("")
-endfunction()
-
-##################################################################################
 # CTest Ext Initialize
 ##################################################################################

@@ -930,7 +930,7 @@
         ctest_ext_info("Test")
         ctest_ext_info("==========================================================================")

-        ctest_ext_info("Parameters : ${ARGN}")
+        ctest_ext_info("ctest_test parameters : ${ARGN}")
         ctest_test(${ARGN})
     endif()
 endfunction()
@@ -1000,7 +1000,7 @@
         ctest_ext_info("MemCheck")
         ctest_ext_info("==========================================================================")

-        ctest_ext_info("Parameters : ${ARGN}")
+        ctest_ext_info("ctest_memcheck parameters : ${ARGN}")
         ctest_memcheck(${ARGN})
     endif()
 endfunction()


ENH: Remove confusing script that was written at the time where GDCM was build using autotools...

--- CMake/FindGDCM.cmake
+++ CMake/FindGDCM.cmake
@@ -1,229 +0,0 @@
-#
-# This module finds if GDCM is installed and determines where the
-# include files and libraries are. It also determines what the name of
-# the library is. This code sets the following variables:
-# For more info on this library go to:
-#
-#        http://www.creatis.insa-lyon.fr/Public/Gdcm/
-#
-#  GDCM_FOUND             = system has GDCM and it should be used
-#  GDCM_LIBRARIES         = full path to the GDCM library and linker flags on unix
-#  CMAKE_GDCM_CXX_FLAGS   = compiler flags for building GDCM
-#  GDCM_INCLUDE_DIR       = include path of GDCM
-#
-#
-#   NOTE: That GDCM *MUST* be build as a shared library
-#         because it its distributed under a LGPL license.
-#         This is currently the only way for using GDCM
-#         at a open license level similar to ITK.
-#
-#
-#
-IF(WIN32)
-  IF(NOT UNIX)
-
-  SET (GDCM_POSSIBLE_LIB_PATHS
-    /usr/lib
-    /usr/local/lib
-    $ENV{HOME}/local/lib
-    $ENV{CREATIS}/gdcm/lib/Release
-    $ENV{CREATIS}/gdcm/lib/Debug
-    $ENV{CREATIS}/gdcm/lib/
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\gdcmPython-py2.2;UninstallString]\\..\\lib"
-    "C:\\gdcm\\lib"
-  )
-
-  FIND_LIBRARY(GDCM_STATIC_LIBRARY
-    NAMES gdcm gdcmdll
-    PATHS ${GDCM_POSSIBLE_LIB_PATHS}
-  )
-
-  FIND_LIBRARY(GDCM_SHARED_LIBRARY
-    NAMES gdcm gdcmdll
-    PATHS ${GDCM_POSSIBLE_LIB_PATHS}
-  )
-
-  FIND_LIBRARY(GDCMIJPEG8_STATIC_LIBRARY
-    NAMES gdcmijpeg8 libgdcmijpeg8
-    PATHS ${GDCM_POSSIBLE_LIB_PATHS}
-  )
-
-  FIND_LIBRARY(GDCMIJPEG8_SHARED_LIBRARY
-    NAMES gdcmijpeg8 libgdcmijpeg8
-    PATHS ${GDCM_POSSIBLE_LIB_PATHS}
-  )
-
-  FIND_LIBRARY(GDCMIJPEG12_STATIC_LIBRARY
-    NAMES gdcmijpeg12 libgdcmijpeg12
-    PATHS ${GDCM_POSSIBLE_LIB_PATHS}
-  )
-
-  FIND_LIBRARY(GDCMIJPEG12_SHARED_LIBRARY
-    NAMES gdcmijpeg12 libgdcmijpeg12
-    PATHS ${GDCM_POSSIBLE_LIB_PATHS}
-  )
-
-  FIND_LIBRARY(GDCMLJPEG_STATIC_LIBRARY
-    NAMES gdcmljpeg libgdcmljpeg
-    PATHS ${GDCM_POSSIBLE_LIB_PATHS}
-  )
-
-  FIND_LIBRARY(GDCMLJPEG_SHARED_LIBRARY
-    NAMES gdcmljpeg libgdcmljpeg
-    PATHS ${GDCM_POSSIBLE_LIB_PATHS}
-  )
-
-  FIND_LIBRARY(VTKGDCM_STATIC_LIBRARY
-    NAMES vtkgdcm
-    PATHS ${GDCM_POSSIBLE_LIB_PATHS}
-  )
-
-  FIND_LIBRARY(VTKGDCM_SHARED_LIBRARY
-    NAMES vtkgdcm
-    PATHS ${GDCM_POSSIBLE_LIB_PATHS}
-  )
-
-  SET (GDCM_POSSIBLE_INCLUDE_PATHS
-    /usr/lib
-    /usr/local/lib
-    $ENV{CREATIS}/gdcm/src
-    $ENV{CREATIS}/gdcm/vtk
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\gdcmPython-py2.2;UninstallString]\\..\\include"
-    "C:\\GDCM\\include"
-    $ENV{PUB_DICT_PATH}/../src
-    $ENV{PUB_DICT_PATH}/../vtk
-  )
-
-  FIND_PATH(GDCM_INCLUDE_DIR
-    gdcm.h
-    ${GDCM_POSSIBLE_INCLUDE_PATHS}
-  )
-
-  FIND_PATH(GDCM_CONFIGURE_INCLUDE_DIR
-    gdcmConfigure.h
-    ${GDCM_POSSIBLE_INCLUDE_PATHS}/..
-  )
-
-  FIND_PATH(VTKGDCM_INCLUDE_DIR
-    vtkGdcmReader.h
-    ${GDCM_POSSIBLE_INCLUDE_PATHS}
-  )
-  #Merge evry path in one single :
-  SET(GDCM_INCLUDE_DIR ${GDCM_INCLUDE_DIR} ${VTKGDCM_INCLUDE_DIR} ${GDCM_CONFIGURE_INCLUDE_DIR})
-
-  IF(GDCM_SHARED_LIBRARY)
-    OPTION(GDCM_USE_SHARED_LIBS
-           "Use shared versions of GDCM libraries" ON)
-    MARK_AS_ADVANCED(GDCM_USE_SHARED_LIBS)
-  ENDIF(GDCM_SHARED_LIBRARY)
-
-  IF(GDCM_USE_SHARED_LIBS)
-    SET(GDCM_LIBRARIES ${VTKGDCM_SHARED_LIBRARY} ${GDCM_SHARED_LIBRARY}
-    ${GDCMIJPEG8_SHARED_LIBRARY} ${GDCMIJPEG12_SHARED_LIBRARY} ${GDCMLJPEG_SHARED_LIBRARY})
-  ELSE(GDCM_USE_SHARED_LIBS)
-    SET(GDCM_LIBRARIES ${VTKGDCM_STATIC_LIBRARY} ${GDCM_STATIC_LIBRARY}
-    ${GDCMIJPEG8_STATIC_LIBRARY} ${GDCMIJPEG12_STATIC_LIBRARY} ${GDCMLJPEG_STATIC_LIBRARY})
-  ENDIF(GDCM_USE_SHARED_LIBS)
-
-  MARK_AS_ADVANCED(
-    GDCM_STATIC_LIBRARY
-    GDCM_SHARED_LIBRARY
-    GDCM_INCLUDE_DIR
-    VTKGDCM_STATIC_LIBRARY
-    VTKGDCM_SHARED_LIBRARY
-    VTKGDCM_INCLUDE_DIR
-  )
-  ENDIF(NOT UNIX)
-
-ENDIF(WIN32)
-
-
-
-IF(UNIX)
-
-  SET (GDCM_POSSIBLE_LIB_PATHS
-    $ENV{CREATIS}/gdcm/lib/
-    $ENV{HOME}/local/lib
-    $ENV{GDCMHOME}/lib
-    /usr/local/lib
-    /usr/lib
-    $ENV{PUB_DICT_PATH}/../lib
-  )
-
-  SET (GDCM_POSSIBLE_INCLUDE_PATHS
-    $ENV{CREATIS}/gdcm/src
-    $ENV{CREATIS}/gdcm/vtk
-    $ENV{HOME}/local/include
-    $ENV{GDCMHOME}/src
-    $ENV{GDCMHOME}/vtk
-    /usr/local/include
-    /usr/include
-    $ENV{PUB_DICT_PATH}/../src
-    $ENV{PUB_DICT_PATH}/../vtk
-  )
-
-  FIND_PATH(GDCM_INCLUDE_DIR
-    gdcm.h
-    ${GDCM_POSSIBLE_INCLUDE_PATHS}
-  )
-
-  FIND_PATH(GDCM_INCLUDE_DIR
-    vtkGdcmReader.h
-    ${GDCM_POSSIBLE_INCLUDE_PATHS}
-  )
-
-  #Merge every path in one single :
-  SET(GDCM_INCLUDE_DIR ${GDCM_INCLUDE_DIR} ${VTKGDCM_INCLUDE_DIR})
-
-  FIND_LIBRARY(GDCM_SHARED_LIBRARY
-    NAMES gdcm
-    PATHS ${GDCM_POSSIBLE_LIB_PATHS}
-  )
-
-  FIND_LIBRARY(VTKGDCM_SHARED_LIBRARY
-    NAMES vtkgdcm
-    PATHS ${GDCM_POSSIBLE_LIB_PATHS}
-  )
-
-  FIND_LIBRARY(GDCMIJPEG8_SHARED_LIBRARY
-    NAMES gdcmijpeg8 libgdcmijpeg8
-    PATHS ${GDCM_POSSIBLE_LIB_PATHS}
-  )
-
-  FIND_LIBRARY(GDCMIJPEG12_SHARED_LIBRARY
-    NAMES gdcmijpeg12 libgdcmijpeg12
-    PATHS ${GDCM_POSSIBLE_LIB_PATHS}
-  )
-
-  FIND_LIBRARY(GDCMLJPEG_SHARED_LIBRARY
-    NAMES gdcmljpeg libgdcmljpeg
-    PATHS ${GDCM_POSSIBLE_LIB_PATHS}
-  )
-
-  SET(GDCM_LIBRARIES ${VTKGDCM_SHARED_LIBRARY} ${GDCM_SHARED_LIBRARY}
-  ${GDCMIJPEG8_SHARED_LIBRARY} ${GDCMIJPEG12_SHARED_LIBRARY} ${GDCMLJPEG_SHARED_LIBRARY})
-
-  MARK_AS_ADVANCED(
-    VTKGDCM_SHARED_LIBRARY
-    GDCM_SHARED_LIBRARY
-    GDCMIJPEG8_SHARED_LIBRARY
-    GDCMIJPEG12_SHARED_LIBRARY
-    GDCMLJPEG_SHARED_LIBRARY
-    CMAKE_GDCM_CXX_FLAGS
-    GDCM_INCLUDE_DIR
-  )
-
-ENDIF(UNIX)
-
-MARK_AS_ADVANCED(
-  CMAKE_GDCM_CXX_FLAGS
-  GDCM_INCLUDE_DIR
-)
-
-IF(GDCM_LIBRARIES)
-  IF(GDCM_INCLUDE_DIR OR CMAKE_GDCM_CXX_FLAGS)
-    SET(CMAKE_GDCM_CAN_COMPILE 1)
-    SET(GDCM_FOUND 1)
-  ENDIF(GDCM_INCLUDE_DIR OR CMAKE_GDCM_CXX_FLAGS)
-ENDIF(GDCM_LIBRARIES)
-


Fix warning

Fix warning

--- CommonCPPCTest.cmake
+++ CommonCPPCTest.cmake
@@ -99,7 +99,7 @@
     COMMAND ${RUN_PREFIX} $<TARGET_FILE:${TEST_NAME}> ${RUN_ARGS}
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

-  if("${NAME}" MATCHES "^perf" OR "${NAME}" MATCHES "perf-")
+  if(${NAME} MATCHES "^perf" OR ${NAME} MATCHES "perf-")
     list(APPEND ALL_CPP_PERF_TESTS ${TEST_NAME})
     set(TEST_LABELS ${PROJECT_NAME}-perf)
     install(TARGETS ${TEST_NAME} DESTINATION share/${PROJECT_NAME}/benchmarks


Set version to 1.6.0 (#55)

Set version to 1.6.0 (#55)

--- version.cmake
+++ version.cmake
@@ -1,4 +1,4 @@
 # Copyright (C) 2017 Prism Skylabs
 set(ConnectSDK_VERSION_MAJOR 1)
-set(ConnectSDK_VERSION_MINOR 5)
-set(ConnectSDK_VERSION_REVISION 2)
+set(ConnectSDK_VERSION_MINOR 6)
+set(ConnectSDK_VERSION_REVISION 0)


Split off 7.12.8

Split off 7.12.8

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

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


SVN_SILENT made messages (.desktop file)

--- plasma-runner-ktp-contact.desktop.cmake
+++ plasma-runner-ktp-contact.desktop.cmake
@@ -8,6 +8,7 @@
 Name[es]=Mensajería instantánea
 Name[fi]=Pikaviestintä
 Name[fr]=Messagerie instantanée
+Name[gl]=Mensaxería instantánea
 Name[hu]=Azonnali üzenetküldés
 Name[ia]=Messageria instantanee
 Name[it]=Messaggistica istantanea
@@ -40,6 +41,7 @@
 Comment[es]=Iniciar una conversación con cualquiera de sus contactos de MI o cambiar su estado de MI
 Comment[fi]=Aloita keskustelu muun pikaviestinkäyttäjän kanssa tai vaihda pikaviestintilaasi
 Comment[fr]=Démarre une discussion avec n'importe lequel de vos contacts de messagerie instantanée ou change l'état de celle-ci
+Comment[gl]=Inicie unha conversa con calquera dos seus contactos ou cambie seu estado na IM
 Comment[hu]=Csevegés indítása az azonnali üzenetküldési partnerei valamelyikével vagy az azonnali üzenetküldési állapotának módosítása
 Comment[ia]=Initia conversation con qualcunque de tu contactos de IM o modifica tu status de IM
 Comment[it]=Avvia una chat con un tuo contatto di MI oppure cambia il tuo stato di MI


PKG: use quote when equating with CMake STREQUAL

--- SuperBuild/Packaging/PackageHelper.cmake
+++ SuperBuild/Packaging/PackageHelper.cmake
@@ -1,7 +1,7 @@
 macro(macro_super_package)
   cmake_parse_arguments(PKG  "" "STAGE_DIR" "SEARCHDIRS" ${ARGN} )

-  if(${PKG_STAGE_DIR} STREQUAL "")
+  if("${PKG_STAGE_DIR}" STREQUAL "")
     message(FATAL_ERROR "PKG_STAGE_DIR is emtpy. Just can't continue.")
   endif()


New version: 0.5.1

New version: 0.5.1

--- hawkey/VERSION.cmake
+++ hawkey/VERSION.cmake
@@ -1,3 +1,3 @@
 SET(HAWKEY_MAJOR "0")
 SET(HAWKEY_MINOR "5")
-SET(HAWKEY_PATCH "0")
+SET(HAWKEY_PATCH "1")


Fix build failures on platforms with a lib named aio

Solaris have a library named libaio.so, which historically
provided the asynchronous IO functions aiocancel/read etc,
but all of this is now part of libc (and the library exists
for backwards compatibility). We need to check that we've
got the header and the library before using the macro,
otherwise we'll get errors due to using a cmake variable
that isn't set

Change-Id: Ie87790fc527c7877d01cd8aef7bd7c8a17f5a117

--- FindAsyncIOLib.cmake
+++ FindAsyncIOLib.cmake
@@ -23,13 +23,13 @@
 ELSEIF (WIN32)
 ENDIF()

-IF (ASYNC_IO_LIBRARIES)
+IF (ASYNC_IO_LIBRARIES AND ASYNC_IO_INCLUDE_DIR)
     MESSAGE(STATUS "Found async I/O libraries in ${ASYNC_IO_INCLUDE_DIR} :
             ${ASYNC_IO_LIBRARIES}")
     ADD_DEFINITIONS(-D_ASYNC_IO=1)
     set(ASYNC_IO_LIB ${ASYNC_IO_LIBRARIES})
     include_directories(AFTER ${ASYNC_IO_INCLUDE_DIR})
     MARK_AS_ADVANCED(ASYNC_IO_INCLUDE_DIR ASYNC_IO_LIBRARIES)
-ELSE (ASYNC_IO_LIBRARIES)
+ELSE (ASYNC_IO_LIBRARIES AND ASYNC_IO_INCLUDE_DIR)
     MESSAGE(STATUS "Can't find async I/O libraries")
-ENDIF (ASYNC_IO_LIBRARIES)
+ENDIF (ASYNC_IO_LIBRARIES AND ASYNC_IO_INCLUDE_DIR)


[CMake] Set LLVM_DEFAULT_EXTERNAL_LIT in standalone build correctly on windows

LLVM installed llvm-lit with a .py suffix on windows. Let's match that
behavior here.

git-svn-id: 4c4cc70b1ef44ba2b7963015e681894188cea27e@356412 91177308-0d34-0410-b5e6-96231b3b80d8

--- cmake/modules/LLDBStandalone.cmake
+++ cmake/modules/LLDBStandalone.cmake
@@ -26,7 +26,12 @@
   set(LLVM_MAIN_INCLUDE_DIR ${LLVM_MAIN_INCLUDE_DIR} CACHE PATH "Path to llvm/include")
   set(LLVM_LIBRARY_DIR ${LLVM_LIBRARY_DIR} CACHE PATH "Path to llvm/lib")
   set(LLVM_BINARY_DIR ${LLVM_BINARY_DIR} CACHE PATH "Path to LLVM build tree")
-  set(LLVM_DEFAULT_EXTERNAL_LIT ${LLVM_TOOLS_BINARY_DIR}/llvm-lit CACHE PATH "Path to llvm-lit")
+
+  set(lit_file_name "llvm-lit")
+  if(CMAKE_HOST_WIN32 AND NOT CYGWIN)
+    set(lit_file_name "${lit_file_name}.py")
+  endif()
+  set(LLVM_DEFAULT_EXTERNAL_LIT "${LLVM_TOOLS_BINARY_DIR}/${lit_file_name}" CACHE PATH "Path to llvm-lit")

   if(CMAKE_CROSSCOMPILING)
     set(LLVM_NATIVE_BUILD "${LLDB_PATH_TO_LLVM_BUILD}/NATIVE")


- added set(CMAKE_CXX_STANDARD 11)

- added set(CMAKE_CXX_STANDARD 11)

--- CMake/Common.cmake
+++ CMake/Common.cmake
@@ -26,3 +26,5 @@
 endif()

 add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+
+set(CMAKE_CXX_STANDARD 11)


honor new CMake 3.8 target properties

honor new CMake 3.8 target properties

--- CMake/cotire.cmake
+++ CMake/cotire.cmake
@@ -3135,7 +3135,7 @@
 		LINK_SEARCH_START_STATIC LINK_SEARCH_END_STATIC
 		STATIC_LIBRARY_FLAGS STATIC_LIBRARY_FLAGS_<CONFIG>
 		NO_SONAME SOVERSION VERSION
-		LINK_WHAT_YOU_USE)
+		LINK_WHAT_YOU_USE BUILD_RPATH)
 	# copy cmake stuff
 	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		IMPLICIT_DEPENDS_INCLUDE_TRANSFORM RULE_LAUNCH_COMPILE RULE_LAUNCH_CUSTOM RULE_LAUNCH_LINK)
@@ -3144,7 +3144,7 @@
 		BUNDLE BUNDLE_EXTENSION FRAMEWORK FRAMEWORK_VERSION INSTALL_NAME_DIR
 		MACOSX_BUNDLE MACOSX_BUNDLE_INFO_PLIST MACOSX_FRAMEWORK_INFO_PLIST MACOSX_RPATH
 		OSX_ARCHITECTURES OSX_ARCHITECTURES_<CONFIG> PRIVATE_HEADER PUBLIC_HEADER RESOURCE XCTEST
-		IOS_INSTALL_COMBINED)
+		IOS_INSTALL_COMBINED XCODE_EXPLICIT_FILE_TYPE XCODE_PRODUCT_TYPE)
 	# copy Windows platform specific stuff
 	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		GNUtoMS
@@ -3160,7 +3160,7 @@
 		VS_WINRT_COMPONENT VS_WINRT_EXTENSIONS VS_WINRT_REFERENCES
 		WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS
 		DEPLOYMENT_REMOTE_DIRECTORY VS_CONFIGURATION_TYPE
-		VS_SDK_REFERENCES)
+		VS_SDK_REFERENCES VS_USER_PROPS VS_DEBUGGER_WORKING_DIRECTORY)
 	# copy Android platform specific stuff
 	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		ANDROID_API ANDROID_API_MIN ANDROID_GUI


start 1.7.11

start 1.7.11

--- CMake/cotire.cmake
+++ CMake/cotire.cmake
@@ -43,7 +43,7 @@
 endif()

 set (COTIRE_CMAKE_MODULE_FILE "${CMAKE_CURRENT_LIST_FILE}")
-set (COTIRE_CMAKE_MODULE_VERSION "1.7.10")
+set (COTIRE_CMAKE_MODULE_VERSION "1.7.11")

 # activate select policies
 if (POLICY CMP0025)


cmake: Fix install path deduction

cmake: Fix install path deduction

--- CMakeInstall.cmake
+++ CMakeInstall.cmake
@@ -15,6 +15,8 @@

 # This file contains all installation paths of tiscamera

+find_package(PkgConfig REQUIRED QUIET)
+
 # helper funcion to receive the value of an arbitrary variable
 function(pkg_check_variable _pkg _name)
   string(TOUPPER ${_pkg} _pkg_upper)


cmake: Default TCAM_ARAVIS_USB_VISION to ON

--- CMakeOptions.cmake
+++ CMakeOptions.cmake
@@ -26,7 +26,7 @@

 option(TCAM_INTERNAL_ARAVIS "Use internal aravis dependency instead of system libraries" ON)
-option(TCAM_ARAVIS_USB_VISION "Use aravis usb vision backend. Disables v4l2." OFF)
+option(TCAM_ARAVIS_USB_VISION "Use aravis usb vision backend. Disables v4l2." ON)
 option(TCAM_DOWNLOAD_MESON "Download version of meson for compilation purposes" ON)

 option(TCAM_INSTALL_FORCE_PREFIX "Force CMAKE_INSTALL_PREFIX onto all tiscamera parts. Only works with custom prefix." OFF)


sync mimetype list with vlc master

sync mimetype list with vlc master

BUG: 363240

--- MimeTypes.cmake
+++ MimeTypes.cmake
@@ -4,95 +4,147 @@
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.

 set(PHONON_VLC_MIME_TYPES
+    application/mpeg4-iod
+    application/mpeg4-muxcodetable
+    application/mxf
     application/ogg
+    application/ram
+    application/sdp
+    application/vnd.apple.mpegurl
+    application/vnd.ms-asf
+    application/vnd.ms-wpl
+    application/vnd.rn-realmedia
+    application/vnd.rn-realmedia-vbr
+    application/x-extension-m4a
+    application/x-extension-mp4
+    application/x-flac
+    application/x-flash-video
+    application/x-matroska
     application/x-ogg
-    application/vnd.rn-realmedia
-    application/x-annodex
-    application/x-flash-video
+    application/x-quicktime-media-link
     application/x-quicktimeplayer
-    application/x-extension-mp4
-    audio/168sv
+    application/x-shockwave-flash
+    application/xspf+xml
     audio/3gpp
     audio/3gpp2
-    audio/8svx
-    audio/aiff
+    audio/AMR
+    audio/AMR-WB
+    audio/aac
+    audio/ac3
     audio/amr
     audio/amr-wb
     audio/basic
+    audio/dv
+    audio/eac3
+    audio/flac
+    audio/m4a
+    audio/midi
+    audio/mp1
+    audio/mp2
     audio/mp3
     audio/mp4
-    audio/midi
     audio/mpeg
-    audio/mpeg2
-    audio/mpeg3
-    audio/prs.sid
+    audio/mpegurl
+    audio/mpg
+    audio/ogg
+    audio/opus
+    audio/scpls
+    audio/vnd.dolby.heaac.1
+    audio/vnd.dolby.heaac.2
+    audio/vnd.dolby.mlp
+    audio/vnd.dts
+    audio/vnd.dts.hd
     audio/vnd.rn-realaudio
-    audio/vnd.rn-realmedia
     audio/wav
     audio/webm
-    audio/x-16sv
-    audio/x-8svx
+    audio/x-aac
     audio/x-aiff
-    audio/x-basic
+    audio/x-ape
+    audio/x-flac
+    audio/x-gsm
     audio/x-it
     audio/x-m4a
     audio/x-matroska
     audio/x-mod
+    audio/x-mp1
+    audio/x-mp2
     audio/x-mp3
     audio/x-mpeg
-    audio/x-mpeg2
-    audio/x-mpeg3
     audio/x-mpegurl
+    audio/x-mpg
+    audio/x-ms-asf
+    audio/x-ms-asx
+    audio/x-ms-wax
     audio/x-ms-wma
-    audio/x-ogg
+    audio/x-musepack
     audio/x-pn-aiff
     audio/x-pn-au
+    audio/x-pn-realaudio
     audio/x-pn-realaudio-plugin
     audio/x-pn-wav
     audio/x-pn-windows-acm
     audio/x-real-audio
     audio/x-realaudio
     audio/x-s3m
-    audio/x-speex+ogg
+    audio/x-scpls
+    audio/x-shorten
+    audio/x-speex
+    audio/x-tta
+    audio/x-vorbis
     audio/x-vorbis+ogg
     audio/x-wav
+    audio/x-wavpack
     audio/x-xm
-    image/ilbm
-    image/png
-    image/x-ilbm
-    image/x-png
+    image/vnd.rn-realpix
+    misc/ultravox
+    text/google-video-pointer
+    text/x-google-video-pointer
+    video/3gp
     video/3gpp
     video/3gpp2
-    video/anim
-    video/avi
     video/divx
+    video/dv
+    video/fli
     video/flv
-    video/mkv
-    video/mng
+    video/mp2t
     video/mp4
+    video/mp4v-es
     video/mpeg
     video/mpeg-system
-    video/mpg
     video/msvideo
     video/ogg
     video/quicktime
+    video/vnd.divx
+    video/vnd.mpegurl
+    video/vnd.rn-realvideo
     video/webm
     video/x-anim
-    video/x-flic
+    video/x-avi
+    video/x-flc
+    video/x-fli
     video/x-flv
+    video/x-m4v
     video/x-matroska
-    video/x-mng
-    video/x-m4v
     video/x-mpeg
     video/x-mpeg-system
+    video/x-mpeg2
     video/x-ms-asf
-    video/x-ms-wma
+    video/x-ms-asf-plugin
+    video/x-ms-asx
+    video/x-ms-wm
     video/x-ms-wmv
+    video/x-ms-wmx
     video/x-ms-wvx
     video/x-msvideo
-    video/x-quicktime
-    audio/x-flac
-    audio/x-ape
+    video/x-nsv
+    video/x-ogm+ogg
+    video/x-theora
+    video/x-theora+ogg
+    x-content/audio-cdda
+    x-content/audio-player
+    x-content/video-dvd
+    x-content/video-svcd
+    x-content/video-vcd
 )

 macro(CREATE_C_ARRAY var list)


Misc. typo fixes

Misc. typo fixes

Found via `codespell`

--- src/deb/DebSourcePPA.cmake
+++ src/deb/DebSourcePPA.cmake
@@ -90,7 +90,7 @@

 # remove unnecessary folders
 foreach(REMOVE_DIR ${CPACK_DEBIAN_PACKAGE_REMOVE_SOURCE_FILES})
-    MESSAGE(STATUS "Removing direcotry from source-orig-dir. " ${REMOVE_DIR})
+    MESSAGE(STATUS "Removing directory from source-orig-dir. " ${REMOVE_DIR})
   file(REMOVE_RECURSE ${DEBIAN_SOURCE_ORIG_DIR}.orig/${REMOVE_DIR})
 endforeach()

@@ -169,7 +169,7 @@

   ##############################################################################
   # debian/copyright
-  MESSAGE(STATUS "  creating debian/coyright.")
+  MESSAGE(STATUS "  creating debian/copyright.")
   set(DEBIAN_COPYRIGHT ${DEBIAN_SOURCE_DIR}/debian/copyright)
   execute_process(COMMAND ${CMAKE_COMMAND} -E
     copy ${CPACK_RESOURCE_FILE_LICENSE} ${DEBIAN_COPYRIGHT}


Disable doing C++11 tests if we're explicitly using C++03

--- TestCPP11.cmake
+++ TestCPP11.cmake
@@ -1,8 +1,8 @@
 # Copyright (c) 2013 ahmet.bilgili@epfl.ch
 #               2013 Stefan.Eilemann@epfl.ch

-# OPT: do this only once, included by Common.cmake
-if(TESTS_CPP11_DONE)
+# OPT: do this only once, included by Common.cmake, don't do if C++03
+if(TESTS_CPP11_DONE OR COMMON_USE_CXX03)
   return()
 endif()
 set(TESTS_CPP11_DONE ON)