STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


Define metadata_extractor plugin tests with add_standard_plugin_tests

--- plugins/metadata_extractor/plugin.cmake
+++ plugins/metadata_extractor/plugin.cmake
@@ -1,25 +1,5 @@
-###############################################################################
-#  Copyright Kitware Inc.
-#
-#  Licensed under the Apache License, Version 2.0 ( the "License" );
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-###############################################################################
+add_standard_plugin_tests(NO_SERVER_TESTS)

-get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME)
-
-add_python_test(client_metadata_extractor PLUGIN ${PLUGIN} RESOURCE_LOCKS cherrypy PY2_ONLY)
-add_python_test(server_metadata_extractor PLUGIN ${PLUGIN} RESOURCE_LOCKS cherrypy PY2_ONLY)
-
-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")
+get_filename_component(_pluginName "${CMAKE_CURRENT_LIST_DIR}" NAME)
+add_python_test(client_metadata_extractor PLUGIN ${_pluginName} RESOURCE_LOCKS cherrypy PY2_ONLY)
+add_python_test(server_metadata_extractor PLUGIN ${_pluginName} RESOURCE_LOCKS cherrypy PY2_ONLY)


Workaround MSVC2015 internal compiler errors when building Eigen.

Eigen/src/Core/ArithmeticSequence.h causes an internal compiler
error when building with MSVC2015 with the default built
configuration. This is caused by MSVC2015's partial support for
C++14 which is required by dependencies of TF Lite. To workaround
this issue, limit Eigen to C++11 by defining EIGEN_MAX_CPP_VER=11
when building TF Lite.

PiperOrigin-RevId: 373876648
Change-Id: I62591057120084a4b4617cb93e84d16ccc520c50

--- tensorflow/lite/tools/cmake/modules/Findeigen.cmake
+++ tensorflow/lite/tools/cmake/modules/Findeigen.cmake
@@ -19,6 +19,23 @@
 if(eigen_POPULATED)
   set(EIGEN_FOUND TRUE)
   get_target_property(EIGEN_INCLUDE_DIRS eigen INTERFACE_DIRECTORIES)
+  # If using MSVC2015 (14) or below force Eigen to C++11.
+  if(MSVC_VERSION LESS_EQUAL 1900)
+    set(COMPILE_DEFINITIONS "EIGEN_MAX_CPP_VER=11")
+    get_target_property(EIGEN_COMPILE_DEFINITIONS eigen
+      INTERFACE_COMPILE_DEFINITIONS
+    )
+    if(EIGEN_COMPILE_DEFINITIONS)
+      list(APPEND COMPILE_DEFINITIONS ${EIGEN_COMPILE_DEFINITIONS})
+    endif()
+    set_property(
+      TARGET
+        eigen
+      PROPERTY
+        INTERFACE_COMPILE_DEFINITIONS
+        ${COMPILE_DEFINITIONS}
+    )
+  endif()
   set(EIGEN_LIBRARIES Eigen3::Eigen)
 endif()


Move DE_3RD_PARTY_CXX*FLAGS definition to the end

Components: Framework

Change-Id: I67d550046e52eeb80467dc691f2c7c31423ebd8c

--- framework/delibs/cmake/CFlags.cmake
+++ framework/delibs/cmake/CFlags.cmake
@@ -39,10 +39,6 @@
 		set(LINK_FLAGS		"${LINK_FLAGS} -lgcov")
 	endif ()

-	# For 3rd party sw disable all warnings
-	set(DE_3RD_PARTY_C_FLAGS	"${CMAKE_C_FLAGS} ${TARGET_FLAGS} -w")
-	set(DE_3RD_PARTY_CXX_FLAGS	"${CMAKE_CXX_FLAGS} ${TARGET_FLAGS} -w")
-
 	# \note Remove -Wno-sign-conversion for more warnings
 	set(WARNING_FLAGS			"-Wall -Wextra -Wno-long-long -Wshadow -Wundef -Wconversion -Wno-sign-conversion")

@@ -58,6 +54,10 @@
 	# Any static libraries build are linked into the standalone executable binaries.
 	set(CMAKE_C_FLAGS			"${CMAKE_C_FLAGS} -fvisibility=hidden")
 	set(CMAKE_CXX_FLAGS			"${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
+
+	# For 3rd party sw disable all warnings
+	set(DE_3RD_PARTY_C_FLAGS	"${CMAKE_C_FLAGS} ${TARGET_FLAGS} -w")
+	set(DE_3RD_PARTY_CXX_FLAGS	"${CMAKE_CXX_FLAGS} ${TARGET_FLAGS} -w")
 elseif (DE_COMPILER_IS_MSC)
 	# Compiler flags for msc

@@ -70,13 +70,12 @@
 	set(MSC_BASE_FLAGS "/DWIN32 /D_WINDOWS /D_CRT_SECURE_NO_WARNINGS")
 	set(MSC_WARNING_FLAGS "/W3 /wd4820 /wd4255 /wd4668 /wd4738 /wd4711")

+	set(CMAKE_C_FLAGS			"${CMAKE_C_FLAGS} ${MSC_BASE_FLAGS} ${MSC_WARNING_FLAGS}")
+	set(CMAKE_CXX_FLAGS			"${CMAKE_CXX_FLAGS} ${MSC_BASE_FLAGS} /EHsc ${MSC_WARNING_FLAGS}")
+
 	# For 3rd party sw disable all warnings
 	set(DE_3RD_PARTY_C_FLAGS	"${CMAKE_C_FLAGS} ${MSC_BASE_FLAGS} /W0")
 	set(DE_3RD_PARTY_CXX_FLAGS	"${CMAKE_CXX_FLAGS} ${MSC_BASE_FLAGS} /EHsc /W0")
-
-	set(CMAKE_C_FLAGS			"${CMAKE_C_FLAGS} ${MSC_BASE_FLAGS} ${MSC_WARNING_FLAGS}")
-	set(CMAKE_CXX_FLAGS			"${CMAKE_CXX_FLAGS} ${MSC_BASE_FLAGS} /EHsc ${MSC_WARNING_FLAGS}")
-
 else ()
 	message(FATAL_ERROR "DE_COMPILER is not valid")
 endif ()


New version: 0.5.3

New version: 0.5.3

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


CDash driver script considers the 'Documentation' label

--- CMake/ctkDashboardDriverScript.cmake
+++ CMake/ctkDashboardDriverScript.cmake
@@ -194,7 +194,10 @@
     endforeach()

     if (WITH_DOCUMENTATION)
+      message("----------- [ Build Documentation ] -----------")
       # Build Documentation target
+      set_property(GLOBAL PROPERTY SubProject Documentation)
+      set_property(GLOBAL PROPERTY Label Documentation)
       set(CTEST_BUILD_TARGET "doc")
       ctest_build(BUILD "${ctk_build_dir}" APPEND)
       ctest_submit(PARTS Build)


ADD (#2208): added ModalityProperty in files.cmake

--- Core/Code/files.cmake
+++ Core/Code/files.cmake
@@ -74,6 +74,7 @@
   DataManagement/mitkLevelWindowProperty.cpp
   DataManagement/mitkLookupTable.cpp
   DataManagement/mitkMemoryUtilities.cpp
+  DataManagement/mitkModalityProperty.cpp
   DataManagement/mitkModeOperation.cpp
   DataManagement/mitkNodePredicateAND.cpp
   DataManagement/mitkNodePredicateBase.cpp


Added -ldl when compiling with OpenMP

Added -ldl when compiling with OpenMP

Former-commit-id: 4018e7deda76b7de418f99d4ec13df97d8c36982

--- cmake-modules/CheckOMPCompiles.cmake
+++ cmake-modules/CheckOMPCompiles.cmake
@@ -28,7 +28,7 @@
             int main() {
                 omp_set_num_threads(4);
                 std::cout << \"OMP Threads \" << omp_get_max_threads() << std::endl;
-                int counter;
+                int counter = 0;
                 #pragma omp parallel for shared(counter)
                 for(int i = 0; i < 16; i++){
                     #pragma omp atomic
@@ -70,7 +70,7 @@
         message("OpenMP_LIBRARIES    : ${OpenMP_LIBRARIES} ")
         message("OpenMP_INCLUDE_DIR  : ${OpenMP_INCLUDE_DIR} ")

-        list(APPEND OpenMP_LIBRARIES  Threads::Threads)
+        list(APPEND OpenMP_LIBRARIES  Threads::Threads -ldl)
         message(STATUS "OpenMP libraries found: ${OpenMP_LIBRARIES}" )
         if(BUILD_SHARED_LIBS)
             check_omp_compiles("${OpenMP_FLAGS}" "${OpenMP_LIBRARIES}" "${OpenMP_INCLUDE_DIR}")
@@ -97,7 +97,7 @@

         if(OpenMP_LIBRARIES AND OpenMP_INCLUDE_DIR)
             list(APPEND OpenMP_LIBRARIES Threads::Threads -ldl)
-            set(OpenMP_FLAGS "")
+            set(OpenMP_FLAGS "-D_OPENMP")
             if(${BUILD_SHARED_LIBS})
                 check_omp_compiles("${OpenMP_FLAGS}" "${OpenMP_LIBRARIES}" "${OpenMP_INCLUDE_DIR}")
             else()
@@ -152,7 +152,7 @@
     list(APPEND OMP_LIBRARY_PATHS
             ${MKLROOT}/../intel/lib/intel64  ${MKL_ROOT}/../intel/lib/intel64
             $ENV{MKLROOT}/../intel/lib/intel64 $ENV{MKL_ROOT}/../intel/lib/intel64
-            $ENV{EBROOTIMKL}/intel/lib/intel64
+            $ENV{EBROOTIMKL}/../intel/lib/intel64
             /opt/intel/lib/intel64
             )
     foreach(omp_name ${OMP_LIBRARY_NAMES})


simplify iOS cmake toolchain file a bit more

--- cmake-toolchains/ios.toolchain.cmake
+++ cmake-toolchains/ios.toolchain.cmake
@@ -1,6 +1,8 @@
 #-------------------------------------------------------------------------------
 #	ios.toolchain.cmake
 #	Fips cmake toolchain file for cross-compiling to iOS from OSX.
+#
+#   NOTE that iOS support requires at least cmake 3.14!
 #-------------------------------------------------------------------------------

 set(FIPS_PLATFORM IOS)
@@ -9,17 +11,9 @@
 set(FIPS_OSX 1)
 set(FIPS_POSIX 1)

-# NOTE I'm not sure if those 2 are necessary, it worked for me
-# without, but not for others
-# See:
-# - https://github.com/floooh/fips/pull/112
-# - https://cmake.org/Bug/view.php?id=15329
-set(CMAKE_MACOSX_BUNDLE YES)
-set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
-
 set(CMAKE_SYSTEM_NAME iOS)
-set(CMAKE_OSX_ARCHITECTURES "armv7 arm64")
 set(CMAKE_OSX_SYSROOT "iphoneos")
+set(CMAKE_OSX_ARCHITECTURES "armv7;arm64")
 set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos;-iphonesimulator")

 # define configurations


Clarified cmake output message

Clarified cmake output message

--- cmake/CMakeModules/FindJsonCpp.cmake
+++ cmake/CMakeModules/FindJsonCpp.cmake
@@ -16,7 +16,7 @@

 if (USE_OSSIM_JSONCPP)
    find_path( JSONCPP_INCLUDE_DIR json/json.h PATHS "${OSSIM_INCLUDE_DIR}/ossim")
-   message("JSONCPP: Using amalgamated form in ${JSONCPP_INCLUDE_DIR}/json/json.h")
+   message("-- JSONCPP: Using amalgamated form in ossim package.")
    set(JSONCPP_LIBRARY "")
    find_package_handle_standard_args( JSONCPP DEFAULT_MSG JSONCPP_INCLUDE_DIR )
 else(USE_OSSIM_JSONCPP)


FIX: proper exit status check

FIX: proper exit status check

--- cmake/Modules/FindPythonModule.cmake
+++ cmake/Modules/FindPythonModule.cmake
@@ -16,9 +16,9 @@
 			OUTPUT_VARIABLE _${module}_location
 			ERROR_QUIET
 			OUTPUT_STRIP_TRAILING_WHITESPACE)
-		if(NOT _${module}_status)
+		if(${_${module}_status} EQUAL 0)
 			set(PYTHON_${module_upper} ${_${module}_location} CACHE STRING "Location of Python module ${module}")
-		endif(NOT _${module}_status)
+		endif(${_${module}_status} EQUAL 0)
 	endif(NOT PYTHON_${module_upper})
 	find_package_handle_standard_args(PY_${module} DEFAULT_MSG PYTHON_${module_upper})
 endfunction(find_python_module)


[CMake] Add a missing case of TO_CMAKE_PATH

This fixes building sanitizers for mingw natively.

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

--- cmake/Modules/HandleCompilerRT.cmake
+++ cmake/Modules/HandleCompilerRT.cmake
@@ -13,6 +13,7 @@
       OUTPUT_VARIABLE LIBRARY_FILE
   )
   string(STRIP "${LIBRARY_FILE}" LIBRARY_FILE)
+  file(TO_CMAKE_PATH "${LIBRARY_FILE}" LIBRARY_FILE)
   string(REPLACE "builtins" "${name}" LIBRARY_FILE "${LIBRARY_FILE}")
   if (NOT HAD_ERROR AND EXISTS "${LIBRARY_FILE}")
     message(STATUS "Found compiler-rt ${name} library: ${LIBRARY_FILE}")


Documentation fixes for cmake users.

Documentation fixes for cmake users.

svn path=/trunk/kdesupport/qca/; revision=644009

--- cmake/modules/FindPkcs11Helper.cmake
+++ cmake/modules/FindPkcs11Helper.cmake
@@ -1,9 +1,9 @@
 # - Try to find the pkcs11-helper library
 # Once done this will define
 #
-#  PKCS11H_FOUND - system has mozilla-nss lib
-#  PKCS11H_INCLUDE_DIRS - the mozilla-nss include directories
-#  PKCS11H_LIBRARIES - Link these to use mozilla-nss
+#  PKCS11H_FOUND - system has pkcs11-helper
+#  PKCS11H_INCLUDE_DIRS - the pkcs11-helper include directories
+#  PKCS11H_LIBRARIES - Link to these to use pkcs11-helper
 #  PKCS11H_DEFINITIONS - Compiler switches required for using pkcs11-helper
 #
 # Copyright (c) 2006, Laurent Montel, <montel@kde.org>


update redistribute deps for Open VKL module renames.

--- cmake/ospray_redistribute_deps.cmake
+++ cmake/ospray_redistribute_deps.cmake
@@ -1,4 +1,4 @@
-## Copyright 2009-2020 Intel Corporation
+## Copyright 2009-2021 Intel Corporation
 ## SPDX-License-Identifier: Apache-2.0

 macro(ospray_install_namelink NAME)
@@ -66,10 +66,10 @@
   ospray_add_dependent_lib(TBB::tbbmalloc)
 endif()
 ospray_add_dependent_lib(openvkl::openvkl)
-ospray_add_dependent_lib(openvkl::openvkl_module_ispc_driver)
-ospray_add_dependent_lib(openvkl::openvkl_module_ispc_driver_4)
-ospray_add_dependent_lib(openvkl::openvkl_module_ispc_driver_8)
-ospray_add_dependent_lib(openvkl::openvkl_module_ispc_driver_16)
+ospray_add_dependent_lib(openvkl::openvkl_module_cpu_device)
+ospray_add_dependent_lib(openvkl::openvkl_module_cpu_device_4)
+ospray_add_dependent_lib(openvkl::openvkl_module_cpu_device_8)
+ospray_add_dependent_lib(openvkl::openvkl_module_cpu_device_16)
 if (OSPRAY_MODULE_DENOISER)
   ospray_add_dependent_lib(OpenImageDenoise)
 endif()


freetype 2.4.12-p1

freetype 2.4.12-p1

--- cmake/projects/freetype/hunter.cmake
+++ cmake/projects/freetype/hunter.cmake
@@ -29,6 +29,17 @@
     6623f3b91b921c71c4b4485f67b252a7025eb18e
 )

+hunter_add_version(
+    PACKAGE_NAME
+    freetype
+    VERSION
+    "2.4.12-p1"
+    URL
+    "https://github.com/hunter-packages/freetype/archive/v2.4.12-p1.tar.gz"
+    SHA1
+    7f172287e594c916150f1b2a2882a188f945e969
+)
+
 hunter_pick_scheme(DEFAULT url_sha1_cmake)
 hunter_cacheable(freetype)
 hunter_download(PACKAGE_NAME freetype)


BUG: Fixed VMTK binaries location to be consistent with additional launcher settings

--- SuperBuild/External_VMTK.cmake
+++ SuperBuild/External_VMTK.cmake
@@ -28,9 +28,9 @@
     SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
     BINARY_DIR ${proj}-build
     CMAKE_CACHE_ARGS
-      #-DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_CURRENT_BINARY_DIR}/SlicerVmtk-build/${Slicer_QTLOADABLEMODULES_LIB_DIR}
-      #-DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_CURRENT_BINARY_DIR}/SlicerVmtk-build/${Slicer_QTLOADABLEMODULES_LIB_DIR}
-      #-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_CURRENT_BINARY_DIR}/SlicerVmtk-build/${Slicer_QTLOADABLEMODULES_LIB_DIR}
+      -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_BINARY_DIR}/${Slicer_THIRDPARTY_BIN_DIR}
+      -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_BINARY_DIR}/${Slicer_THIRDPARTY_LIB_DIR}
+      -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
       -DBUILD_SHARED_LIBS:BOOL=ON
       -DBUILD_DOCUMENTATION:BOOL=OFF
       -DCMAKE_CXX_FLAGS:STRING=${ep_common_cxx_flags}


allow user to set the root installation of ICU

--- FindICU.cmake
+++ FindICU.cmake
@@ -13,6 +13,10 @@
 #   - ICU_PATCH_VERSION     : patch version of ICU
 #   - ICU_<COMPONENT>_FOUND : were <COMPONENT> found? (FALSE for non specified component if it is not a dependency)
 #
+# For windows or non standard installation, define ICU_ROOT variable to point to the root installation of ICU. Two ways:
+#   - run cmake with -DICU_ROOT=<PATH>
+#   - define an environment variable with the same name before running cmake
+#
 # Example Usage:
 #
 #   1. Copy this file in the root of your project source directory
@@ -30,7 +34,7 @@
 #   endif()

 #=============================================================================
-# Copyright (c) 2011, julp
+# Copyright (c) 2011-2012, julp
 #
 # Distributed under the OSI-approved BSD License
 #
@@ -46,6 +50,14 @@
         message("${_varname} = ${${_varname}}")
     endif(ICU_DEBUG)
 endfunction(icudebug)
+
+set(IcuRoot "")
+if(DEFINED ENV{ICU_ROOT})
+    set(IcuRoot "$ENV{ICU_ROOT}")
+endif(DEFINED ENV{ICU_ROOT})
+if (DEFINED ICU_ROOT)
+    set(IcuRoot "${ICU_ROOT}")
+endif(DEFINED ICU_ROOT)

 set(IcuComponents )
 # <icu component name> <library name 1> ... <library name N>
@@ -88,6 +100,8 @@
 find_path(
     ICU_INCLUDE_DIRS
     NAMES unicode/utypes.h
+    HINTS ${IcuRoot}
+    PATH_SUFFIXES "include"
     DOC "Include directories for ICU"
 )

@@ -112,6 +126,8 @@
     find_library(
         _icu_lib
         NAMES ${IcuComponents_${_icu_component}}
+        HINTS ${IcuRoot}
+        PATH_SUFFIXES "bin" "lib"
         DOC "Libraries for ICU"
     )

@@ -181,4 +197,4 @@
 icudebug("ICU_MAJOR_VERSION")
 icudebug("ICU_MINOR_VERSION")
 icudebug("ICU_PATCH_VERSION")
-icudebug("ICU_VERSION")+icudebug("ICU_VERSION")


ctest: Shorten 'KDE neon' build name on dashboard submission

Signed-off-by: Matthias Kretz <372ea4eca737a13cd010ee806d4ce7b98ee71550@kde.org>

--- test.cmake
+++ test.cmake
@@ -97,6 +97,7 @@
    string(REPLACE " release" "" os_ident "${os_ident}")
    string(REPLACE " GNU/Linux" "" os_ident "${os_ident}")
    string(REPLACE "openSUSE" "Suse" os_ident "${os_ident}")
+   string(REPLACE " User Edition" "" os_ident "${os_ident}")
    string(STRIP "${os_ident}" os_ident)
 elseif(arch STREQUAL "darwin")
    set(os_ident "OSX")


Now dynamic_reconfigure gendeps failures show up on stderr, making debugging MUCH easier. Fixes #4092.

--HG--
extra : convert_revision : svn%3Aeb33c2ac-9c88-4c90-87e0-44a10359b0c3/stacks/driver_common/trunk%4032857

--- dynamic_reconfigure/cmake/cfgbuild.cmake
+++ dynamic_reconfigure/cmake/cfgbuild.cmake
@@ -61,7 +61,6 @@
     execute_process(
       COMMAND ${dynamic_reconfigure_PACKAGE_PATH}/cmake/gendeps ${_input}
       OUTPUT_VARIABLE __gencfg_autodeps
-      ERROR_VARIABLE __gencfg_cpp_err_ignore
       OUTPUT_STRIP_TRAILING_WHITESPACE)
     string(REPLACE "\n" " " ${_input}_AUTODEPS ${__gencfg_autodeps})
     separate_arguments(${_input}_AUTODEPS)


Adapt to changed directory (include/Vc -> Vc)

--- test.cmake
+++ test.cmake
@@ -404,7 +404,7 @@

 macro(go)
    # On Continuous builds this string may change and thus must be inside go()
-   file(STRINGS "${CTEST_SOURCE_DIRECTORY}/include/Vc/version.h"
+   file(STRINGS "${CTEST_SOURCE_DIRECTORY}/Vc/version.h"
       Vc_VERSION_STRING
       REGEX "#define +Vc_VERSION_STRING "
       )


Fix typo in build-name

Fix typo in build-name

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

--- test/openVibeTests.cmake
+++ test/openVibeTests.cmake
@@ -23,7 +23,7 @@
 endmacro(getuname)

 IF(WIN32)
-	SET(distrib ""})
+	SET(distrib "")
 	SET(distrib-release "")
 ELSE(WIN32)
 	find_program(LSB_RELEASE NAMES lsb_release)


UWP: tweaked linker flags

UWP: tweaked linker flags

--- cmake-toolchains/windows.cmake
+++ cmake-toolchains/windows.cmake
@@ -93,7 +93,9 @@
 endif()

 # define exe linker flags
-if (NOT FIPS_UWP)
+if (FIPS_UWP)
+    set(CMAKE_EXE_LINKER_FLAGS "/MANIFEST:NO /DEBUG:FASTLINK /WINMD")
+else()
     set(CMAKE_EXE_LINKER_FLAGS "/STACK:5000000 /machine:${FIPS_WINDOWS_PLATFORM_NAME}")
 endif()
 set(CMAKE_EXE_LINKER_FLAGS_DEBUG "/DEBUG")


More UWP stuff

More UWP stuff

--- cmake-toolchains/windows.cmake
+++ cmake-toolchains/windows.cmake
@@ -29,15 +29,19 @@
 set(CMAKE_CONFIGURATION_TYPES Debug Release)

 # define the standard link libraries
-set(CMAKE_CXX_STANDARD_LIBRARIES "kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib dbghelp.lib wsock32.lib ws2_32.lib rpcrt4.lib wininet.lib")
-set(CMAKE_C_STANDARD_LIBRARIES "kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib dbghelp.lib wsock32.lib ws2_32.lib rpcrt4.lib wininet.lib")
+if (FIPS_UWP)
+    set(CMAKE_CXX_STANDARD_LIBRARIES "WindowsApp.lib")
+    set(CMAKE_C_STANDARD_LIBRARIES "WindowsApp.lib")
+else()
+    set(CMAKE_CXX_STANDARD_LIBRARIES "kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib dbghelp.lib wsock32.lib ws2_32.lib rpcrt4.lib wininet.lib")
+    set(CMAKE_C_STANDARD_LIBRARIES "kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib dbghelp.lib wsock32.lib ws2_32.lib rpcrt4.lib wininet.lib")
+endif()

 # define compiler and linker flags

 # GENERIC compiler flags:
 # 	/WX treat warnings as errors
 # 	/GF eliminate duplicate strings
-# 	/arch:SSE2 generate code for SSE2
 # 	/TP treat files as C++ source
 #	/TC treat files as C source
 # 	/fp:fast create fast (not precise) floating point code
@@ -67,8 +71,8 @@
 set(CMAKE_CXX_FLAGS_RELEASE "/Ox /DNDEBUG")
 if (FIPS_UWP)
     # must link runtime as DLLs
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd /ZW")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD /ZW")
 else()
     # on Win32, link runtime statically
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
@@ -80,8 +84,8 @@
 set(CMAKE_C_FLAGS_RELEASE "/Ox /DNDEBUG ")
 if (FIPS_UWP)
     # must link runtime as DLLs
-    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MDd")
-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MD")
+    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MDd /ZW")
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MD /ZW")
 else()
     # on Win32, link runtime statically
     set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
@@ -89,7 +93,9 @@
 endif()

 # define exe linker flags
-set(CMAKE_EXE_LINKER_FLAGS "/STACK:5000000 /machine:${FIPS_WINDOWS_PLATFORM_NAME}")
+if (NOT FIPS_UWP)
+    set(CMAKE_EXE_LINKER_FLAGS "/STACK:5000000 /machine:${FIPS_WINDOWS_PLATFORM_NAME}")
+endif()
 set(CMAKE_EXE_LINKER_FLAGS_DEBUG "/DEBUG")
 set(CMAKE_EXE_LINKER_FLAGS_RELEASE "")


further slight update to logic in FindMatlab - WARNING: this still dosnt check if the Qt dependency is satisfied properly

--- cmake/modules/FindMatlab.cmake
+++ cmake/modules/FindMatlab.cmake
@@ -131,7 +131,7 @@
     PATH_SUFFIXES /bin
     NO_DEFAULT_PATH)

-if(MATLAB_INCLUDE_DIR AND MATLAB_LIBRARIES AND MATLAB_BINARY_DIR AND MATLAB_QT_QTCORE_LIBRARY_FOUND)
+if (MATLAB_INCLUDE_DIR AND MATLAB_LIBRARIES AND MATLAB_BINARY_DIR)
     set(MATLAB_FOUND TRUE)
 endif(MATLAB_INCLUDE_DIR AND MATLAB_LIBRARIES AND MATLAB_BINARY_DIR)


 Fix FindOracle.cmake to find version 21.x

Notice: I did not test Oracle functionality with 21.x

--- cmake/modules/FindOracle.cmake
+++ cmake/modules/FindOracle.cmake
@@ -55,7 +55,7 @@
 )
 FIND_LIBRARY(
     ORACLE_LIBRARY_LNNZ
-    NAMES libnnz10 nnz10 libnnz11 nnz11 libnnz12 nnz12 nnz18 nnz19 ociw32
+    NAMES libnnz10 nnz10 libnnz11 nnz11 libnnz12 nnz12 nnz18 nnz19 nnz21 ociw32
     PATHS ${ORACLE_LIB_LOCATION}
 )


The one from kdelibs does the job just fine, doesn't it?

svn path=/trunk/KDE/kdepim/; revision=663017

--- cmake/modules/FindStrigi.cmake
+++ cmake/modules/FindStrigi.cmake
@@ -1,48 +0,0 @@
-# This is a modified copy of playground/base/strigiapplet/cmake/FindStrigi.cmake
-#
-#  STRIGI_FOUND - system has Strigi
-#  STRIGI_INCLUDE_DIR - the Strigi include directory
-#  STRIGIHTMLGUI_LIBRARY - Link these to use Strigi html gui
-#  STRIGICLIENT_LIBRARY - Link to use the Strigi C++ client
-#
-
-FIND_PATH(STRIGI_INCLUDE_DIR strigihtmlgui.h
-  PATHS
-  /usr/include
-  /usr/local/include
-  ${INCLUDE_INSTALL_DIR}
-)
-
-FIND_LIBRARY(STRIGIHTMLGUI_LIBRARY NAMES strigihtmlgui
-  PATHS
-  /usr/lib
-  /usr/local/lib
-  ${LIB_INSTALL_DIR}
-)
-FIND_LIBRARY(STRIGICLIENT_LIBRARY NAMES searchclient
-  PATHS
-  /usr/lib
-  /usr/local/lib
-  ${LIB_INSTALL_DIR}
-)
-FIND_LIBRARY(STRIGIQTDBUSCLIENT_LIBRARY NAMES strigiqtdbusclient
-  PATHS
-  /usr/lib
-  /usr/local/lib
-  ${LIB_INSTALL_DIR}
-)
-
-IF(STRIGI_INCLUDE_DIR AND STRIGIHTMLGUI_LIBRARY AND STRIGICLIENT_LIBRARY AND STRIGIQTDBUSCLIENT_LIBRARY)
-   SET(STRIGI_FOUND TRUE)
-ENDIF(STRIGI_INCLUDE_DIR AND STRIGIHTMLGUI_LIBRARY AND STRIGICLIENT_LIBRARY AND STRIGIQTDBUSCLIENT_LIBRARY)
-
-IF(STRIGI_FOUND)
-  IF(NOT Strigi_FIND_QUIETLY)
-    MESSAGE(STATUS "Found Strigi: ${STRIGIHTMLGUI_LIBRARY}")
-  ENDIF(NOT Strigi_FIND_QUIETLY)
-ELSE(STRIGI_FOUND)
-  IF(Strigi_FIND_REQUIRED)
-    MESSAGE(FATAL_ERROR "Could not find Strigi")
-  ENDIF(Strigi_FIND_REQUIRED)
-ENDIF(STRIGI_FOUND)
-


COMP: Remove carriage returns from Cuberille remote.

Change-Id: I861270296fc61115298a9f111ea17194b83cdd4d

--- Modules/Remote/Cuberille.remote.cmake
+++ Modules/Remote/Cuberille.remote.cmake
@@ -17,5 +17,5 @@
 http://www.insight-journal.org/browse/publication/213
 "
   GIT_REPOSITORY https://github.com/InsightSoftwareConsortium/ITKCuberille.git
-  GIT_TAG 066ba15ec4ffc7206dfdc200996f4cf328364128
+  GIT_TAG eb9672c4ce279d587af412393980137f1bafd166
   )


Update Test.cmake

Update Test.cmake

Make unit-tests optional

--- logrotate/test/Test.cmake
+++ logrotate/test/Test.cmake
@@ -3,24 +3,30 @@
 #  2015, April 30, @author Kjell.Hedstrom
 # =====================================================

+option (ADD_LOGROTATE_UNIT_TEST "logrotate unit tests" OFF)

+IF (ADD_LOGROTATE_UNIT_TEST)

-set(GTEST_DIR ${DIR_3RDPARTY}/gtest-1.7.0)
-set(GTEST_INCLUDE_DIRECTORIES ${GTEST_DIR}/include ${GTEST_DIR} ${GTEST_DIR}/src)
-MESSAGE( "Attempt to build gtest. gtest directory: " ${GTEST_DIR})
-include_directories(${GTEST_INCLUDE_DIRECTORIES})
-add_library(gtest_170_lib ${GTEST_DIR}/src/gtest-all.cc)
-set_target_properties(gtest_170_lib PROPERTIES COMPILE_DEFINITIONS "GTEST_HAS_RTTI=0")
-enable_testing(true)
-include_directories(test)
-file(GLOB TEST_SRC_FILES "test/*.cpp" "test/*.h" "test/*.hpp")
-set(TestRunner UnitTestRunner)
+    set(GTEST_DIR ${DIR_3RDPARTY}/gtest-1.7.0)
+    set(GTEST_INCLUDE_DIRECTORIES ${GTEST_DIR}/include ${GTEST_DIR} ${GTEST_DIR}/src)
+    MESSAGE( "Attempt to build gtest. gtest directory: " ${GTEST_DIR})
+    include_directories(${GTEST_INCLUDE_DIRECTORIES})
+    add_library(gtest_170_lib ${GTEST_DIR}/src/gtest-all.cc)
+    set_target_properties(gtest_170_lib PROPERTIES COMPILE_DEFINITIONS "GTEST_HAS_RTTI=0")
+    enable_testing(true)
+    include_directories(test)
+    file(GLOB TEST_SRC_FILES "test/*.cpp" "test/*.h" "test/*.hpp")
+    set(TestRunner UnitTestRunner)

-# build the unit tests
-add_executable(${TestRunner} ${DIR_3RDPARTY}/test_main.cpp ${TEST_SRC_FILES} )
-set_target_properties(${TestRunner} PROPERTIES COMPILE_DEFINITIONS "GTEST_HAS_TR1_TUPLE=0")
-set_target_properties(${TestRunner} PROPERTIES COMPILE_DEFINITIONS "GTEST_HAS_RTTI=0")
-set_target_properties(${TestRunner} PROPERTIES COMPILE_FLAGS "-isystem -pthread ")
-target_link_libraries(${TestRunner} ${LIBRARY_TO_BUILD} ${G3LOG} gtest_170_lib -lstdc++ ${TCMALLOC}  ${PLATFORM_LINK_LIBRIES} -Wl,-rpath,. -Wl,-rpath,${G3_LIBRARY_PATH}  -Wl,-rpath,${G3_LIBRARY_PATH}/../lib64 )
+    # build the unit tests
+    add_executable(${TestRunner} ${DIR_3RDPARTY}/test_main.cpp ${TEST_SRC_FILES} )
+    set_target_properties(${TestRunner} PROPERTIES COMPILE_DEFINITIONS "GTEST_HAS_TR1_TUPLE=0")
+    set_target_properties(${TestRunner} PROPERTIES COMPILE_DEFINITIONS "GTEST_HAS_RTTI=0")
+    set_target_properties(${TestRunner} PROPERTIES COMPILE_FLAGS "-isystem -pthread ")
+    target_link_libraries(${TestRunner} ${LIBRARY_TO_BUILD} ${G3LOG} gtest_170_lib -lstdc++ ${TCMALLOC}  ${PLATFORM_LINK_LIBRIES} -Wl,-rpath,. -Wl,-rpath,${G3_LIBRARY_PATH}  -Wl,-rpath,${G3_LIBRARY_PATH}/../lib64 )

-MESSAGE("library to build ${LIBRARY_TO_BUILD}")+    MESSAGE("library to build ${LIBRARY_TO_BUILD}")
+
+ELSE()
+  MESSAGE("-DADD_LOGROTATE_UNIT_TEST=OFF")
+ENDIF (ADD_LOGROTATE_UNIT_TEST)


always enable memory growth in emscripten

--- toolchains/emscripten.cmake
+++ toolchains/emscripten.cmake
@@ -28,3 +28,8 @@
 # see: https://github.com/emscripten-core/emscripten/blob/master/src/settings.js

 set( TNUN_MALLOC_OVERCOMMIT_POLICY Partial )
+
+set( enable_memory_growth "SHELL:-s ALLOW_MEMORY_GROWTH=1" )
+
+add_compile_options( ${enable_memory_growth} )
+add_link_options( ${enable_memory_growth} )


Fixing cmake variable name

Fixing cmake variable name

--- appveyor.cmake
+++ appveyor.cmake
@@ -1,2 +1,2 @@
 set(BUILD_DIR C:/projects/morebin CACHE PATH "")
-set(BOOST_DIR C:/Libraries/boost_1_60_0 "")
+set(Boost_DIR C:/Libraries/boost_1_60_0 "")


Fix the detection of the XIMEA library (since its location may be different when the version of the ximea software is updated)

--- modules/videoio/cmake/detect_ximea.cmake
+++ modules/videoio/cmake/detect_ximea.cmake
@@ -6,10 +6,10 @@
     endif()
   endif()
   if(X86_64)
-    set(lib_dir "x64")
+    set(lib_dir "API/x64" "API/64bit")
     set(lib_suffix "64")
   else()
-    set(lib_dir "x86")
+    set(lib_dir "API/x86" "API/32bit")
     set(lib_suffix "32")
   endif()
   find_path(XIMEA_INCLUDE "xiApi.h"
@@ -19,7 +19,7 @@
   find_library(XIMEA_LIBRARY m3api xiapi${lib_suffix}
     PATHS "${XIMEA_ROOT}" ENV XIMEA_ROOT "/opt/XIMEA"
     HINTS "${regpath}"
-    PATH_SUFFIXES "API/${lib_dir}")
+    PATH_SUFFIXES ${lib_dir})
   if(XIMEA_INCLUDE AND XIMEA_LIBRARY)
     set(HAVE_XIMEA TRUE)
   endif()


Fixed formatting.

Fixed formatting.

--- cmake/fp.cmake
+++ cmake/fp.cmake
@@ -17,8 +17,8 @@

 message("      FP_METHD=BASIC    Schoolbook squaring.")
 message("      FP_METHD=INTEG    Integrated modular squaring.")
-message("      FP_METHD=COMBA    Comba squaring.\n")
-message("      FP_METHD=MULTP    Reuse multiplication for squaring.")
+message("      FP_METHD=COMBA    Comba squaring.")
+message("      FP_METHD=MULTP    Reuse multiplication for squaring.\n")

 message("      FP_METHD=BASIC    Division-based reduction.")
 message("      FP_METHD=QUICK    Fast reduction modulo special form prime (2^t - c, c > 0).")


[CI] ctest : dot not remove binary dir before submission...

--- CI/machinery/CTestDriver.cmake
+++ CI/machinery/CTestDriver.cmake
@@ -98,8 +98,10 @@
 # cf discussions here:
 # https://gitlab.kitware.com/cmake/cmake/issues/17000

-if(CTEST_BINARY_DIRECTORY)
-  file(REMOVE_RECURSE ${CTEST_BINARY_DIRECTORY})
+if(SUBMIT EQUAL 0)
+  if(CTEST_BINARY_DIRECTORY)
+    file(REMOVE_RECURSE ${CTEST_BINARY_DIRECTORY})
+  endif()
 endif()

 find_program(CTEST_GIT_COMMAND NAMES git)
@@ -166,6 +168,9 @@
   if (WITH_MEMCHECK AND CTEST_MEMORYCHECK_COMMAND)
     ctest_memcheck()
   endif (WITH_MEMCHECK AND CTEST_MEMORYCHECK_COMMAND)
+  if(NOT TEST_RETURN_VAL EQUAL 0)
+    message(FATAL_ERROR " *** test failure *** ")
+  endif()
 endif()

 if(SUBMIT EQUAL 1)
@@ -178,7 +183,5 @@
   endif()
 endif()

-if(NOT TEST_RETURN_VAL EQUAL 0)
-  message(FATAL_ERROR " *** test failure *** ")
-endif()

+


COMP: Fix for CMake 1.8, which does not have DEFINED test.

--- CMake/vtkDependentOption.cmake
+++ CMake/vtkDependentOption.cmake
@@ -10,7 +10,7 @@
 # retains its old value.
 #
 MACRO(VTK_DEPENDENT_OPTION option doc default depends force)
-  IF(${option}_ISSET MATCHES "^${option}_ISSET")
+  IF(${option}_ISSET MATCHES "^${option}_ISSET$")
     SET(${option}_AVAILABLE 1)
     FOREACH(d ${depends})
       IF(NOT ${d})
@@ -21,12 +21,13 @@
       OPTION(${option} "${doc}" "${default}")
       SET(${option} "${${option}}" CACHE BOOL "${doc}" FORCE)
     ELSE(${option}_AVAILABLE)
-      IF(DEFINED ${option})
+      IF(${option} MATCHES "^${option}$")
+      ELSE(${option} MATCHES "^${option}$")
         SET(${option} "${${option}}" CACHE INTERNAL "${doc}")
-      ENDIF(DEFINED ${option})
+      ENDIF(${option} MATCHES "^${option}$")
       SET(${option} ${force})
     ENDIF(${option}_AVAILABLE)
-  ELSE(${option}_ISSET MATCHES "^${option}_ISSET")
+  ELSE(${option}_ISSET MATCHES "^${option}_ISSET$")
     SET(${option} "${${option}_ISSET}")
-  ENDIF(${option}_ISSET MATCHES "^${option}_ISSET")
+  ENDIF(${option}_ISSET MATCHES "^${option}_ISSET$")
 ENDMACRO(VTK_DEPENDENT_OPTION)


BUG: Fix save on an existing file when we use QtTesting

Bug fix in QtTesting. See commite :
https://github.com/benjaminlong/QtTesting/commit/75c24a70e9ca2acdb86fd204285747a756c0a7ce

--- CMakeExternals/QtTesting.cmake
+++ CMakeExternals/QtTesting.cmake
@@ -23,7 +23,7 @@

     if(NOT DEFINED QtTesting_DIR)

-      set(revision_tag dac049b06724862583f6b64b2b038c0726bd2ba0)
+      set(revision_tag 75c24a70e9ca2acdb86fd204285747a756c0a7ce)
       if(${proj}_REVISION_TAG)
         set(revision_tag ${${proj}_REVISION_TAG})
       endif()


Fixed add_link_options() to support non-uppercase configuration names.

--- build_options.cmake
+++ build_options.cmake
@@ -52,5 +52,6 @@
     # function (with a major the difference: this function accepts a single
     # string of options as opposed to a list).
     #                                         (24.05.2016.) (Domagoj Saric)
+    string( TOUPPER ${configuration} configuration )
     set( CMAKE_EXE_LINKER_FLAGS_${configuration} "${CMAKE_EXE_LINKER_FLAGS_${configuration}} ${options}" PARENT_SCOPE )
 endfunction()


Fix Linux build

Fix Linux build

--- Source/PLT/target/Linux/config.cmake
+++ Source/PLT/target/Linux/config.cmake
@@ -33,6 +33,7 @@
 # Configuration for libPLT.a

 set(PLT_source
+    Platform/Source/PLT/target/native/platform.cpp
     Platform/Source/PLT/SDL2/Audio.cpp
     Platform/Source/PLT/SDL2/Event.cpp
     Platform/Source/PLT/SDL2/Frame.cpp


message("foo") instead of message(STATUS "foo")

the STATUS messages are not showing up in my
log file...

--- cdash/nightly.cmake
+++ cdash/nightly.cmake
@@ -41,14 +41,14 @@

 function(git_exec CMD ACTION)
   string(REPLACE " " ";" CMD2 "${CMD}")
-  message(STATUS "Running \"git ${CMD}\"")
+  message("Running \"git ${CMD}\"")
   execute_process(COMMAND "${CTEST_GIT_COMMAND}" ${CMD2}
     WORKING_DIRECTORY "${CTEST_SOURCE_DIRECTORY}/${CTEST_PROJECT_NAME}"
     RESULT_VARIABLE RETVAR)
   if(RETVAR)
     message(FATAL_ERROR "${ACTION} failed (code ${RETVAR})!")
   else()
-    message(STATUS "${ACTION} succeeded")
+    message("${ACTION} succeeded")
   endif()
 endfunction(git_exec)

@@ -64,14 +64,14 @@

 function(setup_repo)
   if(NOT EXISTS "${CTEST_SOURCE_DIRECTORY}/${CTEST_PROJECT_NAME}")
-    message(STATUS "Running \"git clone ${REPO_URL_BASE}.git ${CTEST_SOURCE_DIRECTORY}/${CTEST_PROJECT_NAME}\"")
+    message("Running \"git clone ${REPO_URL_BASE}.git ${CTEST_SOURCE_DIRECTORY}/${CTEST_PROJECT_NAME}\"")
     execute_process(COMMAND "${CTEST_GIT_COMMAND}" clone ${REPO_URL_BASE}.git
         "${CTEST_SOURCE_DIRECTORY}/${CTEST_PROJECT_NAME}"
         RESULT_VARIABLE CLONE_RET)
     if(CLONE_RET)
       message(FATAL_ERROR "Cloning ${REPO_URL_BASE}.git failed (code ${RETVAR})!")
     else()
-      message(STATUS "Cloning ${REPO_URL_BASE}.git succeeded")
+      message("Cloning ${REPO_URL_BASE}.git succeeded")
     endif()
     # make local tracking versions of all remote branches
     foreach(REPO_SUFFIX IN LISTS REPO_SUFFIXES)
@@ -101,7 +101,7 @@
   if(CONFIG_RET)
     message(WARNING "${BRANCH_NAME} config failed (code ${CONFIG_RET})!")
   else()
-    message(STATUS "${BRANCH_NAME} config passed")
+    message("${BRANCH_NAME} config passed")
   endif()

   ctest_build(
@@ -116,7 +116,7 @@
   ${NUM_BUILD_ERRORS} errors
   code ${BUILD_RET}")
   else()
-    message(STATUS "${BRANCH_NAME} build passed")
+    message("${BRANCH_NAME} build passed")
   endif()

   ctest_test(
@@ -125,7 +125,7 @@
   if(TEST_RET)
     message(WARNING "${BRANCH_NAME} testing failed (code ${TEST_RET})!")
   else()
-    message(STATUS "${BRANCH_NAME} testing passed")
+    message("${BRANCH_NAME} testing passed")
   endif()

   if(CONFIG_RET OR
@@ -134,7 +134,7 @@
     message(WARNING "some ${BRANCH_NAME} checks failed!")
     set(${ERRVAR} True PARENT_SCOPE)
   else()
-    message(STATUS "all ${BRANCH_NAME} checks passed")
+    message("all ${BRANCH_NAME} checks passed")
     set(${ERRVAR} False PARENT_SCOPE)
   endif()

@@ -146,7 +146,7 @@
     if(SUBMIT_ERROR)
       message(WARNING "Could not submit ${BRANCH_NAME} results to CDash (code ${SUBMIT_ERROR})!")
     else()
-      message(STATUS "Submitted ${BRANCH_NAME} results to CDash")
+      message("Submitted ${BRANCH_NAME} results to CDash")
     endif()
   endif()
 endfunction(check_current_branch)
@@ -160,7 +160,7 @@
   if("${NUM_UPDATES}" EQUAL "-1")
     message(FATAL_ERROR "Could not update ${BRANCH_NAME} branch!")
   endif()
-  message(STATUS "Updated ${NUM_UPDATES} files")
+  message("Updated ${NUM_UPDATES} files")
   check_current_branch(${BRANCH_NAME} "${CONFIG_OPTS}" ERRVAL2)
   set(${ERRVAR} ${ERRVAL2} PARENT_SCOPE)
 endfunction(check_tracking_branch)
@@ -185,7 +185,7 @@
   set(NEW_NAME "${SECOND_NAME}-into-${FIRST_NAME}")
   create_branch(${NEW_NAME} origin${REPO_SUFFIX}/${FIRST_BASE})
   checkout_branch(${NEW_NAME})
-  message(STATUS "Running \"git merge --no-ff --no-commit ${SECOND_NAME}\"")
+  message("Running \"git merge --no-ff --no-commit ${SECOND_NAME}\"")
   execute_process(COMMAND "${CTEST_GIT_COMMAND}" merge --no-ff --no-commit ${SECOND_NAME}
     WORKING_DIRECTORY ${CTEST_SOURCE_DIRECTORY}/${CTEST_PROJECT_NAME}
     OUTPUT_VARIABLE MERGE_OUTPUT
@@ -196,14 +196,14 @@
     return()
   endif()
   if("${MERGE_OUTPUT}" MATCHES "Already up-to-date")
-    message(STATUS "${FIRST_NAME} up-to-date with ${SECOND_NAME}, stopping merge")
+    message("${FIRST_NAME} up-to-date with ${SECOND_NAME}, stopping merge")
     set(${NEXT_ACTION} CLEANUP PARENT_SCOPE)
     return()
   endif()
   if(MERGE_RET)
     message(FATAL_ERROR "Merging ${SECOND_NAME} into ${FIRST_NAME} failed (code ${MERGE_RET})!")
   endif()
-  message(STATUS "Merging ${SECOND_NAME} into ${FIRST_NAME} worked okay...")
+  message("Merging ${SECOND_NAME} into ${FIRST_NAME} worked okay...")
   set(${NEXT_ACTION} PROCEED PARENT_SCOPE)
 endfunction(start_merge)

@@ -217,7 +217,7 @@
 function(accept_merge FIRST_BASE REPO_SUFFIX SECOND_NAME)
   set(FIRST_NAME ${FIRST_BASE}${REPO_SUFFIX})
   set(NEW_NAME "${SECOND_NAME}-into-${FIRST_NAME}")
-  message(STATUS "Running \"git commit -m \"Merging ${SECOND_NAME} into ${FIRST_NAME}\" --author=\"${MERGE_AUTHOR}\"\"")
+  message("Running \"git commit -m \"Merging ${SECOND_NAME} into ${FIRST_NAME}\" --author=\"${MERGE_AUTHOR}\"\"")
   execute_process(COMMAND "${CTEST_GIT_COMMAND}" commit
     -m "Merging ${SECOND_NAME} into ${FIRST_NAME}"
     --author="${MERGE_AUTHOR}"
@@ -226,7 +226,7 @@
   if(RETVAR)
     message(FATAL_ERROR "Commiting merge ${NEW_NAME} failed (code ${RETVAR})!")
   else()
-    message(STATUS "Commiting merge ${NEW_NAME} succeeded")
+    message("Commiting merge ${NEW_NAME} succeeded")
   endif()
   git_exec("push origin${REPO_SUFFIX} ${NEW_NAME}:${FIRST_BASE}"
            "Pushing merge ${NEW_NAME}")


SuperBuild: curl: detect install prefix from compiler version

--- SuperBuild/CMake/External_curl.cmake
+++ SuperBuild/CMake/External_curl.cmake
@@ -9,33 +9,28 @@
   ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(OPENSSL)
 endif()

-
 if(MSVC)
   if(NOT BUILD_SHARED_LIBS)
     message(FATAL_ERROR "static build or curl not supported")
     return()
-endif()
+  endif()

-if(NOT DEFINED ENV{PROCESSOR_ARCHITECTURE})
-  message(FATAL_ERROR "PROCESSOR_ARCHITECTURE env variable is not defined")
-  return()
-endif()
+  execute_process(
+  COMMAND ${CMAKE_C_COMPILER}
+  ERROR_VARIABLE ev
+  OUTPUT_VARIABLE ov
+  OUTPUT_QUIET
+  OUTPUT_STRIP_TRAILING_WHITESPACE)

-if("$ENV{PROCESSOR_ARCHITECTURE}" MATCHES "AMD64" )
-  set(CURL_INSTALL_DIR_PREFIX "libcurl-vc-x64")
-else()
-  set(CURL_INSTALL_DIR_PREFIX "libcurl-vc-x86")
-endif()
+  if("${ev}" MATCHES "x86")
+	set(CURL_INSTALL_DIR_PREFIX "libcurl-vc-x86")
+  else()
+	set(CURL_INSTALL_DIR_PREFIX "libcurl-vc-x64")
+  endif()

-if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
-  set(CURL_INSTALL_DIR_PREFIX "${CURL_INSTALL_DIR_PREFIX}-release")
-else()
-  set(CURL_INSTALL_DIR_PREFIX "${CURL_INSTALL_DIR_PREFIX}-debug")
-endif()
+  set(CURL_INSTALL_DIR_PREFIX "${CURL_INSTALL_DIR_PREFIX}-release-dll-zlib-dll-ipv6-sspi-winssl")

-set(CURL_INSTALL_DIR_PREFIX "${CURL_INSTALL_DIR_PREFIX}-dll-zlib-dll-ipv6-sspi-winssl")
-
-ExternalProject_Add(CURL
+  ExternalProject_Add(CURL
   PREFIX CURL
   URL "http://curl.haxx.se/download/curl-7.40.0.tar.gz"
   URL_MD5 58943642ea0ed050ab0431ea1caf3a6f


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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