Update to c++14

Update to c++14

--- BuildUtils.cmake
+++ BuildUtils.cmake
@@ -159,8 +159,8 @@
             POSITION_INDEPENDENT_CODE ON

             # It is crucial to set CXX_STANDARD flag to only affect c++ files and avoid failures compiling c-files:
-            # error: invalid argument '-std=c++11' not allowed with 'C/ObjC'
-            CXX_STANDARD 11
+            # error: invalid argument '-std=c++14' not allowed with 'C/ObjC'
+            CXX_STANDARD 14
             CXX_STANDARD_REQUIRED ON

             C_STANDARD 11


fixed: on non-windows platforms debug/release libs are interchangeable,
       avoid config errors if only one is found

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

--- CMake/FindCollada.cmake
+++ CMake/FindCollada.cmake
@@ -98,6 +98,16 @@
                                                       COLLADA_DAE_INCLUDE_DIR
                                                       COLLADA_DOM_INCLUDE_DIR)

+# if only the debug or release lib was found, use it for both configurations,
+# except on windows where the runtimes have to match
+IF(NOT WIN32)
+    IF(COLLADA_LIBRARY_RELEASE AND NOT COLLADA_LIBRARY_DEBUG)
+        SET(COLLADA_LIBRARY_DEBUG "${COLLADA_LIBRARY_RELEASE}")
+    ELSEIF(COLLADA_LIBRARY_DEBUG AND NOT COLLADA_LIBRARY_RELEASE)
+        SET(COLLADA_LIBRARY_RELEASE "${COLLADA_LIBRARY_DEBUG}")
+    ENDIF(COLLADA_LIBRARY_RELEASE AND NOT COLLADA_LIBRARY_DEBUG)
+ENDIF(NOT WIN32)
+
 # set output variables
 IF(COLLADA_FOUND)
     GET_FILENAME_COMPONENT(__COLLADA_LIB_DIR_RELEASE "${COLLADA_LIBRARY_RELEASE}" PATH)


CMake LINK_FLAGS should be space-delimited

Fixes an issue where, on Windows, we're getting a single link flag:
/IGNORE:4199"%3B"/DELAYLOAD:electron.exe"%3B"/DELAYLOAD...

Could work around it in our CMakeLists by getting the link_flags from the
target, looping through them and writing them back to the target's link flags
with spaces, but I'd rather fix it at the source.

It looks like this may have been broken for a while but only shows up on
Windows because Windows is the only platform that ends up with multiple
values in NodeJS_LINK_FLAGS

--- FindNodeJS.cmake
+++ FindNodeJS.cmake
@@ -450,7 +450,9 @@
     if(NOT LINK_FLAGS)
         set(LINK_FLAGS "")
     endif()
-    set(LINK_FLAGS "${LINK_FLAGS} ${NodeJS_LINK_FLAGS}")
+    foreach(NodeJS_LINK_FLAG ${NodeJS_LINK_FLAGS})
+        set(LINK_FLAGS "${LINK_FLAGS} ${NodeJS_LINK_FLAG}")
+    endforeach()
     set_target_properties(${NAME} PROPERTIES
         PREFIX ""
         SUFFIX ".node"


Tweak GNUModules, use reasonable defaults

--- GNUModules.cmake
+++ GNUModules.cmake
@@ -9,6 +9,12 @@
 # Additionally, the following variables have to set before including
 # GNUModules.cmake.

+# Need variables defined by (Common)CPackConfig
+if(NOT CPACK_PROJECT_NAME OR NOT CPACK_PACKAGE_VENDOR OR NOT VERSION OR
+   NOT CMAKE_SYSTEM_PROCESSOR OR NOT LSB_RELEASE OR NOT LSB_DISTRIBUTOR_ID)
+  message(FATAL_ERROR "Need CommonCPack before GNUModule")
+endif()
+
 # Specify the environment for your software that the module should setup
 # Example:
 #   set(MODULE_ENV "
@@ -17,17 +23,27 @@
 #   append-path    PATH             $root/bin
 #   append-path    LD_LIBRARY_PATH  $root/lib")
 if(NOT MODULE_ENV)
-  message(FATAL_ERROR "Need MODULE_ENV for GNUModule")
+  string(TOUPPER ${CMAKE_PROJECT_NAME} UPPER_PROJECT_NAME)
+  set(MODULE_ENV "
+  setenv         ${UPPER_PROJECT_NAME}_INCLUDE_DIR  $root/include
+  setenv         ${UPPER_PROJECT_NAME}_ROOT         $root
+  append-path    PATH             $root/bin
+  append-path    LD_LIBRARY_PATH  $root/lib")
 endif()

 # the base directory containing all modules on a machine
 if(NOT MODULE_SW_BASEDIR)
-  message(FATAL_ERROR "Need MODULE_SW_BASEDIR for GNUModule")
+  set(MODULE_SW_BASEDIR "/usr/share/Modules")
 endif()

 # the category/subdirectory inside the basedir for this software
 if(NOT MODULE_SW_CLASS)
-  message(FATAL_ERROR "Need MODULE_SW_CLASS for GNUModule")
+  set(MODULE_SW_CLASS ${CPACK_PACKAGE_VENDOR})
+endif()
+
+# path in MODULE_SW_BASEDIR to modulefiles
+if(NOT MODULE_MODULEFILES)
+  set(MODULE_MODULEFILES "modulefiles")
 endif()

 # optional: list of required modules that need to be loaded before this module
@@ -38,12 +54,6 @@

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

-
-# Need variables defined by (Common)CPackConfig
-if(NOT CPACK_PROJECT_NAME OR NOT VERSION OR NOT CMAKE_SYSTEM_PROCESSOR OR
-   NOT LSB_RELEASE OR NOT LSB_DISTRIBUTOR_ID)
-  message(FATAL_ERROR "Need CommonCPack before GNUModule")
-endif()

 # get the used compiler + its version
 get_filename_component(MODULE_COMPILER_NAME ${CMAKE_C_COMPILER} NAME CACHE)
@@ -113,9 +123,10 @@
   COMMENT "Installing GNU module source at ${MODULE_SRC_INSTALL}" VERBATIM
   DEPENDS ${ALL_DEP_TARGETS})

-set(MODULE_FILE_INSTALL "${MODULE_SW_BASEDIR}/module/modulefiles")
+set(MODULE_FILE_INSTALL "${MODULE_SW_BASEDIR}/${MODULE_MODULEFILES}")
 add_custom_target(module
   ${CMAKE_COMMAND} -E copy ${MODULE_FILENAME} ${MODULE_FILE_INSTALL}/${MODULE_FILENAME}
   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
   COMMENT "Creating GNU module ${MODULE_FILENAME} at ${MODULE_FILE_INSTALL}" VERBATIM)
 add_dependencies(module module_install)
+


cmake-modules
 * FindThirdPartyMatlab.cmake : fixed the search path for matlab. Let cmake finds it works, and it's simpler.

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

--- trunk/cmake-modules/FindThirdPartyMatlab.cmake
+++ trunk/cmake-modules/FindThirdPartyMatlab.cmake
@@ -4,10 +4,9 @@

 IF(UNIX OR WIN32)
 	SET(Matlab_EXECUTABLE "Matlab_EXECUTABLE-NOTFOUND")
-	FIND_PROGRAM(Matlab_EXECUTABLE matlab PATHS "$ENV{MATLABROOT}/bin" "$ENV{OV_DEP_MATLAB}/bin" NO_DEFAULT_PATH)
-	FIND_PROGRAM(Matlab_EXECUTABLE MATLAB PATHS "$ENV{MATLABROOT}/bin" "$ENV{OV_DEP_MATLAB}/bin" NO_DEFAULT_PATH)
-	FIND_PROGRAM(Matlab_EXECUTABLE matlab PATHS "$ENV{MATLABROOT}/bin" "$ENV{OV_DEP_MATLAB}/bin")
-	FIND_PROGRAM(Matlab_EXECUTABLE MATLAB PATHS "$ENV{MATLABROOT}/bin" "$ENV{OV_DEP_MATLAB}/bin")
+
+	# FIND_PROGRAM(Matlab_EXECUTABLE matlab PATHS "$ENV{MATLABROOT}/bin" "$ENV{OV_DEP_MATLAB}/bin")
+	FIND_PROGRAM(Matlab_EXECUTABLE MATLAB)
 	IF(Matlab_EXECUTABLE)
 		GET_FILENAME_COMPONENT(Matlab_ROOT ${Matlab_EXECUTABLE} PATH)
 		SET(Matlab_ROOT ${Matlab_ROOT}/..)
@@ -30,6 +29,8 @@
 				# /DELAYLOAD:libmex.dll /DELAYLOAD:mclmcrrt.dll --> useless, no import
 			ENDIF(WIN32)
 			SET(Matlab_FOUND TRUE)
+			SET(PLOP $ENV{OV_DEP_MATLAB})
+			MESSAGE(STATUS "Found matlab in [${Matlab_EXECUTABLE}] ")
 		ELSE(Matlab_INCLUDE)
 		ENDIF(Matlab_INCLUDE)
 	ENDIF(Matlab_EXECUTABLE)


Fixed Linking.cmake file after merge with LL V3.3.2 and use Firestorm build targets instead V3's

--- indra/cmake/Linking.cmake
+++ indra/cmake/Linking.cmake
@@ -33,13 +33,19 @@
   set(AUTOBUILD_LIBS_INSTALL_DIRS ${AUTOBUILD_INSTALL_DIR}/lib/${CMAKE_BUILD_TYPE_LOWER})
 endif(WINDOWS OR DARWIN)

-if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+# <FS:Ansariel> Changed for Firestorm
+#if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "ReleaseFS" AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "ReleaseFS_open")
+# </FS:Ansariel> Changed for Firestorm
   # When we're building something other than Release, append the
   # packages/lib/release directory to deal with autobuild packages that don't
   # provide (e.g.) lib/debug libraries.
   list(APPEND AUTOBUILD_LIBS_INSTALL_DIRS ${ARCH_PREBUILT_DIRS_RELEASE})
   message(STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}, extending AUTOBUILD_LIBS_INSTALL_DIRS")
-endif (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+# <FS:Ansariel> Changed for Firestorm
+#endif (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+endif (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "ReleaseFS" AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "ReleaseFS_open")
+# </FS:Ansariel> Changed for Firestorm
 message(STATUS "For ${CMAKE_BUILD_TYPE}, AUTOBUILD_LIBS_INSTALL_DIRS: ${AUTOBUILD_LIBS_INSTALL_DIRS}")
 link_directories(${AUTOBUILD_LIBS_INSTALL_DIRS})


cmake fix for cross builds    misuse of CMAKE_SYSTEM_NAME

--- build.cmake
+++ build.cmake
@@ -36,7 +36,7 @@

 elseif(PLT_TARGET STREQUAL "" OR PLT_TARGET STREQUAL "native")
    # Use the host system as the target
-   set(PLT_TARGET ${CMAKE_SYSTEM_NAME})
+   set(PLT_TARGET ${CMAKE_HOST_SYSTEM_NAME})
 endif()

 # Translate macOSes confusing self description


Added SDK flags to pch headers on apple targets

--- PCHSupport.cmake
+++ PCHSupport.cmake
@@ -76,6 +76,15 @@
 		LIST(APPEND ${_out_compile_flags} "/Gd")
 	endif()

+	if (APPLE)
+		if (CMAKE_OSX_DEPLOYMENT_TARGET)
+			LIST(APPEND ${_out_compile_flags} "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+		endif()
+		if(CMAKE_OSX_SYSROOT)
+			LIST(APPEND ${_out_compile_flags} "-isysroot ${CMAKE_OSX_SYSROOT}")
+		endif()
+	endif()
+
 	# Format definitions and remove duplicates
 	SEPARATE_ARGUMENTS(${_out_compile_flags})
 	LIST(REMOVE_DUPLICATES ${_out_compile_flags})


ThriftCppLibrary.cmake: fixup deps

ThriftCppLibrary.cmake: fixup deps

Summary:
this adds the include and library dirs for generated thrift targets;
these are important when those dependencies are not installed into a default
prefix.

Reviewed By: strager

Differential Revision: D14683957

fbshipit-source-id: ed47ffac5c8732810afe77e6947584b7a2f05155

--- build/fbcode_builder/CMake/ThriftCppLibrary.cmake
+++ build/fbcode_builder/CMake/ThriftCppLibrary.cmake
@@ -107,11 +107,14 @@
     PUBLIC
       ${CMAKE_SOURCE_DIR}
       ${CMAKE_BINARY_DIR}
+      ${FOLLY_INCLUDE_DIR}
+      ${FBTHRIFT_INCLUDE_DIR}
   )
   target_link_libraries(
     ${LIB_NAME}
     PUBLIC
       ${DEPENDS}
       FBThrift::thriftcpp2
+      Folly::folly
   )
 endfunction()


limit VKL ISA to AVX2 (for now) in superbuild

--- scripts/superbuild/dependencies/dep_openvkl.cmake
+++ scripts/superbuild/dependencies/dep_openvkl.cmake
@@ -43,6 +43,7 @@
     -DBUILD_BENCHMARKS=OFF
     -DBUILD_EXAMPLES=OFF
     -DBUILD_TESTING=OFF
+    -DOPENVKL_MAX_ISA=AVX2
   BUILD_COMMAND ${DEFAULT_BUILD_COMMAND}
   BUILD_ALWAYS ${ALWAYS_REBUILD}
 )


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

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


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   26)
+SET(KWSYS_DATE_STAMP_DAY   27)


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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


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

 # 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

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

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


Gentoo ebuilds are slotted despite my request. Adding some future insurance to the FindCUDA.cmake ebuild so that CUDA will be found for many versions to come.

git-svn-id: 4ba210d0a933e3fb1aa9ab096f190cd38965d92a@1464 fa922fa7-2fde-0310-acd8-f43f465a7996

--- src/CMake/cuda/FindCuda.cmake
+++ src/CMake/cuda/FindCuda.cmake
@@ -119,7 +119,7 @@
 IF(NOT CUDA_INSTALL_PREFIX)
   FIND_PATH(CUDA_INSTALL_PREFIX
     NAMES nvcc nvcc.exe
-    PATHS /usr/local/cuda /opt/cuda /opt/cuda-1.1 /opt/cuda-2.0 /opt/cuda-2.1 ENV CUDA_BIN_PATH
+    PATHS /usr/local/cuda /opt/cuda /opt/cuda-1.1 /opt/cuda-2.0 /opt/cuda-2.1 /opt/cuda-2.2 /opt/cuda-2.3 /opt/cuda/2.4 /opt/cuda-2.5 /opt/cuda-2.6 /opt/cuda-2.7 /opt/cuda-2.8 /opt/cuda-2.9 /opt/cuda-3.0 ENV CUDA_BIN_PATH
     PATH_SUFFIXES bin
     DOC "Toolkit location."
     )


BUGsFIX: Slicer Extension Building

BUGsFIX: Slicer Extension Building

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -50,15 +50,18 @@

 set( ${PRIMARY_PROJECT_NAME}_DEPENDENCIES )

-if(NOT defined ITK_DIR)
+if(defined ITK_DIR)
+else()
   list(APPEND ${PRIMARY_PROJECT_NAME}_DEPENDENCIES ITKv4)
 endif()

-if(NOT defined SlicerExecutionModel_DIR)
+if(defined SlicerExecutionModel_DIR)
+else()
   list(APPEND ${PRIMARY_PROJECT_NAME}_DEPENDENCIES SlicerExecutionModel)
 endif()

-if(NOT defined QtToCppXML_DIR)
+if(defined QtToCppXML_DIR)
+else()
   list(APPEND ${PRIMARY_PROJECT_NAME}_DEPENDENCIES QtToCppXML)
 endif()


Revert "bzip2: switch to Fedora mirror"

Revert "bzip2: switch to Fedora mirror"

This reverts commit 38cc68789dcf7b2eea4008b18c554bf0f94d3610.

--- packages/bzip2.cmake
+++ packages/bzip2.cmake
@@ -1,7 +1,6 @@
 ExternalProject_Add(bzip2
     DEPENDS gcc
-#     URL "http://bzip.org/1.0.6/bzip2-1.0.6.tar.gz"
-    URL "http://pkgs.fedoraproject.org/repo/pkgs/bzip2/bzip2-1.0.6.tar.gz/00b516f4704d4a7cb50a1d97e6e8e15b/bzip2-1.0.6.tar.gz"
+    URL "http://bzip.org/1.0.6/bzip2-1.0.6.tar.gz"
     URL_MD5 00b516f4704d4a7cb50a1d97e6e8e15b
     PATCH_COMMAND patch -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/bzip2-1-fixes.patch
     CONFIGURE_COMMAND ""


ENH: Bump PerformanceBenchmarking to 2016-11-07

Log:

 Matt McCormick (1):
       ENH: Add CTestConfig.cmake to the examples

Change-Id: I6ee918d0ab39ac490f1bddda803203201fdb7dcc

--- Modules/Remote/PerformanceBenchmarking.remote.cmake
+++ Modules/Remote/PerformanceBenchmarking.remote.cmake
@@ -15,5 +15,5 @@
   http://insight-journal.org/browse/publication/972
 "
   GIT_REPOSITORY ${git_protocol}://github.com/InsightSoftwareConsortium/ITKPerformanceBenchmarking.git
-  GIT_TAG c561a3b357dbd4e175d93eb5b6b544107a700393
+  GIT_TAG e07106507f6b7fd4fe0707c2ee463f56f53e637d
   )


Fix the XAudio2 detection logic on Windows platform.

--- CMake/Modules/FindDirectX.cmake
+++ CMake/Modules/FindDirectX.cmake
@@ -212,7 +212,7 @@

 # For now take shortcut for the other DirectX components by just checking on the headers and not the libraries
 include (CheckIncludeFiles)
-include (CheckIncludeFile)
+include (CheckIncludeFileCXX)
 foreach (NAME ${DIRECTX_HEADERS})
     string (REPLACE . _ BASE_NAME ${NAME})
     string (TOUPPER ${BASE_NAME} UPCASE_NAME)
@@ -220,7 +220,7 @@
         # Workaround an issue in finding xinput.h using check_include_file() as it depends on windows.h but not included it by itself in WinSDK
         check_include_files (windows.h\;${NAME} HAVE_${UPCASE_NAME})
     else ()
-        check_include_file (${NAME} HAVE_${UPCASE_NAME})
+        check_include_file_cxx (${NAME} HAVE_${UPCASE_NAME})
     endif ()
 endforeach ()
 if (HAVE_D3D9_H)


CMake: Fix warning shown because of incorrect condition.

--- CMake/Modules/UrhoOptions.cmake
+++ CMake/Modules/UrhoOptions.cmake
@@ -199,7 +199,7 @@
         set (URHO3D_LOGGING ON)
         if (NOT DEFINED URHO3D_HASH_DEBUG)
             set (URHO3D_HASH_DEBUG ON)
-        else ()
+        elseif (NOT URHO3D_HASH_DEBUG)
             message (WARNING "Editor uses URHO3D_HASH_DEBUG feature, but it was disabled. Editor will still build but some features will break.")
         endif ()
     endif ()


CMake: Disable plugins on web builds.

CMake: Disable plugins on web builds.

--- CMake/Modules/UrhoOptions.cmake
+++ CMake/Modules/UrhoOptions.cmake
@@ -116,7 +116,7 @@
 _option(URHO3D_HASH_DEBUG         "Enable StringHash name debugging"                      ${URHO3D_ENABLE_ALL}                                    )
 _option(URHO3D_MONOLITHIC_HEADER  "Create Urho3DAll.h which includes all engine headers." OFF                                                     )
 _option2(URHO3D_MINIDUMPS         "Enable writing minidumps on crash"                     ${URHO3D_ENABLE_ALL} "MSVC"                          OFF)
-_option(URHO3D_PLUGINS            "Enable plugins"                                        ${URHO3D_ENABLE_ALL})
+_option2(URHO3D_PLUGINS           "Enable plugins"                                        ${URHO3D_ENABLE_ALL} "NOT WEB"                       OFF)
 _option2(URHO3D_THREADING         "Enable multithreading"                                 ${URHO3D_ENABLE_ALL} "NOT WEB"                       OFF)
 _option(URHO3D_WEBP               "WEBP support enabled"                                  ${URHO3D_ENABLE_ALL}                                    )
 # Web


Update install location for cl2hpp external project

--- CMakeModules/build_cl2hpp.cmake
+++ CMakeModules/build_cl2hpp.cmake
@@ -1,14 +1,13 @@
 INCLUDE(ExternalProject)

-SET(prefix ${CMAKE_BINARY_DIR}/third_party/cl2hpp/src/cl2hpp-ext-build)
+SET(prefix ${CMAKE_BINARY_DIR}/third_party/cl2hpp)

 ExternalProject_Add(
     cl2hpp-ext
-    GIT_REPOSITORY https://github.com/KhronosGroup/OpenCL-CLHPP.git
-    GIT_TAG 2b415bf8fc6ab035b6de6a14f3c579f91199fa2a
+    GIT_REPOSITORY https://github.com/9prady9/OpenCL-CLHPP.git
+    GIT_TAG install_targets
     PREFIX "${prefix}"
-    INSTALL_COMMAND ""
-    INSTALL_DIR "${prefix}"
+    INSTALL_DIR "${prefix}/package"
     UPDATE_COMMAND ""
     CONFIGURE_COMMAND ${CMAKE_COMMAND} -Wno-dev "-G${CMAKE_GENERATOR}" <SOURCE_DIR>
     -DCMAKE_SOURCE_DIR:PATH=<SOURCE_DIR>
@@ -17,12 +16,14 @@
     -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
     -DBUILD_DOCS:BOOL=OFF
-    -DBUILD_EXAMPLES:BOOL=ON
+    -DBUILD_EXAMPLES:BOOL=OFF
     -DBUILD_TESTS:BOOL=OFF
     )

-ADD_CUSTOM_TARGET(cl2hpp DEPENDS "${prefix}/include/CL/cl2.hpp")
+ExternalProject_Get_Property(cl2hpp-ext install_dir)
+
+ADD_CUSTOM_TARGET(cl2hpp DEPENDS "${prefix}/package/CL/cl2.hpp")

 ADD_DEPENDENCIES(cl2hpp cl2hpp-ext)

-SET(CL2HPP_INCLUDE_DIRECTORY ${prefix}/include)
+SET(CL2HPP_INCLUDE_DIRECTORY ${install_dir})


Promote the warning in macro_pickup_tests.cmake to a fatal error

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

--- deal.II/cmake/macros/macro_pickup_tests.cmake
+++ deal.II/cmake/macros/macro_pickup_tests.cmake
@@ -74,12 +74,12 @@
           SET(_define_test FALSE)
         ENDIF()
       ELSE()
-        MESSAGE(WARNING "
+        MESSAGE(FATAL_ERROR "
 Invalid feature constraint \"${_match}\" in file
 \"${_comparison}\":
-The feature \"DEAL_II_${_feature}\" does not exist. Test dropped.\n"
+The feature \"DEAL_II_${_feature}\" does not exist.\n"
           )
-        SET(_define_test FALSE)
+        #SET(_define_test FALSE)
       ENDIF()
     ENDFOREACH()


COMP: Don't try to install header files that don't exist.

--- CMake/KitCommonBlock.cmake
+++ CMake/KitCommonBlock.cmake
@@ -48,7 +48,9 @@
     GET_FILENAME_COMPONENT(__fname ${__file} ABSOLUTE)
     GET_FILENAME_COMPONENT(__fname.path ${__fname} PATH)
     GET_FILENAME_COMPONENT(__fname.name ${__fname} NAME_WE)
-    SET(__files.h ${__files.h} "${__fname.path}/${__fname.name}.h")
+    IF ( EXISTS "${__fname.path}/${__fname.name}.h" )
+      SET(__files.h ${__files.h} "${__fname.path}/${__fname.name}.h")
+    ENDIF ( EXISTS "${__fname.path}/${__fname.name}.h" )
   ENDFOREACH(__file)
   INSTALL(FILES ${__files.h}
     DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}


Include TargetConditionals.h in the CMake folly-config.h

Summary:
Clang makes using undefined macros starting with `TARGET_OS_*` an error by default on mac, since those are supposed to be supplied by `TargetConditionals.h`.
Resolves https://github.com/facebook/folly/issues/1819

Reviewed By: Gownta

Differential Revision: D37898184

fbshipit-source-id: 1fc899f18eac0e6fd4a2ebdfae73fa8dd44e6df6

--- CMake/folly-config.h.cmake
+++ CMake/folly-config.h.cmake
@@ -15,6 +15,10 @@
  */

 #pragma once
+
+#ifdef __APPLE__
+#include <TargetConditionals.h> // @manual
+#endif

 #if !defined(FOLLY_MOBILE)
 #if defined(__ANDROID__) || \


ENH: Upgrade to zlib 1.2.12

ENH: Upgrade to zlib 1.2.12

--- SuperBuild/CMake/External_zlib.cmake
+++ SuperBuild/CMake/External_zlib.cmake
@@ -26,8 +26,8 @@
 # Try official release 1.2.11
 ExternalProject_Add(ZLIB
   PREFIX ZLIB
-  URL "https://downloads.sourceforge.net/project/libpng/zlib/1.2.11/zlib-1.2.11.tar.gz"
-  URL_MD5 1c9f62f0778697a09d36121ead88e08e
+  URL "https://zlib.net/zlib-1.2.12.tar.gz"
+  URL_MD5 5fc414a9726be31427b440b434d05f78
   BINARY_DIR ${ZLIB_SB_BUILD_DIR}
   INSTALL_DIR ${SB_INSTALL_PREFIX}
   DOWNLOAD_DIR ${DOWNLOAD_LOCATION}


iOS: set IOS_SDK_VERSION (if empty)

iOS: set IOS_SDK_VERSION (if empty)

--- iOS.cmake
+++ iOS.cmake
@@ -58,3 +58,28 @@
   message(FATAL_ERROR "xcodebuild not found")
 endif()

+# Order is important(!)
+# Set high priority to the last
+if(NOT IOS_SDK_VERSION)
+  set(IOS_SDK_VERSIONS 5.0 5.1 6.0 6.1 7.0)
+  foreach(x ${IOS_SDK_VERSIONS})
+    execute_process(
+        COMMAND
+        ${XCODEBUILD_EXECUTABLE}
+        -showsdks
+        -sdk
+        "iphoneos${x}"
+        RESULT_VARIABLE
+        IOS_SDK_VERSION_RESULT
+        OUTPUT_QUIET
+        ERROR_QUIET
+    )
+    if(${IOS_SDK_VERSION_RESULT} EQUAL 0)
+      set(IOS_SDK_VERSION ${x})
+    endif()
+  endforeach()
+endif()
+
+if(NOT IOS_SDK_VERSION)
+  message(FATAL_ERROR "iOS version not found, tested: [${IOS_SDK_VERSIONS}]")
+endif()


COMP: Update LesionSizingToolkit remote module from upstream

This fixes a compiler warning on Visual Studio 9.

Change-Id: I44c387aa5e66b0165130d989c3c56ce132e159c9

--- Modules/Remote/LesionSizingToolkit.remote.cmake
+++ Modules/Remote/LesionSizingToolkit.remote.cmake
@@ -1,5 +1,5 @@
 itk_fetch_module(LesionSizingToolkit
   "Framework for determining the sizes of lesions in medical images."
   GIT_REPOSITORY http://public.kitware.com/LesionSizingToolkit.git
-  GIT_TAG  c03168c0ff69386d7f59b00b46875273852068c7
+  GIT_TAG  cb8c368a391199a2cba9d01747a2f96186f6772a
   )


Fixes redebug cmake warning.

Fixes redebug cmake warning.

--- build-utils/cmake/compiler_settings.cmake
+++ build-utils/cmake/compiler_settings.cmake
@@ -18,7 +18,7 @@
 # Redebug all
 if(ozz_build_redebug_all)
   message("OZZ_HAS_REDEBUG_ALL is enabled")
-  set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG OZZ_HAS_REDEBUG_ALL=1)
+  set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_$<$<CONFIG:Debug>:OZZ_HAS_REDEBUG_ALL=1)
 endif()

 #------------------------


[CMake] [builtins] [macho_embedded] Don't pass -mfloat-abi=hard flag to x86 because the compiler ignores it and complains.

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

--- cmake/Modules/CompilerRTDarwinUtils.cmake
+++ cmake/Modules/CompilerRTDarwinUtils.cmake
@@ -377,14 +377,18 @@
       foreach(arch ${DARWIN_${float_type}_FLOAT_ARCHS})
         set(DARWIN_macho_embedded_SYSROOT ${DARWIN_osx_SYSROOT})
         set(DARWIN_macho_embedded_BUILTIN_MIN_VER_FLAG ${DARWIN_osx_BUILTIN_MIN_VER_FLAG})
+        set(float_flag)
         if(${arch} MATCHES "^arm")
           set(DARWIN_macho_embedded_SYSROOT ${DARWIN_ios_SYSROOT})
+          # x86 targets are hard float by default, but the complain about the
+          # float ABI flag, so don't pass it unless we're targeting arm.
+          set(float_flag ${${float_type}_FLOAT_FLAG})
         endif()
         darwin_add_builtin_library(clang_rt ${lib_suffix}
                               OS macho_embedded
                               ARCH ${arch}
                               SOURCES ${${arch}_filtered_sources}
-                              CFLAGS -arch ${arch} ${${type}_FLAG} ${${float_type}_FLOAT_FLAG} ${CFLAGS_${arch}}
+                              CFLAGS -arch ${arch} ${${type}_FLAG} ${float_flag} ${CFLAGS_${arch}}
                               PARENT_TARGET builtins)
       endforeach()
       foreach(lib ${macho_embedded_${lib_suffix}_libs})


look for toku_config.h

look for toku_config.h

--- cmake_modules/TokuBuildTagDatabases.cmake
+++ cmake_modules/TokuBuildTagDatabases.cmake
@@ -30,7 +30,7 @@
   db-benchmark-test/*.h
   )
 list(APPEND all_hdrs
-  ${CMAKE_CURRENT_BINARY_DIR}/toku_include/config.h
+  ${CMAKE_CURRENT_BINARY_DIR}/toku_include/toku_config.h
   ${CMAKE_CURRENT_BINARY_DIR}/buildheader/db.h
   ${CMAKE_CURRENT_BINARY_DIR}/ft/log_header.h
   )


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)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


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   18)
+SET(KWSYS_DATE_STAMP_DAY   19)


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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


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


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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


Add more potential library defaults to FindQScintilla

--- cmake/FindQScintilla.cmake
+++ cmake/FindQScintilla.cmake
@@ -77,7 +77,7 @@
 )

 find_library(QSCINTILLA_LIBRARY
-  NAMES qt5scintilla2 libqt5scintilla2 "${PC_QSCINTILLA_LIBRARIES}"
+  NAMES qt5scintilla2 qscintilla2 q5scintilla2 qscintilla qt5scintilla qtscintilla "${PC_QSCINTILLA_LIBRARIES}"
   PATHS "${Qt5Core_LIBRARIES}" "${PC_QSCINTILLA_LIBRARY_DIRS}" "${QSCINTILLA_BREW_LIBRARY}"
   DOC "Path to the QScintilla library."
 )


cmake error on osx

cmake error on osx

--- cmake/install_macros.cmake
+++ cmake/install_macros.cmake
@@ -32,7 +32,7 @@
       # It's a dirty hack, but cmake too stupid and mysql cmake files too buggy */
       STRING(REPLACE "liblibmysql.dylib" "libmysqlclient.${SHARED_LIB_MAJOR_VERSION}.dylib" location ${location})
       IF(type MATCHES "EXECUTABLE" OR type MATCHES "MODULE" OR type MATCHES "SHARED_LIBRARY")
-        INSTALL(DIRECTORY "${location}.dSYM" DESTINATION ${INSTALL_LOCATION} COMPONENT Debuginfo)
+        INSTALL(DIRECTORY "${location}.dSYM" DESTINATION ${ARG_DESTINATION} COMPONENT Debuginfo)
       ENDIF()
     ENDFOREACH()
   ENDIF()


removed boost::filesystem as a dependency

git-svn-id: 5398946ba177a3e438c2dae55e2cdfc2fb96c905@833 a9d63959-f2ad-4865-b262-bf0e56cfafb6

--- cmake/pcl_find_boost.cmake
+++ cmake/pcl_find_boost.cmake
@@ -4,7 +4,7 @@
     set(Boost_USE_STATIC_LIBS ON)
 endif(NOT PCL_SHARED_LIBS)

-find_package(Boost 1.40.0 COMPONENTS system filesystem thread date_time)
+find_package(Boost 1.40.0 COMPONENTS system thread date_time)

 include_directories(${Boost_INCLUDE_DIRS})
 link_directories(${Boost_LIBRARY_DIRS})


COMP: VTK off by default

COMP: VTK off by default

--- SuperBuild/External_ITKv4.cmake
+++ SuperBuild/External_ITKv4.cmake
@@ -117,6 +117,7 @@
       -DITK_WRAPPING:BOOL=OFF #${BUILD_SHARED_LIBS} ## HACK:  QUICK CHANGE
       -DModule_MGHIO:BOOL=ON
       -DModule_ITKReview:BOOL=ON
+      -DModule_ITKVtkGlue:BOOL=OFF
       ${${proj}_DCMTK_ARGS}
       ${${proj}_WRAP_ARGS}
       ${${proj}_FFTWF_ARGS}


Cmake: enable a bunch of modules - still a lot TODO

--- extras/buildsystem/cmake/include/config.cmake
+++ extras/buildsystem/cmake/include/config.cmake
@@ -384,7 +384,7 @@
 # Modules: Following are all listed in options
 ###########################################################

-# This module will be enabled but user could disabled it
+# This modules are enabled by default but can still be disabled manually
 vlc_enable_modules(dummy logger memcpy)
 vlc_enable_modules(mpgv mpga m4v m4a h264 vc1 demux_cdg cdg ps pva avi mp4 rawdv rawvid nsv real aiff mjpeg demuxdump flacsys tta)
 vlc_enable_modules(cvdsub svcdsub spudec subsdec subsusf t140 dvbsub cc mpeg_audio lpcm a52 dts cinepak flac)
@@ -401,8 +401,9 @@
 vlc_enable_modules(packetizer_mpegvideo packetizer_h264)
 vlc_enable_modules(packetizer_mpeg4video packetizer_mpeg4audio)
 vlc_enable_modules(packetizer_vc1)
-vlc_enable_modules(spatializer)
+vlc_enable_modules(spatializer atmo blendbench croppadd)
 vlc_enable_modules(asf)
+vlc_enable_modules(vmem visual growl_udp)

 set(enabled ${ENABLE_STREAM_OUT})
 vlc_register_modules(${enabled} access_output_dummy access_output_udp access_output_file access_output_http)
@@ -430,7 +431,7 @@
 set(enabled)

 if(NOT WIN32)
-   vlc_enable_modules(screensaver)
+   vlc_enable_modules(screensaver signals dynamicoverlay) #motion
 endif(NOT WIN32)

 # This module is disabled because the CMakeList.txt which
@@ -596,6 +597,11 @@
   vlc_module_add_link_libraries(panoramix ${X11_LIBRARIES})
 endif(X11_FOUND)

+vlc_check_include_files (linux/fb.h)
+if(HAVE_LINUX_FB_H)
+  vlc_enable_modules(fb)
+endif(HAVE_LINUX_FB_H)
+
 find_package(Mpeg2)
 if(Mpeg2_FOUND)
   vlc_enable_modules(libmpeg2)


fix variable names on pkg-config dependencies checking

--- FindICU.cmake
+++ FindICU.cmake
@@ -189,10 +189,10 @@
     if(PKG_CONFIG_FOUND)
         set(${ICU_PRIVATE_VAR_NS}_COMPONENTS_DUP ${${ICU_PUBLIC_VAR_NS}_FIND_COMPONENTS})
         foreach(${ICU_PRIVATE_VAR_NS}_COMPONENT ${${ICU_PRIVATE_VAR_NS}_COMPONENTS_DUP})
-            pkg_check_modules(PC_ICU_PRIVATE_VAR_NS "icu-${${ICU_PRIVATE_VAR_NS}_COMPONENT}" QUIET)
+            pkg_check_modules(${PC_ICU_PRIVATE_VAR_NS} "icu-${${ICU_PRIVATE_VAR_NS}_COMPONENT}" QUIET)

             if(${PC_ICU_PRIVATE_VAR_NS}_FOUND)
-                foreach(${PC_ICU_PRIVATE_VAR_NS}_LIBRARY ${PC_ICU_LIBRARIES})
+                foreach(${PC_ICU_PRIVATE_VAR_NS}_LIBRARY ${${PC_ICU_PRIVATE_VAR_NS}_LIBRARIES})
                     string(REGEX REPLACE "^icu" "" ${PC_ICU_PRIVATE_VAR_NS}_STRIPPED_LIBRARY ${${PC_ICU_PRIVATE_VAR_NS}_LIBRARY})
                     list(APPEND ${ICU_PUBLIC_VAR_NS}_FIND_COMPONENTS ${${PC_ICU_PRIVATE_VAR_NS}_STRIPPED_LIBRARY})
                 endforeach(${PC_ICU_PRIVATE_VAR_NS}_LIBRARY)


Update Depdendencies.cmake

Update Depdendencies.cmake

Downgrade qt to 5.15.2 on ubuntu to see if works with pyside2

--- cmake/Depdendencies.cmake
+++ cmake/Depdendencies.cmake
@@ -63,8 +63,8 @@
             )
         else()
             fast_download_dependency(qt5
-                    5.15.5
-                    bd9dcfb8cd54f37946341195cbbc2d839e46e52c312560924deacbd151ab6fb4
+                    5.15.2
+		    71bf6dbae6aa24cc5e64379cb04899f6abf4fe512d87093f3f566c6b0fca4fa9
                     libQt5Core.so libQt5Gui.so libQt5Widgets.so libQt5OpenGL.so libQt5Multimedia.so libQt5MultimediaWidgets.so libQt5Network.so libQt5PrintSupport.so libQt5SerialPort.so
             )
             fast_download_dependency(openssl


fix CMake warning for doxygen target with CMake 3 (fix #660)

--- cmake/tools/doxygen.cmake
+++ cmake/tools/doxygen.cmake
@@ -37,11 +37,8 @@
   set(DOXYGEN_FOUND TRUE CACHE BOOL "Doxygen found")
 endif()

-GET_TARGET_PROPERTY(doxygen_catkin_property doxygen "catkin")
-if (doxygen_catkin_property)
-else()
-  add_custom_target(doxygen COMMENT "doxygen found")
-  set_target_properties(doxygen PROPERTIES "catkin" "found")
+if(NOT TARGET doxygen)
+  add_custom_target(doxygen)
 endif()

 macro(catkin_doxygen TARGET_NAME SEARCH_DIRS)


fix test options

fix test options

--- cmake/vSMCFunctions.cmake
+++ cmake/vSMCFunctions.cmake
@@ -33,8 +33,10 @@

             ADD_DEPENDENCIES (${basename} ${exe_name})
             ADD_TEST (NAME ${exe_name} COMMAND ${exe_name}
-                "--partile_num 100 --prior2 100"
-                "--burnin_num 1000 --iter_num 1000"
+                "--particle_num" "100"
+                "--prior2" "30"
+                "--burnin_num" "100"
+                "--iter_num" "100"
                 WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
                 CONFIGURATIONS Debug Release RelWithDebInfo MinSizeRel)
         ENDFOREACH(alg)


Bumping version 1.0.1 for patch release

Bumping version 1.0.1 for patch release

--- Version.cmake
+++ Version.cmake
@@ -10,7 +10,7 @@

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


Bugfix

Bugfix

git-svn-id: fbbf69ba8011aca0e74e1c67904b11cccbdbe66b@26348 0785d39b-7218-0410-832d-ea1e28bc413d

--- deal.II/contrib/cmake/configure/configure_umfpack.cmake
+++ deal.II/contrib/cmake/configure/configure_umfpack.cmake
@@ -1,7 +1,16 @@
 FIND_PACKAGE(LAPACK REQUIRED)
 FIND_PACKAGE(BLAS REQUIRED)

+SET(CMAKE_SHARED_LINKER_FLAGS
+  "${CMAKE_SHARED_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}"
+  )
+
+LIST(APPEND deal_ii_external_libraries
+  ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES}
+  )
+
 # TODO: A deal.II specific error message if blas or lapack is not found
+

 IF(NOT DEAL_II_FORCE_CONTRIB_UMFPACK)

@@ -24,7 +33,6 @@
 ELSE()
   SET(UMFPACKAMD_FOUND FALSE)
 ENDIF()
-
 IF(DEAL_II_FORCE_CONTRIB_UMFPACK OR NOT UMFPACKAMD_FOUND)

   INCLUDE_DIRECTORIES(
@@ -49,12 +57,8 @@

   INCLUDE_DIRECTORIES(${UMFPACK_INCLUDE_DIR} ${AMD_INCLUDE_DIR})

-  LIST(APPEND deal_ii_required_linker_flags
-    ${BLAS_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}
-    )
-
   LIST(APPEND deal_ii_external_libraries
-    ${UMFPACK_LIBRARY} ${AMD_LIBRARY} ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES}
+    ${UMFPACK_LIBRARY} ${AMD_LIBRARY}
     )

 ENDIF()


Fix Urho3D project configuration issue due to wrong CMake condition.

--- Source/CMake/Modules/GetUrho3DRevision.cmake
+++ Source/CMake/Modules/GetUrho3DRevision.cmake
@@ -22,7 +22,7 @@

 # Get Urho3D library revision number

-if (DEFINED $ENV{CI} AND DEFINED $ENV{RELEASE_TAG})
+if (DEFINED ENV{CI} AND DEFINED ENV{RELEASE_TAG})
     # Use the release tag provided by the CI server, this is important because git describe command will be off by one commit in the CI mirror branches
     set (LIB_REVISION $ENV{RELEASE_TAG})
     set (GIT_EXIT_CODE 0)


set current version

set current version

--- conan.cmake
+++ conan.cmake
@@ -33,7 +33,7 @@
 # but it is only necessary on the end-user side. It is not necessary to create conan
 # packages, in fact it shouldn't be use for that. Check the project documentation.

-# version: 0.16.0-dev
+# version: 0.15.0

 include(CMakeParseArguments)


better way of testing for -NOTFOUND; fix testing of different variables

--- CMake/toolchain.cmake
+++ CMake/toolchain.cmake
@@ -47,13 +47,13 @@
     return()
 endmacro(gcc_program_notfound)

-if(${ARM_NONE_EABI_GCC} STREQUAL "ARM_NONE_EABI_GCC-NOTFOUND")
+if(NOT ARM_NONE_EABI_GCC)
     gcc_program_notfound("arm-none-eabi-gcc")
 endif()
-if(${ARM_NONE_EABI_GCC} STREQUAL "ARM_NONE_EABI_GPP-NOTFOUND")
+if(NOT ARM_NONE_EABI_GPP)
     gcc_program_notfound("arm-none-eabi-g++")
 endif()
-if(${ARM_NONE_EABI_GCC} STREQUAL "ARM_NONE_EABI_OBJCOPY-NOTFOUND")
+if(NOT ARM_NONE_EABI_OBJCOPY)
     gcc_program_notfound("arm-none-eabi-objcopy")
 endif()


Add code to algorithmically shortern runtime library names

Because 260 chars ought to be enough for anybody

Former-commit-id: 308448642274fb6a2f001abdaeced63dd7af6f7a

--- halide.cmake
+++ halide.cmake
@@ -425,16 +425,62 @@
   _halide_split_target("${HALIDE_TARGET}" BASE FEATURES)
   # Discard target features which do not affect the contents of the runtime.
   list(REMOVE_DUPLICATES FEATURES)
-  list(REMOVE_ITEM FEATURES "user_context" "no_asserts" "no_bounds_query" "profile")
+  list(REMOVE_ITEM FEATURES "user_context" "no_asserts" "no_bounds_query" "no_runtime" "profile")
   list(SORT FEATURES)
   # Now build up the name
-  set(RESULT "halide_library_runtime")
+  set(RESULT "halide_rt")
   foreach(B ${BASE})
     list(APPEND RESULT ${B})
   endforeach()
+  if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+    set(HALIDE_ABBREVIATE_TARGETS TRUE)
+  endif()
+  if(HALIDE_ABBREVIATE_TARGETS)
+    # Windows systems still have limits of 260-character pathnames in
+    # lots of situations, and CMake can replicate project names multiple times
+    # in the same path, so long target strings can cause us to overflow
+    # this limit, even if CMAKE_OBJECT_PATH_MAX is set. So here we make
+    # algorithmically-generated abbreviations for all the feature strings
+    # and use those for external cmaketarget/filenames.
+
+    # Halide Target Features we know about. (This need not be exact, but should
+    # be close for best compression.)
+    list(APPEND KNOWN_FEATURES armv7s avx avx2 avx512 avx512_cannonlake avx512_knl
+         avx512_skylake c_plus_plus_name_mangling cl_doubles cuda cuda_capability_30
+         cuda_capability_32 cuda_capability_35 cuda_capability_50 cuda_capability_61
+         debug f16c fma fma4 fuzz_float_stores hvx_128 hvx_64 hvx_shared_object
+         hvx_v62 hvx_v65 hvx_v66 jit large_buffers matlab metal mingw msan no_asserts
+         no_bounds_query no_neon no_runtime opencl opengl openglcompute
+         power_arch_2_07 profile soft_float_abi sse41 trace_loads trace_realizations
+         trace_stores user_context vsx)
+    # Synthesize a one-or-two-char abbreviation based on the feature's position
+    # in the KNOWN_FEATURES list.
+    set(I 0)
+    foreach(F ${KNOWN_FEATURES})
+      math(EXPR II "97 + (${I} / 26)")
+      if("${II}" GREATER 97)
+        string(ASCII ${II} C1)
+      else()
+        set(C1 "")
+      endif()
+      math(EXPR II "97 + (${I} % 26)")
+      string(ASCII ${II} C2)
+      # CMake has no map-like structure; we'll fake it using synthesized variable names.
+      set(HALIDE_TARGET_FEATURE_ABBREVIATION_${F} ${C1}${C2})
+      math(EXPR I "${I} + 1")
+    endforeach()
+  endif()
+
   foreach(F ${FEATURES})
-    list(APPEND RESULT ${F})
-  endforeach()
+    if(DEFINED HALIDE_TARGET_FEATURE_ABBREVIATION_${F})
+      list(APPEND RESULT ${HALIDE_TARGET_FEATURE_ABBREVIATION_${F}})
+    else()
+      # Unknown features get appended to the end
+      list(APPEND RESULT ${F})
+    endif()
+  endforeach()
+
+  # Finally, convert from a list into a _ separated name
   string(REPLACE ";" "_" RESULT "${RESULT}")
   set(${OUTVAR} "${RESULT}" PARENT_SCOPE)
 endfunction()


remove rosbuild_make_distribution logic as it is now a noop/marker

--- core/rosbuild/public.cmake
+++ core/rosbuild/public.cmake
@@ -1020,31 +1020,7 @@
 endmacro(rosbuild_add_openmp_flags)

 macro(rosbuild_make_distribution)
-  # Infer stack name from directory name.
-  get_filename_component(_project ${PROJECT_SOURCE_DIR} NAME)
-  project(${_project})
-
-  # Set up for packaging
-  # TODO: get version from manifest
-  #set(CPACK_PACKAGE_VERSION_MAJOR "0")
-  #set(CPACK_PACKAGE_VERSION_MINOR "0")
-  #set(CPACK_PACKAGE_VERSION_PATCH "1")
-  set(CPACK_PACKAGE_NAME "${PROJECT_NAME}")
-  if("${ARGN}" STREQUAL "")
-    set(CPACK_PACKAGE_VERSION "latest")
-  else("${ARGN}" STREQUAL "")
-    set(CPACK_PACKAGE_VERSION "${ARGN}")
-  endif("${ARGN}" STREQUAL "")
-  set(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}")
-  set(CPACK_GENERATOR "TBZ2")
-  # The CPACK_SOURCE_GENERATOR variable seems only to be obeyed in 2.6.
-  # 2.4 seems to use CPACK_GENERATOR for both binary and source packages.
-  set(CPACK_SOURCE_GENERATOR "TBZ2")
-  # CPACK_SOURCE_IGNORE_FILES contains things we want to ignore when
-  # building a source package.  We assume that the package was already
-  # cleaned, so we don't need to ignore .a, .o, .so, etc.
-  list(APPEND CPACK_SOURCE_IGNORE_FILES "/build/;/.svn/;.gitignore;build-failure;test-failure;rosmakeall-buildfailures-withcontext.txt;rosmakeall-profile;rosmakeall-buildfailures.txt;rosmakeall-testfailures.txt;rosmakeall-coverage.txt;/log/")
-  include(CPack)
+  # Noop.  This logic is handled in Python instead.
 endmacro(rosbuild_make_distribution)

 # Compute the number of hardware cores on the machine.  Intended to use for


[ament_cmake_copyright] Add file exclusion support (#328)

* [ament_cmake_copyright] Add file exclusion support

In the `ament_copyright` CMake function, the optional list
argument `EXCLUDE` can now be used as an exclusion specifier.

Signed-off-by: Abrar Rahman Protyasha <6764efe3f81be0ed6408c793ffae84bd7fbe557a@u.rochester.edu>

* [ament_cmake_copyright] Fix function header typo

Remove reference to `cppcheck` in the `EXCLUDE` arg description.

Signed-off-by: Abrar Rahman Protyasha <6764efe3f81be0ed6408c793ffae84bd7fbe557a@u.rochester.edu>

--- ament_cmake_copyright/cmake/ament_copyright.cmake
+++ ament_cmake_copyright/cmake/ament_copyright.cmake
@@ -19,13 +19,15 @@
 # :type TESTNAME: string
 # :param TIMEOUT: the test timeout in seconds, default: 120
 # :type TIMEOUT: integer
+# :param EXCLUDE: an optional list of exclude files or directories for copyright check
+# :type EXCLUDE: list
 # :param ARGN: the files or directories to check
 # :type ARGN: list of strings
 #
 # @public
 #
 function(ament_copyright)
-  cmake_parse_arguments(ARG "" "TESTNAME;TIMEOUT" "" ${ARGN})
+  cmake_parse_arguments(ARG "" "TESTNAME;TIMEOUT" "EXCLUDE" ${ARGN})
   if(NOT ARG_TESTNAME)
     set(ARG_TESTNAME "copyright")
   endif()
@@ -40,6 +42,9 @@

   set(result_file "${AMENT_TEST_RESULTS_DIR}/${PROJECT_NAME}/${ARG_TESTNAME}.xunit.xml")
   set(cmd "${ament_copyright_BIN}" "--xunit-file" "${result_file}")
+  if(ARG_EXCLUDE)
+    list(APPEND cmd "--exclude" "${ARG_EXCLUDE}")
+  endif()
   list(APPEND cmd ${ARG_UNPARSED_ARGUMENTS})

   file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/ament_copyright")


modules: updated FindCorrade.cmake.

modules: updated FindCorrade.cmake.

--- modules/FindCorrade.cmake
+++ modules/FindCorrade.cmake
@@ -84,6 +84,8 @@
 #   Client with `glibc` toolchain
 #  CORRADE_TARGET_EMSCRIPTEN    - Defined if compiled for Emscripten
 #  CORRADE_TARGET_ANDROID       - Defined if compiled for Android
+#  CORRADE_TESTSUITE_TARGET_XCTEST - Defined if TestSuite is targetting Xcode
+#   XCTest
 #
 # Additionally these variables are defined for internal usage:
 #
@@ -246,7 +248,8 @@
     TARGET_NACL_GLIBC
     TARGET_EMSCRIPTEN
     TARGET_ANDROID
-    TESTSUITE_TARGET_XCTEST)
+    TESTSUITE_TARGET_XCTEST
+    UTILITY_USE_ANSI_COLORS)
 foreach(_corradeFlag ${_corradeFlags})
     string(FIND "${_corradeConfigure}" "#define CORRADE_${_corradeFlag}" _corrade_${_corradeFlag})
     if(NOT _corrade_${_corradeFlag} EQUAL -1)
@@ -284,6 +287,13 @@
         set(_CORRADE_${_COMPONENT}_DEPENDENCIES Utility)
     elseif(_component STREQUAL Utility)
         set(_CORRADE_${_COMPONENT}_DEPENDENCIES Containers rc)
+    endif()
+
+    # Mark the dependencies as required if the component is also required
+    if(Corrade_FIND_REQUIRED_${_component})
+        foreach(_dependency ${_CORRADE_${_COMPONENT}_DEPENDENCIES})
+            set(Corrade_FIND_REQUIRED_${_dependency} TRUE)
+        endforeach()
     endif()

     list(APPEND _CORRADE_ADDITIONAL_COMPONENTS ${_CORRADE_${_COMPONENT}_DEPENDENCIES})


modules: updated FindCorrade.cmake.

modules: updated FindCorrade.cmake.

--- modules/FindCorrade.cmake
+++ modules/FindCorrade.cmake
@@ -119,7 +119,7 @@
 #
 #   This file is part of Corrade.
 #
-#   Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#   Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015
 #             Vladimír Vondruš <mosra@centrum.cz>
 #
 #   Permission is hereby granted, free of charge, to any person obtaining a


Simplifiy the ParaView build

Simplifiy the ParaView build

Use the default all plugins off CMake variable, and disable VTKm as we
don't use it in Tomviz (should reduce build times a little).

Signed-off-by: Marcus D. Hanwell <cf7042e2e8eee958b5bcde1ae2cbefef82efc184@kitware.com>

--- projects/paraview.cmake
+++ projects/paraview.cmake
@@ -34,34 +34,10 @@
     -DPARAVIEW_ENABLE_COMMANDLINE_TOOLS:BOOL=OFF
     -DPARAVIEW_ENABLE_WEB:BOOL=ON
     -DPARAVIEW_USE_QTHELP:BOOL=OFF
+    -DPARAVIEW_USE_VTKM:BOOL=OFF
+    -DPARAVIEW_PLUGINS_DEFAULT:BOOL=OFF
     # Disable for now as kits requires CMake 3.12
     #    -DPARAVIEW_ENABLE_KITS:BOOL=ON
-    -DPARAVIEW_PLUGIN_ENABLE_AcceleratedAlgorithms:BOOL=FALSE
-    -DPARAVIEW_PLUGIN_ENABLE_AnalyzeNIfTIReaderWriter:BOOL=FALSE
-    -DPARAVIEW_PLUGIN_ENABLE_ArrowGlyph:BOOL=FALSE
-    -DPARAVIEW_PLUGIN_ENABLE_BagPlotViewsAndFilters:BOOL=FALSE
-    -DPARAVIEW_PLUGIN_ENABLE_CDIReader:BOOL=FALSE
-    -DPARAVIEW_PLUGIN_ENABLE_DigitalRockPhysics:BOOL=FALSE
-    -DPARAVIEW_PLUGIN_ENABLE_EmbossingRepresentations:BOOL=FALSE
-    -DPARAVIEW_PLUGIN_ENABLE_ExplicitStructuredGrid:BOOL=FALSE
-    -DPARAVIEW_PLUGIN_ENABLE_EyeDomeLighting:BOOL=FALSE
-    -DPARAVIEW_PLUGIN_ENABLE_GMVReader:BOOL=FALSE
-    -DPARAVIEW_PLUGIN_ENABLE_GeodesicMeasurement:BOOL=FALSE
-    -DPARAVIEW_PLUGIN_ENABLE_GmshReader:BOOL=FALSE
-    -DPARAVIEW_PLUGIN_ENABLE_InSituExodus:BOOL=FALSE
-    -DPARAVIEW_PLUGIN_ENABLE_Moments:BOOL=FALSE
-    -DPARAVIEW_PLUGIN_ENABLE_MooseXfemClip:BOOL=FALSE
-    -DPARAVIEW_PLUGIN_ENABLE_NetCDFTimeAnnotationPlugin:BOOL=FALSE
-    -DPARAVIEW_PLUGIN_ENABLE_NonOrthogonalSource:BOOL=FALSE
-    -DPARAVIEW_PLUGIN_ENABLE_PanoramicProjectionView:BOOL=FALSE
-    -DPARAVIEW_PLUGIN_ENABLE_SLACTools:BOOL=FALSE
-    -DPARAVIEW_PLUGIN_ENABLE_StreamLinesRepresentation:BOOL=FALSE
-    -DPARAVIEW_PLUGIN_ENABLE_StreamingParticles:BOOL=FALSE
-    -DPARAVIEW_PLUGIN_ENABLE_SurfaceLIC:BOOL=FALSE
-    -DPARAVIEW_PLUGIN_ENABLE_ThickenLayeredCells:BOOL=FALSE
-    -DPARAVIEW_PLUGIN_ENABLE_VDFReaderPlugin:BOOL=FALSE
-    -DPARAVIEW_PLUGIN_ENABLE_VTKmFilters:BOOL=FALSE
-    -DPARAVIEW_PLUGIN_ENABLE_pvNVIDIAIndeX:BOOL=FALSE
     -DPARAVIEW_ENABLE_FFMPEG:BOOL=ON
     -DCMAKE_CXX_STANDARD:STRING=11
     -DCMAKE_CXX_STANDARD_REQUIRED:BOOL=ON


Sync AddZstdCompilationFlags.cmake from zstd sources

--- builtins/zstd/cmake/AddZstdCompilationFlags.cmake
+++ builtins/zstd/cmake/AddZstdCompilationFlags.cmake
@@ -33,16 +33,24 @@
         EnableCompilerFlag("-Wcast-align" true true)
         EnableCompilerFlag("-Wcast-qual" true true)
         EnableCompilerFlag("-Wstrict-prototypes" true false)
+        # Enable asserts in Debug mode
+        if (CMAKE_BUILD_TYPE MATCHES "Debug")
+            EnableCompilerFlag("-DDEBUGLEVEL=1" true true)
+        endif ()
     elseif (MSVC) # Add specific compilation flags for Windows Visual

         set(ACTIVATE_MULTITHREADED_COMPILATION "ON" CACHE BOOL "activate multi-threaded compilation (/MP flag)")
         if (CMAKE_GENERATOR MATCHES "Visual Studio" AND ACTIVATE_MULTITHREADED_COMPILATION)
             EnableCompilerFlag("/MP" true true)
         endif ()
-
+
         # UNICODE SUPPORT
         EnableCompilerFlag("/D_UNICODE" true true)
         EnableCompilerFlag("/DUNICODE" true true)
+        # Enable asserts in Debug mode
+        if (CMAKE_BUILD_TYPE MATCHES "Debug")
+            EnableCompilerFlag("/DDEBUGLEVEL=1" true true)
+        endif ()
     endif ()

     # Remove duplicates compilation flags
@@ -50,9 +58,10 @@
              CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO
              CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
              CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-        separate_arguments(${flag_var})
-        list(REMOVE_DUPLICATES ${flag_var})
-        string(REPLACE ";" " " ${flag_var} "${${flag_var}}")
+        if( ${flag_var} )
+            separate_arguments(${flag_var})
+            string(REPLACE ";" " " ${flag_var} "${${flag_var}}")
+        endif()
     endforeach ()

     if (MSVC AND ZSTD_USE_STATIC_RUNTIME)
@@ -60,8 +69,10 @@
                  CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO
                  CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
                  CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-            string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
+            if ( ${flag_var} )
+                string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
+            endif()
         endforeach ()
     endif ()

-endmacro()
+endmacro()


build: Set assembly compiler as well

build: Set assembly compiler as well

Set to GCC since we want to have it pre-processed

--- build/CMakeCibylToolchain.cmake
+++ build/CMakeCibylToolchain.cmake
@@ -4,6 +4,7 @@
 set(CMAKE_SYSTEM_VERSION 1)

 # specify the cross compiler
+set(CMAKE_ASM_COMPILER  mips-cibyl-elf-gcc)
 set(CMAKE_C_COMPILER   mips-cibyl-elf-gcc)
 set(CMAKE_CXX_COMPILER mips-cibyl-elf-g++)

@@ -12,3 +13,5 @@
 # for libraries and headers in the target directories
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+set(CMAKE_ASM_FLAGS "-c")


Allow unresolved symbols in shared libraries when using a sanitizer with clang.

--- build_settings.cmake
+++ build_settings.cmake
@@ -167,8 +167,11 @@

 if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
 else()
-# Don't allow unresolved symbols in executables or shared libraries
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
+if(NOT VESPA_USE_SANITIZER OR NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+  # Don't allow unresolved symbols in shared libraries
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
+endif()
+# Don't allow unresolved symbols in executables
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-undefined")

 # Enable GTest unit tests in shared libraries


Revert accidental deoptimization.

Revert accidental deoptimization.

--- build_settings.cmake
+++ build_settings.cmake
@@ -20,7 +20,7 @@
 set(WARN_OPTS "-Wuninitialized -Werror -Wall -W -Wchar-subscripts -Wcomment -Wformat -Wparentheses -Wreturn-type -Wswitch -Wtrigraphs -Wunused -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings")

 # C and C++ compiler flags
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Og ${WARN_OPTS} -fPIC -D_GLIBCXX_USE_CXX11_ABI=0 -DBOOST_DISABLE_ASSERTS -march=westmere -mtune=intel")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 ${WARN_OPTS} -fPIC -D_GLIBCXX_USE_CXX11_ABI=0 -DBOOST_DISABLE_ASSERTS -march=westmere -mtune=intel")

 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS} -Wnon-virtual-dtor -fvisibility-inlines-hidden -fdiagnostics-color=auto")


Cmake: added definition `_USE_64BIT_TIME_T` when compiling on windows

--- src/yuni/cmake/core.cmake
+++ src/yuni/cmake/core.cmake
@@ -22,6 +22,7 @@
 else()
 	LIBYUNI_CONFIG_DEFINITION("both" "core" "UNICODE")
 	LIBYUNI_CONFIG_DEFINITION("both" "core" "_UNICODE")
+	LIBYUNI_CONFIG_DEFINITION("both" "core" "_USE_64BIT_TIME_T")
 	if (YUNI_TARGET MATCHES "debug")
 		LIBYUNI_CONFIG_CFLAG("both" "core" "-ggdb3")
 	endif()
@@ -508,6 +509,7 @@
 if (WIN32 OR WIN64)
 	add_definitions("-DUNICODE")
 	add_definitions("-D_UNICODE")
+	add_definitions("-D_USE_64BIT_TIME_T")
 endif ()

 # Setting output path


added cmake switch to enable cuda compile with c++ debug flags

--- build/cmake/custom_scripts/schism_cuda.cmake
+++ build/cmake/custom_scripts/schism_cuda.cmake
@@ -4,6 +4,7 @@

 include(schism_platform)

+option(SCHISM_CUDA_BUILD_DEBUG                     "Build debug"                            OFF)
 option(SCHISM_CUDA_BUILD_USE_FAST_MATH             "Use lower precision math calculations"  ON)
 option(SCHISM_CUDA_BUILD_KEEP_INTERMEDIATE_FILES   "Keep the generated intermediate files"  ON)

@@ -40,8 +41,12 @@
 set(SCM_CUDA_NVCC_DEFINITIONS           "")
 set(SCM_CUDA_NVCC_INCLUDE_DIRECTORIES   "")

-set(SCM_CUDA_NVCC_OPTIONS ${SCM_CUDA_NVCC_OPTIONS} --optimize 3 -Xcompiler ${SCM_CUDA_NVCC_CXX_FLAGS_RELEASE}${SCM_CUDA_NVCC_CXX_FLAGS} CACHE STRING "schism cuda internal" FORCE)
-#set(SCM_CUDA_NVCC_OPTIONS ${SCM_CUDA_NVCC_OPTIONS} -Xcompiler ${SCM_CUDA_NVCC_CXX_FLAGS_DEBUG}${SCM_CUDA_NVCC_CXX_FLAGS} CACHE STRING "schism cuda internal" FORCE)
+#set(SCM_CUDA_NVCC_OPTIONS ${SCM_CUDA_NVCC_OPTIONS} -Xcompiler ${SCM_CUDA_NVCC_CXX_FLAGS} CACHE STRING "schism cuda internal" FORCE)
+if (SCHISM_CUDA_BUILD_DEBUG)
+    set(SCM_CUDA_NVCC_OPTIONS ${SCM_CUDA_NVCC_OPTIONS} -Xcompiler ${SCM_CUDA_NVCC_CXX_FLAGS_DEBUG}${SCM_CUDA_NVCC_CXX_FLAGS} CACHE STRING "schism cuda internal" FORCE)
+else (SCHISM_CUDA_BUILD_DEBUG)
+    set(SCM_CUDA_NVCC_OPTIONS ${SCM_CUDA_NVCC_OPTIONS} --optimize 3 -Xcompiler ${SCM_CUDA_NVCC_CXX_FLAGS_RELEASE}${SCM_CUDA_NVCC_CXX_FLAGS} CACHE STRING "schism cuda internal" FORCE)
+endif (SCHISM_CUDA_BUILD_DEBUG)

 if (SCHISM_CUDA_BUILD_KEEP_INTERMEDIATE_FILES)
     if (WIN32)


[CMake] Passthrough CFLAGS when checking the compiler-rt path

This is needed when cross-compiling for a different target since
CFLAGS may contain additional flags like -resource-dir which
change the location in which compiler-rt builtins are found.

Differential Revision: https://reviews.llvm.org/D54371

git-svn-id: 6a9f6578bdee8d959f0ed58970538b4ab6004734@346820 91177308-0d34-0410-b5e6-96231b3b80d8

--- cmake/Modules/HandleCompilerRT.cmake
+++ cmake/Modules/HandleCompilerRT.cmake
@@ -8,6 +8,9 @@
   if (CMAKE_CXX_COMPILER_ID MATCHES Clang AND CMAKE_CXX_COMPILER_TARGET)
     list(APPEND CLANG_COMMAND "--target=${CMAKE_CXX_COMPILER_TARGET}")
   endif()
+  get_property(LIBCXXABI_CXX_FLAGS CACHE CMAKE_CXX_FLAGS PROPERTY VALUE)
+  string(REPLACE " " ";" LIBCXXABI_CXX_FLAGS "${LIBCXXABI_CXX_FLAGS}")
+  list(APPEND CLANG_COMMAND ${LIBCXXABI_CXX_FLAGS})
   execute_process(
       COMMAND ${CLANG_COMMAND}
       RESULT_VARIABLE HAD_ERROR


fix posix_rpi_native.cmake: add __DF_RPI define

Needed for the DriverFramework. Fixes the error:
15050 SPIDevObj start failed
15142 DevObj start failed
15185 Unable to open the device path:
ERROR [df_lsm9ds1_wrapper] LSM9DS1 start fail: -1
ERROR [df_lsm9ds1_wrapper] DfLsm9ds1Wrapper start failed
Command 'df_lsm9ds1_wrapper' failed, returned -1

--- cmake/configs/posix_rpi_native.cmake
+++ cmake/configs/posix_rpi_native.cmake
@@ -1,3 +1,7 @@
 include(configs/posix_rpi_common)

+add_definitions(
+	-D __DF_RPI
+	)
+
 set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/toolchains/Toolchain-native.cmake)


Renderscript: Fixed CMake variable description

--- cmake/modules/FindRenderScript.cmake
+++ cmake/modules/FindRenderScript.cmake
@@ -71,8 +71,8 @@
 INCLUDE (FindPackageHandleStandardArgs)

 SET(ANDROID_SOURCE_DIR          $ENV{ANDROID_SOURCE_DIR}        CACHE PATH      "Android source directory.")
-SET(HOST_TYPE                   $ENV{HOST_TYPE}                 CACHE STRING    "Name of target platform.")
-SET(TARGET_NAME                 $ENV{TARGET_NAME}               CACHE STRING    "Name of the local compile host type.")
+SET(HOST_TYPE                   $ENV{HOST_TYPE}                 CACHE STRING    "Name of the local compile host type.")
+SET(TARGET_NAME                 $ENV{TARGET_NAME}               CACHE STRING    "Name of target platform.")
 SET(NDK_TOOLCHAIN_DIR           $ENV{NDK_TOOLCHAIN_DIR}         CACHE PATH      "Android NDK directory.")
 SET(RS_TARGET_API               $ENV{RS_TARGET_API}             CACHE STRING    "Android API level.")


cmake config summary: better format

cmake config summary: better format

--- cmakemodules/script_show_final_summary.cmake
+++ cmakemodules/script_show_final_summary.cmake
@@ -100,47 +100,48 @@
 	MESSAGE(STATUS "")
 ENDIF($ENV{VERBOSE})

-MESSAGE(STATUS  " ____________________ WILL USE THESE LIBRARIES __________________")
+MESSAGE(STATUS " ______________________ OPTIONAL LIBRARIES ______________________")
+SHOW_CONFIG_LINE_SYSTEM("eigen3                              " CMAKE_MRPT_HAS_EIGEN "[Version: ${MRPT_EIGEN_VERSION}]")
+SHOW_CONFIG_LINE_SYSTEM("ffmpeg libs (Video streaming)       " CMAKE_MRPT_HAS_FFMPEG "[avcodec ${LIBAVCODEC_VERSION}, avutil ${LIBAVUTIL_VERSION}, avformat ${LIBAVFORMAT_VERSION}]")
+SHOW_CONFIG_LINE_SYSTEM("gtest (Google unit testing library) " CMAKE_MRPT_HAS_GTEST )
+SHOW_CONFIG_LINE("Intel threading lib (TBB)           " CMAKE_MRPT_HAS_TBB)
+SHOW_CONFIG_LINE_SYSTEM("lib3ds (3DStudio scenes)            " CMAKE_MRPT_HAS_LIB3DS)
+SHOW_CONFIG_LINE_SYSTEM("libclang (for ConvertUTF)           " CMAKE_MRPT_HAS_CLANG)
+SHOW_CONFIG_LINE_SYSTEM("libjpeg (jpeg)                      " CMAKE_MRPT_HAS_JPEG)
+SHOW_CONFIG_LINE_SYSTEM("liblas (ASPRS LAS LiDAR format)     " CMAKE_MRPT_HAS_LIBLAS)
+SHOW_CONFIG_LINE_SYSTEM("OpenCV (Image manipulation)         " CMAKE_MRPT_HAS_OPENCV "[Version: ${MRPT_OPENCV_VERSION}, Has non-free: ${CMAKE_MRPT_HAS_OPENCV_NONFREE}]")
+SHOW_CONFIG_LINE_SYSTEM("OpenGL                              " CMAKE_MRPT_HAS_OPENGL_GLUT)
+SHOW_CONFIG_LINE_SYSTEM("GLUT                                " CMAKE_MRPT_HAS_GLUT)
+SHOW_CONFIG_LINE_SYSTEM("PCL (Pointscloud library)           " CMAKE_MRPT_HAS_PCL  "[Version: ${PCL_VERSION}]")
+SHOW_CONFIG_LINE("SuiteSparse                         " CMAKE_MRPT_HAS_SUITESPARSE)
+SHOW_CONFIG_LINE_SYSTEM("wxWidgets                           " CMAKE_MRPT_HAS_WXWIDGETS)
+SHOW_CONFIG_LINE_SYSTEM("zlib (compression)                  " CMAKE_MRPT_HAS_ZLIB)
+MESSAGE(STATUS  "")

-SHOW_CONFIG_LINE_SYSTEM("Has eigen3                              " CMAKE_MRPT_HAS_EIGEN "[Version: ${MRPT_EIGEN_VERSION}]")
-SHOW_CONFIG_LINE_SYSTEM("Has ffmpeg libs (Video streaming)       " CMAKE_MRPT_HAS_FFMPEG "[avcodec ${LIBAVCODEC_VERSION}, avutil ${LIBAVUTIL_VERSION}, avformat ${LIBAVFORMAT_VERSION}]")
-SHOW_CONFIG_LINE_SYSTEM("Has gtest (Google unit testing library) " CMAKE_MRPT_HAS_GTEST )
-SHOW_CONFIG_LINE("Has Intel threading lib (TBB)           " CMAKE_MRPT_HAS_TBB)
+MESSAGE(STATUS " _____________________ HARDWARE & SENSORS _______________________")
+SHOW_CONFIG_LINE_SYSTEM("libdc1394-2 (FireWire capture)      " CMAKE_MRPT_HAS_LIBDC1394_2)
+SHOW_CONFIG_LINE("DUO3D Camera libs                   " CMAKE_MRPT_HAS_DUO3D)
+IF(UNIX)
+SHOW_CONFIG_LINE_SYSTEM("libftdi (USB)                       " CMAKE_MRPT_HAS_FTDI)
+ENDIF(UNIX)
+message(STATUS " National Instruments...")
+SHOW_CONFIG_LINE("...NIDAQmx?                         " CMAKE_MRPT_HAS_NIDAQMX)
+SHOW_CONFIG_LINE("...NIDAQmx Base?                    " CMAKE_MRPT_HAS_NIDAQMXBASE)
 IF (WIN32)
-SHOW_CONFIG_LINE("Has Kinect CL NUI                       " CMAKE_MRPT_HAS_CL_NUI)
+SHOW_CONFIG_LINE("Kinect CL NUI                       " CMAKE_MRPT_HAS_CL_NUI)
 ENDIF(WIN32)
-SHOW_CONFIG_LINE_SYSTEM("Has lib3ds (3DStudio scenes)            " CMAKE_MRPT_HAS_LIB3DS)
-SHOW_CONFIG_LINE_SYSTEM("Has libclang (for ConvertUTF)           " CMAKE_MRPT_HAS_CLANG)
-SHOW_CONFIG_LINE_SYSTEM("Has libdc1394-2 (FireWire capture)      " CMAKE_MRPT_HAS_LIBDC1394_2)
-IF(UNIX)
-SHOW_CONFIG_LINE_SYSTEM("Has libftdi (USB)                       " CMAKE_MRPT_HAS_FTDI)
-ENDIF(UNIX)
-SHOW_CONFIG_LINE_SYSTEM("Has libjpeg (jpeg)                      " CMAKE_MRPT_HAS_JPEG)
-SHOW_CONFIG_LINE_SYSTEM("Has liblas (ASPRS LAS LiDAR format)     " CMAKE_MRPT_HAS_LIBLAS)
-message(STATUS "Has National Instruments...")
-SHOW_CONFIG_LINE("...NIDAQmx?                             " CMAKE_MRPT_HAS_NIDAQMX)
-SHOW_CONFIG_LINE("...NIDAQmx Base?                        " CMAKE_MRPT_HAS_NIDAQMXBASE)
-SHOW_CONFIG_LINE_SYSTEM("Has OpenCV (Image manipulation)         " CMAKE_MRPT_HAS_OPENCV "[Version: ${MRPT_OPENCV_VERSION}, Has non-free: ${CMAKE_MRPT_HAS_OPENCV_NONFREE}]")
-SHOW_CONFIG_LINE_SYSTEM("Has OpenGL                              " CMAKE_MRPT_HAS_OPENGL_GLUT)
-SHOW_CONFIG_LINE_SYSTEM("Has GLUT                                " CMAKE_MRPT_HAS_GLUT)
-SHOW_CONFIG_LINE_SYSTEM("Has OpenKinect libfreenect              " CMAKE_MRPT_HAS_FREENECT)
-SHOW_CONFIG_LINE_SYSTEM("Has OpenNI2                             " CMAKE_MRPT_HAS_OPENNI2)
-SHOW_CONFIG_LINE_SYSTEM("Has PCL (Pointscloud library)           " CMAKE_MRPT_HAS_PCL  "[Version: ${PCL_VERSION}]")
-IF(NOT UNIX)	# In fact, it's not "support for Bumblebee" but for it thru PGR vendor libraries.
-SHOW_CONFIG_LINE("Has PGR Digiclops/Triclops              " CMAKE_MRPT_HAS_BUMBLEBEE)
-SHOW_CONFIG_LINE("Has DUO3D Camera libs                   " CMAKE_MRPT_HAS_DUO3D)
-ENDIF(NOT UNIX)
-SHOW_CONFIG_LINE("Has PGR FlyCapture2                     " CMAKE_MRPT_HAS_FLYCAPTURE2)
-SHOW_CONFIG_LINE("Has SuiteSparse                         " CMAKE_MRPT_HAS_SUITESPARSE)
-SHOW_CONFIG_LINE_SYSTEM("Has SwissRanger 3/4000 3D camera        " CMAKE_MRPT_HAS_SWISSRANGE )
-SHOW_CONFIG_LINE_SYSTEM("Has Phidget                             " CMAKE_MRPT_HAS_PHIDGET)
-SHOW_CONFIG_LINE_SYSTEM("Has Videre SVS stereo camera            " CMAKE_MRPT_HAS_SVS)
-SHOW_CONFIG_LINE_SYSTEM("Has wxWidgets                           " CMAKE_MRPT_HAS_WXWIDGETS)
-SHOW_CONFIG_LINE_SYSTEM("Has xSENS MT 3rd generation support     " CMAKE_MRPT_HAS_xSENS_MT3)
-SHOW_CONFIG_LINE_SYSTEM("Has xSENS MT 4th generation support     " CMAKE_MRPT_HAS_xSENS_MT4)
-SHOW_CONFIG_LINE_SYSTEM("Has zlib (compression)                  " CMAKE_MRPT_HAS_ZLIB)
+SHOW_CONFIG_LINE_SYSTEM("OpenKinect libfreenect              " CMAKE_MRPT_HAS_FREENECT)
+SHOW_CONFIG_LINE_SYSTEM("OpenNI2                             " CMAKE_MRPT_HAS_OPENNI2)
+SHOW_CONFIG_LINE("PGR Digiclops/Triclops              " CMAKE_MRPT_HAS_BUMBLEBEE)
+SHOW_CONFIG_LINE("PGR FlyCapture2                     " CMAKE_MRPT_HAS_FLYCAPTURE2)
+SHOW_CONFIG_LINE_SYSTEM("Phidget                             " CMAKE_MRPT_HAS_PHIDGET)
+SHOW_CONFIG_LINE_SYSTEM("SwissRanger 3/4000 3D camera        " CMAKE_MRPT_HAS_SWISSRANGE )
+SHOW_CONFIG_LINE_SYSTEM("Videre SVS stereo camera            " CMAKE_MRPT_HAS_SVS)
+SHOW_CONFIG_LINE_SYSTEM("xSENS MT 3rd generation             " CMAKE_MRPT_HAS_xSENS_MT3)
+SHOW_CONFIG_LINE_SYSTEM("xSENS MT 4th generation             " CMAKE_MRPT_HAS_xSENS_MT4)

 MESSAGE(STATUS  "")
+

 # Final warnings:
 IF (NOT CMAKE_MRPT_HAS_OPENCV AND NOT DISABLE_OPENCV)


ENH: ExternalData: Allow ()-groups in series match regex

Refactor use of the ExternalData_SERIES_MATCH value to avoid assuming
that it has no ()-groups that interfere with group indexing.

Change-Id: I577577f3dd9e4338e170c125372c7e099b1ff285

--- CMake/ExternalData.cmake
+++ CMake/ExternalData.cmake
@@ -529,11 +529,14 @@
 function(_ExternalData_arg_find_files pattern regex)
   file(GLOB globbed RELATIVE "${top_src}" "${top_src}/${pattern}*")
   foreach(entry IN LISTS globbed)
-    string(REGEX REPLACE "^(${regex})(\\.md5|)$" "\\1;\\2" tuple "${entry}")
-    list(LENGTH tuple len)
-    if("${len}" EQUAL 2 AND NOT IS_DIRECTORY "${top_src}/${entry}")
-      list(GET tuple 0 relname)
-      list(GET tuple 1 alg)
+    if("x${entry}" MATCHES "^x(.*)(\\.md5)$")
+      set(relname "${CMAKE_MATCH_1}")
+      set(alg "${CMAKE_MATCH_2}")
+    else()
+      set(relname "${entry}")
+      set(alg "")
+    endif()
+    if("x${relname}" MATCHES "^x${regex}$" AND NOT IS_DIRECTORY "${top_src}/${entry}")
       set(name "${top_src}/${relname}")
       set(file "${top_bin}/${relname}")
       if(alg)


Fix the cmake file for linking sfml

Fix the cmake file for linking sfml

--- SFML-2.3.2/share/SFML/cmake/Modules/FindSFML.cmake
+++ SFML-2.3.2/share/SFML/cmake/Modules/FindSFML.cmake
@@ -100,7 +100,7 @@
     # if we could extract them, compare with the requested version number
     if (SFML_VERSION_MAJOR)
         # transform version numbers to an integer
-		math(EXPR SFML_VERSION "${SFML_VERSION_MAJOR} * 10000 + ${SFML_VERSION_MINOR} * 100")
+		math(EXPR SFML_VERSION "${SFML_VERSION_MAJOR} * 10000 + 1 * 100")

         # compare them
         if(SFML_VERSION LESS SFML_REQUESTED_VERSION)


Fixed ordering of plug-ins.

Fixed ordering of plug-ins.

--- Plugins/PluginList.cmake
+++ Plugins/PluginList.cmake
@@ -1,28 +1,27 @@
+
+# Plug-ins must be ordered according to their dependencies
+
 SET(MITK_EXT_PLUGINS
-
-  # default ON
   org.mitk.core.services:ON
   org.mitk.gui.common:ON
-  org.mitk.gui.qt.application:ON
-  org.mitk.gui.qt.common:ON
-  org.mitk.gui.qt.datamanager:ON
-  org.mitk.gui.qt.stdmultiwidgeteditor:ON
   org.mitk.planarfigure:ON
-
-  # default OFF
   org.mitk.core.ext:OFF
   org.mitk.core.jobs:OFF
   org.mitk.diffusionimaging:OFF
+  org.mitk.gui.qt.application:ON
+  org.mitk.gui.qt.coreapplication:OFF
+  org.mitk.gui.qt.ext:OFF
+  org.mitk.gui.qt.extapplication:OFF
+  org.mitk.gui.qt.common:ON
+  org.mitk.gui.qt.stdmultiwidgeteditor:ON
+  org.mitk.gui.qt.common.legacy:OFF
+  org.mitk.gui.qt.diffusionimagingapp:OFF
+  org.mitk.gui.qt.datamanager:ON
   org.mitk.gui.qt.basicimageprocessing:OFF
-  org.mitk.gui.qt.common.legacy:OFF
-  org.mitk.gui.qt.coreapplication:OFF
-  org.mitk.gui.qt.diffusionimagingapp:OFF
   org.mitk.gui.qt.diffusionimaging:OFF
   org.mitk.gui.qt.dtiatlasapp:OFF
   org.mitk.gui.qt.examples:OFF
   org.mitk.gui.qt.examplesopencv:OFF
-  org.mitk.gui.qt.extapplication:OFF
-  org.mitk.gui.qt.ext:OFF
   org.mitk.gui.qt.igtexamples:OFF
   org.mitk.gui.qt.igtnavigation:OFF
   org.mitk.gui.qt.igttracking:OFF


Always dynamically lookup egl functions

Always dynamically lookup egl functions

Android's latest NDK includes support for EGL 1.5 functions.
However, only for API level 29. But due to unified headers
folks building for older API levels will also see the new
functions but won't be able to link. Making the egl functions
dynamic avoids build time issues.

Change-Id: I718e28c7422faf3c7b964ca70b86a1711a08ae54
Affects: EGL
Bug: 1873
(cherry picked from commit 9af8b5c1ad98342a634b79a1f9c1213632248c64)

--- targets/android/android.cmake
+++ targets/android/android.cmake
@@ -48,7 +48,8 @@
 if (IS_DIRECTORY ${ANGLE_LIBS})
 	find_library(EGL_LIBRARY NAMES EGL_angle PATHS ${ANGLE_LIBS} NO_DEFAULT_PATH)
 else()
-	find_library(EGL_LIBRARY EGL PATHS /usr/lib)
+	# Disable static linking by clearing EGL_LIBRARY
+	set(EGL_LIBRARY   )
 endif()
 set(DEQP_EGL_LIBRARIES ${EGL_LIBRARY})


Disable cmake warning if the git remote 'origin' is not found

--- cmake/CppStyleGuideChecks.cmake
+++ cmake/CppStyleGuideChecks.cmake
@@ -94,10 +94,6 @@
     add_clang_format_target(format "${CHANGED_SRC_FILES_ORIGIN_MASTER}" )
     add_clang_tidy_target(tidy "${CHANGED_SRC_FILES_ORIGIN_MASTER}" )
     add_cpplint_target(check-cpplint "${CHANGED_SRC_FILES_ORIGIN_MASTER}" )
-  else()
-    MESSAGE(WARNING "\nWe did not detect any remote origin/master branch. Therefore, targets \
-like 'make format', 'make tidy' and 'make check-cpplint' will not be available. Use 'make format-all', 'make tidy-all' and 'make check-cpplint-all' instead. \
-If you wish to use 'make format'/'make tidy'/'make check-cpplint' try to add an origin/master branch using 'git remote add'.\n")
   endif()

   add_clang_format_target(format-staged "${STAGED_SRC_FILES}" )


Squashed '3rdparty/github/cmake-utils/' changes from 3019a08..1dddd0d

1dddd0d Add PROJECT_NAME in MYPACKAGEPRINTSETUP

git-subtree-dir: 3rdparty/github/cmake-utils
git-subtree-split: 1dddd0db988d5e56bf4af6e7a52ebe6badecbc3f

--- cmake/MyPackagePrintSetup.cmake
+++ cmake/MyPackagePrintSetup.cmake
@@ -1,9 +1,9 @@
 MACRO (MYPACKAGEPRINTSETUP)
   #
-  # Print global setup
+  # Print Setup
   #
   MESSAGE(STATUS "================================")
-  MESSAGE(STATUS "Global setup:")
+  MESSAGE(STATUS "${PROJECT_NAME} Setup:")
   MESSAGE(STATUS "                   CMAKE_SYSTEM: ${CMAKE_SYSTEM}")
   MESSAGE(STATUS "         CMAKE_SYSTEM_PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}")
   MESSAGE(STATUS "               CMAKE_CFG_INTDIR: ${CMAKE_CFG_INTDIR}")


[test] Dropped useless warning messages.

--- cmake/WintermuteVariables.cmake
+++ cmake/WintermuteVariables.cmake
@@ -32,11 +32,10 @@
 	-fstrict-aliasing
 	-std=c++11
 	-Wc++11-compat
-	)
+)

 SET(WINTERMUTE_COMPILE_FLAGS_DEBUG
 	-O0
-	-Waggressive-loop-optimizations
 	-Wctor-dtor-privacy
 	-Wno-deprecated
 	-Wno-unused-parameter
@@ -44,11 +43,10 @@
 	-Wenum-compare
 	-Wextra
 	-Wno-conversion-null
-	-Wuseless-cast
-	)
+)
 SET(WINTERMUTE_COMPILE_FLAGS_RELEASE
 	-O3
-	)
+)

 set(WINTERMUTE_COMPILE_FLAGS ${WINTERMUTE_COMPILE_FLAGS})
 set(WINTERMUTE_COMPILE_FLAGS_DEBUG "${WINTERMUTE_COMPILE_FLAGS_DEBUG}")


[cmake] Find SHLWAPI properly

[cmake] Find SHLWAPI properly

Summary: This help handling standard parameters properly

Test Plan:
  cmake -GNinja ..

Reviewers: #bitcoin_abc, schancel

Reviewed By: #bitcoin_abc, schancel

Subscribers: teamcity

Differential Revision: https://reviews.bitcoinabc.org/D1337

--- cmake/modules/FindSHLWAPI.cmake
+++ cmake/modules/FindSHLWAPI.cmake
@@ -10,6 +10,13 @@

 find_path(SHLWAPI_INCLUDE_DIR NAMES shlwapi.h)
 find_library(SHLWAPI_LIBRARY NAMES shlwapi)
+
 message(STATUS "SHLWAPI lib: " ${SHLWAPI_LIBRARY})

+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GMP DEFAULT_MSG SHLWAPI_INCLUDE_DIR SHLWAPI_LIBRARY)
+
 mark_as_advanced(SHLWAPI_INCLUDE_DIR SHLWAPI_LIBRARY)
+
+set(SHLWAPI_LIBRARIES ${SHLWAPI_LIBRARY})
+set(SHLWAPI_INCLUDE_DIRS ${SHLWAPI_INCLUDE_DIR})


Fix CMake build's library dependencies.

Fix CMake build's library dependencies.

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

--- cmake/modules/LLVMLibDeps.cmake
+++ cmake/modules/LLVMLibDeps.cmake
@@ -60,7 +60,7 @@
 set(MSVC_LIB_DEPS_LLVMTransformUtils LLVMAnalysis LLVMCore LLVMSupport LLVMTarget LLVMipa)
 set(MSVC_LIB_DEPS_LLVMX86AsmParser LLVMMC LLVMMCParser LLVMSupport LLVMTarget LLVMX86Info)
 set(MSVC_LIB_DEPS_LLVMX86AsmPrinter LLVMMC LLVMSupport LLVMX86Utils)
-set(MSVC_LIB_DEPS_LLVMX86CodeGen LLVMAnalysis LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMTarget LLVMX86AsmPrinter LLVMX86Info LLVMX86Utils)
+set(MSVC_LIB_DEPS_LLVMX86CodeGen LLVMAnalysis LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMTarget LLVMX86AsmPrinter LLVMX86Desc LLVMX86Info LLVMX86Utils)
 set(MSVC_LIB_DEPS_LLVMX86Desc LLVMMC LLVMX86Info)
 set(MSVC_LIB_DEPS_LLVMX86Disassembler LLVMMC LLVMSupport LLVMX86Info)
 set(MSVC_LIB_DEPS_LLVMX86Info LLVMMC LLVMSupport)


Changed package source of Lua to tag v5.3.2-p1

--- cmake/projects/Lua/hunter.cmake
+++ cmake/projects/Lua/hunter.cmake
@@ -18,9 +18,9 @@
     VERSION
     "5.3.2"
     URL
-    "https://github.com/hunter-packages/lua/archive/5.3.2.tar.gz"
+    "https://github.com/hunter-packages/lua/archive/v5.3.2-p1.tar.gz"
     SHA1
-    5395f8637c14b41f950b28f2c1dba65f30fa7030
+    0697a2fa7fc657aac91e0a31f9f7709aebf1e3db
 )

 hunter_configuration_types(Lua CONFIGURATION_TYPES Release)


Temporarely disabled all the modules that depend on C-Client library.

--- cmake_modules/FindCClient.cmake
+++ cmake_modules/FindCClient.cmake
@@ -62,7 +62,9 @@

 # Copy the results to the output variables.
 IF(CCLIENT_INCLUDE AND CCLIENT_LIBRARY)
-  SET(CCLIENT_FOUND 1)
+# temporarely disabled the modules that depend on C-Client library
+#   SET(CCLIENT_FOUND 1)
+  SET(CCLIENT_FOUND 0)
   SET(CCLIENT_LIBRARIES ${CCLIENT_LIBRARY})
   SET(CCLIENT_INCLUDE_DIRS ${CCLIENT_INCLUDE})


Only create check_core_uris and associated dependencies if there are any core URIs (to prevent creating this target in standalone module projects).

--- cmake_modules/ZorbaModule.cmake
+++ cmake_modules/ZorbaModule.cmake
@@ -524,14 +524,20 @@
     # Targets and dependencies:
     #   ALL depends on check_uris; check_uris depends on check_core_uris;
     #   zorbacmd depends on check_core_uris.
-    ADD_CUSTOM_TARGET (check_core_uris
-      DEPENDS ${_core_output_files} VERBATIM)
     ADD_CUSTOM_TARGET (check_uris ALL
       DEPENDS ${_noncore_output_files} VERBATIM)
-    ADD_DEPENDENCIES(check_uris check_core_uris)
-    ADD_DEPENDENCIES(zorbacmd check_core_uris)
-    SET_TARGET_PROPERTIES(check_core_uris PROPERTIES FOLDER "Modules")
     SET_TARGET_PROPERTIES(check_uris PROPERTIES FOLDER "Modules")
+    # Only create check_core_uris target and associated dependencies if
+    # there are any core URIs; there should never be any when building a
+    # standalone module project.
+    LIST (LENGTH _core_output_files _num_core)
+    IF (_num_core GREATER 0)
+      ADD_CUSTOM_TARGET (check_core_uris
+        DEPENDS ${_core_output_files} VERBATIM)
+      ADD_DEPENDENCIES(check_uris check_core_uris)
+      ADD_DEPENDENCIES(zorbacmd check_core_uris)
+      SET_TARGET_PROPERTIES(check_core_uris PROPERTIES FOLDER "Modules")
+    ENDIF (_num_core GREATER 0)
     SET_PROPERTY (GLOBAL PROPERTY ZORBA_URI_FILES)

     #add 'xqdoc' and 'xqdoc-xml' targets