COMP: disable non quad edge mesh wrapping

Some new types are required with the functions recently unmasked in
itk::Mesh.

Change-Id: I6b9e71031c026827bd9ca45506127cd2890b8a53

--- Wrapping/WrapITK/Libraries/Mesh/wrap_itkMesh.cmake
+++ Wrapping/WrapITK/Libraries/Mesh/wrap_itkMesh.cmake
@@ -4,10 +4,10 @@

 WRAP_CLASS("itk::Mesh" POINTER)
   foreach(d ${WRAP_ITK_DIMS})
-    WRAP_TEMPLATE("${ITKM_D}${d}S"
-      "${ITKT_D},${d},itk::DefaultStaticMeshTraits< ${ITKT_D},${d},${d},${ITKT_D} >")
-    WRAP_TEMPLATE("${ITKM_D}${d}D"
-      "${ITKT_D},${d},itk::DefaultDynamicMeshTraits< ${ITKT_D},${d},${d},${ITKT_D} >")
+#    WRAP_TEMPLATE("${ITKM_D}${d}S"
+#      "${ITKT_D},${d},itk::DefaultStaticMeshTraits< ${ITKT_D},${d},${d},${ITKT_D} >")
+#    WRAP_TEMPLATE("${ITKM_D}${d}D"
+#      "${ITKT_D},${d},itk::DefaultDynamicMeshTraits< ${ITKT_D},${d},${d},${ITKT_D} >")
     WRAP_TEMPLATE("${ITKM_D}${d}Q"
       "${ITKT_D},${d},itk::QuadEdgeMeshTraits< ${ITKT_D},${d},${ITKT_B},${ITKT_B},${ITKT_F},${ITKT_F} >")
   endforeach(d)


never return duplicate resources

never return duplicate resources

--- ament_cmake_core/cmake/index/ament_index_get_resources.cmake
+++ ament_cmake_core/cmake/index/ament_index_get_resources.cmake
@@ -13,7 +13,7 @@
 # limitations under the License.

 #
-# Get all registered package resource of a specific type from the index.
+# Get all registered package resources of a specific type from the index.
 #
 # :param var: the output variable name
 # :type var: list of resource names
@@ -43,7 +43,7 @@
   foreach(path IN LISTS raw_paths_to_search)
     if(NOT "${path} " STREQUAL " ")
       string(REPLACE "\\" "/" normalized_path "${path}")
-      list(APPEND paths_to_search "${normalized_path}")
+      list_append_unique(paths_to_search "${normalized_path}")
     endif()
   endforeach()
   # Remove CMAKE_INSTALL_PREFIX if it is in the list of paths to search,
@@ -55,7 +55,7 @@
     file(GLOB resources
       RELATIVE "${path}/share/ament_index/resource_index/${resource_type}"
       "${path}/share/ament_index/resource_index/${resource_type}/*")
-    list(APPEND all_resources "${resources}")
+    list_append_unique(all_resources ${resources})
   endforeach()
   set(${var} "${all_resources}" PARENT_SCOPE)
 endfunction()


i#1504 glibc check: allow glibc 2.4

i#1504 glibc check: allow glibc 2.4

Relaxes the glibc import check to allow 2.4, which our buildbots generate
references for.

Review-URL: https://codereview.appspot.com/265870043

--- core/CMake_readelf.cmake
+++ core/CMake_readelf.cmake
@@ -117,10 +117,12 @@
   if (readelf_result OR readelf_error)
     message(FATAL_ERROR "*** ${READELF_EXECUTABLE} failed: ***\n${readelf_error}")
   endif (readelf_result OR readelf_error)
-  string(REGEX MATCH " GLOBAL [ A-Z]* UND [^\n]*@GLIBC_2\\.([4-9]|1[0-9])"
+  # We want to avoid dependences beyond glibc 2.4 for maximum backward
+  # portability without going to extremes with a fixed toolchain (xref i#1504):
+  string(REGEX MATCH " GLOBAL [ A-Z]* UND [^\n]*@GLIBC_2\\.([5-9]|1[0-9])"
     has_recent "${string}")
   if (has_recent)
-    string(REGEX MATCH " GLOBAL DEFAULT  UND [^\n]*@GLIBC_2\\.([4-9]|1[0-9])[^\n]*\n"
+    string(REGEX MATCH " GLOBAL DEFAULT  UND [^\n]*@GLIBC_2\\.([5-9]|1[0-9])[^\n]*\n"
       symname "${string}")
     message(FATAL_ERROR "*** Error: ${lib} has too-recent import: ${symname}")
   endif ()


Rename BULD_FUSE_ALL target.

Rename BULD_FUSE_ALL target.

--- build-utils/cmake/fuse_target.cmake
+++ build-utils/cmake/fuse_target.cmake
@@ -17,10 +17,10 @@
   add_custom_target(BUILD_FUSE_${_target_name} ALL DEPENDS "${output_file}")
   set_target_properties(BUILD_FUSE_${_target_name} PROPERTIES FOLDER "ozz/fuse")

-  if (NOT TARGET BUILD_FUSE)
-    add_custom_target(BUILD_FUSE ALL})
+  if (NOT TARGET BUILD_FUSE_ALL)
+    add_custom_target(BUILD_FUSE_ALL ALL})
   endif()

-  add_dependencies(BUILD_FUSE BUILD_FUSE_${_target_name})
+  add_dependencies(BUILD_FUSE_ALL BUILD_FUSE_${_target_name})

 endfunction()


emscripten: remove the WASM_ASMJS mode

emscripten: remove the WASM_ASMJS mode

--- cmake-toolchains/emscripten.toolchain.cmake
+++ cmake-toolchains/emscripten.toolchain.cmake
@@ -51,7 +51,6 @@
 option(FIPS_EMSCRIPTEN_USE_FS "emscripten: enable FS module" OFF)
 option(FIPS_EMSCRIPTEN_USE_DFE "emscripten: enable Duplicate Function Elimination" OFF)
 option(FIPS_EMSCRIPTEN_USE_WASM "emscripten: enable WebAssembly (experimental)" OFF)
-option(FIPS_EMSCRIPTEN_USE_WASM_ASMJS "emscripten: enable WebAssembly with asm.js fallback (experimental)" OFF)
 option(FIPS_EMSCRIPTEN_USE_SAFE_HEAP "emscripten: enable SAFE_HEAP checks" OFF)
 option(FIPS_EMSCRIPTEN_USE_CPU_PROFILER "emscripten: enable the built-in CPU profiler" OFF)
 option(FIPS_EMSCRIPTEN_USE_MEMORY_PROFILER "emscripten: enable the built-in memory profiler" OFF)
@@ -145,8 +144,6 @@

 if (FIPS_EMSCRIPTEN_USE_WASM)
     set(EMSC_LINKER_FLAGS "${EMSC_LINKER_FLAGS} -s WASM=1 -s \"BINARYEN_METHOD='native-wasm'\"")
-elseif(FIPS_EMSCRIPTEN_USE_WASM_ASMJS)
-    set(EMSC_LINKER_FLAGS "${EMSC_LINKER_FLAGS} -s WASM=1 -s \"BINARYEN_METHOD='native-wasm,asmjs'\"")
 endif()
 set(EMSC_EXE_LINKER_FLAGS "${EMSC_EXE_LINKER_FLAGS} --shell-file ${FIPS_EMSCRIPTEN_SHELL_HTML}")


Update FW with stereo LR-check, subpixel fixes; extended mode is not available

--- 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 "eb3b3cfd94b306ae38f114c1c98b090cb3fe2671")
+set(DEPTHAI_DEVICE_SIDE_COMMIT "06a2d8b03e7903024ed58e3a74161440438a6da3")

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


Update FW with fix

Update FW with 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 "1ddef8afb47bd2c30cf6d3ebb6e1d53b1461354d")
+set(DEPTHAI_DEVICE_SIDE_COMMIT "1fcd1db4e25023a388324a1058e39f6fe0641a7e")

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


Update FW: log warnings for unimplemented `initialControl` commands, changes to shared

--- 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 "c1d766103180bf0e8893b07314ec3382e054f6e8")
+set(DEPTHAI_DEVICE_SIDE_COMMIT "bb7bda62770e68d9e6de69ce2801ab87d9fa1047")

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


Add missing teest targets for MindPX

Add missing teest targets for MindPX

--- cmake/configs/nuttx_mindpx-v2_default.cmake
+++ cmake/configs/nuttx_mindpx-v2_default.cmake
@@ -72,8 +72,19 @@
 	systemcmds/dumpfile
 	systemcmds/ver
 	systemcmds/sd_bench
+	systemcmds/motor_ramp
+
+	#
+	# Tests
+	#
+	drivers/sf0x/sf0x_tests
+	drivers/test_ppm
+	modules/commander/commander_tests
+	modules/controllib_test
+	modules/mavlink/mavlink_tests
+	modules/unit_test
+	modules/uORB/uORB_tests
 	systemcmds/tests
-	systemcmds/motor_ramp

 	#
 	# General system control


Remove problematic path modifications

Remove problematic path modifications

--- cmake/JPetFramework-Utilities.cmake
+++ cmake/JPetFramework-Utilities.cmake
@@ -45,9 +45,7 @@
       set(dictionary
         ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Dictionaries/${name}Dictionary)
       set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES "${ARG_INCLUDE_DIRS};/")
-      string(REGEX REPLACE ^/ "" header "${header}")
       if(EXISTS ${linkdef})
-        string(REGEX REPLACE ^/ "" linkdef "${linkdef}")
         root_generate_dictionary(${dictionary} ${header}
           LINKDEF ${linkdef}
           OPTIONS -p


[compiler-rt][cmake] Don't reset CAN_TARGET_${arch} on every cmake invocation.

Allowing this variable to be cached makes it possible to repair the MIPS
buildbots in lieu of either fixing the mips64 sanitizer issues or fixing the
detection of mips64 support (which I think was changed by r268977 but didn't
take effect on this buildbot until the last couple days) so that it returns to
not being built on these buildbots.

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

--- cmake/Modules/CompilerRTUtils.cmake
+++ cmake/Modules/CompilerRTUtils.cmake
@@ -113,16 +113,18 @@
     set(argstring "${argstring} ${arg}")
   endforeach()
   check_compile_definition("${def}" "${argstring}" HAS_${arch}_DEF)
-  if(NOT HAS_${arch}_DEF)
-    set(CAN_TARGET_${arch} FALSE)
-  elseif(TEST_COMPILE_ONLY)
-    try_compile_only(CAN_TARGET_${arch} ${TARGET_${arch}_CFLAGS})
-  else()
-    set(argstring "${CMAKE_EXE_LINKER_FLAGS} ${argstring}")
-    try_compile(CAN_TARGET_${arch} ${CMAKE_BINARY_DIR} ${SIMPLE_SOURCE}
-                COMPILE_DEFINITIONS "${TARGET_${arch}_CFLAGS}"
-                OUTPUT_VARIABLE TARGET_${arch}_OUTPUT
-                CMAKE_FLAGS "-DCMAKE_EXE_LINKER_FLAGS:STRING=${argstring}")
+  if(NOT DEFINED CAN_TARGET_${arch})
+    if(NOT HAS_${arch}_DEF)
+      set(CAN_TARGET_${arch} FALSE)
+    elseif(TEST_COMPILE_ONLY)
+      try_compile_only(CAN_TARGET_${arch} ${TARGET_${arch}_CFLAGS})
+    else()
+      set(argstring "${CMAKE_EXE_LINKER_FLAGS} ${argstring}")
+      try_compile(CAN_TARGET_${arch} ${CMAKE_BINARY_DIR} ${SIMPLE_SOURCE}
+                  COMPILE_DEFINITIONS "${TARGET_${arch}_CFLAGS}"
+                  OUTPUT_VARIABLE TARGET_${arch}_OUTPUT
+                  CMAKE_FLAGS "-DCMAKE_EXE_LINKER_FLAGS:STRING=${argstring}")
+    endif()
   endif()
   if(${CAN_TARGET_${arch}})
     list(APPEND COMPILER_RT_SUPPORTED_ARCH ${arch})


Fix deadlock

Fix deadlock

--- cmake/modules/hunter_download.cmake
+++ cmake/modules/hunter_download.cmake
@@ -274,11 +274,14 @@
     return()
   endif()

+  # Root should be locked first:
+  # - https://github.com/ruslo/hunter/issues/1806
+  # - https://github.com/forexample/deadlock-test
+  hunter_lock_directory(
+      "${HUNTER_CONFIG_ID_PATH}" HUNTER_ALREADY_LOCKED_DIRECTORIES
+  )
   hunter_lock_directory(
       "${HUNTER_PACKAGE_DOWNLOAD_DIR}" HUNTER_ALREADY_LOCKED_DIRECTORIES
-  )
-  hunter_lock_directory(
-      "${HUNTER_CONFIG_ID_PATH}" HUNTER_ALREADY_LOCKED_DIRECTORIES
   )
   if(hunter_lock_sources)
     hunter_lock_directory(


Fix broken tensorflow-cl-windows-cmake Change: 148805879

--- tensorflow/contrib/cmake/tf_python.cmake
+++ tensorflow/contrib/cmake/tf_python.cmake
@@ -113,6 +113,7 @@
     "${tensorflow_source_dir}/tensorflow/python/*.proto"
     "${tensorflow_source_dir}/tensorflow/contrib/session_bundle/*.proto"
     "${tensorflow_source_dir}/tensorflow/contrib/tensorboard/*.proto"
+    "${tensorflow_source_dir}/tensorflow/contrib/training/*.proto"
 )
 RELATIVE_PROTOBUF_GENERATE_PYTHON(
     ${tensorflow_source_dir} PYTHON_PROTO_GENFILES ${tf_protos_python_srcs}
@@ -125,6 +126,7 @@
     "${tensorflow_source_dir}/tensorflow/python/*.proto"
     "${tensorflow_source_dir}/tensorflow/contrib/session_bundle/*.proto"
     "${tensorflow_source_dir}/tensorflow/contrib/tensorboard/*.proto"
+    "${tensorflow_source_dir}/tensorflow/contrib/training/*.proto"
 )
 RELATIVE_PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS
     ${tensorflow_source_dir} ${tf_python_protos_cc_srcs}


Refine cmake's download function. (#15512)

* Refine cmake's download function.
test=develop

* Set DOWNLOAD_NO_EXTRACT to 1 pure download function.
test=develop

* Fix unpack problem in ExternalProject_Add, and it seem DOWNLOAD_NO_EXTRACT option is not support in cmake-3.5.
test=develop

--- paddle/fluid/inference/tests/test.cmake
+++ paddle/fluid/inference/tests/test.cmake
@@ -1,18 +1,43 @@
+include(ExternalProject)
 set(INFERENCE_URL "http://paddle-inference-dist.cdn.bcebos.com" CACHE STRING "inference download url")
 set(INFERENCE_DEMO_INSTALL_DIR "${THIRD_PARTY_PATH}/inference_demo" CACHE STRING
     "A path setting inference demo download directories.")
-function (inference_download install_dir url filename)
-    message(STATUS "Download inference test stuff from ${url}/${filename}")
-    file(DOWNLOAD "${url}/${filename}" "${install_dir}/${filename}")
-    message(STATUS "finish downloading ${filename}")
+
+function(inference_download INSTALL_DIR URL FILENAME)
+  message(STATUS "Download inference test stuff from ${URL}/${FILENAME}")
+  string(REGEX REPLACE "[-%.]" "_" FILENAME_EX ${FILENAME})
+  ExternalProject_Add(
+      extern_inference_download_${FILENAME_EX}
+      ${EXTERNAL_PROJECT_LOG_ARGS}
+      PREFIX                ${INSTALL_DIR}
+      URL                   ${URL}/${FILENAME}
+      DOWNLOAD_COMMAND      wget -q -O ${INSTALL_DIR}/${FILENAME} ${URL}/${FILENAME}
+      DOWNLOAD_DIR          ${INSTALL_DIR}
+      DOWNLOAD_NO_PROGRESS  1
+      CONFIGURE_COMMAND     ""
+      BUILD_COMMAND         ""
+      UPDATE_COMMAND        ""
+      INSTALL_COMMAND       ""
+  )
 endfunction()

-function (inference_download_and_uncompress install_dir url filename)
-    inference_download(${install_dir} ${url} ${filename})
-    execute_process(
-            COMMAND ${CMAKE_COMMAND} -E tar xzf ${install_dir}/${filename}
-            WORKING_DIRECTORY ${install_dir}
-    )
+function(inference_download_and_uncompress INSTALL_DIR URL FILENAME)
+  message(STATUS "Download inference test stuff from ${URL}/${FILENAME}")
+  string(REGEX REPLACE "[-%.]" "_" FILENAME_EX ${FILENAME})
+  set(EXTERNAL_PROJECT_NAME "extern_inference_download_${FILENAME_EX}")
+  set(UNPACK_DIR "${INSTALL_DIR}/src/${EXTERNAL_PROJECT_NAME}")
+  ExternalProject_Add(
+      ${EXTERNAL_PROJECT_NAME}
+      ${EXTERNAL_PROJECT_LOG_ARGS}
+      PREFIX                ${INSTALL_DIR}
+      URL                   ${URL}/${FILENAME}
+      DOWNLOAD_DIR          ${INSTALL_DIR}
+      DOWNLOAD_NO_PROGRESS  1
+      CONFIGURE_COMMAND     ""
+      BUILD_COMMAND         ""
+      UPDATE_COMMAND        ""
+      INSTALL_COMMAND       ${CMAKE_COMMAND} -E copy_directory ${UNPACK_DIR} ${INSTALL_DIR}
+  )
 endfunction()

 set(WORD2VEC_INSTALL_DIR "${INFERENCE_DEMO_INSTALL_DIR}/word2vec")


Add FOUND_VAR to FindSodium script, to work with CMake 3.0


SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

--- plasma-runner-ktp-contact.desktop.cmake
+++ plasma-runner-ktp-contact.desktop.cmake
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Instant Messaging
 Name[ar]=التّراسل المباشر
+Name[ast]=Mensaxería nel intre
 Name[bs]=Brze poruke
 Name[ca]=Missatgeria instantània
 Name[ca@valencia]=Missatgeria instantània
@@ -44,6 +45,7 @@
 Name[zh_TW]=即時訊息
 Comment=Start a chat with any of your IM contacts or change your IM status
 Comment[ar]=ابدأ محادثة بأيّ من متراسلي ت‌م أو غيّر حالة ت‌م
+Comment[ast]=Anicia una charra con cualesquiera de los tos contautos de MI o camuda'l to estáu
 Comment[bs]=Pokrenite ćaskanje s bilo kojim od vaših IM kontakta ili promijenite svoj IM status
 Comment[ca]=Inicia un xat amb qualsevol dels vostres contactes de MI o canvia el vostre estat de MI
 Comment[ca@valencia]=Inicia un xat amb qualsevol dels vostres contactes de MI o canvia el vostre estat de MI


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


FindSodium: Do not create target unconditionally (#430)

Summary:
This fixes  https://github.com/facebook/fbthrift/issues/429

Pull Request resolved: https://github.com/facebook/fbthrift/pull/430

Reviewed By: iahs

Differential Revision: D28832985

Pulled By: vitaut

fbshipit-source-id: 0719f27207d11bb7970cc43c621640c425d8f55d

--- build/fbcode_builder/CMake/FindSodium.cmake
+++ build/fbcode_builder/CMake/FindSodium.cmake
@@ -254,7 +254,10 @@
 else()
     set(_LIB_TYPE SHARED)
 endif()
-add_library(sodium ${_LIB_TYPE} IMPORTED)
+
+if(NOT TARGET sodium)
+    add_library(sodium ${_LIB_TYPE} IMPORTED)
+endif()

 set_target_properties(sodium PROPERTIES
     INTERFACE_INCLUDE_DIRECTORIES "${sodium_INCLUDE_DIR}"


Fix packaging for non-"Release" builds on multi-configuration generators

* In Visual Studio etc. CPack defaults Release packages when no configuration is specified, even if a different build type is selected in the IDE

--- deploy/packages/pack-template.cmake
+++ deploy/packages/pack-template.cmake
@@ -250,7 +250,7 @@
 # Create target
 add_custom_target(
     pack-${project_name}
-    COMMAND ${CPACK_COMMAND} --config ${PROJECT_BINARY_DIR}/CPackConfig-${project_name}.cmake
+    COMMAND ${CPACK_COMMAND} --config ${PROJECT_BINARY_DIR}/CPackConfig-${project_name}.cmake -C $<CONFIG>
     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
 )
 set_target_properties(pack-${project_name} PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)


Update FW: fix sporadic scaling issue or crash, when rectified streams are used for NN input

--- 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 "1bd254499ebd4d54cfd247aa6f15b8379d458aa4")
+set(DEPTHAI_DEVICE_SIDE_COMMIT "4311773fde2eab53793380420f88c7ac6b46fbcb")

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


Add support for Yolo v6 decoding

Add support for Yolo v6 decoding

--- 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 "796eb3f58b24447286ee88ba2278c52709133591")
+set(DEPTHAI_DEVICE_SIDE_COMMIT "52f7331e81fc872f2191fd473adc96032675f518")

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


cmake: Remove obsolete DefineInstallationPaths.cmake

--- cmake/Modules/DefineInstallationPaths.cmake
+++ cmake/Modules/DefineInstallationPaths.cmake
@@ -1,109 +0,0 @@
-if (UNIX OR OS2)
-  IF (NOT APPLICATION_NAME)
-    MESSAGE(STATUS "${PROJECT_NAME} is used as APPLICATION_NAME")
-    SET(APPLICATION_NAME ${PROJECT_NAME})
-  ENDIF (NOT APPLICATION_NAME)
-
-  # Suffix for Linux
-  SET(LIB_SUFFIX
-    CACHE STRING "Define suffix of directory name (32/64)"
-  )
-
-  SET(EXEC_INSTALL_PREFIX
-    "${CMAKE_INSTALL_PREFIX}"
-    CACHE PATH  "Base directory for executables and libraries"
-  )
-  SET(SHARE_INSTALL_PREFIX
-    "${CMAKE_INSTALL_PREFIX}/share"
-    CACHE PATH "Base directory for files which go to share/"
-  )
-  SET(DATA_INSTALL_PREFIX
-    "${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}"
-    CACHE PATH "The parent directory where applications can install their data")
-
-  # The following are directories where stuff will be installed to
-  SET(BIN_INSTALL_DIR
-    "${EXEC_INSTALL_PREFIX}/bin"
-    CACHE PATH "The ${APPLICATION_NAME} binary install dir (default prefix/bin)"
-  )
-  SET(SBIN_INSTALL_DIR
-    "${EXEC_INSTALL_PREFIX}/sbin"
-    CACHE PATH "The ${APPLICATION_NAME} sbin install dir (default prefix/sbin)"
-  )
-  SET(LIB_INSTALL_DIR
-    "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
-    CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is prefix/lib)"
-  )
-  SET(LIBEXEC_INSTALL_DIR
-    "${EXEC_INSTALL_PREFIX}/libexec"
-    CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is prefix/libexec)"
-  )
-  SET(PLUGIN_INSTALL_DIR
-    "${LIB_INSTALL_DIR}/${APPLICATION_NAME}"
-    CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is prefix/lib/${APPLICATION_NAME})"
-  )
-  SET(INCLUDE_INSTALL_DIR
-    "${CMAKE_INSTALL_PREFIX}/include"
-    CACHE PATH "The subdirectory to the header prefix (default prefix/include)"
-  )
-
-  set(CMAKE_INSTALL_DIR
-    "${LIB_INSTALL_DIR}/cmake"
-    CACHE PATH "The subdirectory to install cmake config files")
-
-  SET(DATA_INSTALL_DIR
-    "${DATA_INSTALL_PREFIX}"
-    CACHE PATH "The parent directory where applications can install their data (default prefix/share/${APPLICATION_NAME})"
-  )
-  SET(HTML_INSTALL_DIR
-    "${DATA_INSTALL_PREFIX}/doc/HTML"
-    CACHE PATH "The HTML install dir for documentation (default data/doc/html)"
-  )
-  SET(ICON_INSTALL_DIR
-    "${DATA_INSTALL_PREFIX}/icons"
-    CACHE PATH "The icon install dir (default data/icons/)"
-  )
-  SET(SOUND_INSTALL_DIR
-    "${DATA_INSTALL_PREFIX}/sounds"
-    CACHE PATH "The install dir for sound files (default data/sounds)"
-  )
-
-  SET(LOCALE_INSTALL_DIR
-    "${SHARE_INSTALL_PREFIX}/locale"
-    CACHE PATH "The install dir for translations (default prefix/share/locale)"
-  )
-
-  SET(XDG_APPS_DIR
-    "${SHARE_INSTALL_PREFIX}/applications/"
-    CACHE PATH "The XDG apps dir"
-  )
-  SET(XDG_DIRECTORY_DIR
-    "${SHARE_INSTALL_PREFIX}/desktop-directories"
-    CACHE PATH "The XDG directory"
-  )
-
-  SET(SYSCONF_INSTALL_DIR
-    "${EXEC_INSTALL_PREFIX}/etc"
-    CACHE PATH "The ${APPLICATION_NAME} sysconfig install dir (default prefix/etc)"
-  )
-  SET(MAN_INSTALL_DIR
-    "${SHARE_INSTALL_PREFIX}/man"
-    CACHE PATH "The ${APPLICATION_NAME} man install dir (default prefix/man)"
-  )
-  SET(INFO_INSTALL_DIR
-    "${SHARE_INSTALL_PREFIX}/info"
-    CACHE PATH "The ${APPLICATION_NAME} info install dir (default prefix/info)"
-  )
-else()
-  # Same same
-  set(BIN_INSTALL_DIR "bin" CACHE PATH "-")
-  set(SBIN_INSTALL_DIR "sbin" CACHE PATH "-")
-  set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "-")
-  set(INCLUDE_INSTALL_DIR "include" CACHE PATH "-")
-  set(CMAKE_INSTALL_DIR "CMake" CACHE PATH "-")
-  set(PLUGIN_INSTALL_DIR "plugins" CACHE PATH "-")
-  set(HTML_INSTALL_DIR "doc/HTML" CACHE PATH "-")
-  set(ICON_INSTALL_DIR "icons" CACHE PATH "-")
-  set(SOUND_INSTALL_DIR "soudns" CACHE PATH "-")
-  set(LOCALE_INSTALL_DIR "lang" CACHE PATH "-")
-endif ()


FMUv2: Allow LPE config

FMUv2: Allow LPE config

--- cmake/configs/nuttx_px4fmu-v2_default.cmake
+++ cmake/configs/nuttx_px4fmu-v2_default.cmake
@@ -76,7 +76,7 @@
 	modules/load_mon
 	modules/navigator
 	modules/mavlink
-	modules/gpio_led
+	#modules/gpio_led
 	modules/uavcan
 	modules/land_detector

@@ -86,12 +86,11 @@
 	modules/attitude_estimator_q
 	modules/ekf_att_pos_estimator
 	modules/position_estimator_inav
-	#modules/local_position_estimator
+	modules/local_position_estimator

 	#
 	# Vehicle Control
 	#
-	# modules/segway # XXX Needs GCC 4.7 fix
 	modules/fw_pos_control_l1
 	modules/fw_att_control
 	modules/mc_att_control


Fix detection of clang version on macOS for builtin TBB

When CUDA is installed on macOS, clang -v prints also the
version of CUDA that is found, which breaks version detection.
As a workaround, clang --version prints the same information,
but without printing the CUDA version.

Fixes: ROOT-9678

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -1075,6 +1075,7 @@
       URL ${lcgpackages}/tbb-${tbb_builtin_version}.tar.gz
       URL_HASH SHA256=${tbb_sha256}
       INSTALL_DIR ${CMAKE_BINARY_DIR}
+      PATCH_COMMAND sed -i -e "/clang -v/s@-v@--version@" build/macos.inc
       CONFIGURE_COMMAND ""
       BUILD_COMMAND make ${_tbb_compiler} "CXXFLAGS=${_tbb_cxxflags}" CPLUS=${CMAKE_CXX_COMPILER} CONLY=${CMAKE_C_COMPILER}
       INSTALL_COMMAND ${CMAKE_COMMAND} -Dinstall_dir=<INSTALL_DIR> -Dsource_dir=<SOURCE_DIR>


[CMake] Look for Numpy evenwithout tmva enabled

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -446,13 +446,13 @@
     find_package(PythonLibs ${python_version} REQUIRED)
     if (tmva)
       find_package(NumPy REQUIRED)
+    else()
+      find_package(NumPy)
     endif()
   else()
     find_package(PythonInterp ${python_version})
     find_package(PythonLibs ${python_version})
-    if(tmva)
-      find_package(NumPy)
-    endif()
+    find_package(NumPy)
   endif()
 endif()


[cmake] Also silence non-builtin blanket tbb deprecation.

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -1210,6 +1210,7 @@
       set(builtin_tbb ON CACHE BOOL "Enabled because imt is enabled, but TBB was not found" FORCE)
     endif()
   endif()
+  set(TBB_CXXFLAGS "-DTBB_SUPPRESS_DEPRECATED_MESSAGES=1")
 endif()

 if(builtin_tbb)


Don't pass unknown options to PGI compiler

--- cmake/modules/VisionarayHandleOptions.cmake
+++ cmake/modules/VisionarayHandleOptions.cmake
@@ -7,6 +7,8 @@
 #

 if(MSVC)
+
+elseif(__COMPILER_PGI)

 else() # GNU, Clang, etc.


[Build System: CMake] Set the binary dir for the bundled apinotes to the source dir when building the standalone overlays.

--- cmake/modules/StandaloneOverlay.cmake
+++ cmake/modules/StandaloneOverlay.cmake
@@ -62,7 +62,7 @@
 # Some overlays include the runtime's headers,
 # and some of those headers are generated at build time.
 add_subdirectory("${SWIFT_SOURCE_DIR}/include" "${SWIFT_SOURCE_DIR}/include")
-add_subdirectory("${SWIFT_SOURCE_DIR}/apinotes" "swift/apinotes")
+add_subdirectory("${SWIFT_SOURCE_DIR}/apinotes" "${SWIFT_SOURCE_DIR}/apinotes")

 # Without this line, installing components is broken. This needs refactoring.
 swift_configure_components()


cmake: Added DEPRECATED_DECLARATIONS_FLAGS to be used to compile the library and examples.

--- cmake/modules/TelepathyDefaults.cmake
+++ cmake/modules/TelepathyDefaults.cmake
@@ -41,6 +41,13 @@
     else (CXX_FVISIBILITY_HIDDEN)
         set(VISIBILITY_HIDDEN_FLAGS)
     endif (CXX_FVISIBILITY_HIDDEN)
+
+    CHECK_CXX_ACCEPTS_FLAG("-Wdeprecated-declarations" CXX_DEPRECATED_DECLARATIONS)
+    if (CXX_DEPRECATED_DECLARATIONS)
+        set(DEPRECATED_DECLARATIONS_FLAGS "-Wdeprecated-declarations -DTELEPATHY_QT4_DEPRECATED_WARNINGS")
+    else (CXX_DEPRECATED_DECLARATIONS)
+        set(DEPRECATED_DECLARATIONS_FLAGS)
+    endif (CXX_DEPRECATED_DECLARATIONS)

     if(${CMAKE_BUILD_TYPE} STREQUAL Release)
         set(NOT_RELEASE 0)


ARROW-6636: [C++] Do not build command line tools by default

Closes #5830 from pitrou/ARROW-6636-build-utilities-off-by-default and squashes the following commits:

8c089d2f0 <Antoine Pitrou> ARROW-6636:  Do not build command line tools by default

Authored-by: Antoine Pitrou <9359a4d812173b65a3a0094cd86363e79731a3c2@python.org>
Signed-off-by: François Saint-Jacques <76801b7d5fe2c448a8401d2246372be49d372480@gmail.com>

--- cpp/cmake_modules/DefineOptions.cmake
+++ cpp/cmake_modules/DefineOptions.cmake
@@ -139,7 +139,7 @@
   #----------------------------------------------------------------------
   set_option_category("Project component")

-  define_option(ARROW_BUILD_UTILITIES "Build Arrow commandline utilities" ON)
+  define_option(ARROW_BUILD_UTILITIES "Build Arrow commandline utilities" OFF)

   define_option(ARROW_COMPUTE "Build the Arrow Compute Modules" ON)


[VTA] Fix VTA compile issue (#5481)

[VTA] Fix VTA compile issue (#5481)

* [VTA] Fix Pynq driver build issue.
Issue:
When doing vta compile in xilinx FPGA, the pynqdriver.cc report can
not find <vta/driver.h>

Solution:
add related path.

* Fix libvta load fail issue.

issue:
run vta on pynq board libvta.so load failed.

solution:
fixed VTA.make logic issue

--- cmake/modules/VTA.cmake
+++ cmake/modules/VTA.cmake
@@ -89,7 +89,7 @@

   # VTA FPGA driver sources
   if(USE_VTA_FPGA)
-    file(GLOB FPGA_RUNTIME_SRCS ${VTA_HW_PATH}/src/*.cc)
+    file(GLOB FPGA_RUNTIME_SRCS vta/runtime/*.cc)
     # Rules for Zynq-class FPGAs with pynq OS support (see pynq.io)
     if(${VTA_TARGET} STREQUAL "pynq" OR
        ${VTA_TARGET} STREQUAL "ultra96")
@@ -108,6 +108,7 @@
     endforeach()
     if(${VTA_TARGET} STREQUAL "pynq" OR
        ${VTA_TARGET} STREQUAL "ultra96")
+      target_include_directories(vta PUBLIC ${VTA_HW_PATH}/include)
       target_link_libraries(vta ${__cma_lib})
     elseif(${VTA_TARGET} STREQUAL "de10nano")  # DE10-Nano rules
      #target_compile_definitions(vta PUBLIC VTA_MAX_XFER=2097152) # (1<<21)


Look in assimp folder rather than hard-code the version

--- CMakeModules/KrisLibraryDependencies.cmake
+++ CMakeModules/KrisLibraryDependencies.cmake
@@ -173,10 +173,9 @@
 # Assimp
 OPTION(USE_ASSIMP "Build with ASSIMP support" ON)
 IF(USE_ASSIMP)
-  SET(ASSIMP_ROOT "${KRISLIBRARY_ROOT}/assimp--3.0.1270-sdk"
+  SET(ASSIMP_ROOT "${KRISLIBRARY_ROOT}/assimp"
      CACHE PATH
      "Root of Assimp package"
-     FORCE
   )
   FIND_PACKAGE(Assimp)
   IF(ASSIMP_FOUND)


Consider the standard CMAKE_LIBRARY_PATH option value when searching for CLucene

svn path=/trunk/kdesupport/strigi/; revision=1166499

--- libstreamanalyzer/cmake/FindCLucene.cmake
+++ libstreamanalyzer/cmake/FindCLucene.cmake
@@ -23,6 +23,7 @@
 SET(TRIAL_LIBRARY_PATHS
   $ENV{CLUCENE_HOME}/lib${LIB_SUFFIX}
   ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
+  ${CMAKE_LIBRARY_PATH}
   /usr/local/lib${LIB_SUFFIX}
   /opt/local/lib${LIB_SUFFIX}
   /usr/lib${LIB_SUFFIX}


switch to cmake

switch to cmake

--- cmake/Cuda.cmake
+++ cmake/Cuda.cmake
@@ -4,7 +4,7 @@

 # Known NVIDIA GPU achitectures Caffe can be compiled for.
 # This list will be used for CUDA_ARCH_NAME = All option
-set(Caffe_known_gpu_archs "30 35 50 52")
+set(Caffe_known_gpu_archs "35 50 52 61")

 ################################################################################################
 # A function for automatic detection of GPUs installed  (if autodetection is enabled)
@@ -267,7 +267,7 @@

 # disable some nvcc diagnostic that apears in boost, glog, glags, opencv, etc.
 foreach(diag cc_clobber_ignored integer_sign_change useless_using_declaration set_but_not_used)
-  list(APPEND CUDA_NVCC_FLAGS -isystem ${PROTOBUF_INCLUDE_DIR} -Xcudafe --diag_suppress=${diag})
+  list(APPEND CUDA_NVCC_FLAGS -Xcudafe "--diag_suppress=${diag}")
 endforeach()

 # setting default testing device


Minor cleanup in fips.cmake

Minor cleanup in fips.cmake

--- cmake/fips.cmake
+++ cmake/fips.cmake
@@ -121,9 +121,9 @@

     # manually include "toolchain" files for non-crosscompiling scenarios
     if (NOT CMAKE_TOOLCHAIN_FILE)
-        if (WIN32)
+        if (FIPS_HOST_WINDOWS)
             include(${FIPS_ROOT_DIR}/cmake-toolchains/windows.cmake)
-        elseif (APPLE)
+        elseif (FIPS_HOST_OSX)
             include(${FIPS_ROOT_DIR}/cmake-toolchains/osx.cmake)
         else()
             include(${FIPS_ROOT_DIR}/cmake-toolchains/linux.cmake)


Correctly finding GLUT dll

Correctly finding GLUT dll

--- cmake/glut.cmake
+++ cmake/glut.cmake
@@ -39,11 +39,11 @@
   ENDIF()
   FIND_LIBRARY(GLUT_glut_LIBRARY
     NAMES freeglut glut glut32
-    PATHS ${GLUT_INCLUDE_DIR}/../lib/${ARCH} ${FREEGLUT_ROOT_PATH}/lib/${ARCH} ${DEPRECIATED_WIN32_RELEASE}
+    HINTS ${GLUT_INCLUDE_DIR}/../lib/${ARCH} ${FREEGLUT_ROOT_PATH}/lib/${ARCH} ${DEPRECIATED_WIN32_RELEASE}
   )
-  FIND_LIBRARY(GLUT_DLL
-    NAMES freeglut
-    PATHS ${GLUT_INCLUDE_DIR}/../bin/${ARCH} ${FREEGLUT_ROOT_PATH}/bin/${ARCH}
+  FIND_FILE(GLUT_DLL
+    NAMES freeglut.dll
+    HINTS ${GLUT_INCLUDE_DIR}/../bin/${ARCH} ${FREEGLUT_ROOT_PATH}/bin/${ARCH}
   )
   SET(GLUT_LIBRARIES ${GLUT_glut_LIBRARY})
   MARK_AS_ADVANCED(


-BUG: another missing }

-BUG: another missing }

--- Testing/Dashboard/pxDashboardCommon.cmake
+++ Testing/Dashboard/pxDashboardCommon.cmake
@@ -255,7 +255,7 @@
 else()
   write_cache()
   ctest_start( ${dashboard_model} )
-  ctest_update( SOURCE ${CTEST_ITKTOOLS_DIRECTORY )
+  ctest_update( SOURCE ${CTEST_ITKTOOLS_DIRECTORY} )
   # run cmake twice; this seems to be necessary, otherwise the
   # KNN lib is not built
   #ctest_configure()


Added a git checkout master to handle going from tagged to untagged

--- cmake/externals/configuration_steps/EP_AddCustomTargets.cmake
+++ cmake/externals/configuration_steps/EP_AddCustomTargets.cmake
@@ -1,6 +1,6 @@
 macro(EP_AddCustomTargets ep)

-set(GIT_COMMAND git pull --ff-only)
+set(GIT_COMMAND git checkout master && git pull --ff-only)
 set(SVN_COMMAND svn update)

 if(DEFINED tag)


Fix the imported FindMPI so that it works

--- CMake/mpi/FindMPI.cmake
+++ CMake/mpi/FindMPI.cmake
@@ -77,8 +77,8 @@
 #  License text for the above reference.)

 # include this to handle the QUIETLY and REQUIRED arguments
-include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/GetPrerequisites.cmake)
+include(FindPackageHandleStandardArgs)
+include(GetPrerequisites)

 #
 # This part detects MPI compilers, attempting to wade through the mess of compiler names in


updated the mex message in cmake

updated the mex message in cmake

--- Examples/Examples.cmake
+++ Examples/Examples.cmake
@@ -167,7 +167,7 @@
 	)
 else()
 	message(STATUS "Matlab not found so mexMTF is disabled")
-	message("\n\tIf Matlab is installed but not detected, mexMTF can be compiled by running the  command in mtf_mex_cmd.txt at the MATLAB prompt after removing all semi colons and replacing all occurences of the type '-l<full path to library>' and '-l-L<path to library folder>' with '<full path to library>' and '-L<path to library folder>' respectively\n")
+	message("\n\tIf Matlab is installed but not detected, mexMTF can be compiled by running the command in mtf_mex_cmd.txt at the MATLAB prompt after:\n\t * removing all semi colons\n\t * replacing all occurences of the type '-l<full path to library>' with '<full path to library>'\n\t * replacing all occurences of the type '-l-L<path to library folder>' with '-L<path to library folder>'\n")
 	addPrefixAndSuffix("${MTF_LIBS}" "-l"  " " MEX_MTF_LIBS)
 	addPrefixAndSuffix("${MTF_DEFINITIONS}" "${DEFINITION_SWITCH}" " " MEX_MTF_DEFINITIONS)
 	addPrefixAndSuffix("${MTF_INCLUDE_DIRS}" "${INCLUDE_SWITCH}\"" "\" " MEX_MTF_INCLUDE_DIRS)


Commented out the CMake line for running setup.py fun now as it does not seem to be working;

--- Examples/Examples.cmake
+++ Examples/Examples.cmake
@@ -202,7 +202,7 @@
 			target_link_libraries(pyMTF2 mtf ${MTF_LIBS} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${PYTHON_LIBS})
 			install(TARGETS pyMTF2 LIBRARY DESTINATION ${MTF_PY_INSTALL_DIR} COMPONENT py2)
 			add_custom_target(py2 DEPENDS pyMTF2)
-			install(CODE "execute_process(COMMAND python setup.py install -f --prefix=${MTF_PY_INSTALL_DIR} WORKING_DIRECTORY python)")
+			# install(CODE "execute_process(COMMAND python setup.py install -f --prefix=${MTF_PY_INSTALL_DIR} WORKING_DIRECTORY python)")
 			install(DIRECTORY ${MTF_INCLUDE_DIRS}
 				DESTINATION ${MTF_HEADER_INSTALL_DIR}
 				COMPONENT header


Update hunter.cmake

Update hunter.cmake

--- cmake/projects/puffin-buffer/hunter.cmake
+++ cmake/projects/puffin-buffer/hunter.cmake
@@ -10,11 +10,11 @@
     PACKAGE_NAME
     puffin-buffer
     VERSION
-    "0.3.0.0"
+    "0.3.1.0"
     URL
-    "https://github.com/designerror/puffin-buffer/archive/v0.3.0.0.tar.gz"
+    "https://github.com/designerror/puffin-buffer/archive/v0.3.1.0.tar.gz"
     SHA1
-    cc25f51c7af5f3e27c6c4ca7d58c22239a6ffd68
+    32315abbd17d9fc0affcb26f561d7f9eae2ff645
 )

 hunter_add_version(


sophia: build static library only

sophia: build static library only

Conflicts:
	cmake/BuildSophia.cmake

--- cmake/BuildSophia.cmake
+++ cmake/BuildSophia.cmake
@@ -6,7 +6,8 @@
     if (${PROJECT_BINARY_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
 		add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/third_party/sophia/db/libsophia.a
 			WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/third_party/sophia
-			COMMAND $(MAKE) -C db
+			COMMAND $(MAKE) -C db libsophia.a
+			DEPENDS ${CMAKE_SOURCE_DIR}/CMakeCache.txt
 		)
     else()
         add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/third_party/sophia
@@ -14,8 +15,8 @@
         )
 		add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/third_party/sophia/db/libsophia.a
 			WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/third_party/sophia
-            COMMAND cp -r ${PROJECT_SOURCE_DIR}/third_party/sophia/* .
-			COMMAND $(MAKE) -C db
+            COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/third_party/sophia ${PROJECT_BINARY_DIR}/third_party/sophia
+			COMMAND $(MAKE) -C db libsophia.a
             DEPENDS ${PROJECT_BINARY_DIR}/CMakeCache.txt ${PROJECT_BINARY_DIR}/third_party/sophia
 		)
     endif()


Drop everything having to do with HAVE_ADA_2007,
Ada_Is_2007_With_and_Use_Numerics, and
Ada_Is_Not_2007_Vector_Matrix_Declarations since none of these
variables are used elsewhere.

svn path=/trunk/; revision=11101

--- cmake/modules/ada.cmake
+++ cmake/modules/ada.cmake
@@ -52,13 +52,3 @@
     message(STATUS "FOUND gnat library ${GNAT_LIB}")
   endif(NOT GNAT_LIB)
 endif(ENABLE_ada)
-
-# New stuff by Jerry for source modifications for Ada 2007 or not Ada 2007.
-set(HAVE_ADA_2007 OFF CACHE BOOL "Ada 2007?" FORCE)
-
-if(HAVE_ADA_2007)
-  set(Ada_Is_2007_With_and_Use_Numerics "    with Ada.Numerics.Long_Real_Arrays; use Ada.Numerics.Long_Real_Arrays;")
-else(HAVE_ADA_2007)
-  # Is there some way to put a line ending after the first semicolon in the quoted string? Not essential.
-  set(Ada_Is_Not_2007_Vector_Matrix_Declarations "    type Real_Vector is array (Integer range <>) of Long_Float;    type Real_Matrix is array (Integer range <>, Integer range <>) of Long_Float;")
-endif(HAVE_ADA_2007)


CUDA: Always link against librt on Linux

--- tests/Makefile.cmake
+++ tests/Makefile.cmake
@@ -95,7 +95,7 @@
 	@echo 'Executing HIPAcc Compiler for CUDA:'
 	$(COMPILER) $(TEST_CASE)/main.cpp $(MYFLAGS) $(COMPILER_INC) -emit-cuda $(HIPACC_OPTS) -o main.cu
 	@echo 'Compiling CUDA file using nvcc:'
-	@NVCC_COMPILER@ $(NVCC_FLAGS) @CUDA_COMP@ -I@RUNTIME_INCLUDES@ -I$(TEST_CASE) $(MYFLAGS) $(OFLAGS) -o main_cuda main.cu @CUDA_LINK@
+	@NVCC_COMPILER@ $(NVCC_FLAGS) @CUDA_COMP@ -I@RUNTIME_INCLUDES@ -I$(TEST_CASE) $(MYFLAGS) $(OFLAGS) -o main_cuda main.cu @CUDA_LINK@ @TIME_LINK@
 	@echo 'Executing CUDA binary'
 	./main_cuda


Use correct name in tests template documentation.

--- tests/test_template.cmake
+++ tests/test_template.cmake
@@ -7,7 +7,7 @@
 # which will run the tests matching this category-label.
 # Can be left empty (or just not set)
 set(CURRENT_CATEGORY <category-label>)
-list(APPEND YAWOT_TESTS ${CURRENT_TEST})
+list(APPEND LIBCELLML_TESTS ${CURRENT_TEST})
 # Remember this is relative to the CMakeLists.txt file in
 # the tests directory
 set(${CURRENT_TEST}_SRCS


Add messages to find_mkl test

Add messages to find_mkl test

--- tests/find_mkl.cmake
+++ tests/find_mkl.cmake
@@ -9,6 +9,10 @@

 add_definitions(${MKL_DEFINITIONS})
 include_directories(${MKL_INCLUDE_DIRS})
+
+message(STATUS "MKL_DEFINITIONS = ${MKL_DEFINITIONS}")
+message(STATUS "MKL_INCLUDE_DIRS = ${MKL_INCLUDE_DIRS}")
+message(STATUS "MKL_LIBRARIES = ${MKL_LIBRARIES}")

 file(WRITE "${CMAKE_SOURCE_DIR}/mkl_sgemm.c"
     "#include <mkl.h>\n"


Autodetect the correct target name for Eigen coming from conan

Former-commit-id: 8ec057319ea68009cc500f508371c658f46be94d

--- cmake-modules/SetupDependenciesConan.cmake
+++ cmake-modules/SetupDependenciesConan.cmake
@@ -100,66 +100,72 @@
             BUILD missing
     )

+    if(TARGET CONAN_PKG:Eigen3)
+        set(eigen_target CONAN_PKG::Eigen3)
+    elseif(TARGET CONAN_PKG::eigen)
+        set(eigen_target CONAN_PKG::eigen)
+    endif()

-    if(TARGET CONAN_PKG::Eigen3 AND TARGET openmp::openmp)
-        target_compile_definitions    (CONAN_PKG::Eigen3 INTERFACE -DEIGEN_USE_THREADS)
-    endif()
-    if(TARGET CONAN_PKG::Eigen3)
-        if(TARGET mkl::mkl)
-            message(STATUS "Eigen3 will use MKL")
+    if(TARGET ${eigen_target})
+        if(TARGET openmp::openmp)
+            target_compile_definitions    (${eigen_target} INTERFACE -DEIGEN_USE_THREADS)
+        endif()
+        if(TB_EIGEN3_BLAS)
             set(EIGEN3_USING_BLAS ON)
-            target_compile_definitions    (CONAN_PKG::Eigen3 INTERFACE -DEIGEN_USE_MKL_ALL)
-            target_compile_definitions    (CONAN_PKG::Eigen3 INTERFACE -DEIGEN_USE_LAPACKE_STRICT)
-            target_link_libraries         (CONAN_PKG::Eigen3 INTERFACE mkl::mkl)
-        else ()
-            message(STATUS "Eigen3 will use OpenBLAS")
-            set(EIGEN3_USING_BLAS ON)
-            target_compile_definitions    (CONAN_PKG::Eigen3 INTERFACE -DEIGEN_USE_BLAS)
-            target_compile_definitions    (CONAN_PKG::Eigen3 INTERFACE -DEIGEN_USE_LAPACKE_STRICT)
-            target_link_libraries         (CONAN_PKG::Eigen3 INTERFACE  CONAN_PKG::openblas)
+            if(TARGET mkl::mkl)
+                message(STATUS "Eigen3 will use MKL")
+                target_compile_definitions    (${eigen_target} INTERFACE -DEIGEN_USE_MKL_ALL)
+                target_compile_definitions    (${eigen_target} INTERFACE -DEIGEN_USE_LAPACKE_STRICT)
+                target_link_libraries         (${eigen_target} INTERFACE mkl::mkl)
+            elseif(TARGET blas::blas)
+                message(STATUS "Eigen3 will use OpenBLAS")
+                target_compile_definitions    (${eigen_target} INTERFACE -DEIGEN_USE_BLAS)
+                target_compile_definitions    (${eigen_target} INTERFACE -DEIGEN_USE_LAPACKE_STRICT)
+                target_link_libraries         (${eigen_target} INTERFACE CONAN_PKG::openblas)
+            endif()
         endif()

+        cmake_host_system_information(RESULT _host_name   QUERY HOSTNAME)
+        if(_host_name MATCHES "tetralith|triolith")
+            # AVX aligns 32 bytes (AVX512 aligns 64 bytes).
+            # When running on Tetralith, with march=native, there can be alignment mismatch
+            # in ceres which results in a segfault on free memory.
+            # Something like "double free or corruption ..."
+            #   * EIGEN_MAX_ALIGN_BYTES=16 works on Tetralith

-            cmake_host_system_information(RESULT _host_name   QUERY HOSTNAME)
-            if(_host_name MATCHES "tetralith|triolith")
-                # AVX aligns 32 bytes (AVX512 aligns 64 bytes).
-                # When running on Tetralith, with march=native, there can be alignment mismatch
-                # in ceres which results in a segfault on free memory.
-                # Something like "double free or corruption ..."
-                #   * EIGEN_MAX_ALIGN_BYTES=16 works on Tetralith
+            ### NOTE August 26 2020 ####
+            #
+            # Ceres started crashing on Tetralith again using -march=native.
+            # Tried to solve this issue once and for all.
+            # I've tried the following flags during compilation of DMRG++ and ceres-solver:
+            #
+            #           -DEIGEN_MALLOC_ALREADY_ALIGNED=[none,0,1]
+            #           -DEIGEN_MAX_ALIGN_BYTES=[none,16,32]
+            #           -march=[none,native]
+            #           -std=[none,c++17]
+            #
+            # Up until now, [0,16,none,none] has worked but now for some reason it stopped now.
+            # I noticed the stdc++=17 flag was not being passed on conan builds, so ceres defaulted to -std=c++14 instead.
+            # I fixed this in the conanfile.py of the ceres build. The -download-method=fetch method already had this fixed.
+            # When no Eigen flags were passed, and ceres-solver finally built with -std=c++17 the issues vanished.
+            # In the end what worked was [none,none,native,c++17] in both DMRG++ and ceres-solver.
+            # It is important that the same eigen setup is used in all compilation units, and c++17/c++14 seems to
+            # make Eigen infer some of the flags differently. In any case, settinc c++17 and no flags for eigen anywhere
+            # lets Eigen do its thing in the same way everywhere.

-                ### NOTE August 26 2020 ####
-                #
-                # Ceres started crashing on Tetralith again using -march=native.
-                # Tried to solve this issue once and for all.
-                # I've tried the following flags during compilation of DMRG++ and ceres-solver:
-                #
-                #           -DEIGEN_MALLOC_ALREADY_ALIGNED=[none,0,1]
-                #           -DEIGEN_MAX_ALIGN_BYTES=[none,16,32]
-                #           -march=[none,native]
-                #           -std=[none,c++17]
-                #
-                # Up until now, [0,16,none,none] has worked but now for some reason it stopped now.
-                # I noticed the stdc++=17 flag was not being passed on conan builds, so ceres defaulted to -std=c++14 instead.
-                # I fixed this in the conanfile.py of the ceres build. The -download-method=fetch method already had this fixed.
-                # When no Eigen flags were passed, and ceres-solver finally built with -std=c++17 the issues vanished.
-                # In the end what worked was [none,none,native,c++17] in both DMRG++ and ceres-solver.
-                # It is important that the same eigen setup is used in all compilation units, and c++17/c++14 seems to
-                # make Eigen infer some of the flags differently. In any case, settinc c++17 and no flags for eigen anywhere
-                # lets Eigen do its thing in the same way everywhere.
-
-#                message(STATUS "Applying special Eigen compile definitions for Tetralith: EIGEN_MAX_ALIGN_BYTES=16")
-#                target_compile_definitions(CONAN_PKG::Eigen3 INTERFACE EIGEN_MALLOC_ALREADY_ALIGNED=0) # May work to fix CERES segfault?
-#                target_compile_definitions(CONAN_PKG::Eigen3 INTERFACE EIGEN_MAX_ALIGN_BYTES=16)  # May work to fix CERES segfault?
-            else()
-#                message(STATUS "Applying special Eigen compile definitions for general machines: EIGEN_MAX_ALIGN_BYTES=16")
-#                target_compile_definitions(CONAN_PKG::Eigen3 INTERFACE EIGEN_MALLOC_ALREADY_ALIGNED=1) # May work to fix CERES segfaults!!!
-#                target_compile_definitions(CONAN_PKG::Eigen3 INTERFACE EIGEN_MAX_ALIGN_BYTES=32)  # May work to fix CERES segfault?
-            endif()
+            #                message(STATUS "Applying special Eigen compile definitions for Tetralith: EIGEN_MAX_ALIGN_BYTES=16")
+            #                target_compile_definitions(${eigen_target} INTERFACE EIGEN_MALLOC_ALREADY_ALIGNED=0) # May work to fix CERES segfault?
+            #                target_compile_definitions(${eigen_target} INTERFACE EIGEN_MAX_ALIGN_BYTES=16)  # May work to fix CERES segfault?
+        else()
+            #                message(STATUS "Applying special Eigen compile definitions for general machines: EIGEN_MAX_ALIGN_BYTES=16")
+            #                target_compile_definitions(${eigen_target} INTERFACE EIGEN_MALLOC_ALREADY_ALIGNED=1) # May work to fix CERES segfaults!!!
+            #                target_compile_definitions(${eigen_target} INTERFACE EIGEN_MAX_ALIGN_BYTES=32)  # May work to fix CERES segfault?
+        endif()

     endif()

+    # Needs to be linked last
     if(TARGET openmp::openmp)
         list(APPEND FOUND_TARGETS openmp::openmp)
     endif()


Revert "PKG: XDK: fix is executable2 function for windows (check .exe and .dll)"

This reverts commit 133cbd1a909e5bcb447cdb83ca386feb8b27c417.

--- SuperBuild/Packaging/PackageMacros.cmake
+++ SuperBuild/Packaging/PackageMacros.cmake
@@ -266,20 +266,23 @@
   get_filename_component(file_full "${file}" ABSOLUTE)
   string(TOLOWER "${file_full}" file_full_lower)

-  # If file name ends in .exe on Windows, *assume* executable.
-  # And If file name ends in .dll on Windows, *assume* libary.
+  # If file name ends in .exe on Windows, *assume* executable:
+  #
   if(WIN32 AND NOT UNIX)
-    if("${file_full_lower}" MATCHES "(\\.exe|\\.dll)$")
-      set(${result_var} 1 PARENT_SCOPE)
+    if("${file_full_lower}" MATCHES "\\.lnk$")
+      set(${result_var1} 1 PARENT_SCOPE)
+      #Assuming the file is linked to a file with same name without .lnk extension
+      get_filename_component(name_we_lnk "${file_full_lower}" NAME_WE)
+      set(${result_var2} "${name_we_lnk}" PARENT_SCOPE)
       return()
     endif()
-
+
     # A clause could be added here that uses output or return value of dumpbin
     # to determine ${result_var}. In 99%+? practical cases, the exe name
     # match will be sufficient...
     #
   endif()
-
+
   # Use the information returned from the Unix shell command "file" to
   # determine if ${file_full} should be considered an executable file...
   #


[FIX] Forcing CMAKE_CXX_FLAGS to be a string in the SeqAn build system.

git-svn-id: a7f2a8f7432d210e972fb03898013d213e2b549b@13311 e6417c60-b987-48fd-844e-b20f0fcc1017

--- util/cmake/SeqAnBuildSystem.cmake
+++ util/cmake/SeqAnBuildSystem.cmake
@@ -46,6 +46,22 @@

 include (SeqAnUsabilityAnalyzer)
 include (SeqAnLegacyBuildSystem)
+
+# ---------------------------------------------------------------------------
+# Normalize CMAKE_CXX_FLAGS to be a string.
+#
+# If we do not do this then setting the environment variable CXXFLAGS will
+# cause CMAKE_CXX_FLAGS to become a list and this will generate compiler
+# command lines including the list item separator semicolon ";".  This makes
+# the compiler command fail.
+# ---------------------------------------------------------------------------
+
+if (CMAKE_CXX_FLAGS)
+  foreach (_FLAG ${CMAKE_CXX_FLAGS})
+    set (_FLAGS "${_FLAGS} ${_FLAG}")
+  endforeach (_FLAG ${CMAKE_CXX_FLAGS})
+  set (CMAKE_CXX_FLAGS "${_FLAGS}")
+endif (CMAKE_CXX_FLAGS)

 # ---------------------------------------------------------------------------
 # Function add_executable (name [WIN32] [MACOSX_BUNDLE] [EXCLUDE_FROM_ALL]


CI: fix path to GDAL data in xdk

CI: fix path to GDAL data in xdk


Fix CopyDependentLibraries dependencies.

	* build-aux/cmake/modules/CopyDependentLibraries.cmake: here.

Signed-off-by: Vincent Ordy <d26676a94649632b1c477e78d16c5a762a0d6fbf@gostai.com>

--- build-aux/cmake/modules/CopyDependentLibraries.cmake
+++ build-aux/cmake/modules/CopyDependentLibraries.cmake
@@ -23,7 +23,7 @@
   add_custom_target(
     ${target}-dldep ALL
     COMMAND ${generator} ${binary} ${destination}
-    DEPENDS ${binary} ${generator}
+    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${binary} ${generator}
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "${CMAKE_COMMAND} -E cmake_echo_color "
     "--switch=${CMAKE_MAKEFILE_COLOR} --cyan "


This does hopefully really raise the warning/error limit.

--- test/testsuite.cmake
+++ test/testsuite.cmake
@@ -164,6 +164,10 @@
 # should ctest wipe the binary tree before running
 SET(CTEST_START_WITH_EMPTY_BINARY_DIRECTORY TRUE)

+# raise the warning/error limit
+set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS "33331")
+set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS "33331")
+
 # this is the initial cache to use for the binary tree, be careful to escape
 # any quotes inside of this string if you use it
 if(WIN32 AND NOT UNIX)


Bug 967: Automatically add cxx11 suffix when building in C++11 mode


COMP: Reduce the number of wrapped types to avoid the hierarchy gaps warnings

--- Wrapping/WrapITK/Modules/Review/wrap_itkBinaryThresholdProjectionImageFilter.cmake
+++ Wrapping/WrapITK/Modules/Review/wrap_itkBinaryThresholdProjectionImageFilter.cmake
@@ -3,7 +3,8 @@

   # reduce the output dimension by 1, if possible
   FOREACH(t ${WRAP_ITK_SCALAR})
-    FOREACH(t2 ${WRAP_ITK_INT})
+#    FOREACH(t2 ${WRAP_ITK_INT})
+      SET(t2 ${t})
       FOREACH(d ${WRAP_ITK_DIMS})
         DECREMENT(d1 ${d})
         FILTER_DIMS(d2 "${d1}")
@@ -11,6 +12,6 @@
           WRAP_TEMPLATE("${ITKM_I${t}${d}}${ITKM_I${t2}${d2}}" "${ITKT_I${t}${d}},${ITKT_I${t2}${d2}}")
         ENDIF(d2)
       ENDFOREACH(d)
-    ENDFOREACH(t2)
+#    ENDFOREACH(t2)
   ENDFOREACH(t)
 END_WRAP_CLASS()


Fix FindAtomSpace dependency on HAVE_ZMQ

* HAVE_ZMQ is only defined if find_package(ZMQ) is done before
  find_package(AtomSpace), which is broken design. FindAtomSpace should
  either search for ZMQ itself, or not depend on it at all. In this
  patch, we only check for the existance of zmqatoms library.

--- lib/FindAtomSpace.cmake
+++ lib/FindAtomSpace.cmake
@@ -69,12 +69,12 @@
 	${ATOMSPACE_smob_LIBRARY}
 )

-IF (HAVE_ZMQ)
+IF (ATOMSPACE_zmqatoms_LIBRARY)
 	set(ATOMSPACE_LIBRARIES
 		${ATOMSPACE_LIBRARIES}
 		${ATOMSPACE_zmqatoms_LIBRARY}
 	)
-ENDIF (HAVE_ZMQ)
+ENDIF (ATOMSPACE_zmqatoms_LIBRARY)

 INCLUDE (CheckIncludeFiles)


Force Android Ninja builds on CircleCI to only use 4 concurrent jobs (#1920)

* Force Ninja on CircleCI to only use 4 concurrent jobs

* testing

* testing

* testing

* testing 16

* More testing

* Fix CIRCLECI env var check

* Trying different way to set job pools

* Tweak Android job pool config

--- platforms/android/config.cmake
+++ platforms/android/config.cmake
@@ -1,4 +1,13 @@
 add_definitions(-DTANGRAM_ANDROID)
+
+if ($ENV{CIRCLECI})
+  # Force Ninja on CircleCI to use a specific number of concurrent jobs.
+  # Otherwise it guesses concurrency based on the physical CPU (which has a lot of cores!) and runs out of memory.
+  message(STATUS "Limiting concurrent jobs due to CI environment.")
+  set_property(GLOBAL APPEND PROPERTY JOB_POOLS compile_pool=4 link_pool=2)
+  set(CMAKE_JOB_POOL_COMPILE compile_pool)
+  set(CMAKE_JOB_POOL_LINK link_pool)
+endif()

 add_library(tangram SHARED
   platforms/common/platform_gl.cpp


Removed the Found OpenThreads message

Removed the Found OpenThreads message

--- CMakeModules/FindOpenThreads.cmake
+++ CMakeModules/FindOpenThreads.cmake
@@ -77,8 +77,8 @@

 SET(OPENTHREADS_FOUND "NO")
 IF(OPENTHREADS_INCLUDE_DIR AND OPENTHREADS_LIBRARY)
-	SET(OPENTHREADS_FOUND "YES")
-  MESSAGE("-- Found OpenThreads: "${OPENTHREADS_LIBRARY})
+  SET(OPENTHREADS_FOUND "YES")
+  # MESSAGE("-- Found OpenThreads: "${OPENTHREADS_LIBRARY})
   IF(NOT OPENTHREADS_LIBRARY_DEBUG)
   	MESSAGE("-- Warning Debug OpenThreads not found, using: ${OPENTHREADS_LIBRARY}")
   	SET(OPENTHREADS_LIBRARY_DEBUG "${OPENTHREADS_LIBRARY}")


LoRaWANTimer UT fixed

LoRaWANTimer UT fixed

--- UNITTESTS/features/lorawan/lorawantimer/unittest.cmake
+++ UNITTESTS/features/lorawan/lorawantimer/unittest.cmake
@@ -37,3 +37,6 @@
   stubs/equeue_stub.c
 )

+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNDEBUG=1")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNDEBUG=1")
+


ENH: revise dcmtk configuration

ENH: revise dcmtk configuration

--- CMakeExternals/DCMTK.cmake
+++ CMakeExternals/DCMTK.cmake
@@ -69,6 +69,9 @@
       -DDCMTK_WITH_ICONV:BOOL=OFF  # see github issue #178
       -DDCMTK_FORCE_FPIC_ON_UNIX:BOOL=ON
       -DDCMTK_OVERWRITE_WIN32_COMPILER_FLAGS:BOOL=OFF
+      -DBUILD_APPS:BOOL=OFF
+      -DDCMTK_ENABLE_BUILTIN_DICTIONARY:BOOL=ON
+      -DDCMTK_ENABLE_PRIVATE_TAGS:BOOL=ON
     DEPENDS
       ${${proj}_DEPENDENCIES}
     )


Fix timeout property in iree_native_test (#10470)

--- build_tools/cmake/iree_native_test.cmake
+++ build_tools/cmake/iree_native_test.cmake
@@ -143,5 +143,5 @@
   list(APPEND _RULE_LABELS "${_PACKAGE_PATH}")
   set_property(TEST ${_TEST_NAME} PROPERTY LABELS "${_RULE_LABELS}")
   set_property(TEST "${_TEST_NAME}" PROPERTY REQUIRED_FILES "${_RULE_DATA}")
-  set_property(TEST ${_TEST_NAME} PROPERTY TIMEOUT ${_RULE_ARGS})
+  set_property(TEST ${_TEST_NAME} PROPERTY TIMEOUT ${_RULE_TIMEOUT})
 endfunction()


runner: Forward C and CXX compiler configuration

--- CMakeUnitRunner.cmake
+++ CMakeUnitRunner.cmake
@@ -286,6 +286,10 @@
          "set (CMAKE_UNIT_COVERAGE_FILE \"${CMAKE_UNIT_COVERAGE_FILE}\"\n"
          "     CACHE STRING \"\" FORCE)\n"
          "set (CMAKE_GENERATOR \"${CMAKE_GENERATOR}\")\n"
+         "set (CMAKE_C_COMPILER_ID \"${CMAKE_C_COMPILER_ID}\")\n"
+         "set (CMAKE_CXX_COMPILER_ID \"${CMAKE_CXX_COMPILER_ID}\")\n"
+         "set (CMAKE_C_COMPILER_VERSION \"${CMAKE_C_COMPILER_VERSION}\")\n"
+         "set (CMAKE_CXX_COMPILER_VERSION \"${CMAKE_CXX_COMPILER_VERSION}\")\n"
          "set (CMAKE_UNIT_INVOKING_BINARY_DIR\n"
          "     \"${CMAKE_CURRENT_BINARY_DIR}\")\n")


Log driver output to NAME.error and NAME.output.

This is useful for tests which wish to read these files.

--- CMakeUnitRunner.cmake
+++ CMakeUnitRunner.cmake
@@ -72,18 +72,34 @@
     file (MAKE_DIRECTORY ${TEST_DIRECTORY_NAME})
     file (MAKE_DIRECTORY ${TEST_WORKING_DIRECTORY_NAME})
     set (TEST_DRIVER_SCRIPT_CONTENTS
-         "function (add_driver_command COMMAND_VAR)\n"
+         "function (add_driver_command COMMAND_VAR OUTPUT_FILE ERROR_FILE)\n"
+         "    include (CMakeParseArguments)\n"
+         "    set (DRIVER_SCRIPT_SINGLEVAR_ARGS\n"
+         "         OUTPUT_FILE\;ERROR_FILE)\n"
+         "    cmake_parse_arguments (DRIVER_SCRIPT\n"
+         "                           \"\"\n"
+         "                           \"\${DRIVER_SCRIPT_SINGLEVAR_ARGS}\"\n"
+         "                           \"\"\n"
+         "                           \${ARGN})\n"
          "    execute_process (COMMAND \${\${COMMAND_VAR}}\n"
          "                     RESULT_VARIABLE RESULT\n"
          "                     OUTPUT_VARIABLE OUTPUT\n"
          "                     ERROR_VARIABLE ERROR)\n"
          "    if (RESULT EQUAL 0)\n"
-         "        message (\"Success: \${OUTPUT} \${ERROR}\")\n"
+         "        message (\"\\n\${OUTPUT}\\n\${ERROR}\")\n"
          "    else (RESULT EQUAL 0)\n"
          "        message (FATAL_ERROR \n"
          "                 \"The command \${\${COMMAND_VAR}}} failed with \"\n"
-         "                 \"\${RESULT} : \${ERROR}\")\n"
+         "                 \"\${RESULT}\\n\${ERROR}\\n\${OUTPUT}\")\n"
          "    endif (RESULT EQUAL 0)\n"
+         "    file (WRITE\n"
+         "          \${OUTPUT_FILE}\n"
+         "          \"Output:\\n\"\n"
+         "          \${OUTPUT})\n"
+         "    file (WRITE\n"
+         "          \${ERROR_FILE}\n"
+         "          \"Errors:\\n\"\n"
+         "          \${ERROR})\n"
          "endfunction (add_driver_command)\n")
     file (WRITE ${DRIVER_SCRIPT} ${TEST_DRIVER_SCRIPT_CONTENTS})

@@ -96,7 +112,9 @@

     file (APPEND ${DRIVER_SCRIPT}
           "set (${STEP} ${${COMMAND_VAR}})\n"
-          "add_driver_command (${STEP})\n")
+          "add_driver_command (${STEP}\n"
+          "                    \${CMAKE_CURRENT_BINARY_DIR}/${STEP}.output\n"
+          "                    \${CMAKE_CURRENT_BINARY_DIR}/${STEP}.error)\n")

 endfunction (_add_driver_step DRIVER_SCRIPT STEP COMMAND_VAR)

@@ -131,7 +149,8 @@
         file (WRITE ${TEST_DIRECTORY_CONFIGURE_SCRIPT}
               ${TEST_DIRECTORY_CONFIGURE_SCRIPT_CONTENTS})

-        set (CONFIGURE_COMMAND ${CMAKE} .. -C${CACHE_FILE})
+        set (CONFIGURE_COMMAND
+             ${CMAKE} .. -C${CACHE_FILE} -DCMAKE_VERBOSE_MAKEFILE=ON)
         _add_driver_step (${DRIVER_SCRIPT} CONFIGURE CONFIGURE_COMMAND)

     endif (EXISTS ${TEST_FILE_PATH})


Require cppcheck version 1.66 which has better support for C++11

--- CppcheckTargets.cmake
+++ CppcheckTargets.cmake
@@ -28,7 +28,7 @@
 set(__add_cppcheck YES)

 if(NOT CPPCHECK_FOUND)
-  find_package(cppcheck 1.61 QUIET)
+  find_package(cppcheck 1.66 QUIET)
 endif()

 if(NOT CPPCHECK_FOUND)


Simplify HalideGenerator.cmake a bit

Simplify HalideGenerator.cmake a bit

Remove support for PNacl-on-XCode; we’ve never really supported this
and never will at this point

--- HalideGenerator.cmake
+++ HalideGenerator.cmake
@@ -88,48 +88,36 @@
       WORKING_DIRECTORY "${SCRATCH_DIR}"
       )
   elseif(XCODE)
-    if (NOT target_is_pnacl)
-      add_custom_command(OUTPUT "${SCRATCH_DIR}/${FILTER_LIB}" "${SCRATCH_DIR}/${FILTER_HDR}"
-                                "${SCRATCH_DIR}/${args_GENERATED_FUNCTION}.o"
-        DEPENDS "${args_GENERATOR_TARGET}"
+    add_custom_command(OUTPUT "${SCRATCH_DIR}/${FILTER_LIB}" "${SCRATCH_DIR}/${FILTER_HDR}"
+                              "${SCRATCH_DIR}/${args_GENERATED_FUNCTION}.o"
+      DEPENDS "${args_GENERATOR_TARGET}"

-        # The generator executable will be placed in a configuration specific
-        # directory, so the Xcode variable $(CONFIGURATION) is passed in the custom
-        # build script.
-        COMMAND "${CMAKE_BINARY_DIR}/bin/$(CONFIGURATION)/${generator_exec}" ${invoke_args}
+      # The generator executable will be placed in a configuration specific
+      # directory, so the Xcode variable $(CONFIGURATION) is passed in the custom
+      # build script.
+      COMMAND "${CMAKE_BINARY_DIR}/bin/$(CONFIGURATION)/${generator_exec}" ${invoke_args}

-        # If we are building an ordinary executable, use libtool to create the
-        # static library.
-        COMMAND libtool -static -o "${FILTER_LIB}" "${SCRATCH_DIR}/${args_GENERATED_FUNCTION}.o"
-        WORKING_DIRECTORY "${SCRATCH_DIR}"
-        )
-    else()
-      # For pnacl targets, there is no libtool step
-      add_custom_command(OUTPUT "${SCRATCH_DIR}/${FILTER_LIB}" "${SCRATCH_DIR}/${FILTER_HDR}"
-        DEPENDS "${args_GENERATOR_TARGET}"
-        COMMAND "${CMAKE_BINARY_DIR}/bin/$(CONFIGURATION)/${generator_exec}" ${invoke_args}
-        WORKING_DIRECTORY "${SCRATCH_DIR}"
-        )
-    endif()
-
+      # If we are building an ordinary executable, use libtool to create the
+      # static library.
+      COMMAND libtool -static -o "${FILTER_LIB}" "${SCRATCH_DIR}/${args_GENERATED_FUNCTION}.o"
+      WORKING_DIRECTORY "${SCRATCH_DIR}"
+      )
+  elseif(target_is_pnacl)
+    # No archive step for pnacl targets
+    add_custom_command(OUTPUT "${SCRATCH_DIR}/${FILTER_LIB}" "${SCRATCH_DIR}/${FILTER_HDR}"
+      DEPENDS "${args_GENERATOR_TARGET}"
+      COMMAND "${CMAKE_BINARY_DIR}/bin/${generator_exec}" ${invoke_args}
+      WORKING_DIRECTORY "${SCRATCH_DIR}"
+      )
   else()
-    if (NOT target_is_pnacl)
-      add_custom_command(OUTPUT "${SCRATCH_DIR}/${FILTER_LIB}" "${SCRATCH_DIR}/${FILTER_HDR}"
-                                "${SCRATCH_DIR}/${args_GENERATED_FUNCTION}.o"
-        DEPENDS "${args_GENERATOR_TARGET}"
-        COMMAND "${CMAKE_BINARY_DIR}/bin/${generator_exec}" ${invoke_args}
-        # Create an archive using ar (or similar)
-        COMMAND "${CMAKE_AR}" r "${FILTER_LIB}" "${SCRATCH_DIR}/${args_GENERATED_FUNCTION}.o"
-        WORKING_DIRECTORY "${SCRATCH_DIR}"
-        )
-    else()
-      # No archive step for pnacl targets
-      add_custom_command(OUTPUT "${SCRATCH_DIR}/${FILTER_LIB}" "${SCRATCH_DIR}/${FILTER_HDR}"
-        DEPENDS "${args_GENERATOR_TARGET}"
-        COMMAND "${CMAKE_BINARY_DIR}/bin/${generator_exec}" ${invoke_args}
-        WORKING_DIRECTORY "${SCRATCH_DIR}"
-        )
-    endif()
+    add_custom_command(OUTPUT "${SCRATCH_DIR}/${FILTER_LIB}" "${SCRATCH_DIR}/${FILTER_HDR}"
+                              "${SCRATCH_DIR}/${args_GENERATED_FUNCTION}.o"
+      DEPENDS "${args_GENERATOR_TARGET}"
+      COMMAND "${CMAKE_BINARY_DIR}/bin/${generator_exec}" ${invoke_args}
+      # Create an archive using ar (or similar)
+      COMMAND "${CMAKE_AR}" r "${FILTER_LIB}" "${SCRATCH_DIR}/${args_GENERATED_FUNCTION}.o"
+      WORKING_DIRECTORY "${SCRATCH_DIR}"
+      )
   endif()

   # Use a custom target to force it to run the generator before the


Check for 'std::is_trivially_copyable' correctly. This should be checked whenever C++11 is enabled; more specifically, it should be checked when compiling with C++14 too.

--- cmake/checks/check_01_cxx_features.cmake
+++ cmake/checks/check_01_cxx_features.cmake
@@ -300,6 +300,20 @@
       SET(DEAL_II_HAVE_CXX11 TRUE)
   ENDIF()

+  IF(DEAL_II_HAVE_CXX11)
+    #
+    # Some compilers (such as Intel 15.3 and GCC 4.9.2) support the flags
+    # "-std=c++11" and "-std=c++14" but do not support
+    # 'std::is_trivially_copyable', so check for support in C++11 or newer.
+    #
+    CHECK_CXX_SOURCE_COMPILES(
+      "
+    #include <type_traits>
+    int main(){ std::is_trivially_copyable<int> bob; }
+    "
+      DEAL_II_HAVE_CXX11_IS_TRIVIALLY_COPYABLE)
+  ENDIF()
+
   #
   # This test does not guarantee full C++14 support, but virtually every
   # compiler with some C++14 support implements this.
@@ -389,15 +403,6 @@
 ELSEIF(DEAL_II_WITH_CXX11)
   ADD_FLAGS(DEAL_II_CXX_FLAGS "${DEAL_II_CXX_VERSION_FLAG}")
   MESSAGE(STATUS "DEAL_II_WITH_CXX11 successfully set up")
-
-  PUSH_CMAKE_REQUIRED("${DEAL_II_CXX_VERSION_FLAG}")
-  CHECK_CXX_SOURCE_COMPILES(
-    "
-    #include <type_traits>
-    int main(){ std::is_trivially_copyable<int> bob; }
-    "
-    DEAL_II_HAVE_CXX11_IS_TRIVIALLY_COPYABLE)
-  RESET_CMAKE_REQUIRED()
 ELSE()
   MESSAGE(STATUS "DEAL_II_WITH_CXX14 and DEAL_II_WITH_CXX11 are both disabled")
 ENDIF()


make cmake build RelWithDebInfo use same optimzer settings as Release builds


ENH: Update ExternalProjectsConfig.cmake

--- CMake/Superbuild/ExternalProjectsConfig.cmake
+++ CMake/Superbuild/ExternalProjectsConfig.cmake
@@ -28,9 +28,9 @@
   ${github_protocol}://github.com/danmar/cppcheck.git )
 set( Cppcheck_HASH_OR_TAG 1.61 )

-# Common Toolkit snapshot 2013-09-10 20:12:15
+# Common Toolkit snapshot 2013-09-16 17:59:15
 set( CTK_URL ${github_protocol}://github.com/commontk/CTK.git )
-set( CTK_HASH_OR_TAG 71c234bb8febd32f3b00b068061e93105303ebc0 )
+set( CTK_HASH_OR_TAG dcf7db15f2b43507395316dd680dba5999f886b4 )

 # TubeTK Image Viewer snapshot 2013-08-21 06:23:25
 set( ImageViewer_URL


Prefer the system installed GLEW over any found elsewhere (i.e. in the nuke dir)

--- share/cmake/OCIOMacros.cmake
+++ share/cmake/OCIOMacros.cmake
@@ -36,13 +36,13 @@
         DOC "The directory where GL/glew.h resides")
     FIND_LIBRARY(GLEW_LIBRARIES
         NAMES GLEW glew
-        PATHS
         /usr/lib64
         /usr/lib
         /usr/local/lib64
         /usr/local/lib
         /sw/lib
         /opt/local/lib
+        PATHS
         DOC "The GLEW library")
     if(GLEW_INCLUDES AND GLEW_LIBRARIES)
         set(GLEW_FOUND TRUE)


Get rid of try_run_c

Get rid of try_run_c

--- Modules/ThirdParty/GDAL/otb-module-init.cmake
+++ Modules/ThirdParty/GDAL/otb-module-init.cmake
@@ -51,78 +51,39 @@
   message(FATAL_ERROR "${m}")
 endmacro(error_message)

-#------------------- C version ---------------------
-macro(gdal_try_run_c msg_type var source_file)
-message(STATUS "Performing Test ${var}")
-set(${var})
-try_run(RUN_${var} COMPILE_${var} ${CMAKE_CURRENT_BINARY_DIR}
-${CMAKE_SOURCE_DIR}/Modules/ThirdParty/GDAL/${source_file}
-CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:PATH=${GDAL_INCLUDE_DIR}" "-DLINK_LIBRARIES:STRING=${GDAL_LIBRARY}"
-COMPILE_DEFINITIONS "-w"
-COMPILE_OUTPUT_VARIABLE COMPILE_OUTPUT_${var}
-RUN_OUTPUT_VARIABLE RUN_OUTPUT_${var}
-ARGS ${ARGN}
-)
-
-if(NOT COMPILE_${var})
-  error_message("Compiling Test ${var} - Failed \n
-COMPILE_OUTPUT_${var}: '${COMPILE_OUTPUT_${var}}'")
-endif()
-if(RUN_${var})
-  set(${var} FALSE)
-  #if msg_type is STATUS (ie "okay" if test is failing),
-  #then we don't need to give an run-output and exit status.
-  if("${msg_type}" STREQUAL "STATUS")
-    message(${msg_type} "Performing Test ${var} - Failed")
-  else()
-    error_message("Performing Test ${var} - Failed \n
-            Exit status: '${RUN_${var}}' \n
-            RUN_OUTPUT_${var}: '${RUN_OUTPUT_${var}}'")
-  endif()
-else()
-  set(${var} TRUE)
-  message(STATUS "Performing Test ${var} - Success")
-endif()
-unset(RUN_OUTPUT_${var})
-unset(COMPILE_OUTPUT_${var})
-unset(COMPILE_${var})
-endmacro()
-
 #------------------- Helper Macro ---------------------
 macro(gdal_try_run msg_type var source_file)
-message(STATUS "Performing Test ${var}")
-set(${var})
-try_run(RUN_${var} COMPILE_${var} ${CMAKE_CURRENT_BINARY_DIR}
-${CMAKE_SOURCE_DIR}/Modules/ThirdParty/GDAL/${source_file}
-CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:PATH=${GDAL_INCLUDE_DIR}" "-DLINK_LIBRARIES:STRING=${GDAL_LIBRARY}"
-COMPILE_DEFINITIONS "-std=c++14" "-w"
-COMPILE_OUTPUT_VARIABLE COMPILE_OUTPUT_${var}
-RUN_OUTPUT_VARIABLE RUN_OUTPUT_${var}
-ARGS ${ARGN}
-)
-
-if(NOT COMPILE_${var})
-  error_message("Compiling Test ${var} - Failed \n
-COMPILE_OUTPUT_${var}: '${COMPILE_OUTPUT_${var}}'")
-endif()
-if(RUN_${var})
-  set(${var} FALSE)
-  #if msg_type is STATUS (ie "okay" if test is failing),
-  #then we don't need to give an run-output and exit status.
-  if("${msg_type}" STREQUAL "STATUS")
-    message(${msg_type} "Performing Test ${var} - Failed")
+  message(STATUS "Performing Test ${var}")
+  set(${var})
+  try_run(RUN_${var} COMPILE_${var} ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/Modules/ThirdParty/GDAL/${source_file}
+  CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:PATH=${GDAL_INCLUDE_DIR}" "-DLINK_LIBRARIES:STRING=${GDAL_LIBRARY}"
+  COMPILE_OUTPUT_VARIABLE COMPILE_OUTPUT_${var}
+  RUN_OUTPUT_VARIABLE RUN_OUTPUT_${var}
+  ARGS ${ARGN}
+  )
+  if(NOT COMPILE_${var})
+    error_message("Compiling Test ${var} - Failed \n"
+                  "COMPILE_OUTPUT_${var}: '${COMPILE_OUTPUT_${var}}'")
+  endif()
+  if(RUN_${var})
+    set(${var} FALSE)
+    #if msg_type is STATUS (ie "okay" if test is failing),
+    #then we don't need to give an run-output and exit status.
+    if("${msg_type}" STREQUAL "STATUS")
+      message(${msg_type} "Performing Test ${var} - Failed")
+    else()
+      error_message("Performing Test ${var} - Failed \n"
+              "Exit status: '${RUN_${var}}' \n"
+              "RUN_OUTPUT_${var}: '${RUN_OUTPUT_${var}}'")
+    endif()
   else()
-    error_message("Performing Test ${var} - Failed \n
-            Exit status: '${RUN_${var}}' \n
-            RUN_OUTPUT_${var}: '${RUN_OUTPUT_${var}}'")
+    set(${var} TRUE)
+    message(STATUS "Performing Test ${var} - Success")
   endif()
-else()
-  set(${var} TRUE)
-  message(STATUS "Performing Test ${var} - Success")
-endif()
-unset(RUN_OUTPUT_${var})
-unset(COMPILE_OUTPUT_${var})
-unset(COMPILE_${var})
+  unset(RUN_OUTPUT_${var})
+  unset(COMPILE_OUTPUT_${var})
+  unset(COMPILE_${var})
 endmacro()

 #------------------- TESTS ---------------------
@@ -155,11 +116,11 @@
 # check formats TIFF, GeoTIFF, JPEG, JPEG2000, HDF5
 # Note : exact format names can be found here http://www.gdal.org/formats_list.html

-gdal_try_run_c(STATUS GDAL_FORMATS_LIST gdalFormatsListTest.c ${TEMP}/gdalFormatsList.csv)
+gdal_try_run(STATUS GDAL_FORMATS_LIST gdalFormatsListTest.c ${TEMP}/gdalFormatsList.csv)

-gdal_try_run_c(FATAL_ERROR GDAL_HAS_JPEG gdalFormatsTest.c JPEG)
+gdal_try_run(FATAL_ERROR GDAL_HAS_JPEG gdalFormatsTest.c JPEG)

-gdal_try_run_c(FATAL_ERROR GDAL_HAS_GTiff gdalFormatsTest.c GTiff)
+gdal_try_run(FATAL_ERROR GDAL_HAS_GTiff gdalFormatsTest.c GTiff)

 gdal_try_run(FATAL_ERROR GDAL_CAN_CREATE_GTiff gdalCreateTest.cxx GTiff ${TEMP}/testImage.gtif )

@@ -168,39 +129,39 @@
 gdal_try_run(FATAL_ERROR GDAL_CAN_CREATE_JPEG gdalCreateCopyTest.cxx ${TEMP}/testImage.gtif ${TEMP}/testImage.jpeg JPEG)

 set(JPEG2000_DRIVER_USED)
-gdal_try_run_c(STATUS GDAL_HAS_JP2OpenJPEG gdalFormatsTest.c JP2OpenJPEG)
+gdal_try_run(STATUS GDAL_HAS_JP2OpenJPEG gdalFormatsTest.c JP2OpenJPEG)
 if (GDAL_HAS_JP2OpenJPEG)
   set(JPEG2000_DRIVER_USED "OpenJPEG")
   gdal_try_run(STATUS GDAL_CAN_CREATE_JP2OpenJPEG gdalCreateCopyTest.cxx ${TEMP}/testImage.gtif ${TEMP}/testImage.j2k JP2OpenJPEG)
 endif()

-gdal_try_run_c(STATUS GDAL_HAS_JP2KAK gdalFormatsTest.c JP2KAK)
+gdal_try_run(STATUS GDAL_HAS_JP2KAK gdalFormatsTest.c JP2KAK)
 if (GDAL_HAS_JP2KAK)
   set(JPEG2000_DRIVER_USED "Kakadu")
   gdal_try_run(STATUS GDAL_CAN_CREATE_JP2KAK gdalCreateCopyTest.cxx ${TEMP}/testImage.gtif ${TEMP}/testImage.j2k JP2KAK)
 endif()

-gdal_try_run_c(STATUS GDAL_HAS_JP2ECW gdalFormatsTest.c JP2ECW)
+gdal_try_run(STATUS GDAL_HAS_JP2ECW gdalFormatsTest.c JP2ECW)
 if (GDAL_HAS_JP2ECW)
   set(JPEG2000_DRIVER_USED "ECW")
   gdal_try_run(STATUS GDAL_CAN_CREATE_JP2ECW gdalCreateCopyTest.cxx ${TEMP}/testImage.gtif ${TEMP}/testImage.j2k JP2ECW)
 endif()

-gdal_try_run_c(STATUS GDAL_HAS_JPEG2000 gdalFormatsTest.c JPEG2000)
+gdal_try_run(STATUS GDAL_HAS_JPEG2000 gdalFormatsTest.c JPEG2000)
 if (GDAL_HAS_JPEG2000)
     set(JPEG2000_DRIVER_USED "JPEG2000")
   gdal_try_run(STATUS GDAL_CAN_CREATE_JPEG2000 gdalCreateCopyTest.cxx ${TEMP}/testImage.gtif ${TEMP}/testImage.j2k JPEG2000)
 endif()

-gdal_try_run_c(STATUS GDAL_HAS_HDF5 gdalFormatsTest.c HDF5)
-gdal_try_run_c(STATUS GDAL_HAS_HDF4 gdalFormatsTest.c HDF4)
+gdal_try_run(STATUS GDAL_HAS_HDF5 gdalFormatsTest.c HDF5)
+gdal_try_run(STATUS GDAL_HAS_HDF4 gdalFormatsTest.c HDF4)

 #check some vector formats
 #TODO: fix gdalFormatsTest.c to work with gdal 1.x and 2.x
-# gdal_try_run_c(FATAL_ERROR GDAL_HAS_SQLite gdalFormatsTest.c SQLite)
-# gdal_try_run_c(FATAL_ERROR GDAL_HAS_VRT gdalFormatsTest.c VRT)
-# gdal_try_run_c(FATAL_ERROR GDAL_HAS_KML gdalFormatsTest.c KML)
-# gdal_try_run_c(STATUS GDAL_HAS_LIBKML gdalFormatsTest.c LIBKML)
+# gdal_try_run(FATAL_ERROR GDAL_HAS_SQLite gdalFormatsTest.c SQLite)
+# gdal_try_run(FATAL_ERROR GDAL_HAS_VRT gdalFormatsTest.c VRT)
+# gdal_try_run(FATAL_ERROR GDAL_HAS_KML gdalFormatsTest.c KML)
+# gdal_try_run(STATUS GDAL_HAS_LIBKML gdalFormatsTest.c LIBKML)

 #------------------- TESTS (END)---------------------


SVN_SILENT made messages (.desktop file)

--- plasma-runner-ktp-contact.desktop.cmake
+++ plasma-runner-ktp-contact.desktop.cmake
@@ -9,6 +9,7 @@
 Name[el]=Στιγμιαία μηνύματα
 Name[es]=Mensajería instantánea
 Name[et]=Kiirsuhtlus
+Name[fa]=پیام‌رسانی فوری
 Name[fi]=Pikaviestintä
 Name[fr]=Messagerie instantanée
 Name[gl]=Mensaxería instantánea


--- plasma-runner-ktp-contact.desktop.cmake
+++ plasma-runner-ktp-contact.desktop.cmake
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Instant Messaging
 Name[ca]=Missatgeria instantània
+Name[ca@valencia]=Missatgeria instantània
 Name[cs]=Instant Messaging
 Name[da]=Instant messaging
 Name[de]=Instant-Messaging
@@ -31,6 +32,7 @@
 Name[zh_TW]=即時訊息
 Comment=Start a chat with any of your IM contacts or change your IM status
 Comment[ca]=Inicia un xat amb qualsevol dels vostres contactes de MI o canvia el vostre estat de MI
+Comment[ca@valencia]=Inicia un xat amb qualsevol dels vostres contactes de MI o canvia el vostre estat de MI
 Comment[cs]=Začít rozhovor s kterýmkoliv vaším kontaktem v IM nebo změnit stav na IM
 Comment[da]=Start chat med en af dine IM-kontakter eller skift din IM-status
 Comment[de]=Chats mit ihren Kontakten starten oder Ihren IM-Status ändern


hdf5: avoid CMP0054 warning

hdf5: avoid CMP0054 warning

Change-Id: I9d360fb5a5a35adce1dadf08d1f4433686618a10

--- ThirdParty/hdf5/vtkhdf5/ConfigureChecks.cmake
+++ ThirdParty/hdf5/vtkhdf5/ConfigureChecks.cmake
@@ -447,9 +447,9 @@
         H5_HAVE_SYS_TYPES_H
         H5_HAVE_SYS_SOCKET_H
     )
-      IF ("${def}")
+      IF (def)
         SET (MACRO_CHECK_FUNCTION_DEFINITIONS "${MACRO_CHECK_FUNCTION_DEFINITIONS} -D${def}")
-      ENDIF ("${def}")
+      ENDIF ()
     ENDFOREACH (def)

     IF (LINUX_LFS)


fix for some platforms (Ubuntu 16.04) not defining glfw target when imported

--- apps/exampleViewer/cmake/configure_glfw.cmake
+++ apps/exampleViewer/cmake/configure_glfw.cmake
@@ -44,7 +44,11 @@
   message(STATUS "Using GLFW found in the environment")
 endif()

-get_property(glfw3_INCLUDE_DIRS TARGET glfw PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+#NOTE(jda) - on Ubuntu16.04, the 'glfw' target doesn't exist here "yet", but
+#            still works as a target for linking the viewer app (???)
+if (TARGET glfw)
+  get_property(glfw3_INCLUDE_DIRS TARGET glfw PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+endif()

 set(GLFW_INCLUDE_DIRS ${glfw3_INCLUDE_DIRS}
     CACHE INTERNAL "Found GLFW includes")


cmake: the '-fsanitize' option should not be enabled by default

--- src/cmake/common-settings.cmake
+++ src/cmake/common-settings.cmake
@@ -229,8 +229,8 @@
 	compile_flag("-ggdb3" DEBUG_GDB3  DEBUG RELWITHDEBINFO)

 	# extra debugging tools
-	compile_flag("-fsanitize=undefined" DEBUG_SANITIZE_UNDEF DEBUG RELWITHDEBINFO)
-	compile_flag("-fsanitize=address"   DEBUG_SANITIZE_ADDR  DEBUG RELWITHDEBINFO)
+	#compile_flag("-fsanitize=undefined" DEBUG_SANITIZE_UNDEF DEBUG RELWITHDEBINFO)
+	#compile_flag("-fsanitize=address"   DEBUG_SANITIZE_ADDR  DEBUG RELWITHDEBINFO)

 	# warnings
 	compile_flag("-W"                         W   RELEASE DEBUG RELWITHDEBINFO)


vtk.cmake: Explicitly disable tcl bindings.

--- vtk.cmake
+++ vtk.cmake
@@ -43,6 +43,7 @@
         -DSIP_PYQT_DIR:PATH=${PYTHON_PREFIX}/share/sip/PyQt4
         -DVTK_WRAP_PYTHON:BOOL=ON
         -DVTK_WRAP_PYTHON_SIP:BOOL=ON
+        -DVTK_WRAP_TCL:BOOL=OFF
         # ilastik uses QT VTK widgets
         -DVTK_USE_QT:BOOL=ON
         -DVTK_USE_QVTK_QTOPENGL:BOOL=ON


BUG: Remove extra SplitComponent module dependency

--- itk-module.cmake
+++ itk-module.cmake
@@ -13,7 +13,6 @@
     ITKImageGradient
     ITKImageIntensity
     ITKImageFeature
-    SplitComponents
   TEST_DEPENDS
     ITKTestKernel
   EXCLUDE_FROM_DEFAULT


openh264 depends on yasm

openh264 depends on yasm

* use yasm from externpro
* issue https://github.com/smanders/externpro/issues/155 (build openh264 with cmake)
* issue https://github.com/smanders/externpro/issues/157 (add yasm)

--- projects/openh264.cmake
+++ projects/openh264.cmake
@@ -26,11 +26,21 @@
   if(NOT (XP_DEFAULT OR XP_PRO_OPENH264))
     return()
   endif()
+  if(NOT (XP_DEFAULT OR XP_PRO_YASM))
+    message(STATUS "openh264.cmake: requires yasm")
+    set(XP_PRO_YASM ON CACHE BOOL "include yasm" FORCE)
+    xpPatchProject(${PRO_YASM})
+  endif()
+  build_yasm(yasmTgts) # sets YASM_EXE
   xpGetArgValue(${PRO_OPENH264} ARG VER VALUE VER)
+  set(XP_CONFIGURE
+    -DOPENH264_VER=${VER}
+    -DCMAKE_ASM_NASM_COMPILER=${YASM_EXE}
+    )
   configure_file(${PRO_DIR}/use/usexp-openh264-config.cmake ${STAGE_DIR}/share/cmake/
     @ONLY NEWLINE_STYLE LF
     )
-  xpCmakeBuild(openh264 "" "-DOPENH264_VER=${VER}" openh264Targets)
+  xpCmakeBuild(openh264 "${yasmTgts}" "${XP_CONFIGURE}" openh264Targets)
   if(ARGN)
     set(${ARGN} "${openh264Targets}" PARENT_SCOPE)
   endif()


Disable Catalyst in our ParaView build

Disable Catalyst in our ParaView build

It is not used by Tomviz, and I thought it had already been disabled.

--- projects/paraview.cmake
+++ projects/paraview.cmake
@@ -34,6 +34,7 @@
     -DPARAVIEW_QT_VERSION:STRING=5
     -DPARAVIEW_BUILD_QT_GUI:BOOL=ON
     -DPARAVIEW_ENABLE_PYTHON:BOOL=ON
+    -DPARAVIEW_ENABLE_CATALYST:BOOL=OFF
     -DPARAVIEW_ENABLE_WEB:BOOL=OFF
     -DPARAVIEW_USE_QTHELP:BOOL=OFF
     -DPARAVIEW_BUILD_PLUGIN_AdiosReader:BOOL=FALSE


Investigating bug on cluster

Investigating bug on cluster

Former-commit-id: 8bdb3cde4c100ba2e41d00e0f60582541d5f9009

--- cmake-modules/Fetch_OpenBLAS.cmake
+++ cmake-modules/Fetch_OpenBLAS.cmake
@@ -147,8 +147,8 @@
 #            export LDFLAGS="-L${GFORTRAN_PATH} $LDFLAGS" &&
             BUILD_IN_SOURCE 1
             BUILD_COMMAND
-                        export LD_LIBRARY_PATH=${GFORTRAN_PATH}:$LD_LIBRARY_PATH &&
-                        export LDFLAGS="-l${GFORTRAN_LIB} $LDFLAGS" &&
+                        export LD_LIBRARY_PATH=${GFORTRAN_PATH} &&
+                        export LDFLAGS=-l${GFORTRAN_LIB} &&
                         $(MAKE) TARGET=SANDYBRIDGE
                         DYNAMIC_ARCH=1
                         USE_THREAD=${OpenBLAS_MULTITHREADED}
@@ -161,7 +161,7 @@
                         FFLAGS=-frecursive
                         BINARY64=64
                         GEMM_MULTITHREAD_THRESHOLD=16
-                        LDFLAGS=-l${GFORTRAN_LIB} -l${QUADMATH_LIB}
+                        LDFLAGS="-l${GFORTRAN_LIB} -l${QUADMATH_LIB}"
                         FFLAGS=-O3 -Wno-maybe-uninitialized -Wno-conversion -Wno-unused-but-set-variable -Wno-unused-variable
             INSTALL_COMMAND $(MAKE) PREFIX=<INSTALL_DIR> install
             DEPENDS gfortran


Do not use -l for the moment, it breaks the compilation on Linux

--- cmake/ALICE_CMake.cmake
+++ cmake/ALICE_CMake.cmake
@@ -422,7 +422,7 @@

   ALICE_Format(PELIBSDIR "-L" "" "${PELIBSDIR}")
   ALICE_CheckLibraries(PBLIBS "${PBLIBS}")
-#  ALICE_CheckLibraries(PELIBS "${PELIBS}")
+  ALICE_CheckLibraries(PELIBS "${PELIBS}")

   ALICE_CorrectPaths(EINCLUDE "${EINCLUDE}")
   ALICE_CorrectPaths(PINC "${PINC}")
@@ -479,7 +479,7 @@

   ALICE_Format(PELIBSDIR "-L" "" "${PELIBSDIR}")
   ALICE_CheckLibraries(PBLIBS "${PBLIBS}")
-  ALICE_CheckLibraries(PELIBS "${PELIBS}")
+#  ALICE_CheckLibraries(PELIBS "${PELIBS}")

   ALICE_CorrectPaths(EINCLUDE "${EINCLUDE}")
   ALICE_CorrectPaths(PINC "${PINC}")


New Test Data for SpGeMM can be downloaded

--- cmake/ExternalMTX.cmake
+++ cmake/ExternalMTX.cmake
@@ -19,6 +19,7 @@
 option( DOWNLOAD_MTX_BELL_GARLAND "Sparse matrix files used in Bell-Garlands paper" OFF )
 option( DOWNLOAD_MTX_LARGE "MTX files where majority of time is in kernel" OFF )
 option( DOWNLOAD_MTX_SMALL "MTX files less than 4GB in dense format" OFF )
+option( DOWNLOAD_MTX_SPGEMM "MTX files used in Weifeng Paper for benchmarking SpGEMM" OFF )

 # Emulate a mapping data structure in CMake
 macro( MAP_ENTRY K V )
@@ -180,3 +181,52 @@
 if( DOWNLOAD_MTX_SMALL )
   MTX_process_files( MTX_Small_files MTX_Small_path )
 endif( )
+
+##### SPGEMM Square MTX sparse data #####
+set( MTX_SPGEMM_BENCH_files
+  Williams/cant.tar.gz
+  Williams/mac_econ_fwd500.tar.gz
+  Williams/mc2depi.tar.gz
+  Williams/cop20k_A.tar.gz
+  Williams/webbase-1M.tar.gz
+  Boeing/pwtk.tar.gz
+  DNVS/shipsec1.tar.gz
+  Hamm/scircuit.tar.gz
+  Oberwolfach/filter3D.tar.gz
+  Um/2cubes_sphere.tar.gz
+  vanHeukelum/cage12.tar.gz
+  GHS_psdef/hood.tar.gz
+  JGD_Homology/m133-b3.tar.gz
+  QLi/majorbasis.tar.gz
+  GHS_indef/mario002.tar.gz
+  FreeFieldTechnologies/mono_500Hz.tar.gz
+  Um/offshore.tar.gz
+  Pajek/patents_main.tar.gz
+  FEMLAB/poisson3Da.tar.gz
+)
+
+MAP_ENTRY( "Oberwolfach/filter3D.tar.gz" "fdbfaa0edb11e799f67870ebf16adfb0" )
+MAP_ENTRY( "Um/2cubes_sphere.tar.gz" "797e984d97d0057c9b88a3e4dd9af139" )
+MAP_ENTRY( "Williams/cant.tar.gz" "a5360391e462640583e59a7b36fa216c" )
+MAP_ENTRY( "Boeing/pwtk.tar.gz" "51617ea77ac8212ca3bf5c1eb041061b" )
+MAP_ENTRY( "vanHeukelum/cage12.tar.gz" "a899a0c48b9a58d081c52ffd88a84955" )
+MAP_ENTRY( "DNVS/shipsec1.tar.gz" "73372e7d6a0848f8b19d64a924fab73e" )
+MAP_ENTRY( "Williams/mac_econ_fwd500.tar.gz" "f1b0e56fbb75d1d6862874e3d7d33060" )
+MAP_ENTRY( "Williams/mc2depi.tar.gz" "8c8633eada6455c1784269b213c85ea6" )
+MAP_ENTRY( "Williams/cop20k_A.tar.gz" "beb2302025bbfae6fd1f5604957ffe52" )
+MAP_ENTRY( "Hamm/scircuit.tar.gz" "3e62f7ea83914f7e20019aefb2a5176f" )
+MAP_ENTRY( "Williams/webbase-1M.tar.gz" "2d4c239daad6f12d66a1e6a2af44cbdb" )
+MAP_ENTRY( "GHS_psdef/hood.tar.gz" "6279700b7d44b44fd630c079b31eee46" )
+MAP_ENTRY( "JGD_Homology/m133-b3.tar.gz" "29c5595e95c1f2476ada6fb397f0e2c9" )
+MAP_ENTRY( "QLi/majorbasis.tar.gz" "81a89740c4cd77052af9df5edaae2d1c" )
+MAP_ENTRY( "GHS_indef/mario002.tar.gz" "6cc995b3c4ec92cddaf9706ef2ac7457" )
+MAP_ENTRY( "FreeFieldTechnologies/mono_500Hz.tar.gz" "082f48c8d5af68c67ba229685691d09e" )
+MAP_ENTRY( "Um/offshore.tar.gz" "bac8efa0265bf9bd19d287677c2f455e" )
+MAP_ENTRY( "Pajek/patents_main.tar.gz" "bacaaa14de4398c981ba749665459324" )
+MAP_ENTRY( "FEMLAB/poisson3Da.tar.gz" "1eaf7aaf38385287505fe1d504f8a716" )
+
+set( SPGEMM_BENCH_MTX_path ${PROJECT_BINARY_DIR}/Externals/MTX/SpGemmData )
+
+if( DOWNLOAD_MTX_SPGEMM )
+  MTX_process_files( MTX_SPGEMM_BENCH_files SPGEMM_BENCH_MTX_path )
+endif( )


[cmake] remove unneeded lib

[cmake] remove unneeded lib

--- cmake/FindUmfpack.cmake
+++ cmake/FindUmfpack.cmake
@@ -34,31 +34,8 @@

 find_library(UMFPACK_LIBRARIES umfpack PATHS $ENV{UMFPACKDIR})

-if(UMFPACK_LIBRARIES)
-
-  if (NOT UMFPACK_LIBDIR)
-    get_filename_component(UMFPACK_LIBDIR ${UMFPACK_LIBRARIES} PATH)
-  endif(NOT UMFPACK_LIBDIR)
-
-  find_library(COLAMD_LIBRARY colamd PATHS ${UMFPACK_LIBDIR} $ENV{UMFPACKDIR})
-  if (COLAMD_LIBRARY)
-    set(UMFPACK_LIBRARIES ${UMFPACK_LIBRARIES} ${COLAMD_LIBRARY})
-  endif (COLAMD_LIBRARY)
-
-  find_library(AMD_LIBRARY amd PATHS ${UMFPACK_LIBDIR} $ENV{UMFPACKDIR})
-  if (AMD_LIBRARY)
-    set(UMFPACK_LIBRARIES ${UMFPACK_LIBRARIES} ${AMD_LIBRARY})
-  endif (AMD_LIBRARY)
-
-  find_library(SUITESPARSE_LIBRARY SuiteSparse PATHS ${UMFPACK_LIBDIR} $ENV{UMFPACKDIR})
-  if (SUITESPARSE_LIBRARY)
-    set(UMFPACK_LIBRARIES ${UMFPACK_LIBRARIES} ${SUITESPARSE_LIBRARY})
-  endif (SUITESPARSE_LIBRARY)
-
-endif(UMFPACK_LIBRARIES)
-
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(UMFPACK DEFAULT_MSG
-                                  UMFPACK_INCLUDE_DIR UMFPACK_LIBRARIES )
+                                  UMFPACK_INCLUDE_DIR UMFPACK_LIBRARIES)

-mark_as_advanced(UMFPACK_INCLUDE_DIR UMFPACK_LIBRARIES AMD_LIBRARY COLAMD_LIBRARY SUITESPARSE_LIBRARY)
+mark_as_advanced(UMFPACK_INCLUDE_DIR UMFPACK_LIBRARIES)


Add dependency between windeployqt and target

--- cmake/WinDeployQt.cmake
+++ cmake/WinDeployQt.cmake
@@ -51,7 +51,8 @@
 	endif()

 	add_custom_target(windeployqt ${_deploy_PROGRAM} ${_ARGS}
-		$<TARGET_FILE:${_deploy_TARGET}>)
+		$<TARGET_FILE:${_deploy_TARGET}>
+		DEPENDS ${_deploy_TARGET})
 endfunction()


Few more little fixes

Few more little fixes

--- cmake/check_vcpkg.cmake
+++ cmake/check_vcpkg.cmake
@@ -1,21 +1,21 @@
-function(obe_check_vcpkg var)
+function(obe_check_vcpkg OBE_USE_VCPKG)
     option(USE_VCPKG "Use vcpkg to handle some of the dependencies" OFF)
     if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE
         OR USE_VCPKG)
-        set(${var} ON PARENT_SCOPE)
+        set(OBE_USE_VCPKG ON)
         set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
             CACHE STRING "")
     endif()

-    if(${var})
+    if(${OBE_USE_VCPKG})
         if(NOT DEFINED ENV{VCPKG_FEATURE_FLAGS})
         message(FATAL_ERROR
-            "Using vcpkg to build ObEngine without defining ${VCPKG_FEATURE_FLAGS} to be \"manifests\"!! Aborting...") # manifests are required because of vcpkg.json
+            "Using vcpkg to build ObEngine without defining environment variable VCPKG_FEATURE_FLAGS to be \"manifests\"!! Aborting...") # manifests are required because of vcpkg.json
         endif()

         if(NOT DEFINED ENV{VCPKG_DEFAULT_TRIPLET})
             message(FATAL_ERROR
-                "Using vcpkg to build ObEngine without defining ${VCPKG_DEFAULT_TRIPLET}!! Aborting...")
+                "Using vcpkg to build ObEngine without defining environment variable VCPKG_DEFAULT_TRIPLET ! Aborting...")
         endif()
     endif()
 endfunction()


Update libprotobuf.cmake

Update libprotobuf.cmake

link log library on Android

--- cmake/libprotobuf.cmake
+++ cmake/libprotobuf.cmake
@@ -121,6 +121,9 @@
 if(protobuf_LINK_LIBATOMIC)
   target_link_libraries(libprotobuf atomic)
 endif()
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
+	target_link_libraries(libprotobuf-lite log)
+endif()
 target_include_directories(libprotobuf PUBLIC ${protobuf_source_dir}/src)
 if(MSVC AND protobuf_BUILD_SHARED_LIBS)
   target_compile_definitions(libprotobuf


libs weren't linked against boost ?

libs weren't linked against boost ?

git-svn-id: e7ea667a1d39a4453c4efcc4ba7bca3d620c3f19@306 a9d63959-f2ad-4865-b262-bf0e56cfafb6

--- cmake/pcl_targets.cmake
+++ cmake/pcl_targets.cmake
@@ -77,6 +77,8 @@
         set(_lib_type "STATIC")
     endif(PCL_SHARED_LIBS)
     add_library(${_name} ${_lib_type} ${ARGN})
+    #must link explicitly against boost.
+    target_link_libraries(${_name} ${Boost_LIBRARIES})
     set_target_properties(${_name} PROPERTIES
         VERSION ${PCL_VERSION}
         SOVERSION ${PCL_MAJOR_VERSION})


Updated CMake configuration for Android Studio. (#296)

Small change to fix how we are configured if included by Android Studio.
The main difference between Android Studio CMake, and
android-cmake, at least as far as this is concerned is that Android
Studio does not define find_host*. In this case we can just use
find_package and find_program, so set up the macros in that way.

--- cmake/setup_build.cmake
+++ cmake/setup_build.cmake
@@ -1,5 +1,17 @@
 # Find nosetests; see shaderc_add_nosetests() from utils.cmake for opting in to
 # nosetests in a specific directory.
+
+if(NOT COMMAND find_host_package)
+  macro(find_host_package)
+    find_package(${ARGN})
+  endmacro()
+endif()
+if(NOT COMMAND find_host_program)
+  macro(find_host_program)
+    find_program(${ARGN})
+  endmacro()
+endif()
+
 find_program(NOSETESTS_EXE NAMES nosetests PATHS $ENV{PYTHON_PACKAGE_PATH})
 if (NOT NOSETESTS_EXE)
   message(STATUS "nosetests was not found - python code will not be tested")


Fix ISPC build for MIC

Fix ISPC build for MIC

--- common/cmake/ispc.cmake
+++ common/cmake/ispc.cmake
@@ -38,7 +38,7 @@
   IF (__XEON__)
     SET (ISPC_TARGET_EXT ${CMAKE_CXX_OUTPUT_EXTENSION})
   ELSE()
-    SET (ISPC_TARGET_EXT ${CMAKE_CXX_SOURCE_FILE_EXTENSIONS})
+    SET (ISPC_TARGET_EXT .cpp)
     SET (ISPC_TARGET_ALIGNED_MEMORY --opt=force-aligned-memory)
   ENDIF()


CI: git user.name and user.email already setup on windows

--- CI/prepare_superbuild.cmake
+++ CI/prepare_superbuild.cmake
@@ -224,36 +224,36 @@
     message( "ssh_err = ${ssh_err}" )
   endif()

-  execute_process(
-    COMMAND ${GIT} "config" "user.mail" "otbbot@orfeo-toolbox.org"
-    WORKING_DIRECTORY ${SB_ARTIFACT_GIT}
-    RESULT_VARIABLE mail_res
-    OUTPUT_VARIABLE mail_out
-    ERROR_VARIABLE mail_err
-    )
-
-  if ( DEBUG )
-    message( "Step 2: mail")
-    message( "mail_res = ${mail_res}" )
-    message( "mail_out = ${mail_out}" )
-    message( "mail_err = ${mail_err}" )
-  endif()
-
-  execute_process(
-    COMMAND ${GIT} "config" "user.name" "otbbot"
-    WORKING_DIRECTORY ${SB_ARTIFACT_GIT}
-    RESULT_VARIABLE name_res
-    OUTPUT_VARIABLE name_out
-    ERROR_VARIABLE name_err
-    )
-
-  if ( DEBUG )
-    message( "Step 3: name")
-    message( "name_res = ${name_res}" )
-    message( "name_out = ${name_out}" )
-    message( "name_err = ${name_err}" )
-  endif()
-
+  #~ execute_process(
+    #~ COMMAND ${GIT} "config" "user.mail" "otbbot@orfeo-toolbox.org"
+    #~ WORKING_DIRECTORY ${SB_ARTIFACT_GIT}
+    #~ RESULT_VARIABLE mail_res
+    #~ OUTPUT_VARIABLE mail_out
+    #~ ERROR_VARIABLE mail_err
+    #~ )
+  #~
+  #~ if ( DEBUG )
+    #~ message( "Step 2: mail")
+    #~ message( "mail_res = ${mail_res}" )
+    #~ message( "mail_out = ${mail_out}" )
+    #~ message( "mail_err = ${mail_err}" )
+  #~ endif()
+  #~
+  #~ execute_process(
+    #~ COMMAND ${GIT} "config" "user.name" "otbbot"
+    #~ WORKING_DIRECTORY ${SB_ARTIFACT_GIT}
+    #~ RESULT_VARIABLE name_res
+    #~ OUTPUT_VARIABLE name_out
+    #~ ERROR_VARIABLE name_err
+    #~ )
+  #~
+  #~ if ( DEBUG )
+    #~ message( "Step 3: name")
+    #~ message( "name_res = ${name_res}" )
+    #~ message( "name_out = ${name_out}" )
+    #~ message( "name_err = ${name_err}" )
+  #~ endif()
+  #~
   # create a branche
   execute_process(
     COMMAND ${GIT} "checkout" "-b" "${BRANCH_NAME}"


Store VTK's ExternalData in its source directory

If a parent project wants to use ExternalData (say…ParaView), VTK stores
its data in ParaView's source tree. Store it in VTK's instead.

Change-Id: I7b9ab18159338d6d56d406de40d78e6f66405900

--- CMake/vtkExternalData.cmake
+++ CMake/vtkExternalData.cmake
@@ -4,9 +4,9 @@
 if(NOT VTK_DATA_STORE)
   # Select a default from the following.
   set(VTK_DATA_STORE_DEFAULT "")
-  if(EXISTS "${CMAKE_SOURCE_DIR}/.ExternalData/config/store")
+  if(EXISTS "${VTK_SOURCE_DIR}/.ExternalData/config/store")
     # Configuration left by developer setup script.
-    file(STRINGS "${CMAKE_SOURCE_DIR}/.ExternalData/config/store"
+    file(STRINGS "${VTK_SOURCE_DIR}/.ExternalData/config/store"
       VTK_DATA_STORE_DEFAULT LIMIT_COUNT 1 LIMIT_INPUT 1024)
   elseif(IS_DIRECTORY "${CMAKE_SOURCE_DIR}/../VTKExternalData")
     # Adjacent directory created by user.


glob all dune headers

glob all dune headers

--- cmake/DuneUtils.cmake
+++ cmake/DuneUtils.cmake
@@ -25,5 +25,7 @@
 	FOREACH( MODULE ${ARGN} )
 		INCLUDE_DIR( ${CMAKE_CURRENT_SOURCE_DIR}/../dune-${MODULE} )
 		LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../dune-${MODULE}/${MODULE}/.libs )
+		FILE( GLOB_RECURSE tmp_header "${CMAKE_CURRENT_SOURCE_DIR}/../dune-${MODULE}/${MODULE}/*.hh" )
+		LIST( APPEND DUNE_HEADERS ${tmp_header} )
 	ENDFOREACH(MODULE)
 ENDMACRO( ADD_DUNE_MODULES )


disable avx2 and avx512 flag

disable avx2 and avx512 flag

test=develop

--- cmake/configure.cmake
+++ cmake/configure.cmake
@@ -50,11 +50,7 @@
 endif(NOT WITH_PROFILER)

 if(NOT CMAKE_CROSSCOMPILING)
-    if(WITH_AVX AND AVX512F_FOUND)
-        set(SIMD_FLAG ${AVX512F_FLAG})
-    elseif(WITH_AVX AND AVX2_FOUND)
-        set(SIMD_FLAG ${AVX2_FLAG})
-    elseif(WITH_AVX AND AVX_FOUND)
+    if(WITH_AVX AND AVX_FOUND)
         set(SIMD_FLAG ${AVX_FLAG})
     elseif(SSE3_FOUND)
         set(SIMD_FLAG ${SSE3_FLAG})


Add missing CACHE INTERNAL directive to sanitizer

--- cmake/sanitizer.cmake
+++ cmake/sanitizer.cmake
@@ -16,7 +16,7 @@
 endif()
 set(CMAKE_C_FLAGS_THREADSAN "${CMAKE_C_FLAGS_DEBUG} ${THREAD_SAN_FLAGS}" CACHE INTERNAL "Flags used by the C compiler during thread sanitizer builds." FORCE)
 set(CMAKE_CXX_FLAGS_THREADSAN "${CMAKE_CXX_FLAGS_DEBUG} ${THREAD_SAN_FLAGS}" CACHE INTERNAL "Flags used by the C++ compiler during thread sanitizer builds." FORCE)
-set(CMAKE_SHARED_LINKER_FLAGS_THREADSAN "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}" "Flags used for the linker during thread sanitizer builds" FORCE)
+set(CMAKE_SHARED_LINKER_FLAGS_THREADSAN "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}" CACHE INTERNAL "Flags used for the linker during thread sanitizer builds" FORCE)

 # Address sanitizer
 set(ADDR_SAN_FLAGS "-fsanitize=address")
@@ -30,7 +30,7 @@
 endif()
 set(CMAKE_C_FLAGS_ADDRSAN "${CMAKE_C_FLAGS_DEBUG} ${ADDR_SAN_FLAGS} -fno-omit-frame-pointer -fno-optimize-sibling-calls" CACHE INTERNAL "Flags used by the C compiler during address sanitizer builds." FORCE)
 set(CMAKE_CXX_FLAGS_ADDRSAN "${CMAKE_CXX_FLAGS_DEBUG} ${ADDR_SAN_FLAGS} -fno-omit-frame-pointer -fno-optimize-sibling-calls" CACHE INTERNAL "Flags used by the C++ compiler during address sanitizer builds." FORCE)
-set(CMAKE_SHARED_LINKER_FLAGS_ADDRSAN "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}" "Flags used for the linker during address sanitizer builds" FORCE)
+set(CMAKE_SHARED_LINKER_FLAGS_ADDRSAN "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}" CACHE INTERNAL "Flags used for the linker during address sanitizer builds" FORCE)

 # Leak sanitizer
 set(LEAK_SAN_FLAGS "-fsanitize=leak")
@@ -41,7 +41,7 @@
 endif()
 set(CMAKE_C_FLAGS_LEAKSAN "${CMAKE_C_FLAGS_DEBUG} ${LEAK_SAN_FLAGS} -fno-omit-frame-pointer" CACHE INTERNAL "Flags used by the C compiler during leak sanitizer builds." FORCE)
 set(CMAKE_CXX_FLAGS_LEAKSAN "${CMAKE_CXX_FLAGS_DEBUG} ${LEAK_SAN_FLAGS} -fno-omit-frame-pointer" CACHE INTERNAL "Flags used by the C++ compiler during leak sanitizer builds." FORCE)
-set(CMAKE_SHARED_LINKER_FLAGS_LEAKSAN "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}" "Flags used for the linker during leak sanitizer builds" FORCE)
+set(CMAKE_SHARED_LINKER_FLAGS_LEAKSAN "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}" CACHE INTERNAL "Flags used for the linker during leak sanitizer builds" FORCE)

 # Undefined behavior sanitizer
 set(UDEF_SAN_FLAGS "-fsanitize=undefined")
@@ -52,7 +52,7 @@
 endif()
 set(CMAKE_C_FLAGS_UDEFSAN "${CMAKE_C_FLAGS_DEBUG} ${UDEF_SAN_FLAGS}" CACHE INTERNAL "Flags used by the C compiler during undefined behaviour sanitizer builds." FORCE)
 set(CMAKE_CXX_FLAGS_UDEFSAN "${CMAKE_CXX_FLAGS_DEBUG} ${UDEF_SAN_FLAGS}" CACHE INTERNAL "Flags used by the C++ compiler during undefined behaviour sanitizer builds." FORCE)
-set(CMAKE_SHARED_LINKER_FLAGS_UDEFSAN "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}" "Flags used for the linker during undefined behaviour sanitizer builds" FORCE)
+set(CMAKE_SHARED_LINKER_FLAGS_UDEFSAN "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}" CACHE INTERNAL "Flags used for the linker during undefined behaviour sanitizer builds" FORCE)

 # All sanitizer (without thread sanitizer)
 if(NOT ALL_SAN_FLAGS STREQUAL "")
@@ -67,4 +67,4 @@

 set(CMAKE_C_FLAGS_ALLSAN "${CMAKE_C_FLAGS_DEBUG} ${ALL_SAN_FLAGS} -fno-omit-frame-pointer -fno-optimize-sibling-calls" CACHE INTERNAL "Flags used by the C compiler during most possible sanitizer builds." FORCE)
 set(CMAKE_CXX_FLAGS_ALLSAN "${CMAKE_CXX_FLAGS_DEBUG} ${ALL_SAN_FLAGS} -fno-omit-frame-pointer -fno-optimize-sibling-calls" CACHE INTERNAL "Flags used by the C++ compiler during most possible sanitizer builds." FORCE)
-set(CMAKE_SHARED_LINKER_FLAGS_ALLSAN "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}" "Flags used for the linker during most possible sanitizer builds" FORCE)
+set(CMAKE_SHARED_LINKER_FLAGS_ALLSAN "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}" CACHE INTERNAL "Flags used for the linker during most possible sanitizer builds" FORCE)


Using proper GNUInstallDirs from cmake

Using proper GNUInstallDirs from cmake

--- cmake/utilities.cmake
+++ cmake/utilities.cmake
@@ -112,24 +112,19 @@

 set(${UPPER_NAME}_INCLUDE_DIRS ${include_dirs_install_tree})

-
-if (WIN32)
-	set (INST_BIN_PATH bin/$<CONFIG>)
-else()
-	set (INST_BIN_PATH bin)
-endif()
+include(GNUInstallDirs)

 install(TARGETS ${PROJECT_NAME}
 	EXPORT ${PROJECT_NAME}Targets
-	RUNTIME DESTINATION ${INST_BIN_PATH}
-	LIBRARY DESTINATION lib
-	ARCHIVE DESTINATION lib
+	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
-install(EXPORT ${PROJECT_NAME}Targets DESTINATION "lib/cmake/${PROJECT_NAME}")
+install(EXPORT ${PROJECT_NAME}Targets DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")

 ## <package_name>ConfigVersion.cmake
 write_basic_package_version_file(
-	"${CMAKE_BINARY_DIR}/share/cmake/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake"
+	"${DATAROOTDIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake"
 	VERSION ${CGOGN_VERSION_MAJOR}.${CGOGN_VERSION_MINOR}.${CGOGN_VERSION_PATCH}
 	COMPATIBILITY ExactVersion
 )
@@ -139,13 +134,13 @@
 configure_package_config_file(
 #	"${CGOGN_PATH}/cmake/ConfigFiles/${PROJECT_NAME}Config.cmake.in"
 	"${package_root_dir}/${PROJECT_NAME}Config.cmake.in"
-	"${CMAKE_BINARY_DIR}/share/cmake/${PROJECT_NAME}/${PROJECT_NAME}InstallConfig.cmake"
+	"${DATAROOTDIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}InstallConfig.cmake"
 	PATH_VARS ${UPPER_NAME}_INCLUDE_DIRS
 	INSTALL_DESTINATION "lib/cmake/${PROJECT_NAME}"
 )

-install(FILES "${CMAKE_BINARY_DIR}/share/cmake/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake" DESTINATION "lib/cmake/${PROJECT_NAME}")
-install(FILES "${CMAKE_BINARY_DIR}/share/cmake/${PROJECT_NAME}/${PROJECT_NAME}InstallConfig.cmake" DESTINATION "lib/cmake/${PROJECT_NAME}" RENAME "${PROJECT_NAME}Config.cmake")
+install(FILES "${DATAROOTDIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+install(FILES "${DATAROOTDIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}InstallConfig.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" RENAME "${PROJECT_NAME}Config.cmake")

 endmacro()


Some cleanup

Some cleanup

svn path=/trunk/KDE/kdenetwork/kopete/; revision=547754

--- config-kopete.h.cmake
+++ config-kopete.h.cmake
@@ -53,3 +53,6 @@
 /* Defines if you have GL (Mesa, OpenGL, ...) */
 #define HAVE_GL 1

+/* Glib is required for oRTP code and libmimic code */
+#define HAVE_GLIB 1
+