--- plugins/sipe/ktpaccountskcm_plugin_sipe.desktop.cmake
+++ plugins/sipe/ktpaccountskcm_plugin_sipe.desktop.cmake
@@ -22,6 +22,7 @@
 Comment[sr@ijekavianlatin]=Korisničko sučelje za podešavanje posebnih naloga pod menadžerom veze SIPE.
 Comment[sr@latin]=Korisničko sučelje za podešavanje posebnih naloga pod menadžerom veze SIPE.
 Comment[sv]=Användargränssnitt för anpassad kontoinställning av konton som använder anslutningshanteraren Sipe.
+Comment[tr]=Sipe bağlantı yöneticisi kullanan hesaplar için özel hesap yapılandırma kullanıcı arayüzü
 Comment[uk]=Інтерфейс користувача для нетипового налаштовування облікового запису за допомогою керування з’єднаннями sipe.
 Comment[x-test]=xxCustom account configuration user interface for accounts using the sipe connection manager.xx
 Comment[zh_TW]=對使用 sipe 連線管理員的帳號自訂帳號設定使用者介面。
@@ -48,6 +49,7 @@
 Name[sr@ijekavianlatin]=Korisničko sučelje za podešavanje naloga pod SIPE‑om
 Name[sr@latin]=Korisničko sučelje za podešavanje naloga pod SIPE‑om
 Name[sv]=Användargränssnitt för inställning av Sipe-konton
+Name[tr]=Sipe Hesap Yapılandırma Kullanıcı Arayüzü
 Name[uk]=Інтерфейс користувача для налаштовування sipe
 Name[x-test]=xxSipe Account Configuration User Interfacexx
 Name[zh_TW]=Sipe 帳號設定使用者介面


Add print_list.

Add print_list.

	* build-aux/cmake/modules/Tools.cmake: Here.

--- build-aux/cmake/modules/Tools.cmake
+++ build-aux/cmake/modules/Tools.cmake
@@ -22,6 +22,13 @@
   function(ECHO)
     message(STATUS ${ARGV})
   endfunction(ECHO)
+
+  # Print the list names _l_.
+  function(print_list l)
+    foreach(i ${${l}})
+      message("${l}: ${i}")
+    endforeach(i)
+  endfunction(print_list)

   # Find the hostname of machine running cmake.
   # outvar: the name of the variable where to store the result.


Xcode path defined (works for Xcode 4.4 on OS X 10.7 and 10.8)

--- toolchain/iOS.cmake
+++ toolchain/iOS.cmake
@@ -86,7 +86,7 @@

 # Setup iOS developer location
 if (NOT DEFINED CMAKE_IOS_DEVELOPER_ROOT)
-	set (CMAKE_IOS_DEVELOPER_ROOT "/Developer/Platforms/${IOS_PLATFORM_LOCATION}/Developer")
+	set (CMAKE_IOS_DEVELOPER_ROOT "/Applications/Xcode.app/Contents/Developer/Platforms/${IOS_PLATFORM_LOCATION}/Developer")
 endif (NOT DEFINED CMAKE_IOS_DEVELOPER_ROOT)
 set (CMAKE_IOS_DEVELOPER_ROOT ${CMAKE_IOS_DEVELOPER_ROOT} CACHE PATH "Location of iOS Platform")


get rid of License.txt in packaging dir.

--- packaging/linux/LinuxPackaging.cmake
+++ packaging/linux/LinuxPackaging.cmake
@@ -57,8 +57,7 @@
   set(CPACK_RPM_PACKAGE_PROVIDES
     "${CPACK_PACKAGE_NAME} \(=${CPACK_PACKAGE_VERSION}\)"
     )
-  file(READ ${CPACK_RESOURCE_FILE_LICENSE} LICENSE)
-  set(CPACK_RPM_PACKAGE_LICENSE ${LICENSE})
+  set(CPACK_RPM_PACKAGE_LICENSE BSD)
   set (CPACK_RPM_PACKAGE_ARCHITECTURE ${ARCH})
 else()
   set(CPACK_GENERATOR DEB)


Improved comments printed by buzz_make()

--- src/utility/UseBuzz.cmake
+++ src/utility/UseBuzz.cmake
@@ -101,7 +101,7 @@
     COMMAND "BZZPARSE=${BUZZ_PARSER}" "BZZASM=${BUZZ_ASSEMBLER}" "${BUZZ_COMPILER}" ${_buzz_make_BUZZ_INCLUDE_PATH} -b "${_buzz_make_BYTECODE}" -d "${_buzz_make_DEBUG}" -a "${_buzz_make_BASM}" "${CMAKE_CURRENT_SOURCE_DIR}/${_SCRIPT}"
     MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/${_SCRIPT}"
     DEPENDS ${_buzz_make_INCLUDES}
-    COMMENT "Compiling Buzz script ${_SCRIPT}")
+    COMMENT "Compiling Buzz script ${_SCRIPT}, including '${_buzz_make_INCLUDES}'")
   # Add target, so compilation is executed
-  add_custom_target("${_SCRIPT}" ALL DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${_SCRIPT}" "${_buzz_make_BYTECODE}" "${_buzz_make_DEBUG}")
+  add_custom_target("${_SCRIPT}" ALL DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${_SCRIPT}" "${_buzz_make_BYTECODE}" "${_buzz_make_DEBUG}" ${_buzz_make_INCLUDES})
 endfunction(buzz_make)


Added documentation for UseBuzz.cmake.

Added documentation for UseBuzz.cmake.

--- src/utility/UseBuzz.cmake
+++ src/utility/UseBuzz.cmake
@@ -1,3 +1,40 @@
+#
+# UseBuzz
+# -------
+#
+# Use Module for Buzz
+#
+# This file provides functions for Buzz. It is assumed that
+# FindBuzz.cmake has already been loaded. See FindBuzz.cmake for
+# information on how to load Buzz into your CMake project.
+#
+# ::
+#
+#  make_buzz(script.bzz
+#            [DEPENDENCIES dep1.bzz [dep2.bzz ...]])
+#
+# This command compiles script.bzz. If the script depends on other
+# files that should trigger re-compilation if modified, the option
+# DEPENDENCIES should be used.
+#
+# The compilation process looks for include files using the path lists
+# specified in these variables:
+#
+# 1. the environment variable BUZZ_INCLUDE_PATH
+# 2. the CMake variable BUZZ_INCLUDE_PATH
+#
+# The Buzz tools are assumed already detected through
+# FindBuzz.cmake. However, you can also manually set following the
+# CMake variables:
+#
+# - BUZZ_COMPILER: the full path to bzzc
+# - BUZZ_PARSER: the full path to bzzparse
+# - BUZZ_ASSEMBLER: the full path to bzzasm
+
+#=============================================================================
+# Copyright 2016 Carlo Pinciroli <carlo@pinciroli.net>
+#=============================================================================
+
 function(make_buzz _SCRIPT)
   # Make sure _SCRIPT ends with .bzz
   get_filename_component(_make_buzz_EXT "${_SCRIPT}" EXT)


Added missing add_depednencies

Added missing add_depednencies

--- cmake/CMakeModules/OssimUtilities.cmake
+++ cmake/CMakeModules/OssimUtilities.cmake
@@ -179,7 +179,8 @@
         ADD_EXECUTABLE(${TARGET_TARGETNAME} ${PLATFORM_SPECIFIC_CONTROL} ${APPLICATION_SOURCE_FILES} ${APPLICATION_HEADERS})

     ENDIF(APPLICATION_COMMAND_LINE)
-
+
+    ADD_DEPENDENCIES(${TARGET_TARGETNAME} ${OSSIM_LIB_NAME})
     SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}")
     SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES OUTPUT_NAME ${TARGET_NAME})
     SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_OUTPUT_NAME "${TARGET_NAME}${CMAKE_DEBUG_POSTFIX}")


fixed cmake script error

fixed cmake script error

--- cmakemodules/script_national_instruments.cmake
+++ cmakemodules/script_national_instruments.cmake
@@ -5,9 +5,9 @@
 MARK_AS_ADVANCED(NI_ROOT_DIR)

 SET(NI_AUTODETECTED "OFF")
-IF(NOT "" STREQUAL ${NI_ROOT_DIR})
+IF(NOT "" STREQUAL "${NI_ROOT_DIR}")
 	SET(NI_AUTODETECTED "ON")
-ENDIF(NOT "" STREQUAL ${NI_ROOT_DIR})
+ENDIF(NOT "" STREQUAL "${NI_ROOT_DIR}")

 SET(MRPT_HAS_NATIONAL_INSTRUMENTS ${NI_AUTODETECTED} CACHE BOOL "Build hwdrivers interfaces to NI devices")


ffmpeg depends on yasm

ffmpeg depends on yasm

* use yasm from externpro
* issue https://github.com/smanders/externpro/issues/17 (add FFmpeg)
* issue https://github.com/smanders/externpro/issues/157 (add yasm)

--- projects/ffmpeg.cmake
+++ projects/ffmpeg.cmake
@@ -65,9 +65,12 @@
       message(STATUS "ffmpeg.cmake: requires openh264")
       set(XP_PRO_OPENH264 ON CACHE BOOL "include openh264" FORCE)
       xpPatchProject(${PRO_OPENH264})
+      # NOTE: openh264 depends on yasm, so the above already taken care of in openh264
     endif()
+    build_yasm(yasmTgts) # sets YASM_EXE
     build_openh264(openh264Tgts)
     set(XP_CONFIGURE_BASE ${CMAKE_COMMAND} -E env PKG_CONFIG_PATH=${STAGE_DIR}/share/cmake
+      PATH=${STAGE_DIR}/bin:$ENV{PATH} # prepend path to yasm
       <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> #--enable-shared --disable-static
       --enable-libopenh264 --disable-bzlib --disable-iconv --disable-libxcb --disable-zlib
       )
@@ -113,7 +116,7 @@
     DOWNLOAD_COMMAND "" DOWNLOAD_DIR ${NULL_DIR}
     SOURCE_DIR ${SOURCE_DIR}
     CONFIGURE_COMMAND ${XP_CONFIGURE_CMD}
-    BUILD_COMMAND   # use default
+    BUILD_COMMAND ${CMAKE_COMMAND} -E env PATH=${STAGE_DIR}/bin:$ENV{PATH} make # prepend path to yasm
     INSTALL_COMMAND # use default
     )
   set_property(TARGET ${XP_TARGET} PROPERTY FOLDER ${bld_folder})


Fixed ccache detection condition

Fixed ccache detection condition

--- cmake/OpenCVDetectCXXCompiler.cmake
+++ cmake/OpenCVDetectCXXCompiler.cmake
@@ -13,7 +13,7 @@
   set(CMAKE_COMPILER_IS_GNUCC 1)
   set(CMAKE_COMPILER_IS_CLANGCC 1)
 endif()
-if("${CMAKE_CXX_COMPILER};${CMAKE_CXX_COMPILER}" MATCHES "ccache")
+if("${CMAKE_CXX_COMPILER};${CMAKE_C_COMPILER}" MATCHES "ccache")
   set(CMAKE_COMPILER_IS_CCACHE 1)
 endif()


tizen: make compiler overridable for GBS (#82)

There is no arm-linux-gnueabi-gcc in Tizen's sysroot,
so I assume it is used for cross compilation,
not using Tizen's build tools.

To build using GBS (git-build-system),
this variable can be used to use system compiler "gcc" this way:

  cmake -DCMAKE_C_COMPILER=gcc .

Observed issue on Tizen:4.0:Unified (armv7l) was:

  -- Check for working C compiler: arm-linux-gnueabi-gcc
  CMake Error: your C compiler: "arm-linux-gnueabi-gcc" was not found.
  Please set CMAKE_C_COMPILER to a valid compiler path or name.

libtuv-DCO-1.0-Signed-off-by: Philippe Coval philippe.coval@osg.samsung.com

--- cmake/config/config_arm-tizen.cmake
+++ cmake/config/config_arm-tizen.cmake
@@ -17,4 +17,6 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_PROCESSOR arm)

-SET(CMAKE_C_COMPILER   arm-linux-gnueabi-gcc)
+if(NOT DEFINED CMAKE_C_COMPILER)
+  set(CMAKE_C_COMPILER arm-linux-gnueabi-gcc)
+endif()


cmake configs: remove posix_sitl_ekf2.cmake

Not needed anymore, use PX4_ESTIMATOR.

--- cmake/configs/posix_sitl_ekf2.cmake
+++ cmake/configs/posix_sitl_ekf2.cmake
@@ -1 +0,0 @@
-include(cmake/configs/posix_sitl_default.cmake)


Bug 781833 - Do not set '-Wl,--no-undefined' on BSD

--- cmake/modules/SetupBuildFlags.cmake
+++ cmake/modules/SetupBuildFlags.cmake
@@ -77,9 +77,9 @@
 		endforeach()
 	endif(CMAKE_CXX_COMPILER_ID)

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


[cmake] Document the component system via the "Swift Component Manifesto". NFC.

--- cmake/modules/SwiftComponents.cmake
+++ cmake/modules/SwiftComponents.cmake
@@ -1,3 +1,45 @@
+# Swift Components
+# ----------------
+#
+# This file contains the cmake code for initialization and manipulation of
+# "Swift Components". A "Swift Component" is a disjoint set of source files,
+# binary products, and source products that are inputs or products of Swift's
+# cmake build system. At a high level each component can be viewed approximately
+# as an individual package in a Debian-style Linux package (i.e. a .deb file).
+#
+# *NOTE* In the following for brevity, a "Swift Component" will just be called a
+# component.
+#
+# For every cmake invocation, the set of components are split into the following
+# sets: defined, include, build, and install components. These sets form a
+# lattice as follows:
+#
+#    install => build => include => defined
+#
+# We describe the characteristics of each set below:
+#
+# 1. A "defined" component is a component that is known to the build system. It
+# has defined source inputs and binary/source outputs. But the build system is
+# not required to generate targets, run any targets associated with the package
+# while building, or install any binary/source outputs associated with the
+# component.
+#
+# 2. A "include" component is a "defined" component that cmake will generate
+# targets for. This means that it will not be built or installed by default
+# (i.e. it is not apart of the "all" target), but one can from the relevant
+# cmake build command invoke the generated targets directly and any dependencies
+# on the component from other packages will cause the package to be built and or
+# installed.
+#
+# 3. A "build" component is a "include" component that cmake will add to the
+# "all" target. This means that cmake will add this component to the "all"
+# target causing it to be built by default when one invokes a build tool. On the
+# other hand, the component is not guaranteed to be built by default.
+#
+# 4. A "install" component is a "build" component that will have targets
+# generated by default, will be built by default, and will be installed by
+# default.
+#
 # Set of Defined Components
 # -------------------------
 #


pass HUNTER_TLS_VERIFY for external projects to use

--- cmake/modules/hunter_download.cmake
+++ cmake/modules/hunter_download.cmake
@@ -463,6 +463,11 @@
       "${HUNTER_DOWNLOAD_TOOLCHAIN}"
       "set(HUNTER_DOWNLOAD_SERVER \"${HUNTER_DOWNLOAD_SERVER}\" CACHE INTERNAL \"\")\n"
   )
+  file(
+      APPEND
+      "${HUNTER_DOWNLOAD_TOOLCHAIN}"
+      "set(HUNTER_TLS_VERIFY \"${HUNTER_TLS_VERIFY}\" CACHE INTERNAL \"\")\n"
+  )

   string(COMPARE NOTEQUAL "${CMAKE_MAKE_PROGRAM}" "" has_make)
   if(has_make)
@@ -493,6 +498,7 @@
         "Configuration types: ${HUNTER_PACKAGE_CONFIGURATION_TYPES}"
     )
   endif()
+  hunter_status_debug("HUNTER_TLS_VERIFY: ${HUNTER_TLS_VERIFY}")

   if(has_internal_deps_id)
     hunter_status_debug(


Use hidden visibility with GCC and Clang
am: 0fa7ebccc4

Change-Id: I556e6233f7af2818786fbc2798eec1658cf3a590

--- framework/delibs/cmake/CFlags.cmake
+++ framework/delibs/cmake/CFlags.cmake
@@ -53,6 +53,11 @@
 	# Turn on -Wstrict-overflow=5 and check all warnings before removing
 	set(CMAKE_C_FLAGS			"${CMAKE_C_FLAGS} -fwrapv")
 	set(CMAKE_CXX_FLAGS			"${CMAKE_CXX_FLAGS} -fwrapv")
+
+	# Force compiler to not export any symbols.
+	# 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")
 elseif (DE_COMPILER_IS_MSC)
 	# Compiler flags for msc


pw_build/cmake: Add PUBLIC_INCLUDES and PRIVATE_INCLUDES

Extends the pw_add_module_library function to permit explicit
private and public includes instead of assuming that public is
always used and public_overrides must be used if any facades are
implemented.

This is done in a way where the legacy behavior is used if
PUBLIC_INCLUDES are not specified.

Bug: 601
Change-Id: I2219f66861b9e74807da430cccb62689ce753a42
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/78586
Pigweed-Auto-Submit: Ewout van Bekkum <638f134dbc68778d6b859fb04a64baea2b00b021@google.com>
Reviewed-by: Wyatt Hepler <cca3bedb37979eacd157a9bceb473582df8aea1e@google.com>
Commit-Queue: Auto-Submit <14637eda5603879df170705285bf30f5996692f0@pigweed.google.com.iam.gserviceaccount.com>

--- pw_build/pigweed.cmake
+++ pw_build/pigweed.cmake
@@ -166,6 +166,8 @@
 #
 #   SOURCES - source files for this library
 #   HEADERS - header files for this library
+#   PUBLIC_INCLUDES - public target_include_directories argument.
+#   PRIVATE_INCLUDES - public target_include_directories argument.
 #   PUBLIC_DEPS - public target_link_libraries arguments
 #   PRIVATE_DEPS - private target_link_libraries arguments
 #   IMPLEMENTS_FACADES - which facades this library implements
@@ -173,7 +175,8 @@
 #   PRIVATE_DEFINES - private target_compile_definitions arguments
 #
 function(pw_add_module_library NAME)
-  _pw_library_args(list_args IMPLEMENTS_FACADES PUBLIC_DEFINES PRIVATE_DEFINES)
+  _pw_library_args(list_args PUBLIC_INCLUDES PRIVATE_INCLUDES IMPLEMENTS_FACADES
+                   PUBLIC_DEFINES PRIVATE_DEFINES)
   _pw_parse_argv_strict(pw_add_module_library 1 "" "" "${list_args}")

   # Check that the library's name is prefixed by the module name.
@@ -187,7 +190,15 @@
   endif()

   add_library("${NAME}" EXCLUDE_FROM_ALL ${arg_HEADERS} ${arg_SOURCES})
-  target_include_directories("${NAME}" PUBLIC public)
+  if(NOT "${arg_PUBLIC_INCLUDES}" STREQUAL "")
+    target_include_directories("${NAME}" PUBLIC ${arg_PUBLIC_INCLUDES})
+  else()
+    # TODO(pwbug/601): Deprecate this legacy implicit PUBLIC_INCLUDES.
+    target_include_directories("${NAME}" PUBLIC public)
+  endif()
+  if(NOT "${arg_PRIVATE_INCLUDES}" STREQUAL "")
+    target_include_directories("${NAME}" PRIVATE ${arg_PRIVATE_INCLUDES})
+  endif()
   target_link_libraries("${NAME}"
     PUBLIC
       pw_build
@@ -200,6 +211,10 @@

   if(NOT "${arg_IMPLEMENTS_FACADES}" STREQUAL "")
     target_include_directories("${NAME}" PUBLIC public_overrides)
+    if("${arg_PUBLIC_INCLUDES}" STREQUAL "")
+      # TODO(pwbug/601): Deprecate this legacy implicit PUBLIC_INCLUDES.
+      target_include_directories("${NAME}" PUBLIC public_overrides)
+    endif()
     set(facades ${arg_IMPLEMENTS_FACADES})
     list(TRANSFORM facades APPEND ".facade")
     target_link_libraries("${NAME}" PUBLIC ${facades})


Remove duplicates in ALL_INCLUDE_DIRECTORIES

--- CMake/mitkMacroCreateModule.cmake
+++ CMake/mitkMacroCreateModule.cmake
@@ -154,6 +154,7 @@
         MITK_USE_MODULE("${MODULE_DEPENDS}")

         # ok, now create the module itself
+        list(REMOVE_DUPLICATES ALL_INCLUDE_DIRECTORIES)
         include_directories(. ${ALL_INCLUDE_DIRECTORIES})
         include(files.cmake)


Synchronize adm files

Synchronize adm files

--- adm_local_without_kernel/cmake_files/SalomeSetupPlatform.cmake
+++ adm_local_without_kernel/cmake_files/SalomeSetupPlatform.cmake
@@ -82,7 +82,6 @@
 #    ENDIF(CMAKE_BUILD_TYPE STREQUAL Release)
 #ENDIF()

-
 IF(WIN32)
   ## Windows specific:
   ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)  # To disable windows warnings for strcpy, fopen, ...
@@ -98,7 +97,9 @@
   IF(MACHINE_IS_64)
     ADD_DEFINITIONS(-D_SECURE_SCL=0 -D_SECURE_SCL_THROWS=0)
     ADD_DEFINITIONS(-D_HAS_ITERATOR_DEBUGGING=0) # To avoid runtime error during checking iterators
-    SET(SIZE_OF_LONG "4")                        # set sizeof(long) to 4 byte
+    SET(SIZE_OF_LONG 4)                          # set sizeof(long) to 4 byte
+  ELSE()
+    SET(SIZE_OF_LONG ${CMAKE_SIZEOF_VOID_P})     # set sizeof(long) the same as size of pointers
   ENDIF()
 ELSE()
   ## Linux specific:


SVN_SILENT made messages (.desktop file)

--- ds9/ds9.desktop.cmake
+++ ds9/ds9.desktop.cmake
@@ -20,6 +20,7 @@
 Name[es]=DirectShow9
 Name[et]=DirectShow9
 Name[fi]=DirectShow9
+Name[fr]=DirectShow9
 Name[ga]=DirectShow9
 Name[gl]=DirectShow9
 Name[hu]=DirectShow9
@@ -60,6 +61,7 @@
 Comment[es]=Motor DirectShow9 para Phonon
 Comment[et]=Phononi DirectShow9 taustaprogramm
 Comment[fi]=Phonon DirectShow9 -taustaohjelma
+Comment[fr]=Moteur DirectShow9 pour Phonon
 Comment[ga]=Inneall DirectShow9 Phonon
 Comment[gl]=Infraestrutura de DirectShow9 para Phonon
 Comment[hu]=Phonon DirectShow9-modul


Use the git.mitk.org repository for dartclients

--- CMake/MITKDashboardSetup.cmake
+++ CMake/MITKDashboardSetup.cmake
@@ -45,7 +45,7 @@

 # If the dashscript doesn't define a GIT_REPOSITORY variable, let's define it here.
 if (NOT DEFINED GIT_REPOSITORY OR GIT_REPOSITORY STREQUAL "")
-  set(GIT_REPOSITORY "http://mbits/git/MITK.git")
+  set(GIT_REPOSITORY "http://git.mitk.org/MITK.git")
 endif()

 #


bump version number, ABI number

bump version number, ABI number

--- CMakeModules/OMPLVersion.cmake
+++ CMakeModules/OMPLVersion.cmake
@@ -1,8 +1,8 @@
 # set the version in a way CMake can use
 set(OMPL_MAJOR_VERSION 0)
-set(OMPL_MINOR_VERSION 11)
-set(OMPL_PATCH_VERSION 1)
+set(OMPL_MINOR_VERSION 12)
+set(OMPL_PATCH_VERSION 0)
 set(OMPL_VERSION "${OMPL_MAJOR_VERSION}.${OMPL_MINOR_VERSION}.${OMPL_PATCH_VERSION}")

 # increment this when we have ABI changes
-set(OMPL_ABI_VERSION 5)
+set(OMPL_ABI_VERSION 6)


FIX: xforge-ext library file path when build with Xcode

--- CMakeModules/build_forge.cmake
+++ CMakeModules/build_forge.cmake
@@ -2,13 +2,31 @@

 SET(prefix ${CMAKE_BINARY_DIR}/third_party/forge)

+IF(CMAKE_GENERATOR MATCHES "Xcode") # TODO: Also for "Visual Studio"?
+    # FIXME: Cannot use $<CONFIG> generator expression here because add_custom_command
+    #        does not yet support it for the OUTPUT argument, see also:
+    #        - Old "duplicate":   https://cmake.org/Bug/view.php?id=12877
+    #        - Old issue tracker: https://cmake.org/Bug/view.php?id=13840
+    #        - New issue tracker: https://gitlab.kitware.com/cmake/cmake/issues/13840
+    #        In the meantime, use CMAKE_BUILD_TYPE if set by user, assuming that it
+    #        is the primary build configuration used. Otherwise, default to Release.
+    IF(CMAKE_BUILD_TYPE)
+        SET(forge_lib_config ${CMAKE_BUILD_TYPE})
+    ELSE()
+        SET(forge_lib_config Release)
+    ENDIF()
+    SET(forge_lib_infix "/${forge_lib_config}")
+ELSE()
+    SET(forge_lib_config "$<CONFIG>")
+    SET(forge_lib_infix)
+ENDIF()
 IF(WIN32)
     SET(forge_lib_prefix "${prefix}/lib")
 ELSE(WIN32)
     SET(forge_lib_prefix "${prefix}/src/forge-ext-build/src")
 ENDIF(WIN32)

-SET(forge_location "${forge_lib_prefix}/${CMAKE_SHARED_LIBRARY_PREFIX}forge${CMAKE_SHARED_LIBRARY_SUFFIX}")
+SET(forge_location "${forge_lib_prefix}${forge_lib_infix}/${CMAKE_SHARED_LIBRARY_PREFIX}forge${CMAKE_SHARED_LIBRARY_SUFFIX}")
 IF(CMAKE_VERSION VERSION_LESS 3.2)
     IF(CMAKE_GENERATOR MATCHES "Ninja")
         MESSAGE(WARNING "Building forge with Ninja has known issues with CMake older than 3.2")
@@ -36,6 +54,7 @@
     -DGLFW_ROOT_DIR:STRING=${GLFW_ROOT_DIR}
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
     -DBUILD_EXAMPLES:BOOL=OFF
+    BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${forge_lib_config}
     ${byproducts}
     )

@@ -46,7 +65,7 @@
 IF(WIN32)
     SET_TARGET_PROPERTIES(forge PROPERTIES IMPORTED_IMPLIB ${forge_lib_prefix}/forge.lib)
 ELSE(WIN32)
-    SET(forge_bindir_location ${binary_dir}/src/${CMAKE_SHARED_LIBRARY_PREFIX}forge${CMAKE_SHARED_LIBRARY_SUFFIX})
+    SET(forge_bindir_location ${binary_dir}/src${forge_lib_infix}/${CMAKE_SHARED_LIBRARY_PREFIX}forge${CMAKE_SHARED_LIBRARY_SUFFIX})
     IF(NOT (${forge_bindir_location} STREQUAL ${forge_location}))
         MESSAGE(WARNING "Did the forge binary location move? (Have ${forge_bindir_location} vs ${forge_location})")
     ENDIF()


BUG: Fix IOFDFInDoxygenGroup test

BUG: Fix IOFDFInDoxygenGroup test

Updating IOFDF remote module. Set the required doxygen ingroup.

Change-Id: I2bea1c2fb31d31d57da88dfc2aff16d15a80de0b

--- Modules/Remote/IOFDF.remote.cmake
+++ Modules/Remote/IOFDF.remote.cmake
@@ -1,5 +1,5 @@
 itk_fetch_module(IOFDF
   "FDFImageIO plugin for ITK. Authors Gleen Pierce/Nick Tustison/Kent Williams"
   GIT_REPOSITORY http://github.com/InsightSoftwareConsortium/itkFDFImageIO.git
-  GIT_TAG  0805a5e7ff0bd60cf3e5e59830223a62dc988d2e
+  GIT_TAG  eff61805983c8a92b7a2043b94272d7b865c5a06
   )


BUG: Compiler detections file installed into ITK build tree location

These files were being installed into their build tree location. They are
already installed into the right location by the ITK module infrastructure.

Change-Id: I9d1562c253e6604205d5b5730f312440fad64721

--- Modules/Core/Common/CMake/itkGenerateNewCompilerFeatureDetectionHeaders.cmake
+++ Modules/Core/Common/CMake/itkGenerateNewCompilerFeatureDetectionHeaders.cmake
@@ -80,16 +80,3 @@
         cxx_template_template_parameters        # Template template parameters, as defined in ISO/IEC 14882:1998.
   )
 endif()
-
-#
-# Install platform-specific compiler detection files
-#
-file(GLOB ITK_COMPILER_DETECTION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/compilers/*)
-install(FILES ${ITK_COMPILER_DETECTION_FILES}
-      DESTINATION ${ITKCommon_BINARY_DIR}/compilers
-      PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
-      COMPONENT Development )
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/itk_compiler_detection.h
-      DESTINATION ${ITKCommon_BINARY_DIR}
-      PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
-      COMPONENT Development )


BUG: 5317: Adding vxl/v3p to the list of directories to install.      Remains to be verified if this solves the entire issue or not.

--- itkIncludeDirectories.cmake
+++ itkIncludeDirectories.cmake
@@ -57,8 +57,10 @@
 # VXL include directories.
 IF(NOT ITK_USE_SYSTEM_VXL)
   SET(ITK_INCLUDE_DIRS_BUILD_TREE ${ITK_INCLUDE_DIRS_BUILD_TREE}
+    ${ITK_SOURCE_DIR}/Utilities/vxl/v3p/netlib
     ${ITK_SOURCE_DIR}/Utilities/vxl/vcl
     ${ITK_SOURCE_DIR}/Utilities/vxl/core
+    ${ITK_BINARY_DIR}/Utilities/vxl/v3p/netlib
     ${ITK_BINARY_DIR}/Utilities/vxl/vcl
     ${ITK_BINARY_DIR}/Utilities/vxl/core
     )
@@ -130,6 +132,7 @@

 IF(NOT ITK_USE_SYSTEM_VXL)
   SET(ITK_INCLUDE_RELATIVE_DIRS ${ITK_INCLUDE_RELATIVE_DIRS}
+    Utilities/vxl/v3p/netlib
     Utilities/vxl/vcl
     Utilities/vxl/core
     )


Doxygit: Close header row

Doxygit: Close header row

--- Doxygit.cmake
+++ Doxygit.cmake
@@ -48,7 +48,7 @@
 file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/index.html"
   "
Project	Versions	")
 if(DOXYGIT_PROJECT_EXTRA)
-  file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/index.html" "Status	")
+  file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/index.html" "Status
")
 endif()

 macro(DOXYGIT_WRITE_ROW)


Use SWIFT_SDK_${sdk}_OBJECT_FORMAT to choose whether to use lipo and multi-arch builds

--- stdlib/cmake/modules/AddSwiftStdlib.cmake
+++ stdlib/cmake/modules/AddSwiftStdlib.cmake
@@ -501,7 +501,7 @@
     list(APPEND source_binaries $<TARGET_FILE:${source_target}>)
   endforeach()

-  if(${LIPO_SDK} IN_LIST SWIFT_APPLE_PLATFORMS)
+  if("${SWIFT_SDK_${LIPO_SDK}_OBJECT_FORMAT}" STREQUAL "MACHO")
     if(LIPO_CODESIGN)
       set(codesign_command COMMAND "codesign" "-f" "-s" "-" "${LIPO_OUTPUT}")
     endif()


px4/fmu-v6x: disable dumpfile (reduce flash)

--- boards/px4/fmu-v6x/default.cmake
+++ boards/px4/fmu-v6x/default.cmake
@@ -93,7 +93,6 @@
 	SYSTEMCMDS
 		bl_update
 		dmesg
-		dumpfile
 		esc_calib
 		gpio
 		hardfault_log


Updated FindEXPAT.cmake to correctly handle updated expat.

--- CMakeModules/FindEXPAT.cmake
+++ CMakeModules/FindEXPAT.cmake
@@ -33,64 +33,44 @@
 string(TOUPPER ${PROJECT_NAME} _UPPER_PROJECT_NAME)
 set(_PROJECT_DEPENDENCY_DIR ${_UPPER_PROJECT_NAME}_DEPENDENCY_DIR)

+find_path(EXPAT_INCLUDE_DIR expat.h
+    PATHS $ENV{EXPAT_DIR}/include
+            $ENV{EXPAT_DIR}
+            ${${_PROJECT_DEPENDENCY_DIR}}/include
+            ~/Library/Frameworks
+            /Library/Frameworks
+            /sw/include        # Fink
+            /opt/local/include # MacPorts
+            /opt/csw/include   # Blastwave
+            /opt/include
+            /usr/freeware/include
+            NO_DEFAULT_PATH)

-# Check if we have cached results in case the last round was successful.
-if (NOT (EXPAT_INCLUDE_DIR AND EXPAT_LIBRARY) OR NOT EXPAT_FOUND)
+if (NOT EXPAT_INCLUDE_DIR)
+    find_path(EXPAT_INCLUDE_DIR expat.h)
+endif ()

-    set(EXPAT_LDFLAGS)
-
-    find_path(EXPAT_INCLUDE_DIR expat.h
-	    PATHS $ENV{EXPAT_DIR}/include
-	          $ENV{EXPAT_DIR}
-              ${${_PROJECT_DEPENDENCY_DIR}}/include
-	          ~/Library/Frameworks
-	          /Library/Frameworks
-	          /sw/include        # Fink
-	          /opt/local/include # MacPorts
-	          /opt/csw/include   # Blastwave
-	          /opt/include
-	          /usr/freeware/include
-             NO_DEFAULT_PATH)
+find_library(EXPAT_LIBRARY
+    NAMES expat libexpat
+    PATHS $ENV{EXPAT_DIR}/${CMAKE_INSTALL_LIBDIR}
+            $ENV{EXPAT_DIR}/lib-dbg
+            $ENV{EXPAT_DIR}
+            ${${_PROJECT_DEPENDENCY_DIR}}/${CMAKE_INSTALL_LIBDIR}
+            ${${_PROJECT_DEPENDENCY_DIR}}
+            ~/Library/Frameworks
+            /Library/Frameworks
+            /sw/lib        # Fink
+            /opt/local/lib # MacPorts
+            /opt/csw/lib   # Blastwave
+            /opt/lib
+            /usr/freeware/lib64
+            NO_DEFAULT_PATH)

-    if (NOT EXPAT_INCLUDE_DIR)
-        find_path(EXPAT_INCLUDE_DIR expat.h)
-    endif ()
+if (NOT EXPAT_LIBRARY)
+    find_library(EXPAT_LIBRARY NAMES expat libexpat)
+endif ()

-    find_library(EXPAT_LIBRARY
-	    NAMES expat
-	    PATHS $ENV{EXPAT_DIR}/${CMAKE_INSTALL_LIBDIR}
-	          $ENV{EXPAT_DIR}/lib-dbg
-	          $ENV{EXPAT_DIR}
-              ${${_PROJECT_DEPENDENCY_DIR}}/${CMAKE_INSTALL_LIBDIR}
-              ${${_PROJECT_DEPENDENCY_DIR}}
-	          ~/Library/Frameworks
-	          /Library/Frameworks
-	          /sw/lib        # Fink
-	          /opt/local/lib # MacPorts
-	          /opt/csw/lib   # Blastwave
-	          /opt/lib
-	          /usr/freeware/lib64
-             NO_DEFAULT_PATH)
-
-    if (NOT EXPAT_LIBRARY)
-        find_library(EXPAT_LIBRARY NAMES expat)
-    endif ()
-
-    if (NOT WIN32)
-        find_package(PkgConfig)
-        pkg_check_modules(PC_EXPAT QUIET expat)
-
-        message(VERBOSE "${PC_EXPAT_STATIC_LDFLAGS}")
-
-        if (PC_EXPAT_FOUND)
-            set(EXPAT_DEFINITIONS ${PC_EXPAT_CFLAGS_OTHER})
-            set(EXPAT_VERSION ${PC_EXPAT_VERSION} CACHE STRING "Expat Version found" )
-        endif (PC_EXPAT_FOUND)
-    endif (NOT WIN32)
-
-    mark_as_advanced(EXPAT_INCLUDE_DIR EXPAT_LIBRARY)
-
-endif () # Check for cached values
+mark_as_advanced(EXPAT_INCLUDE_DIR EXPAT_LIBRARY)

 if (EXPAT_INCLUDE_DIR AND EXISTS "${EXPAT_INCLUDE_DIR}/expat.h")
@@ -125,6 +105,53 @@
     INTERFACE_INCLUDE_DIRECTORIES "${EXPAT_INCLUDE_DIR}")
 endif()

+# figure out if we need XML_STATIC flag
+if (EXPAT_INCLUDE_DIR AND EXPAT_LIBRARY)
+  enable_language(C)
+  set(EXPAT_EXPAT_CODE
+"
+#include <expat.h>
+#include <stdio.h>
+
+int
+main(void)
+{
+    printf(XML_ExpatVersion());
+    return 0;
+}
+"
+)
+
+set(CMAKE_REQUIRED_LIBRARIES_CACHE ${CMAKE_REQUIRED_LIBRARIES})
+set(CMAKE_REQUIRED_INCLUDES_CACHE ${CMAKE_REQUIRED_INCLUDES})
+set(CMAKE_REQUIRED_DEFINITIONS_CACHE ${CMAKE_REQUIRED_DEFINITIONS})
+
+set(EXPAT_EXPAT_TEST)
+set(CMAKE_REQUIRED_LIBRARIES "${EXPAT_LIBRARY}")
+set(CMAKE_REQUIRED_INCLUDES "${EXPAT_INCLUDE_DIR}")
+CHECK_C_SOURCE_COMPILES("${EXPAT_EXPAT_CODE}" EXPAT_EXPAT_TEST)
+
+if (NOT EXPAT_EXPAT_TEST)
+set(CMAKE_REQUIRED_LIBRARIES "${EXPAT_LIBRARY}")
+set(CMAKE_REQUIRED_INCLUDES "${EXPAT_INCLUDE_DIR}")
+set(CMAKE_REQUIRED_DEFINITIONS "-DXML_STATIC=1")
+
+CHECK_C_SOURCE_COMPILES("${EXPAT_EXPAT_CODE}" EXPAT_EXPAT_TEST2)
+if (EXPAT_EXPAT_TEST2)
+  set_target_properties(EXPAT::EXPAT PROPERTIES
+    INTERFACE_COMPILE_DEFINITIONS "XML_STATIC=1"
+    )
+else()
+  message(FATAL_ERROR "Unable to compile a test executable against expat")
+endif()
+
+endif()
+
+set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_CACHE})
+set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_CACHE})
+set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS_CACHE})
+endif()
+
 include(FindPackageHandleStandardArgs)

 find_package_handle_standard_args(


cmake: fix unable to start confserver on windows

--- tools/cmake/kconfig.cmake
+++ tools/cmake/kconfig.cmake
@@ -146,7 +146,7 @@
         COMMAND ${CMAKE_COMMAND} -E env
         "COMPONENT_KCONFIGS=${kconfigs}"
         "COMPONENT_KCONFIGS_PROJBUILD=${kconfigs_projbuild}"
-        ${IDF_PATH}/tools/kconfig_new/confserver.py --kconfig ${IDF_PATH}/Kconfig --config ${SDKCONFIG}
+        ${PYTHON} ${IDF_PATH}/tools/kconfig_new/confserver.py --kconfig ${IDF_PATH}/Kconfig --config ${SDKCONFIG}
         VERBATIM
         USES_TERMINAL)


android: update target sdk to 21

android: update target sdk to 21

Use latest SDK platform (android-21) per default.

--- cmake/ConfigOptionsAndroid.cmake
+++ cmake/ConfigOptionsAndroid.cmake
@@ -27,7 +27,7 @@
 option(ANDROID_BUILD_JAVA_DEBUG "Create a android debug package" ${JAVA_DEBUG_DEFAULT})

 set(ANDROID_APP_VERSION 3 CACHE STRING "Application version")
-set(ANDROID_APP_TARGET_SDK 14 CACHE STRING "Application target android SDK")
+set(ANDROID_APP_TARGET_SDK 21 CACHE STRING "Application target android SDK")
 set(ANDROID_APP_MIN_SDK 9 CACHE STRING "Application minimum android SDK requirement")
 set(ANDROID_APP_GOOGLE_TARGET_SDK "16" CACHE STRING "Application target google SDK")


added missing patch (thanks Mourad!), per #85

git-svn-id: 1af002208e930b4d920e7c2b948d1e98a012c795@573 a9d63959-f2ad-4865-b262-bf0e56cfafb6

--- cmake/Modules/FindCMinpack.cmake
+++ cmake/Modules/FindCMinpack.cmake
@@ -28,5 +28,12 @@

 if(CMINPACK_FOUND)
   message(STATUS "CMinPack found (include: ${CMINPACK_INCLUDE_DIRS}, lib: ${CMINPACK_LIBRARY})")
+  if(WIN32)
+    option(CMINPACK_IS_STATIC "Set to ON if you use static cminpack library." OFF)
+    mark_as_advanced(CMINPACK_IS_STATIC)
+    if(CMINPACK_IS_STATIC)
+      add_definitions(-DCMINPACK_NO_DLL)
+    endif(CMINPACK_IS_STATIC)
+  endif(WIN32)
 endif(CMINPACK_FOUND)


fix: fix find openblas version

fix: fix find openblas version

--- cmake/modules/FindOpenBLAS.cmake
+++ cmake/modules/FindOpenBLAS.cmake
@@ -2,7 +2,7 @@

 set(OpenBLAS_ROOT_DIR ${PROJECT_SOURCE_DIR}/third_party/openblas CACHE PATH "Folder contains OpenBLAS")

-set(OpenBLAS_DIR ${OpenBLAS_ROOT_DIR} /usr /usr/local)
+set(OpenBLAS_DIR ${OpenBLAS_ROOT_DIR} /usr /usr/local /usr/local/opt/openblas)

 find_path(OpenBLAS_INCLUDE_DIRS
           NAMES cblas.h
@@ -21,9 +21,14 @@
 find_package_handle_standard_args(OpenBLAS DEFAULT_MSG ${__looked_for})

 if (OpenBLAS_FOUND)
-  parse_header_single_define(${OpenBLAS_INCLUDE_DIRS}/openblas_config.h
-                             OPENBLAS_VERSION
-                             "[0-9]+\\.[0-9]+\\.[0-9]+")
+  set(__version_files "openblas_config.h" "openblas/openblas_config.h")
+  foreach (__version_file ${__version_files})
+    if (EXISTS ${OpenBLAS_INCLUDE_DIRS}/${__version_file})
+      parse_header_single_define(${OpenBLAS_INCLUDE_DIRS}/${__version_file}
+                                 OPENBLAS_VERSION
+                                 "[0-9]+\\.[0-9]+\\.[0-9]+")
+    endif ()
+  endforeach ()
   if (NOT OPENBLAS_VERSION)
     set(OpenBLAS_VERSION "?")
   else ()


don't fail if not required

don't fail if not required

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

--- cmake/modules/FindOpenSync.cmake
+++ cmake/modules/FindOpenSync.cmake
@@ -40,7 +40,9 @@
 IF ( OPENSYNC_CMAKE_MODULES )
         SET( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${OPENSYNC_CMAKE_MODULES}" )
 ELSE ( OPENSYNC_CMAKE_MODULES )
+    IF( OpenSync_FIND_REQUIRED )
         MESSAGE( FATAL_ERROR "OpenSync cmake modules not found. Have you installed opensync core or did you set your PKG_CONFIG_PATH if installing in a non system directory ?" )
+    ENDIF( OpenSync_FIND_REQUIRED )
 ENDIF ( OPENSYNC_CMAKE_MODULES )


cmake: support static and shared swift libraries

Enhance add_wift_target to support building static libraries.  We would
always generate shared libraries previously.

--- cmake/modules/SwiftSupport.cmake
+++ cmake/modules/SwiftSupport.cmake
@@ -2,7 +2,7 @@
 include(CMakeParseArguments)

 function(add_swift_target target)
-  set(options LIBRARY)
+  set(options LIBRARY;SHARED;STATIC)
   set(single_value_options MODULE_NAME;MODULE_LINK_NAME;MODULE_PATH;MODULE_CACHE_PATH;OUTPUT;TARGET)
   set(multiple_value_options CFLAGS;DEPENDS;LINK_FLAGS;SOURCES;SWIFT_FLAGS)

@@ -40,9 +40,28 @@
       list(APPEND link_flags ${flag})
     endforeach()
   endif()
+  if(AST_LIBRARY)
+    if(AST_STATIC AND AST_SHARED)
+      message(SEND_ERROR "add_swift_target asked to create library as STATIC and SHARED")
+    elseif(AST_STATIC OR NOT BUILD_SHARED_LIBS)
+      set(library_kind STATIC)
+    elseif(AST_SHARED OR BUILD_SHARED_LIBS)
+      set(library_kind SHARED)
+    endif()
+  else()
+    if(AST_STATIC OR AST_SHARED)
+      message(SEND_ERROR "add_swift_target asked to create executable as STATIC or SHARED")
+    endif()
+  endif()
   if(NOT AST_OUTPUT)
     if(AST_LIBRARY)
-      set(AST_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${target}.dir/${CMAKE_SHARED_LIBRARY_PREFIX}${target}${CMAKE_SHARED_LIBRARY_SUFFIX})
+      if(AST_SHARED OR BUILD_SHARED_LIBS)
+        set(AST_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${target}.dir/${CMAKE_SHARED_LIBRARY_PREFIX}${target}${CMAKE_SHARED_LIBRARY_SUFFIX})
+      else()
+        # NOTE(compnerd) this is a hack for the computation of the
+        # basename/dirname below for the static path.
+        set(AST_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${target}.dir/${target})
+      endif()
     else()
       set(AST_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${target}.dir/${target}${CMAKE_EXECUTABLE_SUFFIX})
     endif()
@@ -107,20 +126,37 @@
   if(AST_LIBRARY)
     set(emit_library -emit-library)
   endif()
-  add_custom_command(OUTPUT
-                       ${AST_OUTPUT}
-                     DEPENDS
-                       ${objs}
-                     COMMAND
-                       ${CMAKE_SWIFT_COMPILER} ${emit_library} ${link_flags} -o ${AST_OUTPUT} ${objs}
-                     COMMAND
-                       ${CMAKE_COMMAND} -E copy ${AST_OUTPUT} ${CMAKE_CURRENT_BINARY_DIR})
-  add_custom_target(${target}
-                    ALL
-                    DEPENDS
-                       ${AST_OUTPUT}
-                       ${module}
-                       ${documentation})
+  if(library_kind STREQUAL SHARED)
+    add_custom_command(OUTPUT
+                         ${AST_OUTPUT}
+                       DEPENDS
+                         ${objs}
+                       COMMAND
+                         ${CMAKE_SWIFT_COMPILER} ${emit_library} ${link_flags} -o ${AST_OUTPUT} ${objs}
+                       COMMAND
+                         ${CMAKE_COMMAND} -E copy ${AST_OUTPUT} ${CMAKE_CURRENT_BINARY_DIR})
+    add_custom_target(${target}
+                      ALL
+                      DEPENDS
+                         ${AST_OUTPUT}
+                         ${module}
+                         ${documentation})
+  else()
+    add_library(${target}-static STATIC ${objs})
+    get_filename_component(ast_output_bn ${AST_OUTPUT} NAME)
+    get_filename_component(ast_output_dn ${AST_OUTPUT} DIRECTORY)
+    set_target_properties(${target}-static
+                          PROPERTIES
+                            LINKER_LANGUAGE C
+                            OUTPUT_DIRECTORY ${ast_output_dn}
+                            OUTPUT_NAME ${ast_output_bn})
+    add_custom_target(${target}
+                      ALL
+                      DEPENDS
+                         ${target}-static
+                         ${module}
+                         ${documentation})
+  endif()
 endfunction()

 function(add_swift_library library)


cmake: Limit color output to terminals

cmake: Limit color output to terminals

VIm's Quickfix is useless with escape sequences embedded in
compiler output.

--- cmake/px4_add_common_flags.cmake
+++ cmake/px4_add_common_flags.cmake
@@ -114,8 +114,8 @@
 	elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")

 		if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9)
-			# force color for gcc > 4.9
-			add_compile_options(-fdiagnostics-color=always)
+			# enable color for gcc > 4.9 when stdout is terminal
+			add_compile_options(-fdiagnostics-color=auto)
 		endif()

 		if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.3)


Fix if-else logic.

Fix if-else logic.

--- cmake_modules/IMPFindC++11.cmake
+++ cmake_modules/IMPFindC++11.cmake
@@ -33,8 +33,6 @@
   else()
     message(STATUS "Enabling clang C++11 support")
     set(IMP_CXX11_FLAGS "--std=c++11" CACHE INTERNAL "" FORCE)
-  else()
-
   endif()
 else()
   message(STATUS "Unknown compiler, not sure what to do about C++11")


Dennis: catch up with OpenFlippers cmake

git-svn-id: b66b41e514ff40863ef1aa95df2dbf63dd8d6be1@148 fdac6126-5c0c-442c-9429-916003d36597

--- cmake/ACGCommon.cmake
+++ cmake/ACGCommon.cmake
@@ -111,12 +111,13 @@
 # look for selected qt dependencies
 macro (acg_qt4)
   if (NOT QT4_FOUND)
-    find_package (Qt4 ${ARGN})
+    find_package (Qt4 COMPONENTS QtCore QtGui ${ARGN})

     set (QT_USE_QTOPENGL 1)
     set (QT_USE_QTNETWORK 1)
     set (QT_USE_QTSCRIPT 1)
     set (QT_USE_QTSQL 1)
+    set (QT_USE_QTXML 1)
     set (QT_USE_QTHELP 1)
     set (QT_USE_QTWEBKIT 1)
     set (QT_USE_QTUITOOLS 1)
@@ -354,20 +355,20 @@
     endif ()
   elseif (APPLE AND NOT ACG_PROJECT_MACOS_BUNDLE)
     if (${_type} STREQUAL SHARED)
-      add_custom_command (TARGET ${target} POST_BUILD
+      add_custom_command (TARGET ${_target} POST_BUILD
                           COMMAND ${CMAKE_COMMAND} -E
                           copy_if_different
-                            ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${_target}.dylib
-                            ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}/${_target}.dylib)
+                            ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${_target}.dylib
+                            ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}/lib${_target}.dylib)
     elseif (${_type} STREQUAL MODULE)
       if (NOT EXISTS ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_PLUGINDIR})
         file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_PLUGINDIR})
       endif ()
-      add_custom_command (TARGET ${target} POST_BUILD
+      add_custom_command (TARGET ${_target} POST_BUILD
                           COMMAND ${CMAKE_COMMAND} -E
                           copy_if_different
-                            ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${_target}.so
-                            ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_PLUGINDIR}/${_target}.so)
+                            ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${_target}.so
+                            ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_PLUGINDIR}/lib${_target}.so)
     endif ()
   endif ()
   if (NOT ACG_PROJECT_BUNDLE OR NOT APPLE)


- use cmake generator targetnames for copying files

refs #1801

git-svn-id: b66b41e514ff40863ef1aa95df2dbf63dd8d6be1@980 fdac6126-5c0c-442c-9429-916003d36597

--- cmake/ACGCommon.cmake
+++ cmake/ACGCommon.cmake
@@ -384,22 +384,14 @@
   # set common target properties defined in common.cmake
   acg_set_target_props (${_target})

-  if (WIN32)
-    # copy exe file to "Build" directory
-    # Visual studio will create this file in a subdirectory so we can't use
-    # RUNTIME_OUTPUT_DIRECTORY directly here
+  if (WIN32 OR (APPLE AND NOT ACG_PROJECT_MACOS_BUNDLE))
     add_custom_command (TARGET ${_target} POST_BUILD
                         COMMAND ${CMAKE_COMMAND} -E
                         copy_if_different
-                          ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${_target}.exe
-                          ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_BINDIR}/${_target}.exe)
-  elseif (APPLE AND NOT ACG_PROJECT_MACOS_BUNDLE)
-    add_custom_command (TARGET ${_target} POST_BUILD
-                        COMMAND ${CMAKE_COMMAND} -E
-                        copy_if_different
-                          ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${_target}
-                          ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_BINDIR}/${_target})
-  endif ()
+                          $<TARGET_FILE:${_target}>
+                          ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_BINDIR}/$<TARGET_FILE_NAME:${_target}>)
+  endif (WIN32 OR (APPLE AND NOT ACG_PROJECT_MACOS_BUNDLE))
+
   if (NOT ACG_PROJECT_MACOS_BUNDLE OR NOT APPLE)
     install (TARGETS ${_target} DESTINATION ${ACG_PROJECT_BINDIR})
   endif ()
@@ -438,25 +430,18 @@
     endif ()
   endif ()

-  if( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
-    set ( postfix ${CMAKE_DEBUG_POSTFIX} )
-  else ()
-    set ( postfix "" )
-  endif ()
-
-  set( fullname ${_target}${postfix} )
-
-
-  if (WIN32)
-    # copy exe file to "Build" directory
-    # Visual studio will create this file in a subdirectory so we can't use
-    # RUNTIME_OUTPUT_DIRECTORY directly here
+  if (WIN32 OR (APPLE AND NOT ACG_PROJECT_MACOS_BUNDLE))
     if (${_type} STREQUAL SHARED)
       add_custom_command (TARGET ${_target} POST_BUILD
                           COMMAND ${CMAKE_COMMAND} -E
                           copy_if_different
-                            ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${fullname}.dll
-                            ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_BINDIR}/${fullname}.dll)
+                            $<TARGET_FILE:${_target}>
+                            ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}/$<TARGET_FILE_NAME:${_target}>)
+	  add_custom_command (TARGET ${_target} POST_BUILD
+                          COMMAND ${CMAKE_COMMAND} -E
+                          copy_if_different
+                            $<TARGET_LINKER_FILE:${_target}>
+                            ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}/$<TARGET_LINKER_FILE_NAME:${_target}>)
     elseif (${_type} STREQUAL MODULE)
       if (NOT EXISTS ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_PLUGINDIR})
         file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_PLUGINDIR})
@@ -464,58 +449,34 @@
       add_custom_command (TARGET ${_target} POST_BUILD
                           COMMAND ${CMAKE_COMMAND} -E
                           copy_if_different
-                            ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${fullname}.dll
-                            ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_PLUGINDIR}/${fullname}.dll)
-    endif ()
-    if (${_type} STREQUAL SHARED OR ${_type} STREQUAL STATIC)
-	  if("${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles")
-		SET(OUTPUTNAME "lib${fullname}.a")
-	  else()
-	    SET(OUTPUTNAME "${fullname}.lib")
-	  endif()
+                            $<TARGET_FILE:${_target}>
+                            ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_PLUGINDIR}/$<TARGET_FILE_NAME:${_target}>)
+    elseif (${_type} STREQUAL STATIC)
+	  add_custom_command (TARGET ${_target} POST_BUILD
+                          COMMAND ${CMAKE_COMMAND} -E
+                          copy_if_different
+                            $<TARGET_FILE:${_target}>
+                            ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}/$<TARGET_FILE_NAME:${_target}>)
+	endif()
+
+
+	# make an extra copy for windows into the binary directory
+    if (${_type} STREQUAL SHARED AND WIN32)
       add_custom_command (TARGET ${_target} POST_BUILD
                           COMMAND ${CMAKE_COMMAND} -E
-                          copy_if_different
-                            ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${OUTPUTNAME}
-                            ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}/${OUTPUTNAME})
-    endif ()
-  elseif (APPLE AND NOT ACG_PROJECT_MACOS_BUNDLE)
-    if (${_type} STREQUAL SHARED)
-      add_custom_command (TARGET ${_target} POST_BUILD
-                          COMMAND ${CMAKE_COMMAND} -E
-                          copy_if_different
-                            ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${fullname}.dylib
-                            ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}/lib${fullname}.dylib)
-    elseif (${_type} STREQUAL MODULE)
-      if (NOT EXISTS ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_PLUGINDIR})
-        file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_PLUGINDIR})
-      endif ()
-      add_custom_command (TARGET ${_target} POST_BUILD
-                          COMMAND ${CMAKE_COMMAND} -E
-                          copy_if_different
-                            ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${fullname}.so
-                            ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_PLUGINDIR}/lib${fullname}.so)
-    elseif (${_type} STREQUAL STATIC)
-      add_custom_command (TARGET ${_target} POST_BUILD
-                          COMMAND ${CMAKE_COMMAND} -E
-                          copy_if_different
-                            ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${fullname}.a
-                            ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}/lib${fullname}.a)
-    endif ()
-    if (_and_static)
+                          copy_if_different
+                            $<TARGET_FILE:${_target}>
+                            ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_BINDIR}/$<TARGET_FILE_NAME:${_target}>)
+	endif ()
+
+  endif(WIN32 OR (APPLE AND NOT ACG_PROJECT_MACOS_BUNDLE))
+
+  if (_and_static)
       add_custom_command (TARGET ${_target}Static POST_BUILD
                           COMMAND ${CMAKE_COMMAND} -E
                           copy_if_different
-                            ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${_target}Static${postfix}.a
-                            ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}/lib${fullname}.a)
-    endif ()
-
-  elseif (NOT APPLE AND _and_static)
-      add_custom_command (TARGET ${_target}Static POST_BUILD
-                          COMMAND ${CMAKE_COMMAND} -E
-                          copy_if_different
-                            ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${_target}Static${postfix}.a
-                            ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}/lib${fullname}.a)
+                            $<TARGET_FILE:${_target}Static>
+                            ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}/$<TARGET_FILE_NAME:${_target}Static>)

   endif ()


use MODULE instead of SHARED to prevent generation of .lib file on Windows

--- cmake/AddPlugin.cmake
+++ cmake/AddPlugin.cmake
@@ -75,9 +75,9 @@
                 INCLUDE_DIRECTORIES $<TARGET_PROPERTY:${name},INCLUDE_DIRECTORIES>
         )
     else()
-        # It's simpler on other platforms: we have a SHARED and that's it.
+        # It's simpler on other platforms: we have a MODULE and that's it.
         # Add the ALIAS so that the tests don't have to think about this mess.
-        add_library(${name} SHARED ${arg_SOURCES})
+        add_library(${name} MODULE ${arg_SOURCES})
         add_library(${name}_test_lib ALIAS ${name})
     endif()


Portable include path for JIT EmbedLLVM, fixes #770 (#800)

--- cmake/EmbedLLVM.cmake
+++ cmake/EmbedLLVM.cmake
@@ -39,8 +39,7 @@
     file(WRITE ${CPP_BUNDLE_FILE} "")
     foreach(FILE ${INPUT_FILES})
         message(STATUS "Adding ${FILE} to LLVM bundle")
-        get_filename_component(ABSOLUTE_FILE ${FILE} ABSOLUTE)
-        file(APPEND ${CPP_BUNDLE_FILE} "#include \"${ABSOLUTE_FILE}\"\n")
+        file(APPEND ${CPP_BUNDLE_FILE} "#include \"${FILE}\"\n")
     endforeach()

     # Step 2: Compiling input files to LLVM-IR


update provided findboost cmake module to the one provided by cmake 3.8

--- cmake/FindBoost.cmake
+++ cmake/FindBoost.cmake
@@ -1,3 +1,6 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
 #.rst:
 # FindBoost
 # ---------
@@ -124,7 +127,10 @@
 #                              ('n' tag).  Default is OFF.
 #   Boost_COMPILER           - Set to the compiler-specific library suffix
 #                              (e.g. "-gcc43").  Default is auto-computed
-#                              for the C++ compiler in use.
+#                              for the C++ compiler in use.  A list may be
+#                              used if multiple compatible suffixes should
+#                              be tested for, in decreasing order of
+#                              preference.
 #   Boost_THREADAPI          - Suffix for "thread" component library name,
 #                              such as "pthread" or "win32".  Names with
 #                              and without this suffix will both be tried.
@@ -201,72 +207,6 @@
 # the Boost CMake package configuration for details on what it provides.
 #
 # Set Boost_NO_BOOST_CMAKE to ON to disable the search for boost-cmake.
-
-#=============================================================================
-# Copyright 2006-2012 Kitware, Inc.
-# Copyright 2006-2008 Andreas Schneider <mail@cynapses.org>
-# Copyright 2007      Wengo
-# Copyright 2007      Mike Jackson
-# Copyright 2008      Andreas Pakulat <apaku@gmx.de>
-# Copyright 2008-2012 Philip Lowman <philip@yhbt.com>
-# Copyright 2016      Alex Turbov <i.zaufi@gmail.com>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# License:
-#=============================================================================
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-#   notice, this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in the
-#   documentation and/or other materials provided with the distribution.
-#
-# * Neither the names of Kitware, Inc., the Insight Software Consortium,
-#   nor the names of their contributors may be used to endorse or promote
-#   products derived from this software without specific prior written
-#   permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# ------------------------------------------------------------------------------
-#
-# The above copyright and license notice applies to distributions of
-# CMake in source and binary form.  Some source files contain additional
-# notices of original copyright by their contributors; see each source
-# for details.  Third-party software packages supplied with CMake under
-# compatible licenses provide their own copyright notices documented in
-# corresponding subdirectories.
-#
-# ------------------------------------------------------------------------------
-#
-# CMake was initially developed by Kitware with the following sponsorship:
-#
-#  * National Library of Medicine at the National Institutes of Health
-#    as part of the Insight Segmentation and Registration Toolkit (ITK).
-#
-#  * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel
-#    Visualization Initiative.
-#
-#  * National Alliance for Medical Image Computing (NAMIC) is funded by the
-#    National Institutes of Health through the NIH Roadmap for Medical Research,
-#    Grant U54 EB005149.
-#
-#  * Kitware, Inc.
-

 #-------------------------------------------------------------------------------
 # Before we go searching, check whether boost-cmake is available, unless the
@@ -490,7 +430,9 @@
   elseif (GHSMULTI)
     set(_boost_COMPILER "-ghs")
   elseif("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC")
-    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19)
+    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10)
+      set(_boost_COMPILER "-vc141;-vc140")
+    elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19)
       set(_boost_COMPILER "-vc140")
     elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18)
       set(_boost_COMPILER "-vc120")
@@ -506,7 +448,7 @@
       set(_boost_COMPILER "-vc71")
     elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13) # Good luck!
       set(_boost_COMPILER "-vc7") # yes, this is correct
-    else() # MSVC60 Good luck!
+    else() # VS 6.0 Good luck!
       set(_boost_COMPILER "-vc6") # yes, this is correct
     endif()
   elseif (BORLAND)
@@ -788,6 +730,37 @@
     set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
     set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
     set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
+  elseif(NOT Boost_VERSION VERSION_LESS 106200 AND Boost_VERSION VERSION_LESS 106300)
+    set(_Boost_CHRONO_DEPENDENCIES system)
+    set(_Boost_CONTEXT_DEPENDENCIES thread chrono system date_time)
+    set(_Boost_COROUTINE_DEPENDENCIES context system)
+    set(_Boost_FIBER_DEPENDENCIES context thread chrono system date_time)
+    set(_Boost_FILESYSTEM_DEPENDENCIES system)
+    set(_Boost_IOSTREAMS_DEPENDENCIES regex)
+    set(_Boost_LOG_DEPENDENCIES date_time log_setup system filesystem thread regex chrono atomic)
+    set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l atomic)
+    set(_Boost_MPI_DEPENDENCIES serialization)
+    set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization)
+    set(_Boost_RANDOM_DEPENDENCIES system)
+    set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
+    set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
+    set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
+  elseif(NOT Boost_VERSION VERSION_LESS 106300 AND Boost_VERSION VERSION_LESS 106500)
+    set(_Boost_CHRONO_DEPENDENCIES system)
+    set(_Boost_CONTEXT_DEPENDENCIES thread chrono system date_time)
+    set(_Boost_COROUTINE_DEPENDENCIES context system)
+    set(_Boost_COROUTINE2_DEPENDENCIES context fiber thread chrono system date_time)
+    set(_Boost_FIBER_DEPENDENCIES context thread chrono system date_time)
+    set(_Boost_FILESYSTEM_DEPENDENCIES system)
+    set(_Boost_IOSTREAMS_DEPENDENCIES regex)
+    set(_Boost_LOG_DEPENDENCIES date_time log_setup system filesystem thread regex chrono atomic)
+    set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l atomic)
+    set(_Boost_MPI_DEPENDENCIES serialization)
+    set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization)
+    set(_Boost_RANDOM_DEPENDENCIES system)
+    set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
+    set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
+    set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
   else()
     message(WARNING "Imported targets not available for Boost version ${Boost_VERSION}")
     set(_Boost_IMPORTED_TARGETS FALSE)
@@ -823,6 +796,7 @@
   set(_Boost_COROUTINE_HEADERS           "boost/coroutine/all.hpp")
   set(_Boost_EXCEPTION_HEADERS           "boost/exception/exception.hpp")
   set(_Boost_DATE_TIME_HEADERS           "boost/date_time/date.hpp")
+  set(_Boost_FIBER_HEADERS               "boost/fiber/all.hpp")
   set(_Boost_FILESYSTEM_HEADERS          "boost/filesystem/path.hpp")
   set(_Boost_GRAPH_HEADERS               "boost/graph/adjacency_list.hpp")
   set(_Boost_GRAPH_PARALLEL_HEADERS      "boost/graph/adjacency_list.hpp")
@@ -915,6 +889,33 @@
 endfunction()

 #
+# Some boost libraries may require particular set of compler features.
+# The very first one was `boost::fiber` introduced in Boost 1.62.
+# One can check required compiler features of it in
+# `${Boost_ROOT}/libs/fiber/build/Jamfile.v2`.
+#
+function(_Boost_COMPILER_FEATURES component _ret)
+  # Boost >= 1.62 and < 1.65
+  if(NOT Boost_VERSION VERSION_LESS 106200 AND Boost_VERSION VERSION_LESS 106500)
+    set(_Boost_FIBER_COMPILER_FEATURES
+        cxx_alias_templates
+        cxx_auto_type
+        cxx_constexpr
+        cxx_defaulted_functions
+        cxx_final
+        cxx_lambdas
+        cxx_noexcept
+        cxx_nullptr
+        cxx_rvalue_references
+        cxx_thread_local
+        cxx_variadic_templates
+    )
+  endif()
+  string(TOUPPER ${component} uppercomponent)
+  set(${_ret} ${_Boost_${uppercomponent}_COMPILER_FEATURES} PARENT_SCOPE)
+endfunction()
+
+#
 # Update library search directory hint variable with paths used by prebuilt boost binaries.
 #
 # Prebuilt windows binaries (https://sourceforge.net/projects/boost/files/boost-binaries/)
@@ -922,28 +923,32 @@
 # This function would append corresponding directories if MSVC is a current compiler,
 # so having `BOOST_ROOT` would be enough to specify to find everything.
 #
-macro(_Boost_UPDATE_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS componentlibvar basedir)
+function(_Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS componentlibvar basedir)
   if("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC")
     if(CMAKE_SIZEOF_VOID_P EQUAL 8)
       set(_arch_suffix 64)
     else()
       set(_arch_suffix 32)
     endif()
-    if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19)
-      list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-14.0)
+    if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10)
+      list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-14.1)
+      list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-14.0)
+    elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19)
+      list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-14.0)
     elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18)
-      list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-12.0)
+      list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-12.0)
     elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 17)
-      list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-11.0)
+      list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-11.0)
     elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16)
-      list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-10.0)
+      list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-10.0)
     elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15)
-      list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-9.0)
+      list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-9.0)
     elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14)
-      list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-8.0)
-    endif()
-  endif()
-endmacro()
+      list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-8.0)
+    endif()
+    set(${componentlibvar} ${${componentlibvar}} PARENT_SCOPE)
+  endif()
+endfunction()

 #
 # End functions/macros
@@ -991,7 +996,7 @@
   # _Boost_COMPONENT_HEADERS.  See the instructions at the top of
   # _Boost_COMPONENT_DEPENDENCIES.
   set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
-    "1.61.0" "1.61" "1.60.0" "1.60"
+    "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"
     "1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55"
     "1.54.0" "1.54" "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51"
     "1.50.0" "1.50" "1.49.0" "1.49" "1.48.0" "1.48" "1.47.0" "1.47" "1.46.1"
@@ -1146,6 +1151,12 @@
   if( Boost_NO_SYSTEM_PATHS)
     list(APPEND _boost_INCLUDE_SEARCH_DIRS NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH)
   else()
+    if("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC")
+      foreach(ver ${_Boost_KNOWN_VERSIONS})
+        string(REPLACE "." "_" ver "${ver}")
+        list(APPEND _boost_INCLUDE_SEARCH_DIRS PATHS "C:/local/boost_${ver}")
+      endforeach()
+    endif()
     list(APPEND _boost_INCLUDE_SEARCH_DIRS PATHS
       C:/boost/include
       C:/boost
@@ -1227,8 +1238,8 @@
   math(EXPR Boost_MINOR_VERSION "${Boost_VERSION} / 100 % 1000")
   math(EXPR Boost_SUBMINOR_VERSION "${Boost_VERSION} % 100")

-  set(Boost_ERROR_REASON
-    "${Boost_ERROR_REASON}Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}\nBoost include path: ${Boost_INCLUDE_DIR}")
+  string(APPEND Boost_ERROR_REASON
+    "Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}\nBoost include path: ${Boost_INCLUDE_DIR}")
   if(Boost_DEBUG)
     message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
                    "version.hpp reveals boost "
@@ -1250,16 +1261,16 @@
     endif()
     if(NOT Boost_FOUND)
       # State that we found a version of Boost that is too new or too old.
-      set(Boost_ERROR_REASON
-        "${Boost_ERROR_REASON}\nDetected version of Boost is too ${_Boost_VERSION_AGE}. Requested version was ${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
+      string(APPEND Boost_ERROR_REASON
+        "\nDetected version of Boost is too ${_Boost_VERSION_AGE}. Requested version was ${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
       if (Boost_FIND_VERSION_PATCH)
-        set(Boost_ERROR_REASON
-          "${Boost_ERROR_REASON}.${Boost_FIND_VERSION_PATCH}")
+        string(APPEND Boost_ERROR_REASON
+          ".${Boost_FIND_VERSION_PATCH}")
       endif ()
       if (NOT Boost_FIND_VERSION_EXACT)
-        set(Boost_ERROR_REASON "${Boost_ERROR_REASON} (or newer)")
+        string(APPEND Boost_ERROR_REASON " (or newer)")
       endif ()
-      set(Boost_ERROR_REASON "${Boost_ERROR_REASON}.")
+      string(APPEND Boost_ERROR_REASON ".")
     endif ()
   else()
     # Caller will accept any Boost version.
@@ -1267,8 +1278,8 @@
   endif()
 else()
   set(Boost_FOUND 0)
-  set(Boost_ERROR_REASON
-    "${Boost_ERROR_REASON}Unable to find the Boost header files. Please set BOOST_ROOT to the root directory containing Boost or BOOST_INCLUDEDIR to the directory containing Boost's headers.")
+  string(APPEND Boost_ERROR_REASON
+    "Unable to find the Boost header files. Please set BOOST_ROOT to the root directory containing Boost or BOOST_INCLUDEDIR to the directory containing Boost's headers.")
 endif()

 # ------------------------------------------------------------------------
@@ -1348,25 +1359,25 @@
   if("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC"
           OR "${CMAKE_CXX_COMPILER}" MATCHES "icl"
           OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc")
-    set(_boost_DEBUG_ABI_TAG "${_boost_DEBUG_ABI_TAG}g")
+    string(APPEND _boost_DEBUG_ABI_TAG "g")
   endif()
 endif()
 #  y        using special debug build of python
 if(Boost_USE_DEBUG_PYTHON)
-  set(_boost_DEBUG_ABI_TAG "${_boost_DEBUG_ABI_TAG}y")
+  string(APPEND _boost_DEBUG_ABI_TAG "y")
 endif()
 #  d        using a debug version of your code
-set(_boost_DEBUG_ABI_TAG "${_boost_DEBUG_ABI_TAG}d")
+string(APPEND _boost_DEBUG_ABI_TAG "d")
 #  p        using the STLport standard library rather than the
 #           default one supplied with your compiler
 if(Boost_USE_STLPORT)
-  set( _boost_RELEASE_ABI_TAG "${_boost_RELEASE_ABI_TAG}p")
-  set( _boost_DEBUG_ABI_TAG   "${_boost_DEBUG_ABI_TAG}p")
+  string(APPEND _boost_RELEASE_ABI_TAG "p")
+  string(APPEND _boost_DEBUG_ABI_TAG "p")
 endif()
 #  n        using the STLport deprecated "native iostreams" feature
 if(Boost_USE_STLPORT_DEPRECATED_NATIVE_IOSTREAMS)
-  set( _boost_RELEASE_ABI_TAG "${_boost_RELEASE_ABI_TAG}n")
-  set( _boost_DEBUG_ABI_TAG   "${_boost_DEBUG_ABI_TAG}n")
+  string(APPEND _boost_RELEASE_ABI_TAG "n")
+  string(APPEND _boost_DEBUG_ABI_TAG "n")
 endif()

 if(Boost_DEBUG)
@@ -1404,10 +1415,10 @@

     if(BOOST_ROOT)
       list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} ${BOOST_ROOT}/lib ${BOOST_ROOT}/stage/lib)
-      _Boost_UPDATE_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} BOOST_ROOT)
+      _Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} "${BOOST_ROOT}")
     elseif(_ENV_BOOST_ROOT)
       list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} ${_ENV_BOOST_ROOT}/lib ${_ENV_BOOST_ROOT}/stage/lib)
-      _Boost_UPDATE_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} _ENV_BOOST_ROOT)
+      _Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} "${_ENV_BOOST_ROOT}")
     endif()

     list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c}
@@ -1415,9 +1426,15 @@
       ${Boost_INCLUDE_DIR}/../lib
       ${Boost_INCLUDE_DIR}/stage/lib
       )
+    _Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} "${Boost_INCLUDE_DIR}/..")
     if( Boost_NO_SYSTEM_PATHS )
       list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH)
     else()
+      foreach(ver ${_Boost_KNOWN_VERSIONS})
+        string(REPLACE "." "_" ver "${ver}")
+        _Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} "C:/local/boost_${ver}")
+      endforeach()
+      _Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} "C:/boost")
       list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} PATHS
         C:/boost/lib
         C:/boost
@@ -1437,9 +1454,9 @@
 if( Boost_USE_STATIC_LIBS )
   set( _boost_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
   if(WIN32)
-    set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
+    list(INSERT CMAKE_FIND_LIBRARY_SUFFIXES 0 .lib .a)
   else()
-    set(CMAKE_FIND_LIBRARY_SUFFIXES .a )
+    set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
   endif()
 endif()

@@ -1465,7 +1482,7 @@
 set(_boost_STATIC_RUNTIME_WORKAROUND false)
 if(WIN32 AND Boost_USE_STATIC_LIBS)
   if(NOT DEFINED Boost_USE_STATIC_RUNTIME)
-    set(_boost_STATIC_RUNTIME_WORKAROUND true)
+    set(_boost_STATIC_RUNTIME_WORKAROUND TRUE)
   endif()
 endif()

@@ -1489,7 +1506,7 @@
 endif()

 # If the user changed any of our control inputs flush previous results.
-if(_Boost_CHANGE_LIBDIR OR _Boost_CHANGE_LIBNAME)
+if(_Boost_CHANGE_LIBDIR_DEBUG OR _Boost_CHANGE_LIBDIR_RELEASE OR _Boost_CHANGE_LIBNAME)
   foreach(COMPONENT ${_Boost_COMPONENTS_SEARCHED})
     string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
     foreach(c DEBUG RELEASE)
@@ -1549,17 +1566,24 @@
   #
   # Find RELEASE libraries
   #
-  set(_boost_RELEASE_NAMES
-    ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
-    ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
+  unset(_boost_RELEASE_NAMES)
+  foreach(compiler IN LISTS _boost_COMPILER)
+    list(APPEND _boost_RELEASE_NAMES
+      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
+      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} )
+  endforeach()
+  list(APPEND _boost_RELEASE_NAMES
     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
   if(_boost_STATIC_RUNTIME_WORKAROUND)
     set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
+    foreach(compiler IN LISTS _boost_COMPILER)
+      list(APPEND _boost_RELEASE_NAMES
+        ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
+        ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
+    endforeach()
     list(APPEND _boost_RELEASE_NAMES
-      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
   endif()
@@ -1590,18 +1614,25 @@
   #
   # Find DEBUG libraries
   #
-  set(_boost_DEBUG_NAMES
-    ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
-    ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
+  unset(_boost_DEBUG_NAMES)
+  foreach(compiler IN LISTS _boost_COMPILER)
+    list(APPEND _boost_DEBUG_NAMES
+      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
+      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} )
+  endforeach()
+  list(APPEND _boost_DEBUG_NAMES
     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}
     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
   if(_boost_STATIC_RUNTIME_WORKAROUND)
     set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
+    foreach(compiler IN LISTS _boost_COMPILER)
+      list(APPEND _boost_DEBUG_NAMES
+        ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
+        ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
+    endforeach()
     list(APPEND _boost_DEBUG_NAMES
-      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
   endif()
@@ -1635,6 +1666,9 @@
   endif()

   _Boost_ADJUST_LIB_VARS(${UPPERCOMPONENT})
+
+  # Check if component requires some compiler features
+  _Boost_COMPILER_FEATURES(${COMPONENT} _Boost_${UPPERCOMPONENT}_COMPILER_FEATURES)

 endforeach()

@@ -1686,26 +1720,26 @@
     set(Boost_FOUND 0)
     # We were unable to find some libraries, so generate a sensible
     # error message that lists the libraries we were unable to find.
-    set(Boost_ERROR_REASON
-      "${Boost_ERROR_REASON}\nCould not find the following")
+    string(APPEND Boost_ERROR_REASON
+      "\nCould not find the following")
     if(Boost_USE_STATIC_LIBS)
-      set(Boost_ERROR_REASON "${Boost_ERROR_REASON} static")
-    endif()
-    set(Boost_ERROR_REASON
-      "${Boost_ERROR_REASON} Boost libraries:\n")
+      string(APPEND Boost_ERROR_REASON " static")
+    endif()
+    string(APPEND Boost_ERROR_REASON
+      " Boost libraries:\n")
     foreach(COMPONENT ${_Boost_MISSING_COMPONENTS})
-      set(Boost_ERROR_REASON
-        "${Boost_ERROR_REASON}        ${Boost_NAMESPACE}_${COMPONENT}\n")
+      string(APPEND Boost_ERROR_REASON
+        "        ${Boost_NAMESPACE}_${COMPONENT}\n")
     endforeach()

     list(LENGTH Boost_FIND_COMPONENTS Boost_NUM_COMPONENTS_WANTED)
     list(LENGTH _Boost_MISSING_COMPONENTS Boost_NUM_MISSING_COMPONENTS)
     if (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS})
-      set(Boost_ERROR_REASON
-        "${Boost_ERROR_REASON}No Boost libraries were found. You may need to set BOOST_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.")
+      string(APPEND Boost_ERROR_REASON
+        "No Boost libraries were found. You may need to set BOOST_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.")
     else ()
-      set(Boost_ERROR_REASON
-        "${Boost_ERROR_REASON}Some (but not all) of the required Boost libraries were found. You may need to install these additional Boost libraries. Alternatively, set BOOST_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.")
+      string(APPEND Boost_ERROR_REASON
+        "Some (but not all) of the required Boost libraries were found. You may need to install these additional Boost libraries. Alternatively, set BOOST_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.")
     endif ()
   endif ()

@@ -1728,13 +1762,11 @@
     endif()

     if(EXISTS "${_boost_LIB_DIR}/lib")
-      set(_boost_LIB_DIR ${_boost_LIB_DIR}/lib)
+      string(APPEND _boost_LIB_DIR /lib)
+    elseif(EXISTS "${_boost_LIB_DIR}/stage/lib")
+      string(APPEND _boost_LIB_DIR "/stage/lib")
     else()
-      if(EXISTS "${_boost_LIB_DIR}/stage/lib")
-        set(_boost_LIB_DIR ${_boost_LIB_DIR}/stage/lib)
-      else()
-        set(_boost_LIB_DIR "")
-      endif()
+      set(_boost_LIB_DIR "")
     endif()

     if(_boost_LIB_DIR AND EXISTS "${_boost_LIB_DIR}")
@@ -1809,6 +1841,10 @@
           set_target_properties(Boost::${COMPONENT} PROPERTIES
             INTERFACE_LINK_LIBRARIES "${_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES}")
         endif()
+        if(_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES)
+          set_target_properties(Boost::${COMPONENT} PROPERTIES
+            INTERFACE_COMPILE_FEATURES "${_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES}")
+        endif()
       endif()
     endif()
   endforeach()


Wrong PhysX lib prefixes in Linux builds

--- cmake/FindPhysX.cmake
+++ cmake/FindPhysX.cmake
@@ -27,11 +27,7 @@

 IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
   SET(LIBFOLDERSUFFIX "64")
-  IF(MSVC)
-    SET(PHYSXPREFIX "_x64")
-  ELSE()
-    SET(PHYSXPREFIX "_64")
-  ENDIF()
+  SET(PHYSXPREFIX "_x64")
 ELSE()
   SET(LIBFOLDERSUFFIX "32")
 ENDIF()


FindclFFT.cmake uses more generic path finding functions.

--- cmake/FindclFFT.cmake
+++ cmake/FindclFFT.cmake
@@ -13,7 +13,6 @@
 # If you desire to use the 64-bit version instead, set
 #   set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON)
 # prior to calling this script.
-#
 #=============================================================================
 # Copyright 2014 Brian Kloppenborg
 #
@@ -29,6 +28,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #=============================================================================
+# - changed path finding functions to be more generic (tdd11235813)
+#=============================================================================

 IF(CLFFT_INCLUDE_DIRS)
   # Already in cache, be silent
@@ -37,17 +38,22 @@

 FIND_PATH(CLFFT_ROOT_DIR
   NAMES include/clFFT.h
-  HINTS /usr/local/ ${CLFFT_ROOT}
+  PATHS CLFFT_ROOT
+  PATHS ENV CLFFT_ROOT
   DOC "clFFT root directory.")

 FIND_PATH(_CLFFT_INCLUDE_DIRS
   NAMES clFFT.h
-  HINTS ${CLFFT_ROOT_DIR}/include
-  DOC "clFFT Include directory")
+  PATHS ${CLFFT_ROOT_DIR}
+  PATH_SUFFIXES "include"
+  DOC "clFFT include directory")

 FIND_LIBRARY(_CLFFT_LIBRARY
   NAMES clFFT
-  HINTS ${CLFFT_ROOT_DIR}/lib)
+  PATHS ${CLFFT_ROOT_DIR}
+  PATH_SUFFIXES "lib" "lib64"
+  DOC "clFFT library directory")
+

 SET(CLFFT_INCLUDE_DIRS ${_CLFFT_INCLUDE_DIRS})
 SET(CLFFT_LIBRARIES ${_CLFFT_LIBRARY})


ARC: hs6x: gcc-m-cpu: update mcpu to be aligned with new toolchain

New ARCv3 GNU toolchain uses hs6x mcpu value for hs6x CPUs, the older
one allows to use any mcpu value.

Update old 'arc64' mcpu to 'hs6x' to be aligned with new toolchain

Signed-off-by: Eugeniy Paltsev <ec089b543c2604b626d7ce60c03e4d074ed102c7@synopsys.com>
Signed-off-by: Evgeniy Paltsev <7de4ab8b01334d64e4e84734c688a8a936513edc@gmail.com>

--- cmake/gcc-m-cpu.cmake
+++ cmake/gcc-m-cpu.cmake
@@ -65,7 +65,7 @@
   elseif(CONFIG_CPU_HS3X)
     set(GCC_M_CPU archs)
   elseif(CONFIG_CPU_HS6X)
-    set(GCC_M_CPU arc64)
+    set(GCC_M_CPU hs6x)
   elseif(CONFIG_CPU_EM4)
     set(GCC_M_CPU arcem)
   elseif(CONFIG_CPU_EM6)


Fix cmake Unittest++ include path (#188)

--- test/cmake/unit-test_external_project.cmake
+++ test/cmake/unit-test_external_project.cmake
@@ -29,7 +29,7 @@
     TEST_EXCLUDE_FROM_MAIN  TRUE # Don't run UnitTest++'s tests by default
   )

-  set(UTPP_INCLUDE_DIRS "${UTPP_INSATLL_DIR}/include/UnitTest++" PARENT_SCOPE)
+  set(UTPP_INCLUDE_DIRS "${UTPP_INSATLL_DIR}/include" PARENT_SCOPE)
   add_library(UnitTest++ STATIC IMPORTED)
   set_target_properties(UnitTest++ PROPERTIES IMPORTED_LOCATION "${UTPP_INSATLL_DIR}/lib/${UTPP_LIB_NAME}" )
   # Require the ExternalProject target to complete before importing the library


GC STDC_HEADERS.

GC STDC_HEADERS.

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

--- include/llvm/Config/config.h.cmake
+++ include/llvm/Config/config.h.cmake
@@ -467,9 +467,6 @@
 /* Define as the return type of signal handlers (`int' or `void'). */
 #cmakedefine RETSIGTYPE ${RETSIGTYPE}

-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t


- force static compilation of gtest

- force static compilation of gtest

git-svn-id: 59214148e3ac47647353bb066875245f1d63170f@7240 4525493e-7705-40b1-a816-d608a930855b

--- test/gtest-1.6.0/cmake/internal_utils.cmake
+++ test/gtest-1.6.0/cmake/internal_utils.cmake
@@ -120,11 +120,11 @@
   set_target_properties(${name}
     PROPERTIES
     COMPILE_FLAGS "${cxx_flags}")
-  if (BUILD_SHARED_LIBS OR type STREQUAL "SHARED")
-    set_target_properties(${name}
-      PROPERTIES
-      COMPILE_DEFINITIONS "GTEST_CREATE_SHARED_LIBRARY=1")
-  endif()
+#  if (BUILD_SHARED_LIBS OR type STREQUAL "SHARED")
+#    set_target_properties(${name}
+#      PROPERTIES
+#      COMPILE_DEFINITIONS "GTEST_CREATE_SHARED_LIBRARY=1")
+#  endif()
   if (CMAKE_USE_PTHREADS_INIT)
     target_link_libraries(${name} ${CMAKE_THREAD_LIBS_INIT})
   endif()


added missing CMake FFTW variables to External_SIRF.cmake, fixes #197 (together with installing boost_1_65_1)

--- SuperBuild/External_SIRF.cmake
+++ SuperBuild/External_SIRF.cmake
@@ -88,6 +88,8 @@
         -DPYTHON_DEST_DIR=${PYTHON_DEST_DIR}
         -DPYTHON_STRATEGY=${PYTHON_STRATEGY}
         -DNiftyReg_Binary_DIR=${NiftyReg_Binary_DIR}
+		-DFFTW3F_LIBRARY=${FFTW3F_LIBRARY}
+		-DFFTW3_INCLUDE_DIR=${FFTW3_INCLUDE_DIR}
 	INSTALL_DIR ${SIRF_Install_Dir}
     DEPENDS
         ${${proj}_DEPENDENCIES}


COMP: Do not add -mcorei7 with Emscripten

To address:

  clang-6.0: warning: argument unused during compilation:
  '-march=corei7' [-Wunused-command-line-argument]

with Emscripten toolchain 1.39.4

--- CMake/ITKSetStandardCompilerFlags.cmake
+++ CMake/ITKSetStandardCompilerFlags.cmake
@@ -218,7 +218,7 @@
        list(APPEND InstructionSetOptimizationFlags
             /arch:SSE /arch:SSE2)
     endif()
-  else()
+  elseif(NOT EMSCRIPTEN)
     if (${CMAKE_C_COMPILER} MATCHES "icc.*$")
       set(USING_INTEL_ICC_COMPILER TRUE)
     endif()


Print Warning when compiling with native OpenGL renderer to highlight, that this is just a fall-back solution.

--- CMake/Options/OptionNativeOpenGL.cmake
+++ CMake/Options/OptionNativeOpenGL.cmake
@@ -25,7 +25,7 @@
 SET (IRRIMGUI_NATIVE_OPENGL OFF CACHE BOOL "Enables the native OpenGL Driver for IMGUI (ATTENTION: This is just a fallback solution!).")

 if (IRRIMGUI_NATIVE_OPENGL)
-	message(STATUS "Use native OpenGL render driver (Fallback solution, do not use it for productive work!)...")
+	message(WARNING "Use native OpenGL render driver (Fallback solution, do not use it for productive work!)...")
 	ADD_DEFINITIONS(
 	-D_IRRIMGUI_NATIVE_OPENGL_
 	)


STYLE: Hide options for unused wrapping features

When wrapping is not requested, hide the wrapping
configuration options that are not relevant

--- Wrapping/WrappingOptions.cmake
+++ Wrapping/WrappingOptions.cmake
@@ -20,43 +20,43 @@
   set(ITK_WRAPPING OFF CACHE INTERNAL "Build external languages support" FORCE)
 endif()

+cmake_dependent_option(ITK_WRAP_unsigned_char "Wrap unsigned char type" ON "ITK_WRAPPING" OFF)
+cmake_dependent_option(ITK_WRAP_unsigned_short "Wrap unsigned short type" OFF "ITK_WRAPPING" OFF)
+cmake_dependent_option(ITK_WRAP_unsigned_long "Wrap unsigned long type" OFF "ITK_WRAPPING" OFF)
+mark_as_advanced(ITK_WRAP_unsigned_long)
+if(ITK_WRAP_unsigned_long)
+  message(WARNING "ITK_WRAP_unsigned_long is deprecated. Please use ITK_WRAP_unsigned_long_long instead.")
+endif()
+cmake_dependent_option(ITK_WRAP_unsigned_long_long "Wrap unsigned long long type" OFF "ITK_WRAPPING" OFF)
+
+cmake_dependent_option(ITK_WRAP_signed_char "Wrap signed char type" OFF "ITK_WRAPPING" OFF)
+cmake_dependent_option(ITK_WRAP_signed_short "Wrap signed short type" ON "ITK_WRAPPING" OFF)
+cmake_dependent_option(ITK_WRAP_signed_long "Wrap signed long type" OFF "ITK_WRAPPING" OFF)
+mark_as_advanced(ITK_WRAP_signed_long)
+if(ITK_WRAP_signed_long)
+  message(WARNING "ITK_WRAP_signed_long is deprecated. Please use ITK_WRAP_signed_long_long instead.")
+endif()
+cmake_dependent_option(ITK_WRAP_signed_long_long "Wrap signed long long type" OFF "ITK_WRAPPING" OFF)
+
+cmake_dependent_option(ITK_WRAP_float "Wrap float type" ON "ITK_WRAPPING" OFF)
+cmake_dependent_option(ITK_WRAP_double "Wrap double type" OFF "ITK_WRAPPING" OFF)
+
+cmake_dependent_option(ITK_WRAP_vector_float "Wrap vector float type" ON "ITK_WRAPPING" OFF)
+cmake_dependent_option(ITK_WRAP_vector_double "Wrap vector double type" OFF "ITK_WRAPPING" OFF)
+
+cmake_dependent_option(ITK_WRAP_covariant_vector_float "Wrap covariant vector float type" ON "ITK_WRAPPING" OFF)
+cmake_dependent_option(ITK_WRAP_covariant_vector_double "Wrap covariant vector double type" OFF "ITK_WRAPPING" OFF)
+
+cmake_dependent_option(ITK_WRAP_rgb_unsigned_char "Wrap RGB< unsigned char > type" ON "ITK_WRAPPING" OFF)
+cmake_dependent_option(ITK_WRAP_rgb_unsigned_short "Wrap RGB< unsigned short > type" OFF "ITK_WRAPPING" OFF)
+
+cmake_dependent_option(ITK_WRAP_rgba_unsigned_char "Wrap RGBA< unsigned char > type" ON "ITK_WRAPPING" OFF)
+cmake_dependent_option(ITK_WRAP_rgba_unsigned_short "Wrap RGBA< unsigned short > type" OFF "ITK_WRAPPING" OFF)
+
+cmake_dependent_option(ITK_WRAP_complex_float "Wrap complex< float > type" ON "ITK_WRAPPING" OFF)
+cmake_dependent_option(ITK_WRAP_complex_double "Wrap complex< double > type" OFF "ITK_WRAPPING" OFF)
+
 if(ITK_WRAPPING)
-  option(ITK_WRAP_unsigned_char "Wrap unsigned char type" ON)
-  option(ITK_WRAP_unsigned_short "Wrap unsigned short type" OFF)
-  option(ITK_WRAP_unsigned_long "Wrap unsigned long type" OFF)
-  mark_as_advanced(ITK_WRAP_unsigned_long)
-  if(ITK_WRAP_unsigned_long)
-    message(WARNING "ITK_WRAP_unsigned_long is deprecated. Please use ITK_WRAP_unsigned_long_long instead.")
-  endif()
-  option(ITK_WRAP_unsigned_long_long "Wrap unsigned long long type" OFF)
-
-  option(ITK_WRAP_signed_char "Wrap signed char type" OFF)
-  option(ITK_WRAP_signed_short "Wrap signed short type" ON)
-  option(ITK_WRAP_signed_long "Wrap signed long type" OFF)
-  mark_as_advanced(ITK_WRAP_signed_long)
-  if(ITK_WRAP_signed_long)
-    message(WARNING "ITK_WRAP_signed_long is deprecated. Please use ITK_WRAP_signed_long_long instead.")
-  endif()
-  option(ITK_WRAP_signed_long_long "Wrap signed long long type" OFF)
-
-  option(ITK_WRAP_float "Wrap float type" ON)
-  option(ITK_WRAP_double "Wrap double type" OFF)
-
-  option(ITK_WRAP_vector_float "Wrap vector float type" ON)
-  option(ITK_WRAP_vector_double "Wrap vector double type" OFF)
-
-  option(ITK_WRAP_covariant_vector_float "Wrap covariant vector float type" ON)
-  option(ITK_WRAP_covariant_vector_double "Wrap covariant vector double type" OFF)
-
-  option(ITK_WRAP_rgb_unsigned_char "Wrap RGB< unsigned char > type" ON)
-  option(ITK_WRAP_rgb_unsigned_short "Wrap RGB< unsigned short > type" OFF)
-
-  option(ITK_WRAP_rgba_unsigned_char "Wrap RGBA< unsigned char > type" ON)
-  option(ITK_WRAP_rgba_unsigned_short "Wrap RGBA< unsigned short > type" OFF)
-
-  option(ITK_WRAP_complex_float "Wrap complex< float > type" ON)
-  option(ITK_WRAP_complex_double "Wrap complex< double > type" OFF)
-
   # Check for type conditions that need to be fullfilled.
   foreach(t float double)
     # Vectors
@@ -95,4 +95,15 @@
   endif()
   UNIQUE(vector_components "${ITK_WRAP_IMAGE_DIMS};4")
   set(ITK_WRAP_VECTOR_COMPONENTS "${vector_components}" CACHE STRING "Number of vector components available separated by semicolons (;)")
+else()
+  # Hide options that are not relevant when no wrapping is requested
+  if(ITK_WRAP_IMAGE_DIMS)
+    set_property(CACHE ITK_WRAP_IMAGE_DIMS PROPERTY TYPE INTERNAL)
+  endif()
+  if(ITK_WRAP_DIMS)
+    set_property(CACHE ITK_WRAP_DIMS PROPERTY TYPE INTERNAL)
+  endif()
+  if(ITK_WRAP_VECTOR_COMPONENTS)
+    set_property(CACHE ITK_WRAP_VECTOR_COMPONENTS PROPERTY TYPE INTERNAL)
+  endif()
 endif()


Wrong name of directory for packages sources

--- CI/main_packages.cmake
+++ CI/main_packages.cmake
@@ -33,7 +33,7 @@
 set ( CTEST_SITE "${IMAGE_NAME}" )

 # Directory variable
-set ( CTEST_SOURCE_DIRECTORY "${OTB_SOURCE_DIR}/Packages" )
+set ( CTEST_SOURCE_DIRECTORY "${OTB_SOURCE_DIR}/Packaging" )
 set ( CTEST_BINARY_DIRECTORY "${OTB_SOURCE_DIR}/build_packages/" )
 set ( CTEST_INSTALL_DIRECTORY "${OTB_SOURCE_DIR}/install_packages" )
 set ( PROJECT_SOURCE_DIR "${CTEST_SOURCE_DIRECTORY}" )


Fix should now find OIS which is not taken from repository

git-svn-id: 65dd0ccd495961f396d5302e5521154b071f0302@947 5b2332b8-efa3-11de-8684-7d64432d61a3

--- CMakeModules/OIS.cmake
+++ CMakeModules/OIS.cmake
@@ -2,25 +2,65 @@
 # Find is already called in the top-level CMakeLists

 macro (FIND_OIS)
-	if (NOT MSVC)
-		find_package (PkgConfig)
-		pkg_search_module (OIS OIS)
-		if (NOT OIS_INCLUDE_DIRS AND NOT OIS_LIBRARIES)
-			message (FATAL_ERROR "OIS not found by pkg-config")
-		endif (NOT OIS_INCLUDE_DIRS AND NOT OIS_LIBRARIES)
-		separate_arguments (OIS_INCLUDE_DIRS)
-		separate_arguments (OIS_LIBRARIES)
-	endif (NOT MSVC)
+
+  if (NOT MSVC)
+
+    find_package (PkgConfig)
+    pkg_search_module (OIS OIS)
+    if (NOT OIS_INCLUDE_DIRS AND NOT OIS_LIBRARIES)
+
+      message (STATUS "OIS was not found by pkg-config")
+
+      set(OIS_PREFIX_GUESSES
+	/opt/OIS
+	/opt/ois
+	/usr/local
+	/usr/lib/ois
+	/usr/lib/OIS
+	/usr/local/ois
+	/usr/local/OIS
+	/usr/local/include/OIS
+	$ENV{HOME}/ois
+	$ENV{HOME}/OIS
+	$ENV{REX_DEP_PATH}/ois
+	$ENV{REX_DEP_PATH}/OIS)
+
+      set(OIS_PREFIX_PATH
+	${OIS_HOME} $ENV{OIS_HOME} ${OIS_PREFIX_GUESSES})
+
+      create_search_paths(OIS)
+      message(STATUS "try to find ois from guessed paths")
+
+      find_path(OIS_INCLUDE_DIR OIS.h HINTS ${OIS_INC_SEARCH_PATH} ${OIS_PKGC_INCLUDE_DIRS})
+      find_path(OIS_LIBRARY_DIR libOIS.so HINTS ${OIS_LIB_SEARCH_PATH})
+
+      set(OIS_INCLUDE_DIRS ${OIS_INCLUDE_DIR})
+      set(OIS_LIBDIR ${OIS_LIBRARY_DIR})
+      set(OIS_LIBRARIES "OIS")
+
+      if (NOT OIS_INCLUDE_DIR OR NOT OIS_LIBRARY_DIR)
+	message(STATUS "Ois was not found either from guessed paths or pkg-config. Please set OIS_HOME enviroment variable")
+      endif()
+
+    endif (NOT OIS_INCLUDE_DIRS AND NOT OIS_LIBRARIES)
+
+    #separate_arguments (OIS_INCLUDE_DIRS)
+    #separate_arguments (OIS_LIBRARIES)
+
+  endif (NOT MSVC)
+
 endmacro (FIND_OIS)

 macro (INCLUDE_OIS)
-	if (MSVC)
-		include_directories (${REX_DEP_PATH}/ois/includes)
-		link_directories (${REX_DEP_PATH}/ois/dll)
-	else (MSVC)
-		include_directories (${OIS_INCLUDE_DIRS})
-		link_directories (${OIS_LIBDIR})
-	endif (MSVC)
+
+  if (MSVC)
+    include_directories (${REX_DEP_PATH}/ois/includes)
+    link_directories (${REX_DEP_PATH}/ois/dll)
+  else (MSVC)
+    include_directories (${OIS_INCLUDE_DIRS})
+    link_directories (${OIS_LIBDIR})
+  endif (MSVC)
+
 endmacro (INCLUDE_OIS)

 macro (LINK_OIS)


Add TensorBoard back to CMake build

Add TensorBoard back to CMake build

PiperOrigin-RevId: 156490983

--- tensorflow/contrib/cmake/tf_python.cmake
+++ tensorflow/contrib/cmake/tf_python.cmake
@@ -878,6 +878,14 @@
                                    ${CMAKE_CURRENT_BINARY_DIR}/tf_python/)

 # Copy resources for TensorBoard.
+file(DOWNLOAD http://mirror.bazel.build/tensorboard/index.html ${DOWNLOAD_LOCATION}/tensorboard/index.html
+  EXPECTED_HASH SHA256=60f185c68ff3f906000df9670bf9f46588056b197da7e7b10074411a0c048dae)
+add_custom_command(TARGET tf_python_touchup_modules PRE_BUILD
+  COMMAND ${CMAKE_COMMAND} -E make_directory
+  ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/tensorboard/components/)
+add_custom_command(TARGET tf_python_build_pip_package POST_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy ${DOWNLOAD_LOCATION}/tensorboard/index.html
+  ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/tensorboard/components/)
 add_custom_command(TARGET tf_python_build_pip_package POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy ${tensorflow_source_dir}/tensorflow/tensorboard/TAG
   ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/tensorboard/)


Disable SSL with Intel CC

Disable SSL with Intel CC

--- cmake/build_configurations/mysql_release.cmake
+++ cmake/build_configurations/mysql_release.cmake
@@ -138,6 +138,7 @@
     IF(CMAKE_C_COMPILER_ID MATCHES "Intel")
       SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-static-intel -g -O3 -unroll2 -ip -mp -restrict")
       SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-static-intel -g -O3 -unroll2 -ip -mp -restrict")
+      SET(WITH_SSL no)
     ENDIF()
   ENDIF()


Fixed yaml-cpp.pc file (with prefix)

Fixed yaml-cpp.pc file (with prefix)

--HG--
extra : convert_revision : svn%3Ade72303c-5753-0410-9a76-25d1066b02d0/trunk%40206

--- yaml-cpp.pc.cmake
+++ yaml-cpp.pc.cmake
@@ -1,7 +1,7 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@LIB_INSTALL_DIR@
-includedir=@INCLUDE_INSTALL_DIR@
+libdir=${prefix}/@LIB_INSTALL_DIR@
+includedir=${prefix}/@INCLUDE_INSTALL_DIR@

 Name: Yaml-cpp
 Description: A YAML parser and emitter for C++


cmake: Set version of external module

cmake: Set version of external module

--- BasisProject.cmake
+++ BasisProject.cmake
@@ -44,6 +44,8 @@
   # meta-data
   NAME        "VolumetricMapping"
   PACKAGE     "MIRTK"
+  VERSION     "1.0.0" # External module version
+  SOVERSION   "0"     # API yet unstable
   AUTHORS     "Andreas Schuh"
   DESCRIPTION "VolumetricMapping library of the Medical Image Registration ToolKit."
   COPYRIGHT   "2013-2015 Imperial College London, Andreas Schuh"


Default to the 'llvm-config' found in PATH instead of llvm-config-N

--- cmake/LLVM.cmake
+++ cmake/LLVM.cmake
@@ -2,7 +2,7 @@
 #=============================================================================
 #   CMake build system files for detecting Clang and LLVM
 #
-#   Copyright (c) 2014-2018 pocl developers
+#   Copyright (c) 2014-2020 pocl developers
 #
 #   Permission is hereby granted, free of charge, to any person obtaining a copy
 #   of this software and associated documentation files (the "Software"), to deal
@@ -37,6 +37,7 @@
   # search for any version
   find_program(LLVM_CONFIG
     NAMES
+      "llvm-config"
       "llvm-config-mp-12.0" "llvm-config-12" "llvm-config120"
       "llvm-config-mp-11.0" "llvm-config-11" "llvm-config110"
       "llvm-config-mp-10.0" "llvm-config-10" "llvm-config100"
@@ -44,7 +45,6 @@
       "llvm-config-mp-8.0" "llvm-config-8" "llvm-config80"
       "llvm-config-mp-7.0" "llvm-config-7" "llvm-config70"
       "llvm-config-mp-6.0" "llvm-config-6.0" "llvm-config60"
-      "llvm-config"
     DOC "llvm-config executable")
 endif()


Discover some compile flags.

Discover some compile flags.

--- cmake/arch.cmake
+++ cmake/arch.cmake
@@ -29,18 +29,19 @@

 if(ARCH STREQUAL X86)
 	set(AFLAGS "-m32")
-	set(WORD 32 CACHE INTEGER "Processor word size")
+	set(WORD 32)
 endif(ARCH STREQUAL X86)
 if(ARCH STREQUAL X64)
 	set(AFLAGS "-m64")
-	set(WORD 64 CACHE INTEGER "Processor word size")
+	set(WORD 64)
 endif(ARCH STREQUAL X64)

 if(NOT WORD)
-	set(WORD 64 CACHE INTEGER "Processor word size")
+	set(WORD 64)
 endif(NOT WORD)
+set(WORD ${WORD} CACHE INTEGER "Processor word size")

 if(NOT ALIGN)
-	set(ALIGN 1 CACHE INTEGER "Boundary to align digit vectors")
+	set(ALIGN 1)
 endif(NOT ALIGN)
 set(ALIGN ${ALIGN} CACHE INTEGER "Boundary to align digit vectors")


Fix linking error on mac.

Fix linking error on mac.

--- cmake/util.cmake
+++ cmake/util.cmake
@@ -25,7 +25,7 @@
             endif()
         endforeach()
         if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
-            if(IOS AND NOT IOS_ENABLE_BITCODE)
+            if(NOT IOS_ENABLE_BITCODE)
                 list(APPEND LIBS "-undefined dynamic_lookup")
             endif()
         endif()


Bump GAPID version to v0.6.1

Bump GAPID version to v0.6.1

--- version.cmake
+++ version.cmake
@@ -16,7 +16,7 @@
 # Increment these numbers immediately after releasing a new version.
 set(GAPID_VERSION_MAJOR 0)
 set(GAPID_VERSION_MINOR 6)
-set(GAPID_VERSION_POINT 0)
+set(GAPID_VERSION_POINT 1)

 if (NOT DEFINED GAPID_BUILD_NUMBER)
     set(GAPID_BUILD_NUMBER 0)


Split off candidate-3.10.2 branch

Split off candidate-3.10.2 branch

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

--- version.cmake
+++ version.cmake
@@ -4,7 +4,7 @@
 set ( HPCC_PROJECT "community" )
 set ( HPCC_MAJOR 3 )
 set ( HPCC_MINOR 10 )
-set ( HPCC_POINT 1 )
-set ( HPCC_MATURITY "closedown" )
-set ( HPCC_SEQUENCE 1 )
+set ( HPCC_POINT 2 )
+set ( HPCC_MATURITY "rc" )
+set ( HPCC_SEQUENCE 0 )
 ###


Nagios Monitoring 7..0-rc2 Release Candidate 2

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

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


Update version number

Update version number

--- version.cmake
+++ version.cmake
@@ -4,4 +4,4 @@

 set(HAKA_VERSION_MAJOR 0)
 set(HAKA_VERSION_MINOR 2)
-set(HAKA_VERSION_PATCH 0)
+set(HAKA_VERSION_PATCH 1)


bump version number

bump version number

--- version.cmake
+++ version.cmake
@@ -1 +1 @@
-set(LeapSerial_VERSION 0.5.1)
+set(LeapSerial_VERSION 0.5.2)