use GTEST_LIBRARIES to get the gtest lib list

--- gtest.cmake
+++ gtest.cmake
@@ -5,13 +5,15 @@
 else()
   include(ExternalProject)

+  set(GTEST_LIBRARIES gtest gtest_main)
+
   # the binary dir must be know before creating the external project in order
   # to pass the byproducts
   set(prefix "${CMAKE_CURRENT_BINARY_DIR}/gtest-external")
   set(binary_dir "${prefix}/src/gtest-external-build")

   set(byproducts)
-  foreach(lib gtest gtest_main)
+  foreach(lib ${GTEST_LIBRARIES})
     set(file ${binary_dir}/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX})
     set(${lib}_properties IMPORTED_LOCATION ${file})
     list(APPEND byproducts ${file})
@@ -50,7 +52,7 @@
     ${build_byproducts}
     INSTALL_COMMAND "")

-  foreach(lib gtest gtest_main)
+  foreach(lib ${GTEST_LIBRARIES})
     add_library(${lib} IMPORTED STATIC)
     add_dependencies(${lib} gtest-external)
     set_target_properties(${lib} PROPERTIES ${${lib}_properties})
@@ -58,6 +60,5 @@

   ExternalProject_Get_Property(gtest-external source_dir)
   set(GTEST_INCLUDE_DIRS ${source_dir}/include)
-  set(GTEST_LIBRARIES gtest gtest_main)
   set(GTEST_FOUND ON)
 endif()


Default python install depends on CMAKE_INSTALL_PREFIX

If it wasn't set and PYTHON_PKG_DIR wasn't set, then defaults to
distutils.
If it is set but PYTHON_PKG_DIR wasn't set, then defaults to
lib/python*/site-packages in CMAKE_INSTALL_PREFIX.
Otherwise, goes where user says.

--- scripts/PythonInstall.cmake
+++ scripts/PythonInstall.cmake
@@ -3,18 +3,29 @@
 find_package(PythonInterp REQUIRED)

 # Find python package directory
-if(NOT DEFINED PYTHON_PKG_DIR)
-  execute_process(
-    COMMAND ${PYTHON_EXECUTABLE} -c
-              "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
-              OUTPUT_VARIABLE PYTHON_PKG_DIR
-  )
-  if(PYTHON_PKG_DIR )
-    string (STRIP ${PYTHON_PKG_DIR} PYTHON_PKG_DIR)
-    set(PYTHON_PKG_DIR ${PYTHON_PKG_DIR} CACHE PATH "Main python package repository.")
-    mark_as_advanced(PYTHON_PKG_DIR)
-  endif(PYTHON_PKG_DIR)
-endif(NOT DEFINED PYTHON_PKG_DIR)
+if(NOT DEFINED DEFAULT_PYTHON_PKG_DIR)
+    execute_process(
+      COMMAND ${PYTHON_EXECUTABLE} -c
+          "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
+          OUTPUT_VARIABLE DEFAULT_PYTHON_PKG_DIR
+    )
+    if(DEFAULT_PYTHON_PKG_DIR )
+        string (STRIP ${DEFAULT_PYTHON_PKG_DIR} DEFAULT_PYTHON_PKG_DIR)
+        set(DEFAULT_PYTHON_PKG_DIR
+            ${DEFAULT_PYTHON_PKG_DIR} CACHE PATH "Main python package repository.")
+        mark_as_advanced(DEFAULT_PYTHON_PKG_DIR)
+    endif(DEFAULT_PYTHON_PKG_DIR)
+endif()
+
+if(NOT DEFINED PYTHON_PKG_DIR AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    set(PYTHON_PKG_DIR "${DEFAULT_PYTHON_PKG_DIR}")
+    message(STATUS "Python install path (PYTHON_PKG_DIR): ${PYTHON_PKG_DIR}")
+elseif(NOT DEFINED PYTHON_PKG_DIR)
+    set(PYTHON_PKG_DIR "${CMAKE_INSTALL_PREFIX}/lib/python")
+    set(PYTHON_PKG_DIR "${PYTHON_PKG_DIR}${PYTHON_VERSION_MAJOR}.")
+    set(PYTHON_PKG_DIR "${PYTHON_PKG_DIR}${PYTHON_VERSION_MINOR}/site-packages")
+    message(STATUS "Python install path (PYTHON_PKG_DIR): ${PYTHON_PKG_DIR}")
+endif()

 # Installs relative to PYTHON_PKG_DIR
 function(install_python)


icu: build as static lib

icu: build as static lib

--- packages/icu.cmake
+++ packages/icu.cmake
@@ -8,6 +8,8 @@
             --host=${TARGET_ARCH}
             --prefix=${MINGW_INSTALL_PREFIX}
             --with-cross-build=<BINARY_DIR>/native
+            --enable-static
+            --disable-shared
             CFLAGS=-DU_USING_ICU_NAMESPACE=0
             CXXFLAGS=--std=gnu++0x
             SHELL=bash


Fixed if clause.

Fixed if clause.

--- cmake/EigenTesting.cmake
+++ cmake/EigenTesting.cmake
@@ -158,7 +158,7 @@
     set(COVERAGE_FLAGS "-fprofile-arcs -ftest-coverage")
   else(EIGEN_COVERAGE_TESTING)
     set(COVERAGE_FLAGS "")
-  endif(EIGEN_ENABLE_COVERAGE_TESTING)
+  endif(EIGEN_COVERAGE_TESTING)
   if(CMAKE_SYSTEM_NAME MATCHES Linux)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COVERAGE_FLAGS} -g2")
     set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COVERAGE_FLAGS} -O2 -g2")


improve compiler name and version detection

--- cmake/EigenTesting.cmake
+++ cmake/EigenTesting.cmake
@@ -271,6 +271,9 @@

   set_property(GLOBAL PROPERTY EIGEN_FAILTEST_FAILURE_COUNT "0")
   set_property(GLOBAL PROPERTY EIGEN_FAILTEST_COUNT "0")
+
+  # uncomment anytime you change the ei_get_compilerver_from_cxx_version_string macro
+  # ei_test_get_compilerver_from_cxx_version_string()
 endmacro(ei_init_testing)

 macro(ei_set_sitename)
@@ -303,28 +306,63 @@
     endif()
   else()
     # on all other system we rely on ${CMAKE_CXX_COMPILER}
-    # supporting a "--version" flag
-    exec_program( ${CMAKE_CXX_COMPILER}
-                  ARGS --version
-                  OUTPUT_VARIABLE eigen_cxx_compiler_version_raw
-                )
-    # first extract the compiler name which is the first word
-    string( REGEX REPLACE ".*(llvm\\-g\\+\\+|g\\+\\+|icpc|clang).*" "\\1"
-            eigen_cxx_compiler_name ${eigen_cxx_compiler_version_raw})
-
-    if(eigen_cxx_compiler_name MATCHES ".*g\\+\\+.*")
-      string( REGEX REPLACE ".* ([0-9])\\.([0-9])\\.([0-9]).*" "\\1.\\2.\\3"
-              eigen_cxx_compiler_version ${eigen_cxx_compiler_version_raw})
-    elseif(eigen_cxx_compiler_name MATCHES "icpc|clang")
-      string( REGEX REPLACE ".* ([0-9]+\\.[0-9]+\\.[0-9]+|[0-9]+\\.[0-9]+).*" "\\1"
-              eigen_cxx_compiler_version ${eigen_cxx_compiler_version_raw})
-    else()
-      set(eigen_cxx_compiler_version "_")
-    endif()
-
-    set(${VAR} "${eigen_cxx_compiler_name}-${eigen_cxx_compiler_version}")
+    # supporting a "--version" flag
+    execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version
+                    COMMAND head -n 1
+                    OUTPUT_VARIABLE eigen_cxx_compiler_version_string OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+    ei_get_compilerver_from_cxx_version_string(${eigen_cxx_compiler_version_string} CNAME CVER)
+
+    set(${VAR} "${CNAME}-${CVER}")
   endif()
 endmacro(ei_get_compilerver)
+
+# Extract compiler name and version from a raw version string
+# WARNING: if you edit thid macro, then please test it by  uncommenting
+# the testing macro call in ei_init_testing() of the EigenTesting.cmake file.
+# See also the ei_test_get_compilerver_from_cxx_version_string macro at the end of the file
+macro(ei_get_compilerver_from_cxx_version_string VERSTRING CNAME CVER)
+  # extract possible compiler names
+  string(REGEX MATCH "g\\+\\+"      ei_has_gpp    ${VERSTRING})
+  string(REGEX MATCH "llvm|LLVM"    ei_has_llvm   ${VERSTRING})
+  string(REGEX MATCH "gcc|GCC"      ei_has_gcc    ${VERSTRING})
+  string(REGEX MATCH "icpc|ICC"     ei_has_icpc   ${VERSTRING})
+  string(REGEX MATCH "clang|CLANG"  ei_has_clang  ${VERSTRING})
+
+  # combine them
+  if((ei_has_llvm) AND (ei_has_gpp OR ei_has_gcc))
+    set(${CNAME} "llvm-g++")
+  elseif((ei_has_llvm) AND (ei_has_clang))
+    set(${CNAME} "llvm-clang++")
+  elseif(ei_has_icpc)
+    set(${CNAME} "icpc")
+  elseif(ei_has_gpp OR ei_has_gcc)
+    set(${CNAME} "g++")
+  else()
+    set(${CNAME} "_")
+  endif()
+
+  # extract possible version numbers
+  # first try to extract 3 isolated numbers:
+  string(REGEX MATCH " [0-9]+\\.[0-9]+\\.[0-9]+" eicver ${VERSTRING})
+  if(NOT eicver)
+    # try to extract 2 isolated ones:
+    string(REGEX MATCH " [0-9]+\\.[0-9]+" eicver ${VERSTRING})
+    if(NOT eicver)
+      # try to extract 3:
+      string(REGEX MATCH "[^0-9][0-9]+\\.[0-9]+\\.[0-9]+" eicver ${VERSTRING})
+      if(NOT eicver)
+        # try to extract 2:
+        string(REGEX MATCH "[^0-9][0-9]+\\.[0-9]+" eicver ${VERSTRING})
+      else()
+        set(eicver " _")
+      endif()
+    endif()
+  endif()
+
+  string(REGEX REPLACE ".(.*)" "\\1" ${CVER} ${eicver})
+
+endmacro(ei_get_compilerver_from_cxx_version_string)

 macro(ei_get_cxxflags VAR)
   set(${VAR} "")
@@ -402,3 +440,31 @@
     set(${VAR} 1)
   endif()
 endmacro(ei_is_64bit_env)
+
+
+# helper macro for testing ei_get_compilerver_from_cxx_version_string
+# STR: raw version string
+# REFNAME: expected compiler name
+# REFVER: expected compiler version
+macro(ei_test1_get_compilerver_from_cxx_version_string STR REFNAME REFVER)
+  ei_get_compilerver_from_cxx_version_string(${STR} CNAME CVER)
+  if((NOT ${REFNAME} STREQUAL ${CNAME}) OR (NOT ${REFVER} STREQUAL ${CVER}))
+    message("STATUS ei_get_compilerver_from_cxx_version_string error:")
+    message("Expected \"${REFNAME}-${REFVER}\", got \"${CNAME}-${CVER}\"")
+  endif()
+endmacro(ei_test1_get_compilerver_from_cxx_version_string)
+
+# macro for testing ei_get_compilerver_from_cxx_version_string
+# feel free to add more version strings
+macro(ei_test_get_compilerver_from_cxx_version_string)
+  ei_test1_get_compilerver_from_cxx_version_string("g++ (SUSE Linux) 4.5.3 20110428 [gcc-4_5-branch revision 173117]" "g++" "4.5.3")
+  ei_test1_get_compilerver_from_cxx_version_string("c++ (GCC) 4.5.1 20100924 (Red Hat 4.5.1-4)" "g++" "4.5.1")
+  ei_test1_get_compilerver_from_cxx_version_string("icpc (ICC) 11.0 20081105" "icpc" "11.0")
+  ei_test1_get_compilerver_from_cxx_version_string("g++-3.4 (GCC) 3.4.6" "g++" "3.4.6")
+  ei_test1_get_compilerver_from_cxx_version_string("SUSE Linux clang version 3.0 (branches/release_30 145598) (based on LLVM 3.0)" "llvm-clang++" "3.0")
+  ei_test1_get_compilerver_from_cxx_version_string("icpc (ICC) 12.0.5 20110719" "icpc" "12.0.5")
+  ei_test1_get_compilerver_from_cxx_version_string("Apple clang version 2.1 (tags/Apple/clang-163.7.1) (based on LLVM 3.0svn)" "llvm-clang++" "2.1")
+  ei_test1_get_compilerver_from_cxx_version_string("i686-apple-darwin11-llvm-g++-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)" "llvm-g++" "4.2.1")
+  ei_test1_get_compilerver_from_cxx_version_string("g++-mp-4.4 (GCC) 4.4.6" "g++" "4.4.6")
+  ei_test1_get_compilerver_from_cxx_version_string("g++-mp-4.4 (GCC) 2011" "g++" "4.4")
+endmacro(ei_test_get_compilerver_from_cxx_version_string)


Same as SVN commit r815981 by neundorf: search in more directories (i.e. allow me to set CMAKE_PREFIX_PATH to kdesupport's prefix)

--- cmake/FindAutomoc4.cmake
+++ cmake/FindAutomoc4.cmake
@@ -23,9 +23,16 @@
    set(AUTOMOC4_CONFIG_FILE "${KDESupport_SOURCE_DIR}/automoc/Automoc4Config.cmake")
 else("${KDESupport_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
    # when building this project outside kdesupport
+
+   # CMAKE_[SYSTEM_]PREFIX_PATH exists starting with cmake 2.6.0
+   file(TO_CMAKE_PATH "$ENV{CMAKE_PREFIX_PATH}" _env_CMAKE_PREFIX_PATH)
+   file(TO_CMAKE_PATH "$ENV{CMAKE_LIBRARY_PATH}" _env_CMAKE_LIBRARY_PATH)
+
    find_file(AUTOMOC4_CONFIG_FILE NAMES Automoc4Config.cmake
              PATH_SUFFIXES automoc4 lib/automoc4 lib64/automoc4
-             PATHS ${CMAKE_SYSTEM_PREFIX_PATH} ${CMAKE_SYSTEM_LIBRARY_PATH} ${CMAKE_INSTALL_PREFIX}/lib
+             PATHS ${_env_CMAKE_PREFIX_PATH} ${CMAKE_PREFIX_PATH} ${CMAKE_SYSTEM_PREFIX_PATH}
+                   ${_env_CMAKE_LIBRARY_PATH} ${CMAKE_LIBRARY_PATH} ${CMAKE_SYSTEM_LIBRARY_PATH}
+                   ${CMAKE_INSTALL_PREFIX}/lib
              NO_DEFAULT_PATH )
 endif("${KDESupport_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")


set fallback arch to x86_64

set fallback arch to x86_64

--- cmake/OptimizeForArchitecture.cmake
+++ cmake/OptimizeForArchitecture.cmake
@@ -43,7 +43,7 @@
 endmacro(_my_find)

 macro(AutodetectHostArchitecture)
-	set(TARGET_ARCHITECTURE "native")
+	set(TARGET_ARCHITECTURE "x86_64")
 	set(ARCH_FLAGS)
 	set(_vendor_id)
 	set(_cpu_family)
@@ -104,8 +104,8 @@
 elseif(_cpu_model EQUAL 14)
 	set(TARGET_ARCHITECTURE "core")
 elseif(_cpu_model LESS 14)
-	message(WARNING "Your CPU (family ${_cpu_family}, model ${_cpu_model}) is not known. Auto-detection of optimization flags failed and will use the native CPU settings with SSE2.")
-	set(TARGET_ARCHITECTURE "native")
+	message(WARNING "Your CPU (family ${_cpu_family}, model ${_cpu_model}) is not known. Auto-detection of optimization flags failed and will use the x86_64 CPU settings with SSE2.")
+	set(TARGET_ARCHITECTURE "x86_64")
 else()
 	message(WARNING "Your CPU (family ${_cpu_family}, model ${_cpu_model}) is not known. Auto-detection of optimization flags failed and will use the 65nm Core 2 CPU settings.")
 	set(TARGET_ARCHITECTURE "merom")
@@ -139,7 +139,7 @@
 endmacro()

 macro(OptimizeForArchitecture)
-	set(TARGET_ARCHITECTURE "auto" CACHE STRING "CPU architecture to optimize for. Using an incorrect setting here can result in crashes of the resulting binary because of invalid instructions used.\nSetting the value to \"auto\" will try to optimize for the architecture where cmake is called.\nOther supported values are: \"none\", \"native\", \"core\", \"merom\" (65nm Core2), \"penryn\" (45nm Core2), \"nehalem\", \"westmere\", \"sandy-bridge\", \"ivy-bridge\", \"atom\", \"k8\", \"k8-sse3\", \"barcelona\", \"istanbul\", \"magny-cours\", \"bulldozer\", \"interlagos\", \"piledriver\".")
+	set(TARGET_ARCHITECTURE "auto" CACHE STRING "CPU architecture to optimize for. Using an incorrect setting here can result in crashes of the resulting binary because of invalid instructions used.\nSetting the value to \"auto\" will try to optimize for the architecture where cmake is called.\nOther supported values are: \"none\", \"x86_64\", \"core\", \"merom\" (65nm Core2), \"penryn\" (45nm Core2), \"nehalem\", \"westmere\", \"sandy-bridge\", \"ivy-bridge\", \"atom\", \"k8\", \"k8-sse3\", \"barcelona\", \"istanbul\", \"magny-cours\", \"bulldozer\", \"interlagos\", \"piledriver\".")
 set(_force)
 	if(NOT _last_target_arch STREQUAL "${TARGET_ARCHITECTURE}")
 	message(STATUS "target changed from \"${_last_target_arch}\" to \"${TARGET_ARCHITECTURE}\"")
@@ -237,8 +237,8 @@
 	list(APPEND _march_flag_list "barcelona")
 	list(APPEND _march_flag_list "core2")
 	list(APPEND _available_vector_units_list "sse" "sse2" "sse3" "sse4a")
-	elseif(TARGET_ARCHITECTURE STREQUAL "native")
-	list(APPEND _march_flag_list "native")
+	elseif(TARGET_ARCHITECTURE STREQUAL "x86_64")
+	list(APPEND _march_flag_list "x86_64")
 	elseif(TARGET_ARCHITECTURE STREQUAL "none")
 # add this clause to remove it from the else clause
 	else(TARGET_ARCHITECTURE STREQUAL "core")


CMake: Add TKSTEP209 to the opencascade link interface

--- cmake/modules/FindOPENCASCADE.cmake
+++ cmake/modules/FindOPENCASCADE.cmake
@@ -55,7 +55,7 @@
 SET(_opencascade_libraries
   TKBO TKBool TKBRep TKernel TKFeat TKFillet TKG2d TKG3d TKGeomAlgo
   TKGeomBase TKHLR TKIGES TKMath TKMesh TKOffset TKPrim TKShHealing TKSTEP
-  TKSTEPAttr TKSTEPBase TKSTL TKTopAlgo TKXSBase
+  TKSTEPAttr TKSTEPBase TKSTEP209 TKSTL TKTopAlgo TKXSBase
   )

 SET(_libraries "")


Add missing target for H7 (#255)

Add missing target for H7 (#255)

--- cmake/FindHAL.cmake
+++ cmake/FindHAL.cmake
@@ -103,17 +103,17 @@
 )

 set(HAL_DRIVERS_H7
-    adc cec comp cortex crc cryp dac dcmi dfsdm dma dma2d dsi dts eth exti fdcan
-    flash gfxmmu gpio hash hrtim hsem i2c i2s irda iwdg jpeg lptim ltdc mdios
+    adc cec comp cordic cortex crc cryp dac dcmi dfsdm dma dma2d dsi dts eth exti fdcan
+    flash fmac gfxmmu gpio hash hcd hrtim hsem i2c i2s irda iwdg jpeg lptim ltdc mdios
     mdma mmc nand nor opamp ospi otfdec pcd pssi pwr qspi ramecc rcc rng rtc sai
     sd sdram smartcard smbus spdifrx spi sram swpmi tim uart usart wwdg
 )
 set(HAL_EX_DRIVERS_H7
-    adc crc cryp dac dfsdm dma eth flash hash i2c i2s ltdc mmc opamp pcd pwr rcc
+    adc crc cryp dac dfsdm dma eth flash hash i2c i2s ltdc mmc opamp pcd pwr rcc
     rng rtc sai sd smartcard spi tim uart usart
 )
 set(HAL_LL_DRIVERS_H7
-    adc bdma comp crc crs dac delayblock dma dma2d exti fmc gpio hrtim i2c lptim
+    adc bdma comp cordic crc crs dac delayblock dma dma2d exti fmac fmc gpio hrtim i2c lptim
     lpuart mdma opamp pwr rcc rng rtc sdmmc spi swpmi tim usart usb utils
 )


Remove FindSMF.cmake as we have our own midi parser.

--- cmake/FindSMF.cmake
+++ cmake/FindSMF.cmake
@@ -1,22 +0,0 @@
-FIND_PATH(SMF_INCLUDE_DIR SMF.h
-  PATHS
-  /usr/local/include
-  /usr/include
-  $ENV{SMFDIR}
-)
-
-FIND_LIBRARY(SMF_LIBRARY
-  NAMES smf
-  PATHS
-  /usr/local/lib
-  /usr/lib
-  $ENV{SMFDIR}
-)
-
-set(SMF_FOUND "FALSE" )
-if (SMF_INCLUDE_DIR AND SMF_LIBRARY)
-    set(SMF_FOUND "TRUE" )
-endif()
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SMF DEFAULT_MSG SMF_LIBRARY SMF_INCLUDE_DIR)


make some minor changes to cmake/

make some minor changes to cmake/

--- cmake/UseGLEW.cmake
+++ cmake/UseGLEW.cmake
@@ -2,21 +2,17 @@
 # UseOpenNI.cmake #
 ###################

-OPTION(WITH_OPENNI "Build with OpenNI support?" OFF)

-IF(WITH_OPENNI)
-  IF(MSVC_IDE)
-    FIND_PATH(GLEW_ROOT LICENSE HINTS "C:/all_libs/glew")
-  ELSEIF("${CMAKE_SYSTEM}" MATCHES "Linux")
-    #FIND_PATH(OPENNI_ROOT LICENSE HINTS ~/Software/OpenNI2)
-  ELSE()
-    MESSAGE(FATAL_ERROR "OpenNI not currently set up to work on this platform.")
-  ENDIF()
+IF(MSVC_IDE)
+	FIND_PATH(GLEW_ROOT LICENSE HINTS "C:/all_libs/glew")
+ELSEIF("${CMAKE_SYSTEM}" MATCHES "Linux")
+	#FIND_PATH(OPENNI_ROOT LICENSE HINTS ~/Software/OpenNI2)
+ELSE()
+	MESSAGE(FATAL_ERROR "Glew not currently set up to work on this platform.")
+ENDIF()

-  FIND_PATH(GLEW_INC "GL/glew.h" HINTS "${GLEW_ROOT}/include/")
-  FIND_LIBRARY(GLEW_LIBRARY glew32 HINTS "${GLEW_ROOT}/bin/Release/x64/" "${GLEW_ROOT}/lib/Release/x64/" )
+FIND_PATH(GLEW_INC "GL/glew.h" HINTS "${GLEW_ROOT}/include/")
+FIND_LIBRARY(GLEW_LIBRARY glew32 HINTS "${GLEW_ROOT}/bin/Release/x64/" "${GLEW_ROOT}/lib/Release/x64/" )

-  INCLUDE_DIRECTORIES(${GLEW_INC})
+INCLUDE_DIRECTORIES(${GLEW_INC})

-  #ADD_DEFINITIONS(-DCOMPILE_WITH_OpenNI)
-ENDIF()


Fix ASIO setup for Jenkins

Fix ASIO setup for Jenkins

--- cmake/jenkins.cmake
+++ cmake/jenkins.cmake
@@ -10,5 +10,5 @@
 endif()
 if ("${LABEL_EXPR}" MATCHES "asio")
   message(STATUS "Set define to use boost asio for the multiplexer")
-  add_definitions(-DCAF_USE_ASIO)
+  set(CAF_USE_ASIO yes)
 endif()


Update version

Update version

--- cmake/version.cmake
+++ cmake/version.cmake
@@ -1,3 +1,3 @@
 set (MIF_VERSION_MAJOR 1)
-set (MIF_VERSION_MINOR 3)
+set (MIF_VERSION_MINOR 4)
 set (MIF_VERSION_PATCH 0)


Add missing quotes around variable

Add missing quotes around variable

--- cmake/GlobalBuildConfig.cmake
+++ cmake/GlobalBuildConfig.cmake
@@ -1,18 +1,26 @@
+# This file is included only if sampgdk is built as a root project (i.e. not
+# as a subdirectory).
+
 list(APPEND CMAKE_MODULE_PATH
-	"${CMAKE_SOURCE_DIR}"
-	"${CMAKE_SOURCE_DIR}/cmake/Modules"
+  "${CMAKE_SOURCE_DIR}"
+  "${CMAKE_SOURCE_DIR}/cmake/Modules"
 )

-if(${CMAKE_C_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_C_COMPILER_ID} STREQUAL "Intel")
-	set(CMAKE_COMPILER_IS_GNUCC TRUE)
+if("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR
+   "${CMAKE_C_COMPILER_ID}" STREQUAL "Intel")
+  set(CMAKE_COMPILER_IS_GNUCC TRUE)
 endif()
-if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
-	set(CMAKE_COMPILER_IS_GNUCXX TRUE)
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR
+   "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+  set(CMAKE_COMPILER_IS_GNUCXX TRUE)
 endif()

-if(CMAKE_COMPILER_IS_GNUCC)
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
+if(CMAKE_COMPILERIS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+  set(flags "-m32 -Wno-attributes")
+  if(CMAKE_COMPILER_IS_GNUCC)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flags}")
+  endif()
+  if(CMAKE_COMPILER_IS_GNUCXX)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flags}")
+  endif()
 endif()
-if(CMAKE_COMPILER_IS_GNUCXX)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
-endif()


Support multiple configurations for libpng and zlib

--- cmake/bootstrap/windows.cmake
+++ cmake/bootstrap/windows.cmake
@@ -151,7 +151,7 @@
   y_download("https://zlib.net/zlib-${_version}.tar.xz" SHA1 "e1cb0d5c92da8e9a8c2635dfa249c341dfd00322")
   y_extract("zlib-${_version}.tar.xz" DIR "zlib-${_version}")
   y_cmake("zlib-${_version}"
-    CONFIG Release
+    CONFIG Release Debug
     OPTIONS -DSKIP_INSTALL_FILES=ON)
 endif()

@@ -178,7 +178,7 @@
   y_download("https://downloads.sourceforge.net/project/libpng/libpng16/${_version}/libpng-${_version}.tar.xz" SHA1 "0df1561aa1da610e892239348970d574b14deed0")
   y_extract("libpng-${_version}.tar.xz" DIR "libpng-${_version}")
   y_cmake("libpng-${_version}"
-    CONFIG Release
+    CONFIG Release Debug
     OPTIONS -DPNG_TESTS=OFF -DSKIP_INSTALL_EXECUTABLES=ON -DSKIP_INSTALL_EXPORT=ON -DSKIP_INSTALL_FILES=ON -DSKIP_INSTALL_PROGRAMS=ON)
 endif()


CPP-584 - win: Produce error message if using Boost v1.66.0+

An error message will be presented during the CMake configuration
process if integration tests are being built and the provided Boost
version is v1.66.0+ and the CMake version is not v3.11.0+.

--- cmake/modules/CppDriver.cmake
+++ cmake/modules/CppDriver.cmake
@@ -545,6 +545,21 @@

   # Determine if Boost components are available for test executables
   if(CASS_BUILD_INTEGRATION_TESTS)
+    # Handle new required version of CMake for Boost v1.66.0 (Windows only)
+    if(WIN32)
+      find_package(Boost)
+      if (Boost_FOUND)
+        if(Boost_VERSION GREATER 106600 OR Boost_VERSION EQUAL 106600)
+          # Ensure CMake version is v3.11.0+
+          if (CMAKE_VERSION VERSION_LESS 3.11.0)
+            message(FATAL_ERROR "Boost v${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION} requires CMake v3.11.0+."
+              "Updgrade CMake or downgrade Boost to v${CASS_MINIMUM_BOOST_VERSION} - v1.65.1.")
+          endif()
+        endif()
+      endif()
+    endif()
+
+    # Ensure Boost components are available
     find_package(Boost ${CASS_MINIMUM_BOOST_VERSION} COMPONENTS chrono system thread unit_test_framework)
     if(NOT Boost_FOUND)
       # Ensure Boost was not found due to minimum version requirement


Removed obsolete FindDCMTK.cmake file. Should use the one provided by cmake

--- cmake/modules/FindDCMTK.cmake
+++ cmake/modules/FindDCMTK.cmake
@@ -1,16 +0,0 @@
-
-#=============================================================================
-# InViWo Build
-
-#--------------------------------------------------------------------
-# Build DICOM lib
-SET( DCMTK_FOUND "NO")
-
-if(NOT DCMTK_FOUND)
-  set(BUILD_DCMTK 1)
-  set(DCMTK_LIBRARY DCMTK)
-  set(DCMTK_LIBRARY_DIR ${LIBRARY_OUTPUT_PATH})
-  mark_as_advanced(FORCE  DCMTK_INCLUDE_DIR )
-  mark_as_advanced(FORCE  DCMTK_LIBRARY )
-  set(DCMTK_LIBRARIES optimized ${DCMTK_LIBRARY} debug ${DCMTK_LIBRARY}${CMAKE_DEBUG_POSTFIX})
-endif(NOT DCMTK_FOUND)


[cmake] do not link Python modules against Py lib

At least on linux, it works. On Mac OS X, I'm not so sure since usually
the linker cries if it cannot all symbols

--- cmake/swig_python_tools.cmake
+++ cmake/swig_python_tools.cmake
@@ -115,7 +115,13 @@

   # Check dependencies and then link ...
   add_dependencies(${SWIG_MODULE_${_name}_REAL_NAME} ${COMPONENT})
-  swig_link_libraries(${_name} ${PYTHON_LIBRARIES} ${${COMPONENT}_LINK_LIBRARIES} ${COMPONENT})
+
+  IF(UNIX)
+    # do not link against the Python library on unix, it is useless
+    swig_link_libraries(${_name} ${${COMPONENT}_LINK_LIBRARIES} ${COMPONENT})
+  ELSE(UNIX)
+    swig_link_libraries(${_name} ${PYTHON_LIBRARIES} ${${COMPONENT}_LINK_LIBRARIES} ${COMPONENT})
+  ENDIF(UNIX)

   # set dep between docstrings and python bindings
   add_dependencies(${SWIG_MODULE_${_name}_REAL_NAME} ${COMPONENT}_docstrings)


Minor android.toolchain.cmake enhancement

--- android/android.toolchain.cmake
+++ android/android.toolchain.cmake
@@ -280,7 +280,7 @@
 if( BUILD_WITH_ANDROID_NDK )
  set( STL_PATH "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++" )
  set( STL_LIBRARIES_PATH "${STL_PATH}/libs/${ARMEABI_NDK_NAME}" )
- include_directories( "${STL_PATH}/include" "${STL_LIBRARIES_PATH}/include" )
+ include_directories(SYSTEM "${STL_PATH}/include" "${STL_LIBRARIES_PATH}/include" )
 # if ( NOT ARMEABI AND NOT FORCE_ARM )
 #  set( STL_LIBRARIES_PATH "${ANDROID_NDK_TOOLCHAIN_ROOT}/arm-linux-androideabi/lib/${CMAKE_SYSTEM_PROCESSOR}/thumb" )
 # endif()
@@ -295,7 +295,7 @@
   set( STL_LIBRARIES_PATH "${STL_LIBRARIES_PATH}/thumb" )
  endif()
  #for some reason this is needed? TODO figure out why...
- include_directories( "${ANDROID_NDK_TOOLCHAIN_ROOT}/arm-linux-androideabi/include/c++/4.4.3/arm-linux-androideabi" )
+ include_directories(SYSTEM "${ANDROID_NDK_TOOLCHAIN_ROOT}/arm-linux-androideabi/include/c++/4.4.3/arm-linux-androideabi" )
 endif()

 # only search for libraries and includes in the ndk toolchain


use MSVC14

use MSVC14

--- CMake/CXX11.cmake
+++ CMake/CXX11.cmake
@@ -26,7 +26,7 @@
 macro(check_for_cxx11_compiler _VAR)
     message(STATUS "Checking for C++11 compiler")
     set(${_VAR})
-    if((MSVC AND (MSVC10 OR MSVC11 OR MSVC12)) OR
+    if((MSVC AND (MSVC10 OR MSVC11 OR MSVC12 OR MSVC14)) OR
        (CMAKE_COMPILER_IS_GNUCXX AND NOT ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 4.6) OR
        (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 3.1) OR
        (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 12.0))


CI: disable DiapOTBModule to compile documentation

--- CI/configure_options.cmake
+++ CI/configure_options.cmake
@@ -71,7 +71,8 @@
 set(cmake_configure_option
 "${cmake_configure_option}
 CMAKE_PREFIX_PATH=${XDK_PATH}")
-foreach(remote_module DiapOTBModule OTBTemporalGapFilling Mosaic SertitObject)#otbGRM #Mosaic # #SertitObject
+# DiapOTBModule disabled until documentation can build it
+foreach(remote_module OTBTemporalGapFilling Mosaic SertitObject)#otbGRM #Mosaic # #SertitObject #DiapOTBModule
   set(cmake_configure_option
 "${cmake_configure_option}
 Module_${remote_module}:BOOL=ON")


BUG: Remove the forcing of -framework Python for Mac OS X. CMake can now handle frameworks. Added appropriate default search path so that the python framework is found on Mac.

--- CMake/FindPythonLibs.cmake
+++ CMake/FindPythonLibs.cmake
@@ -15,23 +15,22 @@

 FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
   STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
-  IF(WIN32)
-    FIND_LIBRARY(PYTHON_DEBUG_LIBRARY
-      NAMES python${_CURRENT_VERSION_NO_DOTS}_d python
-      PATHS
-      [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs/Debug
-      [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs )
-  ENDIF(WIN32)
+  FIND_LIBRARY(PYTHON_DEBUG_LIBRARY
+    NAMES python${_CURRENT_VERSION_NO_DOTS}_d python Python
+    PATHS
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs/Debug
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
+    )

   FIND_LIBRARY(PYTHON_LIBRARY
-    NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION}
+    NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION} Python
     PATHS
       [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
-    PATH_SUFFIXES
+      PATH_SUFFIXES
       python${_CURRENT_VERSION}/config
     # Avoid finding the .dll in the PATH.  We want the .lib.
     NO_SYSTEM_ENVIRONMENT_PATH
-  )
+    )

   SET(PYTHON_FRAMEWORK_INCLUDES)
   IF(Python_FRAMEWORKS AND NOT PYTHON_INCLUDE_PATH)
@@ -57,22 +56,6 @@
   PYTHON_LIBRARY
   PYTHON_INCLUDE_PATH
 )
-
-# Python Should be built and installed as a Framework on OSX
-IF(Python_FRAMEWORKS)
-  # If a framework has been selected for the include path,
-  # make sure "-framework" is used to link it.
-  IF("${PYTHON_INCLUDE_PATH}" MATCHES "Python\\.framework")
-    SET(PYTHON_LIBRARY "")
-    SET(PYTHON_DEBUG_LIBRARY "")
-  ENDIF("${PYTHON_INCLUDE_PATH}" MATCHES "Python\\.framework")
-  IF(NOT PYTHON_LIBRARY)
-    SET (PYTHON_LIBRARY "-framework Python" CACHE FILEPATH "Python Framework" FORCE)
-  ENDIF(NOT PYTHON_LIBRARY)
-  IF(NOT PYTHON_DEBUG_LIBRARY)
-    SET (PYTHON_DEBUG_LIBRARY "-framework Python" CACHE FILEPATH "Python Framework" FORCE)
-  ENDIF(NOT PYTHON_DEBUG_LIBRARY)
-ENDIF(Python_FRAMEWORKS)

 # We use PYTHON_LIBRARY and PYTHON_DEBUG_LIBRARY for the cache entries
 # because they are meant to specify the location of a single library.


From what I just learned about curly braces, the additions in the previous commit should have fewer of them.

--- CMake/Findcycluscore.cmake
+++ CMake/Findcycluscore.cmake
@@ -13,9 +13,9 @@
   PATH_SUFFIXES cyclus/include)

 # Add the root dir to the hints
-IF(NOT DEFINED ${CYCLUS_ROOT_DIR})
+IF(NOT DEFINED CYCLUS_ROOT_DIR)
   SET(CYCLUS_ROOT_DIR "${CYCLUS_CORE_INCLUDE_DIR}/..")
-ENDIF(NOT DEFINED ${CYCLUS_ROOT_DIR})
+ENDIF(NOT DEFINED CYCLUS_ROOT_DIR)

 # Look for the header files
 FIND_PATH(CYCLUS_CORE_SHARE_DIR cyclus.rng.in


updated model hash

updated model hash

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

 set(CTEST_PROJECT_NAME "Embree")
 set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
-set(TEST_MODELS_HASH 3e952b063c50b77544e8a8be2c9cd41fec6b5c11)
+set(TEST_MODELS_HASH aa3b6f873aee61405eaaf8ca99a067a2c8cd2c26)

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


adding Travis

adding Travis

Former-commit-id: 0d150281320378be921b1eb2e4bc6b662d35d33b

--- cmake/Find_or_install_GSL.cmake
+++ cmake/Find_or_install_GSL.cmake
@@ -36,6 +36,7 @@
         message(FATAL_ERROR "GSL not found and failed to install: ${res_var}")
     endif()
     include(${PROJECT_SOURCE_DIR}/libs/gsl/FindGSL.cmake)
+    set(GSL_LIBRARIES "")
     get_libraries(${GSL_LIB_DIR} gsl  GSL_LIBRARIES)
     message("SUCCESSFULLY INSTALLED GSL:   ${GSL_LIBRARIES}")


EnableCXX11, abort if cannot find suitable C++11 compiler

--- cmake/Modules/EnableCXX11.cmake
+++ cmake/Modules/EnableCXX11.cmake
@@ -19,7 +19,7 @@
         #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --std=c++0x")
         message(WARNING "Compiler supports only --std=c++0x.")
     else()
-        message(ERROR "Compiler does not support --std=c++11 or --std=c++0x.")
+        message(FATAL_ERROR "Compiler does not support --std=c++11 or --std=c++0x.")
     endif()
 endif()


STRING REGEX REPLACE fix

STRING REGEX REPLACE fix

--- cmake/MyPackageDependency.cmake
+++ cmake/MyPackageDependency.cmake
@@ -31,7 +31,7 @@
       IF ("${CMAKE_HOST_SYSTEM}" MATCHES ".*Windows.*")
         STRING(REGEX REPLACE "/" "\\\\"  _dependLibraryRuntimeDirectory "${_dependLibraryRuntimeDirectory}")
       ELSE ()
-        STRING(REGEX REPLACE " " "\\ "  _dependLibraryRuntimeDirectory "${_dependLibraryRuntimeDirectory}")
+        STRING(REGEX REPLACE " " "\\\\ "  _dependLibraryRuntimeDirectory "${_dependLibraryRuntimeDirectory}")
       ENDIF ()
       SET(${_FINDPACKAGE}_RUNTIME_DIRECTORY "${_dependLibraryRuntimeDirectory}" CACHE INTERNAL "${dependTarget} Runtime Directory")
       IF (NOT TEST_PATH)


Update OpenCVFindLibsGrfmt.cmake

Update OpenCVFindLibsGrfmt.cmake

--- cmake/OpenCVFindLibsGrfmt.cmake
+++ cmake/OpenCVFindLibsGrfmt.cmake
@@ -211,8 +211,8 @@
     find_package(GDAL QUIET)

     if(NOT GDAL_FOUND)
-        ocv_clear_vars(GDAL_LIBRARY GDAL_INCLUDE_DIR)
         set(HAVE_GDAL NO)
+        ocv_clear_vars(GDAL_VERSION GDAL_LIBRARIES)
     else()
         set(HAVE_GDAL YES)
         ocv_include_directories(${GDAL_INCLUDE_DIR})


Set CMAKE_SKIP_INSTALL_RPATH for bigtable_protos (#2289)

--- cmake/external/googleapis.cmake
+++ cmake/external/googleapis.cmake
@@ -103,6 +103,7 @@
                    -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
                    -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
                    -DCMAKE_INSTALL_RPATH=${GOOGLE_CLOUD_CPP_INSTALL_RPATH}
+                   -DCMAKE_SKIP_INSTALL_RPATH=ON
                    -DgRPC_DEBUG=ON
                    -Dprotobuf_DEBUG=ON
                    -DGOOGLE_CLOUD_CPP_USE_LIBCXX=${GOOGLE_CLOUD_CPP_USE_LIBCXX}


CMake: Update lib deps.

CMake: Update lib deps.

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

--- cmake/modules/LLVMLibDeps.cmake
+++ cmake/modules/LLVMLibDeps.cmake
@@ -2,7 +2,7 @@
 set(MSVC_LIB_DEPS_LLVMARMAsmPrinter LLVMARMCodeGen LLVMARMInfo LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMARMCodeGen LLVMARMInfo LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMARMInfo LLVMSupport)
-set(MSVC_LIB_DEPS_LLVMAlphaAsmPrinter LLVMAlphaCodeGen LLVMAlphaInfo LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSupport LLVMSystem LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMAlphaAsmPrinter LLVMAlphaInfo LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMAlphaCodeGen LLVMAlphaInfo LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMAlphaInfo LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMAnalysis LLVMCore LLVMSupport LLVMSystem LLVMTarget)
@@ -11,12 +11,12 @@
 set(MSVC_LIB_DEPS_LLVMAsmPrinter LLVMAnalysis LLVMCodeGen LLVMCore LLVMMC LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMBitReader LLVMCore LLVMSupport LLVMSystem)
 set(MSVC_LIB_DEPS_LLVMBitWriter LLVMCore LLVMSupport LLVMSystem)
-set(MSVC_LIB_DEPS_LLVMBlackfinAsmPrinter LLVMAsmPrinter LLVMBlackfinCodeGen LLVMBlackfinInfo LLVMCodeGen LLVMCore LLVMMC LLVMSupport LLVMSystem LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMBlackfinAsmPrinter LLVMAsmPrinter LLVMBlackfinInfo LLVMCodeGen LLVMCore LLVMMC LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMBlackfinCodeGen LLVMBlackfinInfo LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMBlackfinInfo LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMCBackend LLVMAnalysis LLVMCBackendInfo LLVMCodeGen LLVMCore LLVMScalarOpts LLVMSupport LLVMSystem LLVMTarget LLVMTransformUtils LLVMipa)
 set(MSVC_LIB_DEPS_LLVMCBackendInfo LLVMSupport)
-set(MSVC_LIB_DEPS_LLVMCellSPUAsmPrinter LLVMAsmPrinter LLVMCellSPUCodeGen LLVMCellSPUInfo LLVMCodeGen LLVMCore LLVMMC LLVMSupport LLVMSystem LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMCellSPUAsmPrinter LLVMAsmPrinter LLVMCellSPUInfo LLVMCodeGen LLVMCore LLVMMC LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMCellSPUCodeGen LLVMCellSPUInfo LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMCellSPUInfo LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMCodeGen LLVMAnalysis LLVMCore LLVMMC LLVMScalarOpts LLVMSupport LLVMSystem LLVMTarget LLVMTransformUtils)
@@ -31,7 +31,7 @@
 set(MSVC_LIB_DEPS_LLVMMC LLVMSupport LLVMSystem)
 set(MSVC_LIB_DEPS_LLVMMSIL LLVMAnalysis LLVMCodeGen LLVMCore LLVMMSILInfo LLVMScalarOpts LLVMSupport LLVMSystem LLVMTarget LLVMTransformUtils LLVMipa)
 set(MSVC_LIB_DEPS_LLVMMSILInfo LLVMSupport)
-set(MSVC_LIB_DEPS_LLVMMSP430AsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMMSP430CodeGen LLVMMSP430Info LLVMSupport LLVMSystem LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMMSP430AsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMMSP430Info LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMMSP430CodeGen LLVMCodeGen LLVMCore LLVMMC LLVMMSP430Info LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMMSP430Info LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMMipsAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMMipsCodeGen LLVMMipsInfo LLVMSupport LLVMSystem LLVMTarget)
@@ -40,25 +40,25 @@
 set(MSVC_LIB_DEPS_LLVMPIC16 LLVMAnalysis LLVMCodeGen LLVMCore LLVMMC LLVMPIC16Info LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMPIC16AsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMPIC16 LLVMPIC16Info LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMPIC16Info LLVMSupport)
-set(MSVC_LIB_DEPS_LLVMPowerPCAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMPowerPCCodeGen LLVMPowerPCInfo LLVMSupport LLVMSystem LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMPowerPCAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMPowerPCInfo LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMPowerPCCodeGen LLVMCodeGen LLVMCore LLVMMC LLVMPowerPCInfo LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMPowerPCInfo LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMScalarOpts LLVMAnalysis LLVMCore LLVMSupport LLVMSystem LLVMTarget LLVMTransformUtils)
 set(MSVC_LIB_DEPS_LLVMSelectionDAG LLVMAnalysis LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMSupport LLVMSystem LLVMTarget)
-set(MSVC_LIB_DEPS_LLVMSparcAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSparcCodeGen LLVMSparcInfo LLVMSupport LLVMSystem LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMSparcAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSparcInfo LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMSparcCodeGen LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSparcInfo LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMSparcInfo LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMSupport LLVMSystem)
 set(MSVC_LIB_DEPS_LLVMSystem )
-set(MSVC_LIB_DEPS_LLVMSystemZAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSupport LLVMSystem LLVMSystemZCodeGen LLVMSystemZInfo LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMSystemZAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSupport LLVMSystem LLVMSystemZInfo LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMSystemZCodeGen LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMSystemZInfo LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMSystemZInfo LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMTarget LLVMCore LLVMMC LLVMSupport LLVMSystem)
 set(MSVC_LIB_DEPS_LLVMTransformUtils LLVMAnalysis LLVMCore LLVMSupport LLVMSystem LLVMTarget LLVMipa)
 set(MSVC_LIB_DEPS_LLVMX86AsmParser LLVMMC LLVMX86Info)
 set(MSVC_LIB_DEPS_LLVMX86AsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSupport LLVMSystem LLVMTarget LLVMX86CodeGen LLVMX86Info)
-set(MSVC_LIB_DEPS_LLVMX86CodeGen LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget LLVMX86Info)
-set(MSVC_LIB_DEPS_LLVMX86Disassembler LLVMX86Info)
+set(MSVC_LIB_DEPS_LLVMX86CodeGen LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget LLVMX86Disassembler LLVMX86Info)
+set(MSVC_LIB_DEPS_LLVMX86Disassembler )
 set(MSVC_LIB_DEPS_LLVMX86Info LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMXCore LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget LLVMXCoreInfo)
 set(MSVC_LIB_DEPS_LLVMXCoreAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSupport LLVMSystem LLVMTarget LLVMXCoreInfo)


typo

typo

git-svn-id: 3c26e0a079b00dd9f1472b5041672814c99a7609@215 3149698f-976c-419d-aa71-eec1decff2c2

--- extensions/FindMatlab.cmake
+++ extensions/FindMatlab.cmake
@@ -15,7 +15,7 @@
 # - on Mac, the installed versions of Matlab are given by the MATLAB pathes in /Application
 # - on Unix, the desired Matlab should be accessible from the PATH.
 #
-# Additionnal information is provided when ``MATLAB_FIND_DEBUG`` is set.
+# Additional information is provided when ``MATLAB_FIND_DEBUG`` is set.
 # When a Matlab binary is found automatically and the ``MATLAB_VERSION`` is not given, then the
 # version is queried from Matlab directly. On Windows, it can make a window running Matlab appear.
 #


Allow to use thread sanitizer with chemfiles

--- cmake/CompilerFlags.cmake
+++ cmake/CompilerFlags.cmake
@@ -175,18 +175,13 @@
 endif()

 set(CHFL_SANITIZER "none" CACHE STRING "Sanitizer (clang and gcc only) to use in the build")
-set_property(CACHE CHFL_SANITIZER PROPERTY STRINGS none all address memory undefined)
+set_property(CACHE CHFL_SANITIZER PROPERTY STRINGS none address memory undefined thread)

 set(CHEMFILES_SANITIZERS "")
 set(CHEMFILES_SANITIZERS "")

 if(${CHFL_SANITIZER} STREQUAL "none")
     # Nothing to do
-elseif(${CHFL_SANITIZER} STREQUAL "all")
-    set(CHEMFILES_SANITIZERS "${CHEMFILES_SANITIZERS} -fsanitize=address")
-    set(CHEMFILES_SANITIZERS "${CHEMFILES_SANITIZERS} -fsanitize=memory")
-    set(CHEMFILES_SANITIZERS "${CHEMFILES_SANITIZERS} -fsanitize=undefined")
-    set(CHEMFILES_SANITIZERS "${CHEMFILES_SANITIZERS} -fsanitize=integer")
 elseif(${CHFL_SANITIZER} STREQUAL "undefined")
     set(CHEMFILES_SANITIZERS "${CHEMFILES_SANITIZERS} -fsanitize=undefined")
     set(CHEMFILES_SANITIZERS "${CHEMFILES_SANITIZERS} -fsanitize=integer")


default CUPS off

default CUPS off

--- cmake/ConfigOptions.cmake
+++ cmake/ConfigOptions.cmake
@@ -25,3 +25,4 @@
 option(WITH_DEBUG_WND "Print window order debug messages" OFF)
 option(WITH_NEON "Enable NEON optimization for rfx decoder" OFF)
 option(WITH_JPEG "Use JPEG decoding." OFF)
+option(WITH_CUPS "Use CUPS printing." OFF)


Add Newbase_USE_STATIC_LIBS option only for other projects

--- cmake/NewbaseConfig.cmake
+++ cmake/NewbaseConfig.cmake
@@ -4,7 +4,11 @@
 set(Newbase_INCLUDE_DIRS ${INSTALLED_PREFIX}/include)
 set(Newbase_INSTALLED_INCLUDE_DIRS ${INSTALLED_PREFIX}/include/newbase)
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    option(Newbase_USE_STATIC_LIBS "Newbase use static libs" OFF)
+    # If static and shared library is available, one can select
+    # which one to use. By default use shared one.
+    if(NOT ${PROJECT_NAME} MATCHES "Newbase")
+        option(Newbase_USE_STATIC_LIBS "Newbase use static libs" OFF)
+    endif()

     if(Newbase_USE_STATIC_LIBS)
         set(Newbase_LIBRARIES  ${INSTALLED_PREFIX}/lib/libNewbase.a)


cmake: hide 'junk' dir from the root of build directory

moved to CMakeFiles (no conflicts are expected)

--- cmake/OpenCVVersion.cmake
+++ cmake/OpenCVVersion.cmake
@@ -15,7 +15,7 @@

 # create a dependency on the version file
 # we never use the output of the following command but cmake will rerun automatically if the version file changes
-configure_file("${OPENCV_VERSION_FILE}" "${CMAKE_BINARY_DIR}/junk/version.junk" COPYONLY)
+configure_file("${OPENCV_VERSION_FILE}" "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/opencv_junk/version.junk" COPYONLY)

 ocv_update(OPENCV_VS_VER_FILEVERSION_QUAD "${OPENCV_VERSION_MAJOR},${OPENCV_VERSION_MINOR},${OPENCV_VERSION_PATCH},0")
 ocv_update(OPENCV_VS_VER_PRODUCTVERSION_QUAD "${OPENCV_VERSION_MAJOR},${OPENCV_VERSION_MINOR},${OPENCV_VERSION_PATCH},0")


Internal boost libraries on by default

Internal boost libraries on by default

--- cmake/ROCSBuildOpts.cmake
+++ cmake/ROCSBuildOpts.cmake
@@ -32,7 +32,7 @@
 ## Documentation
 option(ROCS_BUILD_DOC "Build documentation." YES)
 ## Thirdparty
-option(ROCS_USE_INTERNAL_BOOST "Use the available internal Boost libraries." NO)
+option(ROCS_USE_INTERNAL_BOOST "Use the available internal Boost libraries." YES)
 ## Components

 # Dependencies


Fix version string

Fix version string

--- cmake/VersionString.cmake
+++ cmake/VersionString.cmake
@@ -42,14 +42,14 @@
 		set(BUILD_VERSION_STRING "no git info available")
 	endif()

-	include_directories(${CMAKE_BINARY_DIR} PRIVATE)
+	include_directories(${PROJECT_BINARY_DIR} PRIVATE)
 	string(TIMESTAMP BUILD_DATE_TIME "%Y-%m-%dT%H:%M:%SZ" UTC)

 	if(ARGC GREATER 0)
 		set(VAR_PREFIX "${ARGV0}")
 	endif()

-	file(WRITE "${CMAKE_BINARY_DIR}/revision.hpp.in" [[// Generated revision file
+	file(WRITE "${PROJECT_BINARY_DIR}/revision.hpp.in" [[// Generated revision file

 #pragma once

@@ -72,6 +72,6 @@
 	}
 }
 ]])
-	configure_file("${CMAKE_BINARY_DIR}/revision.hpp.in" "${CMAKE_BINARY_DIR}/revision.hpp" @ONLY)
+	configure_file("${PROJECT_BINARY_DIR}/revision.hpp.in" "${PROJECT_BINARY_DIR}/revision.hpp" @ONLY)
 endfunction()


Minor updates to ZincPackaging, cleaning some debug messages and old comments.  https://tracker.physiomeproject.org/show_bug.cgi?id=3439

--- cmake/ZincPackaging.cmake
+++ cmake/ZincPackaging.cmake
@@ -26,7 +26,6 @@
 		IF( COMMAND_RESULT EQUAL 0 )
 			STRING( REGEX MATCH "^[^\\]*" COMMAND_OUTPUT ${COMMAND_OUTPUT} )
 			STRING( STRIP ${COMMAND_OUTPUT} COMMAND_OUTPUT )
-			message(STATUS "comm out: ${COMMAND_OUTPUT}" )
 			STRING( REPLACE " " "-" SYSTEM_NAME ${COMMAND_OUTPUT} )
 		ENDIF()
 	ELSE()
@@ -49,7 +48,6 @@

 	SET( ZINC_ARCHITECTURE "universal" )
 	SET( CPACK_GENERATOR  "TGZ" "PackageMaker" )
-	#SET( CPACK_BUNDLE_NAME "OpenCMISS-Zinc" )
 ELSEIF( UNIX )
 	SET( CPACK_GENERATOR "TGZ" )
 	STRING( FIND ${ZINC_SYSTEM} "Ubuntu" INDEX )
@@ -64,7 +62,6 @@
 SET( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/distrib/description.txt" )
 SET( CPACK_PACKAGE_VENDOR "physiomeproject" )

-message(STATUS "CPack package name: 'zinc-${ZINC_VERSION}-${ZINC_ARCHITECTURE}-${ZINC_SYSTEM}'" )
 SET( CPACK_PACKAGE_FILE_NAME "zinc-${ZINC_VERSION}-${ZINC_ARCHITECTURE}-${ZINC_SYSTEM}" )
 SET( CPACK_OUTPUT_FILE_PREFIX "package" )


ISPC v1.13 is potentially problematic

ISPC v1.13 is potentially problematic

--- cmake/compiler/ispc.cmake
+++ cmake/compiler/ispc.cmake
@@ -2,7 +2,7 @@
 ## SPDX-License-Identifier: Apache-2.0

 # ISPC versions to look for, in decending order (newest first)
-set(ISPC_VERSION_WORKING "1.13.0" "1.12.0" "1.10.0")
+set(ISPC_VERSION_WORKING "1.12.0" "1.10.0")
 list(GET ISPC_VERSION_WORKING -1 ISPC_VERSION_REQUIRED)

 if (NOT ISPC_EXECUTABLE)
@@ -60,6 +60,11 @@

 if ("${ISPC_VERSION}" STREQUAL "1.11.0")
   message(FATAL_ERROR "ISPC v1.11.0 is incompatible with OSPRay.")
+endif()
+message(STATUS "Found ISPC v${ISPC_VERSION}: ${ISPC_EXECUTABLE}")
+list(FIND ISPC_VERSION_WORKING ${ISPC_VERSION} ISPC_VERSION_TESTED)
+if (ISPC_VERSION_TESTED EQUAL -1)
+  message(WARNING "Using untested version ${ISPC_VERSION} of Intel SPMD Compiler (ISPC), proceed at own risk. Supported versions are ${ISPC_VERSION_WORKING}.")
 endif()

 set(OSPRAY_ISPC_ADDRESSING 32 CACHE STRING "32 vs 64 bit addressing in ispc")


build gloo from source code instead of using the pre-compiled library (#27930)

* build gloo from source code , test=develop

--- cmake/external/gloo.cmake
+++ cmake/external/gloo.cmake
@@ -14,55 +14,40 @@

 INCLUDE(ExternalProject)

-execute_process(COMMAND bash -c "gcc -dumpversion" OUTPUT_VARIABLE GCC_VERSION)
+SET(GLOO_PROJECT       "extern_gloo")
+SET(GLOO_PREFIX_DIR    ${THIRD_PARTY_PATH}/gloo)
+SET(GLOO_SOURCE_DIR    ${THIRD_PARTY_PATH}/gloo/src/extern_gloo/gloo)
+SET(GLOO_INSTALL_DIR   ${THIRD_PARTY_PATH}/install/gloo)
+SET(GLOO_INCLUDE_DIR   "${GLOO_INSTALL_DIR}/include" CACHE PATH "gloo include directory." FORCE)
+SET(GLOO_LIBRARY_DIR   "${GLOO_INSTALL_DIR}/lib" CACHE PATH "gloo library directory." FORCE)
+SET(GLOO_REPOSITORY    https://github.com/sandyhouse/gloo.git)
+SET(GLOO_TAG           v0.0.2)
+SET(GLOO_LIBRARIES     "${GLOO_INSTALL_DIR}/lib/libgloo.a" CACHE FILEPATH "gloo library." FORCE)

-SET(GLOO_PROJECT       "extern_gloo")
-IF((NOT DEFINED GLOO_VER) OR (NOT DEFINED GLOO_URL))
-  MESSAGE(STATUS "use pre defined download url")
-  SET(GLOO_VER "master" CACHE STRING "" FORCE)
-  SET(GLOO_NAME "gloo" CACHE STRING "" FORCE)
+INCLUDE_DIRECTORIES(${GLOO_INCLUDE_DIR})

-  if(${GCC_VERSION} VERSION_EQUAL "8.2.0")
-    SET(GLOO_URL "https://fleet.bj.bcebos.com/gloo/gloo.tar.gz.gcc8" CACHE STRING "" FORCE)
-  else()
-    SET(GLOO_URL "https://fleet.bj.bcebos.com/gloo/gloo.tar.gz.gcc482" CACHE STRING "" FORCE)
-  endif()
-ENDIF()
-
-MESSAGE(STATUS "GLOO_NAME: ${GLOO_NAME}, GLOO_URL: ${GLOO_URL}")
-SET(GLOO_SOURCE_DIR    "${THIRD_PARTY_PATH}/gloo")
-SET(GLOO_DOWNLOAD_DIR  "${GLOO_SOURCE_DIR}/src/${GLOO_PROJECT}")
-SET(GLOO_DST_DIR       "gloo")
-SET(GLOO_INSTALL_ROOT  "${THIRD_PARTY_PATH}/install")
-SET(GLOO_INSTALL_DIR   ${GLOO_INSTALL_ROOT}/${GLOO_DST_DIR})
-SET(GLOO_ROOT          ${GLOO_INSTALL_DIR})
-SET(GLOO_INC_DIR       ${GLOO_ROOT}/include)
-SET(GLOO_LIB_DIR       ${GLOO_ROOT}/lib)
-SET(GLOO_LIB           ${GLOO_LIB_DIR}/libgloo.a)
-#SET(GLOO_IOMP_LIB      ${GLOO_LIB_DIR}/libiomp5.so) #todo what is this
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}" "${GLOO_ROOT}/lib")
-
-INCLUDE_DIRECTORIES(${GLOO_INC_DIR})
-
-FILE(WRITE ${GLOO_DOWNLOAD_DIR}/CMakeLists.txt
-  "PROJECT(GLOO)\n"
-  "cmake_minimum_required(VERSION 3.0)\n"
-  "install(DIRECTORY ${GLOO_NAME}/include ${GLOO_NAME}/lib \n"
-  "        DESTINATION ${GLOO_DST_DIR})\n")
+cache_third_party(extern_gloo
+    REPOSITORY    ${GLOO_REPOSITORY}
+    TAG           ${GLOO_TAG}
+    DIR           GLOO_SOURCE_DIR)

 ExternalProject_Add(
-    ${GLOO_PROJECT}
+    extern_gloo
     ${EXTERNAL_PROJECT_LOG_ARGS}
-    PREFIX                ${GLOO_SOURCE_DIR}
-    DOWNLOAD_DIR          ${GLOO_DOWNLOAD_DIR}
-    DOWNLOAD_COMMAND      wget --no-check-certificate ${GLOO_URL} -c -q -O ${GLOO_NAME}.tar.gz
-                          && tar zxvf ${GLOO_NAME}.tar.gz
-    DOWNLOAD_NO_PROGRESS  1
+    ${SHALLOW_CLONE}
+    "${GLOO_DOWNLOAD_CMD}"
+    PREFIX                "${GLOO_PREFIX_DIR}"
+    SOURCE_DIR            "${GLOO_SOURCE_DIR}"
     UPDATE_COMMAND        ""
-    CMAKE_ARGS            -DCMAKE_INSTALL_PREFIX=${GLOO_INSTALL_ROOT}
-    CMAKE_CACHE_ARGS      -DCMAKE_INSTALL_PREFIX:PATH=${GLOO_INSTALL_ROOT}
+    CONFIGURE_COMMAND     ""
+    BUILD_COMMAND         mkdir -p ${GLOO_SOURCE_DIR}/build
+        && cd ${GLOO_SOURCE_DIR}/build && cmake .. && make
+        && mkdir -p ${GLOO_LIBRARY_DIR} ${GLOO_INCLUDE_DIR}/gloo
+    INSTALL_COMMAND      ${CMAKE_COMMAND} -E copy ${GLOO_SOURCE_DIR}/build/gloo/libgloo.a ${GLOO_LIBRARY_DIR}
+    COMMAND              ${CMAKE_COMMAND} -E copy_directory "${GLOO_SOURCE_DIR}/gloo/" "${GLOO_INCLUDE_DIR}/gloo"
 )

-ADD_LIBRARY(gloo SHARED IMPORTED GLOBAL)
-SET_PROPERTY(TARGET gloo PROPERTY IMPORTED_LOCATION ${GLOO_LIB})
+
+ADD_LIBRARY(gloo STATIC IMPORTED GLOBAL)
+SET_PROPERTY(TARGET gloo PROPERTY IMPORTED_LOCATION ${GLOO_LIBRARIES})
 ADD_DEPENDENCIES(gloo ${GLOO_PROJECT})


fix anakin compile manylinux (#11861)

fix anakin compile manylinux (#11861)

--- cmake/inference_lib.cmake
+++ cmake/inference_lib.cmake
@@ -141,7 +141,7 @@
 if(WITH_CONTRIB)
     message(STATUS "installing contrib")
     set(contrib_dst_dir "${FLUID_INSTALL_DIR}/contrib/inference")
-    if (WITH_ANAKIN)
+    if (WITH_ANAKIN AND WITH_GPU)
         copy(contrib_anakin_inference_lib DEPS paddle_inference_api inference_anakin_api
             SRCS
             ${PADDLE_BINARY_DIR}/paddle/contrib/inference/libinference_anakin_api* # compiled anakin api


boards: lpcxpresso55s69: fix JLink device name

Incorrect device name for JLink runner causing wrong device selected,
causing issues flashing the device when flash size is large.

Signed-off-by: Derek Snell <9880443217b501015ad6795c2d4520252a934dea@nxp.com>

--- boards/arm/lpcxpresso55s69/board.cmake
+++ boards/arm/lpcxpresso55s69/board.cmake
@@ -9,10 +9,10 @@
 ## until then jlink can be used or copy image to storage

 if(CONFIG_BOARD_LPCXPRESSO55S69_CPU0)
-board_runner_args(jlink "--device=LPC55S69_core0")
+board_runner_args(jlink "--device=LPC55S69_M33_0")
 endif()
 if(CONFIG_BOARD_LPCXPRESSO55S69_CPU1)
-board_runner_args(jlink "--device=LPC55S69_core1")
+board_runner_args(jlink "--device=LPC55S69_M33_1")
 endif()

 board_runner_args(pyocd "--target=lpc55s69")


Fix FindOGRE's handling of OgreBuildSettings.h.

--HG--
branch : v1-7

--- CMake/Packages/FindOGRE.cmake
+++ CMake/Packages/FindOGRE.cmake
@@ -140,11 +140,14 @@
 findpkg_framework(OGRE)

 # locate Ogre include files
-find_path(OGRE_CONFIG_INCLUDE_DIR NAMES OgreConfig.h HINTS ${OGRE_INC_SEARCH_PATH} ${OGRE_FRAMEWORK_INCLUDES} ${OGRE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES "OGRE")
+find_path(OGRE_CONFIG_INCLUDE_DIR NAMES OgreBuildSettings.h HINTS ${OGRE_INC_SEARCH_PATH} ${OGRE_FRAMEWORK_INCLUDES} ${OGRE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES "OGRE")
 find_path(OGRE_INCLUDE_DIR NAMES OgreRoot.h HINTS ${OGRE_CONFIG_INCLUDE_DIR} ${OGRE_INC_SEARCH_PATH} ${OGRE_FRAMEWORK_INCLUDES} ${OGRE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES "OGRE")
 set(OGRE_INCOMPATIBLE FALSE)

-if (OGRE_INCLUDE_DIR AND OGRE_CONFIG_INCLUDE_DIR)
+if (OGRE_INCLUDE_DIR)
+  if (NOT OGRE_CONFIG_INCLUDE_DIR)
+    set(OGRE_CONFIG_INCLUDE_DIR ${OGRE_INCLUDE_DIR})
+  endif ()
   # determine Ogre version
   file(READ ${OGRE_INCLUDE_DIR}/OgrePrerequisites.h OGRE_TEMP_VERSION_CONTENT)
   get_preprocessor_entry(OGRE_TEMP_VERSION_CONTENT OGRE_VERSION_MAJOR OGRE_VERSION_MAJOR)


changed mitk data to new test data revision

Signed-off-by: Ralf Floca <fec4a647ab34f54e20bea9a9e3e1c74f13aefc78@dkfz-heidelberg.de>

--- CMakeExternals/MITKData.cmake
+++ CMakeExternals/MITKData.cmake
@@ -12,7 +12,7 @@
 set(MITK-Data_DEPENDS ${proj})

 if(BUILD_TESTING)
-  set(revision_tag 151b3e88) # first 8 characters of hash-tag
+  set(revision_tag 8462f93c) # first 8 characters of hash-tag
 #                  ^^^^^^^^  these are just to check correct length of hash part

   ExternalProject_Add(${proj}


cmake posix sitl: add vmount driver

cmake posix sitl: add vmount driver

--- cmake/configs/posix_sitl_default.cmake
+++ cmake/configs/posix_sitl_default.cmake
@@ -7,6 +7,7 @@
 	drivers/device
 	drivers/gps
 	drivers/pwm_out_sim
+	drivers/vmount

 	platforms/common
 	platforms/posix/drivers/accelsim


force external source

force external source

--- lemon.cmake
+++ lemon.cmake
@@ -19,7 +19,8 @@
     1.3
     lemon-1.3.tar.gz
     814d97757c157c5b46a413cc39aad625
-    http://lemon.cs.elte.hu/pub/sources)
+    http://lemon.cs.elte.hu/pub/sources
+    "FORCE")

 message ("Installing ${lemon_NAME} into FlyEM build area: ${BUILDEM_DIR} ...")
 ExternalProject_Add(${lemon_NAME}


BUG: wrong variable used in itk post install patch script

--- SuperBuild/CMake/post_install.cmake
+++ SuperBuild/CMake/post_install.cmake
@@ -3,9 +3,12 @@
 foreach( p_dir ${P_DIRS} )
 set(file_list)
 file( GLOB file_list "${p_dir}/*.cmake" )
+list(SORT file_list)
 foreach( cmake_file ${file_list} )
-  file(STRINGS "${cmake_file}" MATCH_FOUND REGEX "${MATCH}")
+
+  file(STRINGS "${cmake_file}" MATCH_FOUND REGEX "${P_MATCH}")
   if(MATCH_FOUND)
+    message("Replacing '${P_MATCH}' with '${P_REPLACE}' in ${cmake_file}")
     file(STRINGS "${cmake_file}" cmake_file_CONTENTS NEWLINE_CONSUME)
     string(REPLACE "${P_MATCH}" "$${}{${P_REPLACE}}" cmake_file_CONTENTS ${cmake_file_CONTENTS})
     file(WRITE "${cmake_file}"  "# This file is modified by OTB after installation.


ENH: typo in openjpeg external project comments

--- SuperBuild/CMake/External_openjpeg.cmake
+++ SuperBuild/CMake/External_openjpeg.cmake
@@ -60,5 +60,5 @@

 SUPERBUILD_UPDATE_CMAKE_VARIABLES(OPENJPEG FALSE)

-#Apply patches to openjpeg (for now Even Roualt optim)
+#Apply patches to openjpeg (for now Even Rouault optimizations)
 SUPERBUILD_PATCH_SOURCE(OPENJPEG "-ut")


checking out model repo also for EMBREE_TESTING_INTENSITY 1

--- scripts/test.cmake
+++ scripts/test.cmake
@@ -141,7 +141,7 @@
 ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})
 ctest_start("Continuous")
 #ctest_update (RETURN_VALUE count)
-IF (EMBREE_TESTING_INTENSITY GREATER 1)
+IF (EMBREE_TESTING_INTENSITY GREATER 0)
   update_test_models()
 ENDIF()
 ctest_configure()


Squashed 'lib/settingsnode/' changes from dc32d18..838ff6e

838ff6e Use keyword version of target_link_libraries

git-subtree-dir: lib/settingsnode
git-subtree-split: 838ff6e5e4c727fc04300d22e9a9bba6b92b6efc

--- settingsnode.cmake
+++ settingsnode.cmake
@@ -18,6 +18,6 @@
   add_library(settingsnode INTERFACE)
   function(include_settingsnode TARGET)
     set_property(TARGET settingsnode PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${SETTINGSNODE_MODULES_PATH}/include)
-    target_link_libraries(${TARGET} settingsnode)
+    target_link_libraries(${TARGET} PRIVATE settingsnode)
   endfunction()
 endif()


Set NO_DEFAULT_PATH in FindImGui.cmake

Set NO_DEFAULT_PATH in FindImGui.cmake

Spotted in #97 - we only want to search in IMGUI_SEARCH_PATH, otherwise "IMGUI_DIR" won't work correctly.

--- cmake/FindImGui.cmake
+++ cmake/FindImGui.cmake
@@ -16,6 +16,7 @@
 find_path(IMGUI_INCLUDE_DIR
   NAMES imgui.h
   PATHS ${IMGUI_SEARCH_PATH}
+  NO_DEFAULT_PATH
 )

 if(NOT IMGUI_INCLUDE_DIR)


[cmake] fix MUMPS detection on zesty

[cmake] fix MUMPS detection on zesty

--- cmake/FindMUMPS.cmake
+++ cmake/FindMUMPS.cmake
@@ -12,17 +12,22 @@

 IF(MUMPS_LIBRARY_DIRECTORY)
   FIND_LIBRARY(MUMPS_LIBRARY dmumps PATHS "${MUMPS_LIBRARY_DIRECTORY}" NO_DEFAULT_PATH)
+  IF(NOT MUMPS_LIBRARY)
+    SET(_MUMPS_DEFAULT_SEARCH_DIR TRUE)
+    MESSAGE("Could not find MUMPS in directory ${MUMPS_LIBRARY_DIRECTORY}")
+    FIND_LIBRARY(MUMPS_LIBRARY dmumps)
+  ENDIF()
 ELSE(MUMPS_LIBRARY_DIRECTORY)
   FIND_LIBRARY(MUMPS_LIBRARY dmumps)
 ENDIF(MUMPS_LIBRARY_DIRECTORY)

-IF(MUMPS_LIBRARY_DIRECTORY)
+IF(MUMPS_LIBRARY_DIRECTORY AND NOT _MUMPS_DEFAULT_SEARCH_DIR)
   FIND_LIBRARY(MUMPS_COMMON_LIBRARY mumps_common PATHS "${MUMPS_LIBRARY_DIRECTORY}" NO_DEFAULT_PATH)
-ELSE(MUMPS_LIBRARY_DIRECTORY)
+ELSE()
   FIND_LIBRARY(MUMPS_COMMON_LIBRARY mumps_common)
-ENDIF(MUMPS_LIBRARY_DIRECTORY)
+ENDIF()

 IF(MUMPS_LIBRARY_DIRECTORY)
   FIND_LIBRARY(METIS_LIBRARY metis PATHS "${MUMPS_LIBRARY_DIRECTORY}" NO_DEFAULT_PATH)


Fix non-PIC build after 253959

Fix non-PIC build after 253959

CMAKE_EXE_LINKER_FLAGS is a string. Appending a flag using list(APPEND) introduces an extra
semicolon which breaks stuff. Change this to append the value in the same way that everyone else
seems to be doing.

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

--- cmake/config-ix.cmake
+++ cmake/config-ix.cmake
@@ -301,7 +301,7 @@
   set(ENABLE_PIC 0)
   check_cxx_compiler_flag("-fno-pie" SUPPORTS_NO_PIE_FLAG)
   if(SUPPORTS_NO_PIE_FLAG)
-    list(APPEND CMAKE_EXE_LINKER_FLAGS "-fno-pie")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fno-pie")
   endif()
 endif()


Getting rid of lib64 from the LIB_INSTALL_DIR

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

--- cmake/pcl_utils.cmake
+++ cmake/pcl_utils.cmake
@@ -162,7 +162,7 @@
 macro(SET_INSTALL_DIRS)
     if(OS_IS_64BIT)
         if(NOT APPLE)
-            set(LIB_INSTALL_DIR "lib64")
+            set(LIB_INSTALL_DIR "lib")
         else(NOT APPLE)
             set(LIB_INSTALL_DIR "lib")
         endif(NOT APPLE)


In defaults.cmake, HiOp depends BLAS and LAPACK.

--- config/defaults.cmake
+++ config/defaults.cmake
@@ -41,7 +41,7 @@
 option(MFEM_USE_SIDRE "Enable Axom/Sidre usage" OFF)
 option(MFEM_USE_CONDUIT "Enable Conduit usage" OFF)
 option(MFEM_USE_PUMI "Enable PUMI" OFF)
-option(MFEM_USE_HIOP "Enable HiOP" OFF)
+option(MFEM_USE_HIOP "Enable HiOp" OFF)

 # Allow a user to disable testing, examples, and/or miniapps at CONFIGURE TIME
 # if they don't want/need them (e.g. if MFEM is "just a dependency" and all they
@@ -152,6 +152,8 @@

 set(HIOP_DIR "${MFEM_DIR}/../hiop/install" CACHE STRING
     "Directory where HiOp is installed")
+set(HIOP_REQUIRED_PACKAGES "BLAS" "LAPACK" CACHE STRING
+    "Packages that HiOp depends on.")

 set(BLAS_INCLUDE_DIRS "" CACHE STRING "Path to BLAS headers.")
 set(BLAS_LIBRARIES "" CACHE STRING "The BLAS library.")


cmake: fix qi_install_data() in some corner cases

for some reason get_filename_component(_abs_path "data/*" ABSOLUTE)
returns an exiting directory on windows, causing
the installation to fail later.

test for "*" in arguments earlier to avoid this

Change-Id: I50db574821fe540d4d79286bf80058ef7e5fb478
Reviewed-on: http://gerrit.aldebaran.lan:8080/15588
Tested-by: dmerejkowsky <1e4b13000fa8777df4cefd2fd8215187e3deb062@aldebaran-robotics.com>
Tested-by: gerrit
Reviewed-by: dmerejkowsky <1e4b13000fa8777df4cefd2fd8215187e3deb062@aldebaran-robotics.com>

--- cmake/qibuild/internal/install.cmake
+++ cmake/qibuild/internal/install.cmake
@@ -33,11 +33,7 @@
   set(_dirs_to_install)
   foreach(f ${ARG_UNPARSED_ARGUMENTS})
     get_filename_component(_abs_path "${f}" ABSOLUTE)
-    if(IS_DIRECTORY ${_abs_path})
-      list(APPEND _dirs_to_install ${f})
-    elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${f}" OR EXISTS "${f}")
-      list(APPEND _files_to_install "${f}")
-    elseif("(${f}" MATCHES "\\*")
+    if("${f}" MATCHES "\\*")
       file(${_glob_keyword} _file_to_install RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${f})
       if(NOT _file_to_install)
         qi_error(
@@ -45,6 +41,10 @@
           '${f}' glob does not match any file")
       endif()
       list(APPEND _files_to_install ${_file_to_install})
+    elseif(IS_DIRECTORY ${_abs_path})
+      list(APPEND _dirs_to_install ${f})
+    elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${f}" OR EXISTS "${f}")
+      list(APPEND _files_to_install "${f}")
     else()
       get_source_file_property(_generated "${f}" GENERATED)
       if(_generated)


Missing the preprocessor define in the project generation.

--- Tools/CMake/torque3d.cmake
+++ Tools/CMake/torque3d.cmake
@@ -428,6 +428,10 @@
     addDef(TORQUE_DEDICATED)
 endif()

+if(TORQUE_EXPERIMENTAL_EC)
+	addDef(TORQUE_EXPERIMENTAL_EC)
+endif()
+
 #modules dir
 file(GLOB modules "modules/*.cmake")
 foreach(module ${modules})


Fix for CI server on gcc Linux.

Fix for CI server on gcc Linux.

--- Tools/CMake/torque3d.cmake
+++ Tools/CMake/torque3d.cmake
@@ -23,7 +23,9 @@
 project(${TORQUE_APP_NAME})

 if(UNIX)
-    set(CXX_FLAG32 "")
+    if(NOT CXX_FLAG32)
+        set(CXX_FLAG32 "")
+    endif()
     #set(CXX_FLAG32 "-m32") #uncomment for build x32 on OSx64

     # default compiler flags


fix missing ${ARGN} for find_package_plus_no_import

Change-Id: I3433315dfb56aea1a4b4600b5d4b9ab21ade59cc

--- external/vigra_cmake/VigraAddDep.cmake
+++ external/vigra_cmake/VigraAddDep.cmake
@@ -275,7 +275,7 @@
 # will take care of exporting as global variables the variables defined by the builtin find_package(), and to make
 # the imported targets defined by the builtin find_package() global.
 function(find_package_plus _VAD_NAME)
-  find_package_plus_no_import(${_VAD_NAME})
+  find_package_plus_no_import(${_VAD_NAME} ${ARGN})

   # Now take care of turning any IMPORTED non-GLOBAL target defined by a find_package() call into a GLOBAL one.
   make_imported_targets_global()


Update ios.toolchain.cmake

Update ios.toolchain.cmake

Fixes #19

--- ios.toolchain.cmake
+++ ios.toolchain.cmake
@@ -330,7 +330,7 @@
 set(CMAKE_CXX_OSX_COMPATIBILITY_VERSION_FLAG "${CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG}")
 set(CMAKE_CXX_OSX_CURRENT_VERSION_FLAG "${CMAKE_C_OSX_CURRENT_VERSION_FLAG}")

-if(IOS_ARCH MATCHES "((^|, )(arm64|x86_64))+")
+if(IOS_ARCH MATCHES "((^|, )(arm64|arm64e|x86_64))+")
   set(CMAKE_C_SIZEOF_DATA_PTR 8)
   set(CMAKE_CXX_SIZEOF_DATA_PTR 8)
   message(STATUS "Using a data_ptr size of 8")
@@ -345,7 +345,7 @@
 # Note that only Xcode 7+ supports the newer more specific:
 # -m${XCODE_IOS_PLATFORM}-version-min flags, older versions of Xcode use:
 # -m(ios/ios-simulator)-version-min instead.
-if (IOS_PLATFORM STREQUAL "OS")
+if (IOS_PLATFORM STREQUAL "OS" OR IOS_PLATFORM STREQUAL "OS64")
   if (XCODE_VERSION VERSION_LESS 7.0)
     set(XCODE_IOS_PLATFORM_VERSION_FLAGS
       "-mios-version-min=${IOS_DEPLOYMENT_TARGET}")


finish migration to new build macros -- check before linking debug libs

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

--- CMakeModules/ModuleSetup.cmake
+++ CMakeModules/ModuleSetup.cmake
@@ -127,7 +127,7 @@
 macro (link_package PREFIX)
     target_link_libraries (${TARGET_NAME} ${${PREFIX}_LIBRARIES})

-    if (MSVC)
+    if (MSVC AND ${PREFIX}_DEBUG_LIBRARIES)
         target_link_libraries (${TARGET_NAME} debug ${${PREFIX}_DEBUG_LIBRARIES})
     endif ()
 endmacro (link_package)


Use ONCRPC_RPCGEN_PROGRAM instead of RPCGEN_PROGRAM

--- make/FindACPLT_ONCRPC.cmake
+++ make/FindACPLT_ONCRPC.cmake
@@ -37,7 +37,7 @@
   DOC "A rpc generator")

 IF (ONCRPC_RPCGEN_PROGRAM)
-  MESSAGE(STATUS "Looking for rpcgen... - found rpcgen is ${RPCGEN_PROGRAM}")
+  MESSAGE(STATUS "Looking for rpcgen... - found rpcgen is ${ONCRPC_RPCGEN_PROGRAM}")
   SET(ONCRPC_RPCGEN_FOUND "YES")
 ELSE (ONCRPC_RPCGEN_PROGRAM)
   SET(ONCRPC_RPCGEN_FOUND "NO")
@@ -52,7 +52,7 @@

   MESSAGE(STATUS "Looking for ACPLT_ONCRPC... - found ACPLT_ONCRPC lib : ${ACPLT_ONCRPC_LIBRARY}, include is ${ACPLT_ONCRPC_INCLUDE}")
   SET(ACPLT_ONCRPC_FOUND "YES")
-  GET_FILENAME_COMPONENT(ACPLT_ONCRPC_BINARY_DIRS ${RPCGEN_PROGRAM} PATH)
+  GET_FILENAME_COMPONENT(ACPLT_ONCRPC_BINARY_DIRS ${ONCRPC_RPCGEN_PROGRAM} PATH)
   GET_FILENAME_COMPONENT(ACPLT_ONCRPC_LIBRARY_DIRS ${ACPLT_ONCRPC_LIBRARY} PATH)
   GET_FILENAME_COMPONENT(ACPLT_INCLUDE_DIR1 ${ACPLT_ONCRPC_INCLUDE} PATH)
   GET_FILENAME_COMPONENT(ACPLT_INCLUDE_DIR2 ${ACPLT_INCLUDE_DIR1} PATH)


3.0.0 grl release

3.0.0 grl release

--- BasisProject.cmake
+++ BasisProject.cmake
@@ -83,7 +83,7 @@
   # --------------------------------------------------------------------------
   # meta-data
   NAME             "grl"
-  VERSION          "0.0.0"
+  VERSION          "3.0.0"
   AUTHORS          "Andrew Hundt"
                    #<author>
   DESCRIPTION      "Generic Robotics Library - Robotics software and drivers aiming to be implemented using generic programming"


fix: Build with VTK 7

fix: Build with VTK 7

--- BasisProject.cmake
+++ BasisProject.cmake
@@ -26,7 +26,7 @@
   NAME        "DrawEM"
   PACKAGE     "MIRTK"
   AUTHORS     "Antonios Makropoulos"
-  DESCRIPTION "Segmentation library for the developing brain of the Medical Image Registration ToolKit."
+  DESCRIPTION "Tools for the segmentation of the developing brain"
   COPYRIGHT   "2016 Imperial College London, Antonios Makropoulos"
   LICENSE     "Apache License Version 2.0"
   CONTACT     "Antonios Makropoulos <a.makropoulos11@imperial.ac.uk>"
@@ -36,7 +36,7 @@
   # dependencies
   DEPENDS
     MIRTK{Common,Numerics,Image,Transformation,IO}
-    "VTK-6{
+    "VTK-7|6{
       vtkCommonCore,
       vtkCommonDataModel,
       vtkFiltersCore,


CMake: Bugfix, do not use removed macro

CMake: Bugfix, do not use removed macro

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

--- deal.II/cmake/configure/configure_1_threads.cmake
+++ deal.II/cmake/configure/configure_1_threads.cmake
@@ -215,7 +215,7 @@
   FIND_LIBRARY(dl_LIBRARY NAMES dl)
   MARK_AS_ADVANCED(dl_LIBRARY)
   IF(NOT dl_LIBRARY MATCHES "-NOTFOUND")
-    DEAL_II_APPEND_LIBRARIES(${dl_LIBRARY})
+    LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${dl_LIBRARY})
   ENDIF()

   INCLUDE_DIRECTORIES(${TBB_FOLDER}/include)


in runsuite: don't build if configure fails; don't test if build failed
fixes issue 280

SVN-Revision: 566

--- suite/runsuite.cmake
+++ suite/runsuite.cmake
@@ -318,29 +318,33 @@
   if (DO_UPDATE)
     ctest_update(SOURCE "${CTEST_SOURCE_DIRECTORY}")
   endif (DO_UPDATE)
-  ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}")
-  ctest_build(BUILD "${CTEST_BINARY_DIRECTORY}")
-  # to run a subset of tests add an INCLUDE regexp to ctest_test.  e.g.:
-  #   INCLUDE broadfun
-  if ("${cmake_ver_string}" STRLESS "2.8.")
-    # Parallel tests not supported
-    set(RUN_PARALLEL OFF)
-  elseif (WIN32 AND TEST_LONG)
-    # FIXME i#265: on Windows we can't run multiple instances of
-    # the same app b/c of global reg key conflicts: should support
-    # env vars and not require registry
-    set(RUN_PARALLEL OFF)
-  else ()
-    set(RUN_PARALLEL ON)
-  endif ()
-  if (RUN_PARALLEL)
-    # i#111: run tests in parallel, supported on CTest 2.8.0+
-    # Note that adding -j to CMAKE_COMMAND does not work, though invoking
-    # this script with -j does work, but we want parallel by default.
-    ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}" PARALLEL_LEVEL 5)
-  else (RUN_PARALLEL)
-    ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}")
-  endif (RUN_PARALLEL)
+  ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE config_success)
+  if (config_success)
+    ctest_build(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE build_success)
+    if (build_success)
+      # to run a subset of tests add an INCLUDE regexp to ctest_test.  e.g.:
+      #   INCLUDE broadfun
+      if ("${cmake_ver_string}" STRLESS "2.8.")
+        # Parallel tests not supported
+        set(RUN_PARALLEL OFF)
+      elseif (WIN32 AND TEST_LONG)
+        # FIXME i#265: on Windows we can't run multiple instances of
+        # the same app b/c of global reg key conflicts: should support
+        # env vars and not require registry
+        set(RUN_PARALLEL OFF)
+      else ()
+        set(RUN_PARALLEL ON)
+      endif ()
+      if (RUN_PARALLEL)
+        # i#111: run tests in parallel, supported on CTest 2.8.0+
+        # Note that adding -j to CMAKE_COMMAND does not work, though invoking
+        # this script with -j does work, but we want parallel by default.
+        ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}" PARALLEL_LEVEL 5)
+      else (RUN_PARALLEL)
+        ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}")
+      endif (RUN_PARALLEL)
+    endif (build_success)
+  endif (config_success)
   if (DO_SUBMIT)
     # include any notes via set(CTEST_NOTES_FILES )?
     ctest_submit()


CMake/check.cmake: Use `unset` to clear variables

--- CMake/check.cmake
+++ CMake/check.cmake
@@ -28,7 +28,7 @@
 		set (${result_name} 0 PARENT_SCOPE)
 		endif (header_${result_name})

-	set (header_${result_name}) # Clear the variable.
+	unset (header_${result_name})
 	endfunction ()

 function (lsf_check_type_size type_name result_size)
@@ -43,9 +43,9 @@
 		set (${result_size} 0 PARENT_SCOPE)
 		endif (size_${type_name})

-	set (tmp1) # Clear temp variables.
-	set (tmp2)
-	set (size_${tmp2})
+	unset (tmp1)
+	unset (tmp2)
+	unset (size_${tmp2})
 	endfunction ()

 function (lsf_check_function_exists func_name result_name)
@@ -57,7 +57,7 @@
 		set (${result_name} 0 PARENT_SCOPE)
 		endif (func_${result_name})

-	set (func_${result_name}) # Clear the variable.
+	unset (func_${result_name})
 	endfunction ()

 # Unix does not link libm by default while windows does. We therefore have
@@ -75,7 +75,7 @@
 		set (${result_name} 0 PARENT_SCOPE)
 		endif (func_${result_name})

-	set (func_${result_name}) # Clear the variable.
+	unset (func_${result_name})
 	endfunction ()

 function (lsf_check_library_exists lib_name lib_func location result_name)
@@ -87,6 +87,6 @@
 		set (${result_name} 0 PARENT_SCOPE)
 		endif (lib_${result_name})

-	set (lib_${result_name}) # Clear the variable.
+	unset (lib_${result_name})
 	endfunction ()


swap 3.2 <-> default CTestConfig.cmake file

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -4,10 +4,14 @@
 ## # The following are required to uses Dart and the Cdash dashboard
 ##   ENABLE_TESTING()
 ##   INCLUDE(CTest)
-set(CTEST_PROJECT_NAME "Eigen3.2")
+set(CTEST_PROJECT_NAME "Eigen")
 set(CTEST_NIGHTLY_START_TIME "00:00:00 UTC")

 set(CTEST_DROP_METHOD "http")
 set(CTEST_DROP_SITE "manao.inria.fr")
-set(CTEST_DROP_LOCATION "/CDash/submit.php?project=Eigen3.2")
+set(CTEST_DROP_LOCATION "/CDash/submit.php?project=Eigen")
 set(CTEST_DROP_SITE_CDASH TRUE)
+set(CTEST_PROJECT_SUBPROJECTS
+Official
+Unsupported
+)


Add doc package component

Add doc package component

--- CommonCPack.cmake
+++ CommonCPack.cmake
@@ -50,9 +50,9 @@
 # Default component definition
 if(NOT CPACK_COMPONENTS_ALL)
   if(RELEASE_VERSION)
-    set(CPACK_COMPONENTS_ALL lib dev apps examples)
+    set(CPACK_COMPONENTS_ALL lib dev doc apps examples)
   else()
-    set(CPACK_COMPONENTS_ALL unspecified lib dev apps examples)
+    set(CPACK_COMPONENTS_ALL unspecified lib dev doc apps examples)
   endif()

   set(CPACK_COMPONENT_UNSPECIFIED_DISPLAY_NAME "Unspecified")
@@ -67,6 +67,10 @@
   set(CPACK_COMPONENT_DEV_DESCRIPTION
     "Header and Library Files for ${CPACK_PROJECT_NAME} Development")
   set(CPACK_COMPONENT_DEV_DEPENDS lib)
+
+  set(CPACK_COMPONENT_DOC_DISPLAY_NAME "${CPACK_PROJECT_NAME} Documentation")
+  set(CPACK_COMPONENT_DOC_DESCRIPTION "${CPACK_PROJECT_NAME} Documentation")
+  set(CPACK_COMPONENT_DOC_DEPENDS lib)

   set(CPACK_COMPONENT_APPS_DISPLAY_NAME "${CPACK_PROJECT_NAME} Applications")
   set(CPACK_COMPONENT_APPS_DESCRIPTION "${CPACK_PROJECT_NAME} Applications")


Commented out the CMAK_LIBRARY_PATH addition

--- cmake/CMakeModules/OssimCommonVariables.cmake
+++ cmake/CMakeModules/OssimCommonVariables.cmake
@@ -265,7 +265,7 @@
       SET(CMAKE_LIBRARY_PATH "${CMAKE_LIBRARY_PATH};${OSSIM_DEPENDENCIES}/lib${LIBSUFFIX}")
       SET(CMAKE_INCLUDE_PATH "${CMAKE_INCLUDE_PATH};${OSSIM_DEPENDENCIES}/include")
    ENDIF()
-   SET(CMAKE_LIBRARY_PATH "${CMAKE_LIBRARY_PATH};/usr/lib;/usr/local/lib;/usr/lib64;/usr/lib/x86_64-linux-gnu")
+#   SET(CMAKE_LIBRARY_PATH "${CMAKE_LIBRARY_PATH};/usr/lib;/usr/local/lib;/usr/lib64;/usr/lib/x86_64-linux-gnu")
    SET(CMAKE_INCLUDE_PATH "${CMAKE_INCLUDE_PATH};${OSSIM_DEV_HOME}/ossim/include;/usr/include;/usr/local/include")

    #################################### ADd some common options for all modules to use ###################################


Fix dependency for easy_install module

Fix dependency for easy_install module

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

         set (python-${PKG_NAME} TRUE)
         add_custom_target (${PKG_NAME}
-            DEPENDS ${APP_DEPENDENCIES}
+            DEPENDS ${python_NAME} ${setuptools_NAME}
             COMMAND ${FLYEM_ENV_STRING}  easy_install ${PKG_NAME}
             COMMENT "Installing ${PKG_NAME} via easy_install")


Made a mistake in conditional.  Fixed and separated out to two checks

--- cmake/CMakeModules/OssimCommonVariables.cmake
+++ cmake/CMakeModules/OssimCommonVariables.cmake
@@ -38,7 +38,7 @@
       IF(MSVC)
          message("MSVC_VERSION: ${MSVC_VERSION}")

-         if( ${MSVC_VERSION} GREATER_OR_EQUAL_TO 1600 )
+         if( MSVC_VERSION GREATER 1600) OR (MSVC_VERSION EQUAL 1600))
             if (DEBUG_BUILD)
                SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:LIBCMTD /NODEFAULTLIB:MSVCRT /FORCE:MULTIPLE /MANIFEST:NO")
                SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:LIBCMTD /FORCE:MULTIPLE /MANIFEST:NO")


Update FW with OpenVino FW fix

Update FW with OpenVino FW fix

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

 # "full commit hash of device side binary"
-set(DEPTHAI_DEVICE_SIDE_COMMIT "1087403e3407a40a3342d27b3169b9a8e042b2ad")
+set(DEPTHAI_DEVICE_SIDE_COMMIT "5e256e60d6c3552f9ce24a1df364abd3a11045ef")

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


Update device FW: fix X,Y,Z calc on NN bounding box

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

 # "full commit hash of device side binary"
-set(DEPTHAI_DEVICE_SIDE_COMMIT "f9df8e9f3115e796682ff3499068b04f782f888f")
+set(DEPTHAI_DEVICE_SIDE_COMMIT "808326d10e913968d18316f6fb9c6d18175231ae")

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


CMake: Do not compile examples on Windows targets

--- cmake/checks/check_02_system_features.cmake
+++ cmake/checks/check_02_system_features.cmake
@@ -141,6 +141,9 @@
       "BUILD_SHARED_LIBS forced to OFF\n\n"
       )
     SET(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
+
+    # And disable compilation of examples:
+    SET(DEAL_II_COMPILE_EXAMPLES OFF CACHE BOOL "" FORCE)
   ENDIF()

 ENDIF()


compiler: arcmwdt: Remove unsupported compile flags (-fno-pic, -fno-pie)

Clang version used by ARCMWDT does not support -fno-pic and -fno-pie
flags.
Flags were added into arcmwdt branch by
commit 8259931fce1b ("xcc-clang: Do not used unavailable options").
Initially they were set in common CMakeLists.txt via
zephyr_cc_option() function, which filtered them out, and they
did not used in builing process.

Signed-off-by: Nikolay Agishev <6c2929e41328162725e2d4b78c7f0e5ee539d0f4@synopsys.com>

--- cmake/compiler/arcmwdt/compiler_flags.cmake
+++ cmake/compiler/arcmwdt/compiler_flags.cmake
@@ -176,11 +176,9 @@
 # Compiler flag for turning off thread-safe initialization of local statics
 set_property(TARGET compiler-cpp PROPERTY no_threadsafe_statics "-fno-threadsafe-statics")

-#Compiler flags for disabling position independent code / executable
-set_compiler_property(PROPERTY no_position_independent
-                      -fno-pic
-                      -fno-pie
-)
+# ARC MWDT does not support -fno-pic and -fno-pie flags,
+# but it has PIE disabled by default - so no extra flags are required here.
+set_compiler_property(PROPERTY no_position_independent "")

 #################################
 # This section covers asm flags #


px4fmu-v2_default.cmake: enable vmount

px4fmu-v2_default.cmake: enable vmount

--- cmake/configs/nuttx_px4fmu-v2_default.cmake
+++ cmake/configs/nuttx_px4fmu-v2_default.cmake
@@ -44,7 +44,7 @@
 	#drivers/mkblctrl
 	drivers/px4flow
 	#drivers/oreoled
-	#drivers/vmount
+	drivers/vmount
 	drivers/pwm_input
 	drivers/camera_trigger
 	drivers/bst


Update builtin version of Vdt to 0.4.3

Update builtin version of Vdt to 0.4.3

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -1352,13 +1352,13 @@
     endif()
   endif()
   if(builtin_vdt)
-    set(vdt_version 0.4.2)
+    set(vdt_version 0.4.3)
     set(VDT_FOUND True)
     set(VDT_LIBRARIES ${CMAKE_BINARY_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}vdt${CMAKE_SHARED_LIBRARY_SUFFIX})
     ExternalProject_Add(
       VDT
       URL ${lcgpackages}/vdt-${vdt_version}.tar.gz
-      URL_HASH SHA256=643136a38d6890c1cf18074bd494f99a4f269429ac552c57907e28c0091df8e6
+      URL_HASH SHA256=705674612ebb5c182b65a8f61f4d173eb7fe7cdeee2235b402541a492e08ace1
       INSTALL_DIR ${CMAKE_BINARY_DIR}
       CMAKE_ARGS
         -DSSE=OFF # breaks on ARM without this


Disable asimage if neither 'cocoa' nor 'x11' are enabled - Fix for ROOT-7030

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -173,6 +173,12 @@
 endif()

 #---Check for all kind of graphics includes needed by libAfterImage--------------------
+if(asimage)
+  if(NOT x11 AND NOT cocoa)
+    message(STATUS "Switching off 'asimage' because neither 'x11' nor 'cocoa' are enabled")
+    set(asimage OFF CACHE BOOL "" FORCE)
+  endif()
+endif()
 if(asimage)
   set(ASEXTRA_LIBRARIES)
   find_Package(GIF)