Revert "[cmake] Move common code out of the condition."

This reverts commit 8f98a3b2bdfef3a30c6b513ea6c9b318b8d3e04b.
It causes duplicate cintdll targets and a race.

--- cmake/modules/RootMacros.cmake
+++ cmake/modules/RootMacros.cmake
@@ -413,19 +413,19 @@
   #---Set the library output directory-----------------------
   ROOT_GET_LIBRARY_OUTPUT_DIR(library_output_dir)
   set (runtime_cxxmodule_dependencies )
-  set(library_name ${libprefix}${library_target_name}${libsuffix})
-  set(newargs -s ${library_output_dir}/${library_name})
-  set(rootmap_name ${library_output_dir}/${libprefix}${library_target_name}.rootmap)
   if(ARG_MODULE)
     set(cpp_module)
+    set(library_name ${libprefix}${library_target_name}${libsuffix})
+    set(newargs -s ${library_output_dir}/${library_name})
     set(master_pcm_name ${library_output_dir}/${libprefix}${library_target_name}_rdict.pcm)
     if(ARG_MULTIDICT)
       set(newargs ${newargs} -multiDict)
       set(pcm_name ${library_output_dir}/${libprefix}${library_target_name}_${dictionary}_rdict.pcm)
-      set(rootmap_name ${library_output_dir}/${libprefix}${library_target_name}32.rootmap)
+      set(rootmap_name ${library_output_dir}/${libprefix}${library_target_name}.rootmap)
     else()
       set(cpp_module ${library_target_name})
       set(pcm_name ${master_pcm_name})
+      set(rootmap_name ${library_output_dir}/${libprefix}${library_target_name}.rootmap)
     endif(ARG_MULTIDICT)

     if(runtime_cxxmodules)
@@ -444,7 +444,10 @@
       endif(cpp_module)
     endif()
   else()
+    set(library_name ${libprefix}${library_target_name}${libsuffix})
+    set(newargs -s ${library_output_dir}/${library_name})
     set(pcm_name ${library_output_dir}/${libprefix}${library_target_name}_rdict.pcm)
+    set(rootmap_name ${library_output_dir}/${libprefix}${library_target_name}.rootmap)
   endif()

   if(CMAKE_ROOTTEST_NOROOTMAP OR cpp_module_file)


boards: arm: blackpill_f401ce: add blackmagicprobe

Adds support for flashing the blackmagicprobe target
for the blackpill_f401ce board.

Signed-off-by: Kalyan Sriram <0a87ba2c04b2161fe6afda1ecf1461a7d5060e39@coderkalyan.com>

--- boards/arm/blackpill_f401ce/board.cmake
+++ boards/arm/blackpill_f401ce/board.cmake
@@ -6,3 +6,4 @@
 include(${ZEPHYR_BASE}/boards/common/dfu-util.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)


oss: FindLibEvent.cmake: workaround cmake POLICY annoyances

Summary:
When pulled in as an external project into an environment
that has changed the default cmake policy, the trick we're using
to extract the full library path errors out.  This works around
that issue by saving the policy settings and then setting them
how we need them before restoring them after we're done.

refs https://github.com/facebook/folly/issues/1100

Reviewed By: yfeldblum

Differential Revision: D14766991

fbshipit-source-id: e2506bc0aebd9e66bc70b12c4c538c9e034f9f73

--- build/fbcode_builder/CMake/FindLibEvent.cmake
+++ build/fbcode_builder/CMake/FindLibEvent.cmake
@@ -36,7 +36,13 @@
   # this results in linker errors.
   # To resolve this, we ask cmake to lookup the full path to the library
   # and use that instead.
+  cmake_policy(PUSH)
+  if(POLICY CMP0026)
+    # Allow reading the LOCATION property
+    cmake_policy(SET CMP0026 OLD)
+  endif()
   get_target_property(LIBEVENT_LIB event LOCATION)
+  cmake_policy(POP)

   set(LibEvent_FOUND ${Libevent_FOUND})
   if (NOT LibEvent_FIND_QUIETLY)


maybe this will remove the warnings

maybe this will remove the warnings

--- ANTS.cmake
+++ ANTS.cmake
@@ -135,14 +135,14 @@
 #----------------------------------------------------------------------------
 # Setup ants build environment
 set(PICSL_INCLUDE_DIRS
-  ${CMAKE_CURRENT_SOURCE_DIR}/Utilities
-  ${CMAKE_CURRENT_SOURCE_DIR}/ImageRegistration
-  ${CMAKE_CURRENT_SOURCE_DIR}/ImageSegmentation
+${CMAKE_CURRENT_SOURCE_DIR}/Utilities
+${CMAKE_CURRENT_SOURCE_DIR}/ImageRegistration
+${CMAKE_CURRENT_SOURCE_DIR}/ImageSegmentation
 #  ${CMAKE_CURRENT_SOURCE_DIR}/GraphTheory
-  ${CMAKE_CURRENT_SOURCE_DIR}/Tensor
-  ${CMAKE_CURRENT_SOURCE_DIR}/Temporary
-  ${CMAKE_CURRENT_SOURCE_DIR}/Examples
-  ${CMAKE_CURRENT_BINARY_DIR}
+${CMAKE_CURRENT_SOURCE_DIR}/Tensor
+${CMAKE_CURRENT_SOURCE_DIR}/Temporary
+${CMAKE_CURRENT_SOURCE_DIR}/Examples
+${CMAKE_CURRENT_BINARY_DIR}
 )
 include_directories(${PICSL_INCLUDE_DIRS})


modified location of generated environment files

--- cmake/catkin_generate_environment.cmake
+++ cmake/catkin_generate_environment.cmake
@@ -11,7 +11,7 @@
     # generate setup for various shells
     set(CURRENT_WORKSPACE ${catkin_BUILD_PREFIX}:${CMAKE_SOURCE_DIR})
     em_expand(${catkin_EXTRAS_DIR}/templates/setup.context.py.in
-      ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/setup.buildspace.context.py
+      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/setup.buildspace.context.py
       ${catkin_EXTRAS_DIR}/em/setup.sh.em
       ${catkin_BUILD_PREFIX}/setup.sh)
     foreach(shell bash zsh)
@@ -26,7 +26,7 @@
       ${catkin_BUILD_PREFIX}/env.bat)
     # generate setup
     em_expand(${catkin_EXTRAS_DIR}/templates/setup.context.py.in
-      ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/setup.buildspace.context.py
+      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/setup.buildspace.context.py
       ${catkin_EXTRAS_DIR}/em/setup.bat.em
       ${catkin_BUILD_PREFIX}/setup.bat)
   endif()
@@ -37,24 +37,24 @@
     # non-windows
     # generate and install env
     configure_file(${catkin_EXTRAS_DIR}/templates/env.sh.in
-      ${CMAKE_CURRENT_BINARY_DIR}/installspace/env.sh)
+      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/installspace/env.sh)
     install(PROGRAMS
-      ${CMAKE_CURRENT_BINARY_DIR}/installspace/env.sh
+      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/installspace/env.sh
       DESTINATION ${CMAKE_INSTALL_PREFIX})
     # generate and install setup for various shells
     set(CURRENT_WORKSPACE ${CMAKE_INSTALL_PREFIX})
     em_expand(${catkin_EXTRAS_DIR}/templates/setup.context.py.in
-      ${CMAKE_CURRENT_BINARY_DIR}/setup.installspace.context.py
+      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/setup.installspace.context.py
       ${catkin_EXTRAS_DIR}/em/setup.sh.em
-      ${CMAKE_CURRENT_BINARY_DIR}/installspace/setup.sh)
+      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/installspace/setup.sh)
     install(FILES
-      ${CMAKE_CURRENT_BINARY_DIR}/installspace/setup.sh
+      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/installspace/setup.sh
       DESTINATION ${CMAKE_INSTALL_PREFIX})
     foreach(shell bash zsh)
       configure_file(${catkin_EXTRAS_DIR}/templates/setup.${shell}.in
-        ${CMAKE_CURRENT_BINARY_DIR}/installspace/setup.${shell})
+        ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/installspace/setup.${shell})
       install(FILES
-        ${CMAKE_CURRENT_BINARY_DIR}/installspace/setup.${shell}
+        ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/installspace/setup.${shell}
         DESTINATION ${CMAKE_INSTALL_PREFIX})
     endforeach()

@@ -62,27 +62,26 @@
     # windows
     # generate and install env
     configure_file(${catkin_EXTRAS_DIR}/templates/env.bat.in
-      ${CMAKE_CURRENT_BINARY_DIR}/installspace/env.bat)
+      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/installspace/env.bat)
     install(PROGRAMS
-      ${CMAKE_CURRENT_BINARY_DIR}/installspace/env.bat
+      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/installspace/env.bat
       DESTINATION ${CMAKE_INSTALL_PREFIX})
     # generate and install setup
     em_expand(${catkin_EXTRAS_DIR}/templates/setup.context.py.in
-      ${CMAKE_CURRENT_BINARY_DIR}/setup.installspace.context.py
+      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/setup.installspace.context.py
       ${catkin_EXTRAS_DIR}/em/setup.bat.em
-      ${CMAKE_CURRENT_BINARY_DIR}/installspace/setup.bat)
+      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/installspace/setup.bat)
     install(FILES
-      ${CMAKE_CURRENT_BINARY_DIR}/installspace/setup.bat
+      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/installspace/setup.bat
       DESTINATION ${CMAKE_INSTALL_PREFIX})
   endif()

   # XXX what is .rosinstall needed for?
   #if(catkin_SOURCE_DIR)
-  #  message(STATUS "foo ${CMAKE_CURRENT_BINARY_DIR}")
   #  configure_file(${catkin_EXTRAS_DIR}/templates/rosinstall.installable.in
-  #    ${CMAKE_CURRENT_BINARY_DIR}/installspace/.rosinstall)
+  #    ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/installspace/.rosinstall)
   #  install(FILES
-  #    ${CMAKE_CURRENT_BINARY_DIR}/installspace/.rosinstall
+  #    ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/installspace/.rosinstall
   #    DESTINATION ${CMAKE_INSTALL_PREFIX})
   #endif()
 endfunction()


PARQUET-865: Pass all CXXFLAGS to Thrift ExternalProject

Author: Uwe L. Korn <uwelk@xhochy.com>
Author: Korn, Uwe <Uwe.Korn@blue-yonder.com>

Closes #235 from xhochy/PARQUET-865 and squashes the following commits:

8a18d3a [Korn, Uwe] Extend CXXFLAGS to all external projects
0f3affb [Uwe L. Korn] PARQUET-865: Pass all CXXFLAGS to Thrift ExternalProject

--- cmake_modules/ThirdpartyToolchain.cmake
+++ cmake_modules/ThirdpartyToolchain.cmake
@@ -33,6 +33,11 @@
 message(STATUS "Boost include dir: " ${Boost_INCLUDE_DIRS})
 message(STATUS "Boost libraries: " ${Boost_LIBRARIES})

+string(TOUPPER ${CMAKE_BUILD_TYPE} UPPERCASE_BUILD_TYPE)
+# Set -fPIC on all external projects and include the main CXX_FLAGS
+set(EP_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}} -fPIC")
+set(EP_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}} -fPIC")
+
 # find thrift headers and libs
 find_package(Thrift)

@@ -47,11 +52,13 @@
   set(THRIFT_STATIC_LIB "${THRIFT_PREFIX}/lib/libthrift.a")
   set(THRIFT_COMPILER "${THRIFT_PREFIX}/bin/thrift")
   set(THRIFT_VENDORED 1)
+  set(THRIFT_CONFIGURE_COMMAND
+      ./configure "CFLAGS=${EP_C_FLAGS}" "CXXFLAGS=${EP_CXX_FLAGS}" --without-qt4 --without-c_glib --without-csharp --without-java --without-erlang --without-nodejs --without-lua --without-python --without-perl --without-php --without-php_extension --without-ruby --without-haskell --without-go --without-d --with-cpp "--prefix=${THRIFT_PREFIX}")

   if (CMAKE_VERSION VERSION_GREATER "3.2")
     # BUILD_BYPRODUCTS is a 3.2+ feature
     ExternalProject_Add(thrift_ep
-      CONFIGURE_COMMAND ./configure "CXXFLAGS=-fPIC" --without-qt4 --without-c_glib --without-csharp --without-java --without-erlang --without-nodejs --without-lua --without-python --without-perl --without-php --without-php_extension --without-ruby --without-haskell --without-go --without-d --with-cpp "--prefix=${THRIFT_PREFIX}"
+      CONFIGURE_COMMAND ${THRIFT_CONFIGURE_COMMAND}
       BUILD_IN_SOURCE 1
       # This is needed for 0.9.1 and can be removed for 0.9.3 again
       BUILD_COMMAND make clean
@@ -62,7 +69,7 @@
       )
   else()
     ExternalProject_Add(thrift_ep
-      CONFIGURE_COMMAND ./configure "CXXFLAGS=-fPIC" --without-qt4 --without-c_glib --without-csharp --without-java --without-erlang --without-nodejs --without-lua --without-python --without-perl --without-php --without-php_extension --without-ruby --without-haskell --without-go --without-d --with-cpp "--prefix=${THRIFT_PREFIX}"
+        CONFIGURE_COMMAND ./configure "CFLAGS=${THRIFT_C_FLAGS}" "CXXFLAGS=${THRIFT_CXX_FLAGS}" --without-qt4 --without-c_glib --without-csharp --without-java --without-erlang --without-nodejs --without-lua --without-python --without-perl --without-php --without-php_extension --without-ruby --without-haskell --without-go --without-d --with-cpp "--prefix=${THRIFT_PREFIX}"
       BUILD_IN_SOURCE 1
       # This is needed for 0.9.1 and can be removed for 0.9.3 again
       BUILD_COMMAND make clean
@@ -138,6 +145,8 @@
   set(BROTLI_LIBRARY_COMMON "${BROTLI_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}/libbrotlicommon.a")
   set(BROTLI_VENDORED 1)
   set(BROTLI_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+                        "-DCMAKE_CXX_FLAGS=${EP_CXX_FLAGS}"
+                        "-DCMAKE_C_FLAGS=${EX_C_FLAGS}"
                         -DCMAKE_INSTALL_PREFIX=${BROTLI_PREFIX}
                         -DCMAKE_INSTALL_LIBDIR=lib/${CMAKE_LIBRARY_ARCHITECTURE}
                         -DBUILD_SHARED_LIBS=OFF)
@@ -184,7 +193,7 @@
   set(ZLIB_VENDORED 1)
   set(ZLIB_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
                       -DCMAKE_INSTALL_PREFIX=${ZLIB_PREFIX}
-                      -DCMAKE_C_FLAGS=-fPIC
+                      -DCMAKE_C_FLAGS=${EP_C_FLAGS}
                       -DBUILD_SHARED_LIBS=OFF)

   if (CMAKE_VERSION VERSION_GREATER "3.2")
@@ -216,9 +225,9 @@

   if("$ENV{GTEST_HOME}" STREQUAL "")
     if(APPLE)
-      set(GTEST_CMAKE_CXX_FLAGS "-fPIC -std=c++11 -stdlib=libc++ -DGTEST_USE_OWN_TR1_TUPLE=1 -Wno-unused-value -Wno-ignored-attributes")
+      set(GTEST_CMAKE_CXX_FLAGS "${EP_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1 -Wno-unused-value -Wno-ignored-attributes")
     else()
-      set(GTEST_CMAKE_CXX_FLAGS "-fPIC")
+      set(GTEST_CMAKE_CXX_FLAGS "${EP_CXX_FLAGS}")
     endif()

     set(GTEST_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/googletest_ep-prefix/src/googletest_ep")
@@ -272,12 +281,6 @@
   add_custom_target(runbenchmark ctest -L benchmark)

   if("$ENV{GBENCHMARK_HOME}" STREQUAL "")
-    if(APPLE)
-      set(GBENCHMARK_CMAKE_CXX_FLAGS "-std=c++11 -stdlib=libc++")
-    else()
-      set(GBENCHMARK_CMAKE_CXX_FLAGS "--std=c++11")
-    endif()
-
     set(GBENCHMARK_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/gbenchmark_ep/src/gbenchmark_ep-install")
     set(GBENCHMARK_INCLUDE_DIR "${GBENCHMARK_PREFIX}/include")
     set(GBENCHMARK_STATIC_LIB "${GBENCHMARK_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}benchmark${CMAKE_STATIC_LIBRARY_SUFFIX}")
@@ -285,7 +288,7 @@
     set(GBENCHMARK_CMAKE_ARGS
           "-DCMAKE_BUILD_TYPE=Release"
           "-DCMAKE_INSTALL_PREFIX:PATH=${GBENCHMARK_PREFIX}"
-          "-DCMAKE_CXX_FLAGS=-fPIC ${GBENCHMARK_CMAKE_CXX_FLAGS}")
+          "-DCMAKE_CXX_FLAGS=${EP_CXX_FLAGS}")
     if (CMAKE_VERSION VERSION_GREATER "3.2")
       # BUILD_BYPRODUCTS is a 3.2+ feature
       ExternalProject_Add(gbenchmark_ep
@@ -324,6 +327,8 @@
   set(ARROW_STATIC_LIB "${ARROW_PREFIX}/lib/libarrow.a")
   set(ARROW_IO_STATIC_LIB "${ARROW_PREFIX}/lib/libarrow_io.a")
   set(ARROW_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+    -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
     -DCMAKE_INSTALL_PREFIX=${ARROW_PREFIX}
     -DARROW_JEMALLOC=OFF
     -DARROW_BUILD_TESTS=OFF)


Generate header test sources into their own directory.

--- tests/api_headers/tests.cmake
+++ tests/api_headers/tests.cmake
@@ -3,11 +3,9 @@
   get_filename_component(TEST_HEADER ${_API_HEADER_FILE} NAME)
   set(CURRENT_TEST test_api_headers_${TEST_HEADER_NAME})

-  set(TEST_SRC ${CMAKE_CURRENT_BINARY_DIR}/api_header_${TEST_HEADER_NAME}.cpp)
-  set(TEST_CMAKE_FILE ${CMAKE_CURRENT_BINARY_DIR}/api_header_${TEST_HEADER_NAME}.cmake)
+  set(TEST_SRC ${CMAKE_CURRENT_BINARY_DIR}/api_headers/api_header_${TEST_HEADER_NAME}.cpp)
+  set(TEST_CMAKE_FILE ${CMAKE_CURRENT_BINARY_DIR}/api_headers/api_header_${TEST_HEADER_NAME}.cmake)
   configure_file(api_headers/api_header_test.in.cpp ${TEST_SRC})
   configure_file(api_headers/api_header_test.in.cmake ${TEST_CMAKE_FILE})
   include(${TEST_CMAKE_FILE})
 endforeach()
-
-message(STATUS "TEST_LIST: ${TEST_LIST}")


use recursive dependencies to determine interface dependencies

--- rosidl_cmake/cmake/rosidl_generate_interfaces.cmake
+++ rosidl_cmake/cmake/rosidl_generate_interfaces.cmake
@@ -122,12 +122,21 @@
     ament_index_register_resource("rosidl_interfaces" CONTENT "${_idl_files_lines}")
   endif()

+  # collect package names of recursive dependencies
+  set(_recursive_dependencies)
+  foreach(_dep ${_ARG_DEPENDENCIES})
+    list_append_unique(_recursive_dependencies "${_dep}")
+    foreach(_dep2 ${${_dep}_RECURSIVE_DEPENDENCIES})
+      list_append_unique(_recursive_dependencies "${_dep2}")
+    endforeach()
+  endforeach()
+
   # generators must be executed in topological order
   # which is ensured by every generator finding its dependencies first
   # and then registering itself as an extension
   set(rosidl_generate_interfaces_TARGET ${target})
   set(rosidl_generate_interfaces_IDL_FILES ${_idl_files})
-  set(rosidl_generate_interfaces_DEPENDENCY_PACKAGE_NAMES ${_ARG_DEPENDENCIES})
+  set(rosidl_generate_interfaces_DEPENDENCY_PACKAGE_NAMES ${_recursive_dependencies})
   set(rosidl_generate_interfaces_SKIP_INSTALL ${_ARG_SKIP_INSTALL})
   ament_execute_extensions("rosidl_generate_interfaces")


ENH: Do not build SlicerExecutionModel if its path is provided

In a previous commit (5480a6b32aec3df372f08fc18882e8646ca8b8a5 [1]), External_SlicerExecutionModel.cmake has been modified and does not check if SlicerExecutionModel_DIR is defined before creating the external project to download and compile SlicerExecutionModel. Even if it is provided and if USE_SYSTEM_SLICER_EXECUTION_MODEL is set to ON, the external project for SlicerExecutionModel was still used.

[1] https://github.com/KitwareMedical/ImageViewer/commit/5480a6b32aec3df372f08fc18882e8646ca8b8a5#diff-2ead5608565906a4e7f5d574e7363861

--- CMake/Superbuild/External_SlicerExecutionModel.cmake
+++ CMake/Superbuild/External_SlicerExecutionModel.cmake
@@ -29,8 +29,6 @@
 endif( ${CMAKE_CURRENT_LIST_FILENAME}_FILE_INCLUDED )
 set( ${CMAKE_CURRENT_LIST_FILENAME}_FILE_INCLUDED 1 )

-set( proj SlicerExecutionModel )
-
 # Sanity checks.
 if( DEFINED SlicerExecutionModel_DIR AND NOT EXISTS ${SlicerExecutionModel_DIR} )
   message( FATAL_ERROR "SlicerExecutionModel_DIR variable is defined but corresponds to a nonexistent directory" )
@@ -42,36 +40,45 @@
 # Include dependent projects, if any.
 CheckExternalProjectDependency( SlicerExecutionModel )

-set( SlicerExecutionModel_SOURCE_DIR ${CMAKE_BINARY_DIR}/SlicerExecutionModel )
-set( SlicerExecutionModel_DIR ${CMAKE_BINARY_DIR}/SlicerExecutionModel-build )
+if( NOT DEFINED SlicerExecutionModel_DIR AND NOT USE_SYSTEM_SlicerExecutionModel )
+  set( SlicerExecutionModel_SOURCE_DIR ${CMAKE_BINARY_DIR}/SlicerExecutionModel )
+  set( SlicerExecutionModel_DIR ${CMAKE_BINARY_DIR}/SlicerExecutionModel-build )

-ExternalProject_Add( SlicerExecutionModel
-  GIT_REPOSITORY ${SlicerExecutionModel_URL}
-  GIT_TAG ${SlicerExecutionModel_HASH_OR_TAG}
-  DOWNLOAD_DIR ${SlicerExecutionModel_SOURCE_DIR}
-  SOURCE_DIR ${SlicerExecutionModel_SOURCE_DIR}
-  BINARY_DIR ${SlicerExecutionModel_DIR}
-  INSTALL_DIR ${SlicerExecutionModel_DIR}
-  CMAKE_GENERATOR ${gen}
-  LOG_DOWNLOAD 1
-  LOG_UPDATE 0
-  LOG_CONFIGURE 0
-  LOG_BUILD 0
-  LOG_TEST 0
-  LOG_INSTALL 0
-  UPDATE_COMMAND ""
-  CMAKE_ARGS
-    -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
-    -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
-    -DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}
-    -DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
-    -DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS}
-    -DCMAKE_SHARED_LINKER_FLAGS:STRING=${CMAKE_SHARED_LINKER_FLAGS}
-    -DCMAKE_BUILD_TYPE:STRING=${build_type}
-    ${CMAKE_OSX_EXTERNAL_PROJECT_ARGS}
-    -DBUILD_SHARED_LIBS:BOOL=${shared}
-    -DBUILD_TESTING:BOOL=OFF
-    -DITK_DIR:PATH=${ITK_DIR}
-  INSTALL_COMMAND ""
-  DEPENDS
-    ${SlicerExecutionModel_DEPENDENCIES} )
+  ExternalProject_Add( SlicerExecutionModel
+    GIT_REPOSITORY ${SlicerExecutionModel_URL}
+    GIT_TAG ${SlicerExecutionModel_HASH_OR_TAG}
+    DOWNLOAD_DIR ${SlicerExecutionModel_SOURCE_DIR}
+    SOURCE_DIR ${SlicerExecutionModel_SOURCE_DIR}
+    BINARY_DIR ${SlicerExecutionModel_DIR}
+    INSTALL_DIR ${SlicerExecutionModel_DIR}
+    CMAKE_GENERATOR ${gen}
+    LOG_DOWNLOAD 1
+    LOG_UPDATE 0
+    LOG_CONFIGURE 0
+    LOG_BUILD 0
+    LOG_TEST 0
+    LOG_INSTALL 0
+    UPDATE_COMMAND ""
+    CMAKE_ARGS
+      -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
+      -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
+      -DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}
+      -DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
+      -DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS}
+      -DCMAKE_SHARED_LINKER_FLAGS:STRING=${CMAKE_SHARED_LINKER_FLAGS}
+      -DCMAKE_BUILD_TYPE:STRING=${build_type}
+      ${CMAKE_OSX_EXTERNAL_PROJECT_ARGS}
+      -DBUILD_SHARED_LIBS:BOOL=${shared}
+      -DBUILD_TESTING:BOOL=OFF
+      -DITK_DIR:PATH=${ITK_DIR}
+    INSTALL_COMMAND ""
+    DEPENDS
+      ${SlicerExecutionModel_DEPENDENCIES} )
+else( NOT DEFINED SlicerExecutionModel_DIR AND NOT USE_SYSTEM_SlicerExecutionModel )
+  if( USE_SYSTEM_SlicerExecutionModel )
+    find_package( SlicerExecutionModel REQUIRED )
+  endif( USE_SYSTEM_SlicerExecutionModel )
+
+  AddEmptyExternalProject( SlicerExecutionModel "${SlicerExecutionModel_DEPENDENCIES}" )
+endif( NOT DEFINED SlicerExecutionModel_DIR AND NOT USE_SYSTEM_SlicerExecutionModel )
+


Windows porting by ana

Windows porting by ana

--- salome_adm/cmake_files/FindCAS.cmake
+++ salome_adm/cmake_files/FindCAS.cmake
@@ -60,7 +60,12 @@
 # Definitions:
 SET(CAS_DEFINITIONS "-DLIN -DLINTEL -DCSFDB")
 SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -DNo_exception")
-SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -DHAVE_CONFIG_H")
+
+# No config.h file in the OPEN CASCADE on WINDOWS platform
+IF(NOT WINDOWS)
+ SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -DHAVE_CONFIG_H")
+ENDIF(NOT WINDOWS)
+
 SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -DOCC_CONVERT_SIGNALS")

 # Test for 64 bit machine:


Change variable name

Change variable name

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

--- deal.II/contrib/cmake/configure/configure_trilinos.cmake
+++ deal.II/contrib/cmake/configure/configure_trilinos.cmake
@@ -84,12 +84,12 @@
     # of Epetra.
     #
     IF(EXISTS "${TRILINOS_INCLUDE_DIR}/Epetra_MpiComm.h")
-      SET(TRILINOS_HAVE_EPETRA_MPICOMM_H TRUE)
+      SET(TRILINOS_WITH_MPICOMM TRUE)
     ENDIF()

-    IF( (TRILINOS_HAVE_EPETRA_MPICOMM_H AND NOT DEAL_II_COMPILER_SUPPORTS_MPI)
+    IF( (TRILINOS_WITH_MPI AND NOT DEAL_II_COMPILER_SUPPORTS_MPI)
          OR
-         (NOT TRILINOS_HAVE_EPETRA_MPICOMM_H AND DEAL_II_COMPILER_SUPPORTS_MPI))
+         (NOT TRILINOS_WITH_MPI AND DEAL_II_COMPILER_SUPPORTS_MPI))
       MESSAGE(WARNING "\n"
         "Trilinos has to be configured with the same MPI configuration as deal.II.\n\n"
         )


BUG: Fix file inclusion for slicer extension

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -288,8 +288,8 @@
   unsetForSlicer( NAMES VTK_DIR SlicerExecutionModel_DIR DCMTK_DIR ITK_DIR CMAKE_C_COMPILER CMAKE_CXX_COMPILER CMAKE_CXX_FLAGS CMAKE_C_FLAGS)
   # Create fake imported target to avoid importing Slicer target: See SlicerConfig.cmake:line 820
   add_library(SlicerBaseLogic SHARED IMPORTED)
-  find_package(Slicer REQUIRED)
-  include(${Slicer_USE_FILE})
+  #find_package(Slicer REQUIRED)
+  #include(${Slicer_USE_FILE})
   set( EXTENSION_NO_CLI asc2meta asc2vtk BYU2VTK MeshMath Meta2STL Meta2VTK SpharmTool STL2Meta VTK2Meta )
   set( EXTENSION_CLI GenParaMeshCLP ParaToSPHARMMeshCLP RadiusToMesh SegPostProcessCLP ShapeAnalysisModule  )
   set( EXTENSION_TESTS ${EXTENSION_NO_CLI} ${EXTENSION_CLI} GenParaMeshCLPTest SegPostProcessCLPTest )


Remove proctitle.c from sources. It creates multiple definitions.

--- deps/uv.cmake
+++ deps/uv.cmake
@@ -114,7 +114,6 @@
     ${LIBUVDIR}/src/unix/pipe.c
     ${LIBUVDIR}/src/unix/poll.c
     ${LIBUVDIR}/src/unix/process.c
-    ${LIBUVDIR}/src/unix/proctitle.c
     ${LIBUVDIR}/src/unix/signal.c
     ${LIBUVDIR}/src/unix/spinlock.h
     ${LIBUVDIR}/src/unix/stream.c
@@ -181,6 +180,7 @@
     -D=_DARWIN_USE_64_BIT_INODE
   )
   set(SOURCES ${SOURCES}
+    ${LIBUVDIR}/src/unix/proctitle.c
     ${LIBUVDIR}/include/uv-darwin.h
     ${LIBUVDIR}/src/unix/bsd-ifaddrs.c
     ${LIBUVDIR}/src/unix/darwin.c


ENH: Preparing code for Slicer Extension

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -57,8 +57,8 @@
 option(USE_SYSTEM_BatchMake "Build using an externally defined version of BatchMake" OFF)
 option(USE_SYSTEM_CLAPACK "Build using an externally defined version of CLAPACK" OFF)
 option(USE_SYSTEM_LAPACK "Build using an externally defined version of LAPACK" OFF)
-option(COMPILE_StatNonParamTestPDM "Compile StatNonParam and ShapeMancova" ON)
-option(COMPILE_shapeworks "Compile shapeworks." ON)
+option(COMPILE_StatNonParamTestPDM "Compile StatNonParam and ShapeMancova" OFF)
+option(COMPILE_shapeworks "Compile shapeworks." OFF)
 option(COMPILE_ImageMath "Compile ImageMath." ON)
 option(COMPILE_MetaMeshTools "Compile MetaMeshTools." ON)
 option(COMPILE_SegPostProcessCLP "Compile SegPostProcessCLP." ON)
@@ -66,7 +66,7 @@
 option(COMPILE_RadiusToMesh "Compile RadiusToMesh." ON)
 option(COMPILE_ParaToSPHARMMeshCLP "Compile ParaToSPHARMMeshCLP." ON)
 option(COMPILE_ShapeAnalysisModule "Compile ShapeAnalysisModule." ON)
-option(COMPILE_ParticleModule "Compile ParticleModule." ON)
+option(COMPILE_ParticleModule "Compile ParticleModule." OFF)

 #-----------------------------------------------------------------------------
 # Prerequisites


BUG: When superbuild check if directories are present

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -375,7 +375,11 @@
 set(proj ${LOCAL_PROJECT_NAME})
 list(APPEND LIST_TOOLS DTI-Reg )
 set( DTI-RegTOOL DTI-Reg )
-set( DTI-Reg_INSTALL_DIRECTORY ${EXTERNAL_BINARY_DIRECTORY}/DTI-Reg-install )
+
+if(NOT DTI-Reg_INSTALL_DIRECTORY)
+  set( DTI-Reg_INSTALL_DIRECTORY ${EXTERNAL_BINARY_DIRECTORY}/DTI-Reg-install )
+endif()
+
 set(proj_build ${proj}-build)

 if( DTI-Reg_BUILD_SLICER_EXTENSION )
@@ -405,8 +409,13 @@

   # Import DTIProcess targets for the tests
   # DTIProcess_DIR is set because DTI-Reg is defined as dependent of the extension DTIProcess
-  include( ${DTIProcess_DIR}/ImportDTIProcessExtensionExecutables.cmake )
-  include( ${ResampleDTIlogEuclidean_DIR}/ResampleDTIlogEuclidean-exports.cmake )
+  if(DTIProcess_DIR)
+    include( ${DTIProcess_DIR}/ImportDTIProcessExtensionExecutables.cmake )
+  endif()
+
+  if(ResampleDTIlogEuclidean_DIR)
+    include( ${ResampleDTIlogEuclidean_DIR}/ResampleDTIlogEuclidean-exports.cmake )
+  endif()

 endif()


[BUILD] moved platform to top and exit with warning if unknown platform is detected

--- util/cmake/SeqAnCtdSetup.cmake
+++ util/cmake/SeqAnCtdSetup.cmake
@@ -53,6 +53,18 @@
   return ()
 endif ()

+# Create the payload binary ZIP file.
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  set (SEQAN_PLATFORM "lnx")
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  set (SEQAN_PLATFORM "win")
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+  set (SEQAN_PLATFORM "mac")
+else ()
+  message (STATUS "Unsupported platform ${CMAKE_SYSTEM_NAME}, disabling CTD support.")
+  return()
+endif ()
+
 # ============================================================================
 # Variable Setup
 # ============================================================================
@@ -122,7 +134,7 @@
   list (APPEND TMP_PAYLOAD_FILES "${PAYLOAD_TMP_BIN_PATH}/${_BINARY}")
   add_custom_command (OUTPUT ${PAYLOAD_TMP_BIN_PATH}/${_BINARY}
                       COMMAND ${CMAKE_COMMAND} -E copy "${_BINARY_PATH}" "${PAYLOAD_TMP_BIN_PATH}/${_BINARY}"
-                      DEPENDS ${_TARGET}
+                      DEPENDS ${_TARGET}
                               ${PAYLOAD_TMP_BIN_PATH})
 endforeach ()

@@ -130,17 +142,6 @@
 add_custom_command (OUTPUT "${PAYLOAD_TMP_PATH}/binaries.ini"
                     COMMAND ${CMAKE_COMMAND} -E touch ${PAYLOAD_TMP_PATH}/binaries.ini
                     DEPENDS ${PAYLOAD_TMP_PATH})
-
-# Create the payload binary ZIP file.
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  set (SEQAN_PLATFORM "lnx")
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
-  set (SEQAN_PLATFORM "win")
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-  set (SEQAN_PLATFORM "mac")
-else ()
-  message (FATAL_ERROR "Unknown platform name ${SEQAN_PLATFORM}")
-endif ()

 if (CMAKE_SIZEOF_VOID_P EQUAL 8)
   set (SEQAN_SYSTEM_WORDSIZE "64")
@@ -239,4 +240,3 @@
                            ${ICON_FILES}
                            ${WORKFLOW_PLUGIN_DIR}/plugin.properties
                            ${_ZIP_PATH}/${_ZIP_NAME})
-


ENH: Bump the MinimalPathExtraction Remote to 2015-10-20.

The shortlog:

  COMP: Add missing ObjectFactory header.
  COMP: Add missing vector header include.
  ENH: Update the examples directory to build against ITK.
  BUG: Update path information typedef, method, and member names.
  COMP: Remove non-ASCII character.
  BUG: Use the ITK modularization linking macro for the generated library.
  ENH: Build the Docker image in CircleCI build for the test.
  ENH: Test the example build.
  BUG: Add missing LICENSE file.
  STYLE: Move the PDF documentation to a doc directory.
  STYLE: Move test/data to test/Input.

Change-Id: I1dbd56402f9c72d694962379901866f0aa8c9454

--- Modules/Remote/MinimalPathExtraction.remote.cmake
+++ Modules/Remote/MinimalPathExtraction.remote.cmake
@@ -3,5 +3,5 @@
  "http://www.insight-journal.org/browse/publication/213
 "
   GIT_REPOSITORY https://github.com/InsightSoftwareConsortium/ITKMinimalPathExtraction.git
-  GIT_TAG 50380b8142cb470403997979544fc555b9ed3448
+  GIT_TAG 611676c916310b05ea6c5e6b7804df72f8d20807
   )


Remove now obsolete cmake config file

Remove now obsolete cmake config file

--- cmake/FindLibgit2.cmake
+++ cmake/FindLibgit2.cmake
@@ -1,20 +0,0 @@
-SET(LIBGIT2_DEFINITIONS ${PC_LIBGIT2_CFLAGS_OTHER})
-
-FIND_PATH(LIBGIT2_INCLUDE_DIR NAMES git2.h
-   HINTS
-   ${PC_LIBGIT2_INCLUDEDIR}
-   ${PC_LIBGIT2_INCLUDE_DIRS}
-)
-
-FIND_LIBRARY(LIBGIT2_LIBRARIES NAMES git2
-   HINTS
-   ${PC_LIBGIT2_LIBDIR}
-   ${PC_LIBGIT2_LIBRARY_DIRS}
-)
-
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(libgit2 DEFAULT_MSG LIBGIT2_LIBRARIES LIBGIT2_INCLUDE_DIR)
-
-MARK_AS_ADVANCED(LIBGIT2_INCLUDE_DIR LIBGIT2_LIBRARIES)
-


Fix mbedtls detection in out-of-source builds

--- cmake/FindMbedTLS.cmake
+++ cmake/FindMbedTLS.cmake
@@ -48,12 +48,17 @@
 # Set ``MBEDTLS_ROOT_DIR`` to the root directory of an mbedTLS installation.
 # Set ``MBEDTLS_USE_STATIC_LIBS`` to ``TRUE`` to look for static libraries.

+if(MBEDTLS_ROOT_DIR)
+    # Disable re-rooting paths in find_path/find_library.
+    # This assumes MBEDTLS_ROOT_DIR is an absolute path.
+    set(_EXTRA_FIND_ARGS "NO_CMAKE_FIND_ROOT_PATH")
+endif()

 find_path(MBEDTLS_INCLUDE_DIR
           NAMES mbedtls/ssl.h
           PATH_SUFFIXES include
-          HINTS ${MBEDTLS_ROOT_DIR})
-
+          HINTS ${MBEDTLS_ROOT_DIR}
+          ${_EXTRA_FIND_ARGS})

 # based on https://github.com/ARMmbed/mbedtls/issues/298
 if(MBEDTLS_INCLUDE_DIR AND EXISTS "${MBEDTLS_INCLUDE_DIR}/mbedtls/version.h")
@@ -69,7 +74,7 @@
 endif()

-if(MBEDTLS_STATIC_LIBRARIES)
+if(MBEDTLS_USE_STATIC_LIBS)
     set(_MBEDTLS_LIB_NAME libmbedtls.a)
     set(_MBEDTLS_CRYPTO_LIB_NAME libmbedcrypto.a)
     set(_MBEDTLS_X509_LIB_NAME libmbedx509.a)
@@ -82,17 +87,20 @@
 find_library(MBEDTLS_LIBRARY
              NAMES ${_MBEDTLS_LIB_NAME}
              PATH_SUFFIXES lib
-             HINTS ${MBEDTLS_ROOT_DIR})
+             HINTS ${MBEDTLS_ROOT_DIR}
+             ${_EXTRA_FIND_ARGS})

 find_library(MBEDTLS_CRYPTO_LIBRARY
              NAMES ${_MBEDTLS_CRYPTO_LIB_NAME}
              PATH_SUFFIXES lib
-             HINTS ${MBEDTLS_ROOT_DIR})
+             HINTS ${MBEDTLS_ROOT_DIR}
+             ${_EXTRA_FIND_ARGS})

 find_library(MBEDTLS_X509_LIBRARY
              NAMES ${_MBEDTLS_X509_LIB_NAME}
              PATH_SUFFIXES lib
-             HINTS ${MBEDTLS_ROOT_DIR})
+             HINTS ${MBEDTLS_ROOT_DIR}
+             ${_EXTRA_FIND_ARGS})

 set(MBEDTLS_LIBRARIES ${MBEDTLS_LIBRARY} ${MBEDCRYPTO_LIBRARY} ${MBEDX509_LIBRARY})


Try another nuget ssl package maybe this one is good.

--- cmake/FindOpenSSL.cmake
+++ cmake/FindOpenSSL.cmake
@@ -73,19 +73,19 @@
 if (WIN32)
   # 32-bit not officially supported anymore anyway
   set(SSL_BITS "x64")
-  set(SSL_NUGET_RELEASE "Release") # there also is Debug if you want to...
+  set(SSL_NUGET_RELEASE "release") # there also is Debug if you want to...
   set(SSL_NUGET_TARGET "${SSL_NUGET_RELEASE}/target")
   # v140 corresponds to VS 2015
   # dynamic dll openssl looks like that...
   #set(SSL_NUGET_DIR "lib/native/v140/windesktop/msvcstl/dyn/rt-dyn")
   #set(SSL_NUGET_ROOT "$ENV{USERPROFILE}/.nuget/packages/openssl.v140.windesktop.msvcstl.dyn.rt-dyn.${SSL_BITS}")

-  set(SSL_NUGET_DIR "lib/v140/")
-  set(SSL_NUGET_ROOT "$ENV{USERPROFILE}/.nuget/packages/rmt_openssl/")
+  set(SSL_NUGET_DIR "v140/windesktop/msvcstl/static/rt-dyn")
+  set(SSL_NUGET_ROOT "$ENV{USERPROFILE}/.nuget/packages/openssl.v140.windesktop.msvcstl.static.rt-dyn.x64/")
   if (NOT OPENSSL_ROOT_DIR AND IS_DIRECTORY ${SSL_NUGET_ROOT})
     # find latest version based on folder name and assign to OPENSSL_ROOT_DIR
     FILE(GLOB dirlist RELATIVE ${SSL_NUGET_ROOT} ${SSL_NUGET_ROOT}/*)
-
+
     list(SORT dirlist)
     list(LENGTH dirlist listlength)
     math(EXPR lastindex "${listlength}-1")
@@ -105,12 +105,13 @@
     set(OPENSSL_INCLUDE "${OPENSSL_ROOT_DIR}/build/native/include")
     set(_OPENSSL_ROOT_HINTS "${OPENSSL_ROOT_DIR}/build/native/include")

-    set(OPENSSL_LIB_DIR "${OPENSSL_ROOT_DIR}/build/native/${SSL_NUGET_DIR}/${SSL_BITS}")
+    set(OPENSSL_LIB_DIR "${OPENSSL_ROOT_DIR}/lib/native/${SSL_NUGET_DIR}/${SSL_BITS}")
     set(_OPENSSL_ROOT_HINTS "${OPENSSL_ROOT_DIR}/build/native/include")

     set(_OPENSSL_ROOT_PATHS
       "${OPENSSL_ROOT_DIR}/build/native/include"
-      "${OPENSSL_ROOT_DIR}/build/native/${SSL_NUGET_DIR}/")
+      "${OPENSSL_ROOT_DIR}/lib/native/${SSL_NUGET_DIR}/")
+    # ${OPENSSL_ROOT_DIR}/${SSL_NUGET_DIR}/${SSL_BITS}/"
   else()
     # http://www.slproweb.com/products/Win32OpenSSL.html
     set(_OPENSSL_ROOT_HINTS
@@ -178,24 +179,23 @@
     #endif ()

     set(LIB_EAY_DEBUG LIB_EAY_DEBUG-NOTFOUND)
-
-    if (EXISTS "${OPENSSL_LIB_DIR}/Debug/static/libeay32.lib")
-      set(LIB_EAY_DEBUG "${OPENSSL_LIB_DIR}/Debug/static/libeay32.lib")
+    if (EXISTS "${OPENSSL_LIB_DIR}/debug/libeay32.lib")
+      set(LIB_EAY_DEBUG "${OPENSSL_LIB_DIR}/debug/libeay32.lib")
     endif()

     set(LIB_EAY_RELEASE LIB_EAY_RELEASE-NOTFOUND)
-    if (EXISTS "${OPENSSL_LIB_DIR}/Release/static/libeay32.lib")
-      set(LIB_EAY_RELEASE "${OPENSSL_LIB_DIR}/Release/static/libeay32.lib")
+    if (EXISTS "${OPENSSL_LIB_DIR}/release/libeay32.lib")
+      set(LIB_EAY_RELEASE "${OPENSSL_LIB_DIR}/release/libeay32.lib")
     endif()

     set(SSL_EAY_DEBUG SSL_EAY_DEBUG-NOTFOUND)
-    if (EXISTS "${OPENSSL_LIB_DIR}/Debug/static/ssleay32.lib")
-      set(SSL_EAY_DEBUG "${OPENSSL_LIB_DIR}/Debug/static/ssleay32.lib")
+    if (EXISTS "${OPENSSL_LIB_DIR}/debug/ssleay32.lib")
+      set(SSL_EAY_DEBUG "${OPENSSL_LIB_DIR}/debug/ssleay32.lib")
     endif()

     set(SSL_EAY_RELEASE SSL_EAY_RELEASE-NOTFOUND)
-    if (EXISTS "${OPENSSL_LIB_DIR}/Release/static/ssleay32.lib")
-      set(SSL_EAY_RELEASE "${OPENSSL_LIB_DIR}/Release/static/ssleay32.lib")
+    if (EXISTS "${OPENSSL_LIB_DIR}/release/ssleay32.lib")
+      set(SSL_EAY_RELEASE "${OPENSSL_LIB_DIR}/release/ssleay32.lib")
     endif()

     set(LIB_EAY_LIBRARY_DEBUG "${LIB_EAY_DEBUG}")
@@ -544,7 +544,3 @@
 if(OPENSSL_USE_STATIC_LIBS)
   set(CMAKE_FIND_LIBRARY_SUFFIXES ${_openssl_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
 endif()
-
-if (OPENSSL_ROOT_DIR AND SSL_NUGET)
-  set(OPENSSL_INCLUDE_DIR "${OPENSSL_INCLUDE_DIR};${OPENSSL_INCLUDE_DIR}/v140/${SSL_BITS}/${SSL_NUGET_RELEASE}/static/")
-endif()


modified build rules for OSX, no pthread dependency needed

--- cmake/build_rules.cmake
+++ cmake/build_rules.cmake
@@ -46,10 +46,12 @@
 else()
 set( CMAKE_THREAD_PREFER_PTHREAD TRUE )
 find_package( Threads REQUIRED )
+if( NOT APPLE )
 if(CMAKE_USE_PTHREADS_INIT)
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread" )
 set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread" )
 endif()
+endif( NOT APPLE )
 endif()

 string( REGEX  MATCH  "\\-std\\=c\\+\\+[1-7]+"  SET_STD_CXX_11 "${CMAKE_CXX_FLAGS}" )


Remove trailing whitespace on empty line

--- cmake/git-version.cmake
+++ cmake/git-version.cmake
@@ -30,7 +30,7 @@
     COMMAND grep -E "^v[0-9][0-9]*\\.[0-9][0-9]*\\.[0-9][0-9]*(-.*)?$"
     OUTPUT_STRIP_TRAILING_WHITESPACE
     OUTPUT_VARIABLE VERSION_TYPE_3)
-
+
   if ("${GIT_TAG_VERSION}" STREQUAL "")
     message (WARNING "No version information was found! "
       "Package should be built from correct source tree.")


CMake: typo fix

CMake: typo fix

--- cmake/globalutils.cmake
+++ cmake/globalutils.cmake
@@ -505,7 +505,7 @@
             set(${retval} 32 PARENT_SCOPE)
             return()
         endif()
-    elif(APPLE)
+    elseif(APPLE)
         execute_process(COMMAND file -L -b ${lib} OUTPUT_VARIABLE result)
         string(REGEX MATCH "(x86_64)" found_64bit ${result})
         if(CMAKE_MATCH_1)


Remove outdated use of find_dependency [skip ci]

--- cmake/jegp-config.cmake
+++ cmake/jegp-config.cmake
@@ -1,5 +1 @@
-include(CMakeFindDependencyMacro)
-
-find_dependency(range-v3 0.10.0)
-
 include(${CMAKE_CURRENT_LIST_DIR}/jegp-targets.cmake)


move gtest warning into catkin itself

move gtest warning into catkin itself

--- cmake/tools/gtest.cmake
+++ cmake/tools/gtest.cmake
@@ -27,3 +27,6 @@
 #

 find_package(GTest QUIET)
+if(NOT GTEST_FOUND)
+  message("-- Warning: GTest not found; C++ tests will fail to build.")
+endif()


Fix PROG_CMD for Nexys Video.

Fix PROG_CMD for Nexys Video.

Signed-off-by: Keith Rothman <1bc19627a439baf17510dc2d0b2d250c96d445a5@users.noreply.github.com>

--- xc7/boards.cmake
+++ xc7/boards.cmake
@@ -83,6 +83,6 @@
   PACKAGE test
   PART xc7a200tsbg484-1
   PROG_TOOL ${OPENOCD_TARGET}
-  PROG_CMD "${OPENOCD} -f ${PRJXRAY_DIR}/utils/openocd/board-digilent-basys3.cfg -c \\\"init $<SEMICOLON> pld load 0 \${OUT_BIN} $<SEMICOLON> exit\\\""
+  PROG_CMD "${OPENOCD} -f board/digilent_nexys_video.cfg -c \\\"init $<SEMICOLON> pld load 0 \${OUT_BIN} $<SEMICOLON> exit\\\""
 )


for cmake3 make tbb an imported target

for cmake3 make tbb an imported target

addresses an error when exporting a target that depends on tbb

--- FindTBB.cmake
+++ FindTBB.cmake
@@ -263,11 +263,13 @@
   ##################################

   if(NOT CMAKE_VERSION VERSION_LESS 3.0 AND TBB_FOUND)
-    add_library(tbb INTERFACE)
-    target_include_directories(tbb INTERFACE ${TBB_INCLUDE_DIRS})
+    add_library(tbb UNKNOWN IMPORTED)
+    set_target_properties(tbb PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${TBB_INCLUDE_DIRS})
     if(TBB_LIBRARIES_RELEASE AND TBB_LIBRARIES_DEBUG)
-      target_compile_definitions(tbb INTERFACE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:TBB_USE_DEBUG=1>)
-      target_link_libraries(tbb INTERFACE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:${TBB_LIBRARIES_DEBUG}> $<$<OR:$<CONFIG:Release>,$<CONFIG:MinSizeRel>,$<CONFIG:>>:${TBB_LIBRARIES_RELEASE}>)
+      set_target_properties(tbb PROPERTIES
+          INTERFACE_COMPILE_DEFINITIONS "$<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:TBB_USE_DEBUG=1">
+          INTERFACE_LINK_LIBRARIES "$<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:${TBB_LIBRARIES_DEBUG}> $<$<OR:$<CONFIG:Release>,$<CONFIG:MinSizeRel>,$<CONFIG:>>:${TBB_LIBRARIES_RELEASE}>">
+          )
     elseif(TBB_LIBRARIES_RELEASE)
       target_link_libraries(tbb INTERFACE ${TBB_LIBRARIES_RELEASE})
     else()


Cached CMake package files also need version update

--- build/cmake_package_files/CppUTestConfigVersion.cmake
+++ build/cmake_package_files/CppUTestConfigVersion.cmake
@@ -7,14 +7,14 @@
 # PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version,
 # but only if the requested major version is the same as the current one.
 # The variable CVF_VERSION must be set before calling configure_file().
-set(PACKAGE_VERSION "3.8")
+set(PACKAGE_VERSION "4.0")
 if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
-  if("3.8" MATCHES "^([0-9]+)\\.")
+  if("4.0" MATCHES "^([0-9]+)\\.")
     set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
   else()
-    set(CVF_VERSION_MAJOR "3.8")
+    set(CVF_VERSION_MAJOR "4.0")
   endif()
   if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR)
     set(PACKAGE_VERSION_COMPATIBLE TRUE)


Split off 8.0.2

Split off 8.0.2

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

--- version.cmake
+++ version.cmake
@@ -5,7 +5,7 @@
 set ( HPCC_PROJECT "nagios-monitoring" )
 set ( HPCC_MAJOR 8 )
 set ( HPCC_MINOR 0 )
-set ( HPCC_POINT 1 )
+set ( HPCC_POINT 3 )
 set ( HPCC_MATURITY "closedown" )
 set ( HPCC_SEQUENCE 0 )
 ###


enh: Include version and components in "Looking for MIRTK..." status message [Templates]

--- Templates/mirtk-module/1.0/config/FindMIRTK.cmake
+++ Templates/mirtk-module/1.0/config/FindMIRTK.cmake
@@ -232,7 +232,14 @@

 # Look for MIRTK installation
 if (NOT MIRTK_FIND_QUIETLY)
-  message(STATUS "Looking for MIRTK...")
+  set(_msg "Looking for MIRTK")
+  if (MIRTK_FIND_VERSION)
+    set(_msg "${_msg} ${MIRTK_FIND_VERSION}")
+  endif ()
+  if (MIRTK_FIND_COMPONENTS)
+    set(_msg "${_msg} [${MIRTK_FIND_COMPONENTS}]")
+  endif ()
+  message(STATUS "${_msg}...")
 endif ()

 set(_argv)
@@ -329,3 +336,4 @@
 unset(_cached)
 unset(_dir)
 unset(_var)
+unset(_msg)


Set MACOSX_BUNDLE_ICON_FILE to icon.icns and fix copying of file

Signed-off-by: Caspar Goch <5009b2f1057faa18dd6e9f1cc5592a99d7ee0834@dkfz-heidelberg.de>

--- BlueBerry/CMake/FunctionCreateBlueBerryApplication.cmake
+++ BlueBerry/CMake/FunctionCreateBlueBerryApplication.cmake
@@ -114,10 +114,12 @@
 # Add executable icon (Mac)
 # -----------------------------------------------------------------------
 if(APPLE)
-  if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/icons/icon.icns")
-    set_target_properties(${_APP_NAME} PROPERTIES MACOSX_BUNDLE_ICON_FILE "${CMAKE_CURRENT_SOURCE_DIR}/icons/icon.icns")
-    file(COPY ${MACOSX_BUNDLE_ICON_FILE} DESTINATION "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_APP_NAME}.app/Contents/Resources/")
-    file(INSTALL ${MACOSX_BUNDLE_ICON_FILE} DESTINATION "${_APP_NAME}.app/Contents/Resources/")
+  set(icon_name "icon.icns")
+  set(icon_full_path "${CMAKE_CURRENT_SOURCE_DIR}/icons/${icon_name}")
+  if(EXISTS "${icon_full_path}")
+    set_target_properties(${_APP_NAME} PROPERTIES MACOSX_BUNDLE_ICON_FILE "${icon_name}")
+    file(COPY ${icon_full_path} "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_APP_NAME}.app/Contents/Resources/")
+    INSTALL (FILES ${icon_full_path} DESTINATION "${_APP_NAME}.app/Contents/Resources/")
   endif()
 endif()


testing ISPC executables

testing ISPC executables

--- common/cmake/test.cmake
+++ common/cmake/test.cmake
@@ -50,9 +50,8 @@
   #if platform == 'x64' and OS != 'macosx':
   #  models += models_large

-#IF (ENABLE_ISPC_SUPPORT AND RTCORE_RAY_PACKETS)
-
   MACRO (ADD_EMBREE_MODEL_TEST name executable reference model)
+
     ADD_TEST(NAME ${name}
              WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
              COMMAND ${PROJECT_SOURCE_DIR}/scripts/invoke_test.py
@@ -61,6 +60,17 @@
                      --reference ${reference}
                      --model ${model}
                      --execute ${PROJECT_BINARY_DIR}/${executable})
+
+    IF (ENABLE_ISPC_SUPPORT AND RTCORE_RAY_PACKETS)
+      ADD_TEST(NAME ${name}_ispc
+               WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+               COMMAND ${PROJECT_SOURCE_DIR}/scripts/invoke_test.py
+                       --name ${name}_ispc
+                       --modeldir ${BUILD_TESTING_MODEL_DIR}
+                       --reference ${reference}
+                       --model ${model}
+                       --execute ${PROJECT_BINARY_DIR}/${executable}_ispc)
+    ENDIF()
   ENDMACRO()

   MACRO (ADD_EMBREE_MODELS_TEST name executable)


CMake: Fix a strange CMake bug

CMake: Fix a strange CMake bug

git-svn-id: 59f82343654cec32357d3b049d399063e4e4cfc7@30349 0785d39b-7218-0410-832d-ea1e28bc413d

--- deal.II/cmake/configure/configure_boost.cmake
+++ deal.II/cmake/configure/configure_boost.cmake
@@ -38,7 +38,11 @@

 MACRO(FEATURE_BOOST_FIND_EXTERNAL var)

-  SET_IF_EMPTY(BOOST_DIR "$ENV{BOOST_DIR}")
+  IF(NOT DEFINED BOOST_DIR)
+    SET(BOOST_DIR "$ENV{BOOST_DIR}")
+  ELSE()
+    SET_IF_EMPTY(BOOST_DIR "$ENV{BOOST_DIR}")
+  ENDIF()
   IF(NOT "${BOOST_DIR}" STREQUAL "")
     SET(BOOST_ROOT "${BOOST_DIR}")
   ENDIF()


Search for /usr/share for R includes

Search for /usr/share for R includes

On Ubuntu the R header files are in /usr/share/R/include
directory. Adding this path enable CMake to automatically find these
needed headers.

--- CMake/FindR.cmake
+++ CMake/FindR.cmake
@@ -28,7 +28,7 @@

 set(CMAKE_FIND_APPBUNDLE ${TEMP_CMAKE_FIND_APPBUNDLE})

-find_path(R_INCLUDE_DIR R.h PATHS /usr/local/lib /usr/local/lib64 ${R_BASE_DIR} PATH_SUFFIXES R/include DOC "Path to file R.h")
+find_path(R_INCLUDE_DIR R.h PATHS /usr/local/lib /usr/local/lib64 /usr/share ${R_BASE_DIR} PATH_SUFFIXES R/include DOC "Path to file R.h")
 find_library(R_LIBRARY_BASE R PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "R library (example libR.a, libR.dylib, etc.).")

 set(R_LIBRARIES ${R_LIBRARY_BASE})


Delete CPackConfig.cmake

Delete CPackConfig.cmake

--- CPackConfig.cmake
+++ CPackConfig.cmake
@@ -1,16 +0,0 @@
-set(CPACK_PACKAGE_VENDOR "Ultimaker B.V.")
-set(CPACK_PACKAGE_CONTACT "Arjen Hiemstra <a.hiemstra@ultimaker.com>")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Cura application to drive the CuraEngine")
-set(CPACK_PACKAGE_VERSION_MAJOR 15)
-set(CPACK_PACKAGE_VERSION_MINOR 05)
-set(CPACK_PACKAGE_VERSION_PATCH 90)
-set(CPACK_PACKAGE_VERSION_REVISION 1)
-set(CPACK_GENERATOR "DEB")
-
-set(DEB_DEPENDS
-    "uranium (>= 15.05.93)"
-)
-string(REPLACE ";" ", " DEB_DEPENDS "${DEB_DEPENDS}")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS ${DEB_DEPENDS})
-
-include(CPack)


corrected nightly start time

corrected nightly start time

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -15,7 +15,7 @@
 ## ======================================================================== ##

 set(CTEST_PROJECT_NAME "Embree")
-set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")
+set(CTEST_NIGHTLY_START_TIME "00:00:00 UTC")

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


[ctest] use "https" drop_method instead of "http"

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -1,7 +1,7 @@
 set(CTEST_PROJECT_NAME "nix")
 set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")

-set(CTEST_DROP_METHOD "http")
+set(CTEST_DROP_METHOD "https")
 set(CTEST_DROP_SITE "cdash.0xdeadbabe.info")
 set(CTEST_DROP_LOCATION "/submit.php?project=nix")
 set(CTEST_DROP_SITE_CDASH TRUE)


Update CDash URL

Update CDash URL

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -8,8 +8,8 @@
 set(CTEST_PROJECT_NAME "MERCURY")
 set(CTEST_NIGHTLY_START_TIME "00:00:00 CST")

-set(CTEST_DROP_METHOD "http")
-set(CTEST_DROP_SITE "149.28.123.102/CDash")
+set(CTEST_DROP_METHOD "https")
+set(CTEST_DROP_SITE "mercury-cdash.hdfgroup.org")
 set(CTEST_DROP_LOCATION "/submit.php?project=Mercury")
 set(CTEST_DROP_SITE_CDASH TRUE)


updated models_hash

updated models_hash

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

 set(CTEST_PROJECT_NAME "Embree")
 set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
-set(TEST_MODELS_HASH d8e7eaa8092c8f5ef00a835d1d34862b4e029155)
+set(TEST_MODELS_HASH f8dbe2a191be663d4fb5dc9d18c9f208ce147158)

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


Unused CTest file

Unused CTest file

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -1,15 +0,0 @@
-## This file should be placed in the root directory of your project.
-## Then modify the CMakeLists.txt file in the root directory of your
-## project to incorporate the testing dashboard.
-##
-## # The following are required to submit to the CDash dashboard:
-##   ENABLE_TESTING()
-##   INCLUDE(CTest)
-
-set(CTEST_PROJECT_NAME "ROSS-simulator")
-set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
-
-set(CTEST_DROP_METHOD "http")
-set(CTEST_DROP_SITE "my.cdash.org")
-set(CTEST_DROP_LOCATION "/submit.php?project=ROSS-simulator")
-set(CTEST_DROP_SITE_CDASH TRUE)


I see and understand the -Wabi warning about Decltype and don't want to do anything about it. So shut up.

--- CTestCustom.cmake
+++ CTestCustom.cmake
@@ -9,6 +9,7 @@
    "GCC 4.4.x shows false positives for -Wparentheses, thus we rather disable" # This warning is meant for users not the dashboard
    "AVX disabled per default because of old/broken compiler" # This warning is meant for users not the dashboard
    "GCC 4.7.0 miscompiles at -O3, adding -fno-predictive-commoning to the" # This warning is meant for users not the dashboard
+   "warning: the mangled name of .*typename Vc::{anonymous}::Decltype.* will change in a future version of GCC"
    "^\\*\\*\\* WARNING non-zero return value in ctest from: make") # Ignore output from ctest

 set(CTEST_CUSTOM_ERROR_EXCEPTION ${CTEST_CUSTOM_ERROR_EXCEPTION}


be more forgiving about utf8 quotes

be more forgiving about utf8 quotes

--- CTestCustom.cmake
+++ CTestCustom.cmake
@@ -1,7 +1,7 @@
 set(CTEST_CUSTOM_WARNING_EXCEPTION ${CTEST_CUSTOM_WARNING_EXCEPTION}
    "used uninitialized in this function"
    "GCC < 4.3 does not have full support for SSE2 intrinsics." # Ignore self-made warning, though what I really want is a message when the warning is absent
-   "call to 'Vc::Warnings::_operator_bracket_warning' declared with attribute warning"
+   "call to .*Vc::Warnings::_operator_bracket_warning.* declared with attribute warning"
    "warning is a GCC extension"
    "^-- "  # Ignore output from cmake
    "^\\*\\*\\* WARNING non-zero return value in ctest from: make") # Ignore output from ctest


[iOS] Fix an issue where the wrong zziplib would be found due to different naming.

--- CMake/Packages/FindZZip.cmake
+++ CMake/Packages/FindZZip.cmake
@@ -32,7 +32,7 @@
   ZZip_INCLUDE_DIR
 )

-set(ZZip_LIBRARY_NAMES zzip zziplib)
+set(ZZip_LIBRARY_NAMES zziplib zzip)
 get_debug_names(ZZip_LIBRARY_NAMES)

 use_pkgconfig(ZZip_PKGC zziplib)


COMP: Superbuild - Now downloading PythonQt from http://github.com/commontk/PythonQt

That new repository contains two branches:
 - the default one named "patched"
 - an other one named "svn-mirror" which is used
to track the official repository of PythonQt

Since the patched are kept in a separate branch, that will make easier:
1) merge of the official mirror with our patched version easier
2) eventual contribution back to the upstream svn easier

--- CMakeExternals/PythonQt.cmake
+++ CMakeExternals/PythonQt.cmake
@@ -20,30 +20,11 @@
     IF(NOT PYTHONLIBS_FOUND)
       MESSAGE(FATAL_ERROR "error: Python is required to build ${PROJECT_NAME}")
     ENDIF()
-
-    # Patch program
-    FIND_PROGRAM(CTK_PATCH_EXECUTABLE patch
-      "C:/Program Files/GnuWin32/bin"
-      "C:/Program Files (x86)/GnuWin32/bin")
-    MARK_AS_ADVANCED(CTK_PATCH_EXECUTABLE)
-    IF(NOT CTK_PATCH_EXECUTABLE)
-      MESSAGE(FATAL_ERROR "error: Patch is required to build ${PROJECT_NAME}. Set CTK_PATCH_EXECUTABLE")
-    ENDIF()
-
-    # Configure patch script
-    SET(pythonqt_src_dir ${ep_source_dir}/${proj})
-    SET(pythonqt_patch_dir ${CTK_SOURCE_DIR}/Utilities/PythonQt/)
-    SET(pythonqt_configured_patch_dir ${CTK_BINARY_DIR}/Utilities/PythonQt/)
-    SET(pythonqt_patchscript
-      ${CTK_BINARY_DIR}/Utilities/PythonQt/PythonQt-trunk-patch.cmake)
-    CONFIGURE_FILE(
-      ${CTK_SOURCE_DIR}/Utilities/PythonQt/PythonQt-trunk-patch.cmake.in
-      ${pythonqt_patchscript} @ONLY)

     ExternalProject_Add(${proj}
-      SVN_REPOSITORY "http://pythonqt.svn.sourceforge.net/svnroot/pythonqt/trunk"
+      GIT_REPOSITORY "git://github.com/commontk/PythonQt.git"
+      GIT_TAG "patched"
       CMAKE_GENERATOR ${gen}
-      PATCH_COMMAND ${CMAKE_COMMAND} -P ${pythonqt_patchscript}
       BUILD_COMMAND ""
       CMAKE_ARGS
         ${ep_common_args}


Use new qRestAPI hash

Use new qRestAPI hash

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

     if(NOT DEFINED qRestAPI_DIR)

-      set(revision_tag "2c4ea3fc9c")
+      set(revision_tag "778ac3f871")
       if(${proj}_REVISION_TAG)
         set(revision_tag ${${proj}_REVISION_TAG})
       endif()


[jancy] release 1.6.4

[jancy] release 1.6.4

--- version.cmake
+++ version.cmake
@@ -1,6 +1,6 @@
 set (VERSION_MAJOR     1)
 set (VERSION_MINOR     6)
-set (VERSION_REVISION  3)
+set (VERSION_REVISION  4)
 set (VERSION_TAG)

 set (VERSION_FILE_SUFFIX "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")


Graph Control 3.10.4-1 Gold

Graph Control 3.10.4-1 Gold

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

--- version.cmake
+++ version.cmake
@@ -5,8 +5,8 @@
 set ( HPCC_MAJOR 3 )
 set ( HPCC_MINOR 10 )
 set ( HPCC_POINT 4 )
-set ( HPCC_MATURITY "rc" )
-set ( HPCC_SEQUENCE 5 )
+set ( HPCC_MATURITY "release" )
+set ( HPCC_SEQUENCE 1 )
 ###
 IF ( ${HPCC_POINT} GREATER 65 )
   error ( "HPCC_POINT must be less than 66." )


Split off 7.8.78

Split off 7.8.78

Signed-off-by: Gavin Halliday <2edfa8aca9fb78974188e5b35be8b52d4e4967ae@lexisnexis.com>

--- version.cmake
+++ version.cmake
@@ -5,7 +5,7 @@
 set ( HPCC_PROJECT "nagios-monitoring" )
 set ( HPCC_MAJOR 7 )
 set ( HPCC_MINOR 8 )
-set ( HPCC_POINT 77 )
+set ( HPCC_POINT 79 )
 set ( HPCC_MATURITY "closedown" )
 set ( HPCC_SEQUENCE 0 )
 ###


updated model hash

updated model hash


Export version major + minor for correct version sort in Jekyll.

--- DoxygenRule.cmake
+++ DoxygenRule.cmake
@@ -120,6 +120,8 @@
 "---\n"
 "name: ${PROJECT_NAME}\n"
 "version: ${VERSION_MAJOR}.${VERSION_MINOR}\n"
+"major: ${VERSION_MAJOR}\n"
+"minor: ${VERSION_MINOR}\n"
 "description: ${${UPPER_PROJECT_NAME}_DESCRIPTION}\n"
 "issuesurl: ${${UPPER_PROJECT_NAME}_ISSUES_URL}\n"
 "packageurl: ${${UPPER_PROJECT_NAME}_PACKAGE_URL}\n"


Always do shallow clones

Always do shallow clones

--- GitExternal.cmake
+++ GitExternal.cmake
@@ -8,7 +8,7 @@
 #    update target to bump the tag to the master revision by
 #    recreating .gitexternals.
 #  * Provides function
-#      git_external(<directory> <giturl> <gittag> [VERBOSE,SHALLOW]
+#      git_external(<directory> <giturl> <gittag> [VERBOSE]
 #        [RESET <files>])
 #    which will check out directory in CMAKE_SOURCE_DIR (if relative)
 #    or in the given absolute path using the given repository and tag
@@ -18,11 +18,6 @@
 #  VERBOSE, when present, this option tells the function to output
 #    information about what operations are being performed by git on
 #    the repo.
-#  SHALLOW, when present, causes a shallow clone of depth 1 to be made
-#    of the specified repo. This may save considerable memory/bandwidth
-#    when only a specific branch of a repo is required and the full history
-#    is not required. Note that the SHALLOW option will only work for a branch
-#    or tag and cannot be used for an arbitrary SHA.
 #  OPTIONAL, when present, this option makes this operation optional.
 #    The function will output a warning and return if the repo could not be
 #    cloned.
@@ -77,7 +72,7 @@
 endfunction()

 function(GIT_EXTERNAL DIR REPO tag)
-  cmake_parse_arguments(GIT_EXTERNAL_LOCAL "VERBOSE;SHALLOW;OPTIONAL" "" "RESET" ${ARGN})
+  cmake_parse_arguments(GIT_EXTERNAL_LOCAL "VERBOSE;OPTIONAL" "" "RESET" ${ARGN})
   set(TAG ${tag})
   if(GIT_EXTERNAL_TAG AND "${tag}" MATCHES "^[0-9a-f]+$")
     set(TAG ${GIT_EXTERNAL_TAG})
@@ -105,14 +100,8 @@

   if(NOT EXISTS "${DIR}")
     # clone
-    set(_clone_options --recursive)
-    if(GIT_EXTERNAL_LOCAL_SHALLOW)
-      list(APPEND _clone_options --depth 1 --branch ${TAG})
-    else()
-      set(_msg_tag "[${TAG}]")
-    endif()
-    JOIN("${_clone_options}" " " _msg_text)
-    message(STATUS "git clone ${_msg_text} ${REPO} ${DIR} ${_msg_tag}")
+    set(_clone_options --recursive --depth 1 --branch ${TAG})
+    message(STATUS "git clone ${REPO} ${DIR} [${TAG}]")
     execute_process(
       COMMAND "${GIT_EXECUTABLE}" clone ${_clone_options} ${REPO} ${DIR}
       RESULT_VARIABLE nok ERROR_VARIABLE error
@@ -124,26 +113,6 @@
       else()
         message(FATAL_ERROR "${DIR} clone failed: ${error}\n")
       endif()
-    endif()
-
-    # checkout requested tag
-    if(NOT GIT_EXTERNAL_LOCAL_SHALLOW)
-      execute_process(
-        COMMAND "${GIT_EXECUTABLE}" checkout -q "${TAG}"
-        RESULT_VARIABLE nok ERROR_VARIABLE error
-        WORKING_DIRECTORY "${DIR}")
-      if(nok)
-        message(FATAL_ERROR "git checkout ${TAG} in ${DIR} failed: ${error}\n")
-      endif()
-    endif()
-
-    # checkout requested tag
-    execute_process(
-      COMMAND "${GIT_EXECUTABLE}" checkout -q "${TAG}"
-      RESULT_VARIABLE nok ERROR_VARIABLE error
-      WORKING_DIRECTORY "${DIR}")
-    if(nok)
-      message(FATAL_ERROR "git checkout ${TAG} in ${DIR} failed: ${error}\n")
     endif()
   endif()


[OGRE-378] Unable to build when using MinGW without samples.

--HG--
branch : v1-9

--- CMake/InstallDependencies.cmake
+++ CMake/InstallDependencies.cmake
@@ -113,10 +113,20 @@
 	  endif ()

 	  if (MINGW)
-      install(FILES ${OIS_LIBRARY_DBG} DESTINATION lib/debug CONFIGURATIONS Debug)
-      install(FILES ${OIS_LIBRARY_REL} DESTINATION lib/relwithdebinfo CONFIGURATIONS RelWithDebInfo)
-      install(FILES ${OIS_LIBRARY_REL} DESTINATION lib/release CONFIGURATIONS Release)
-      install(FILES ${OIS_LIBRARY_REL} DESTINATION lib/minsizerel CONFIGURATIONS MinSizeRel)
+		if (EXISTS ${OIS_LIBRARY_DBG})
+			install(FILES ${OIS_LIBRARY_DBG} DESTINATION lib/debug CONFIGURATIONS Debug)
+		else()
+			install(FILES DESTINATION lib/debug CONFIGURATIONS Debug)
+		endif ()
+		if (EXISTS ${OIS_LIBRARY_REL})
+			install(FILES ${OIS_LIBRARY_REL} DESTINATION lib/relwithdebinfo CONFIGURATIONS RelWithDebInfo)
+			install(FILES ${OIS_LIBRARY_REL} DESTINATION lib/release CONFIGURATIONS Release)
+			install(FILES ${OIS_LIBRARY_REL} DESTINATION lib/minsizerel CONFIGURATIONS MinSizeRel)
+		else()
+			install(FILES DESTINATION lib/relwithdebinfo CONFIGURATIONS RelWithDebInfo)
+			install(FILES DESTINATION lib/release CONFIGURATIONS Release)
+			install(FILES DESTINATION lib/minsizerel CONFIGURATIONS MinSizeRel)
+		endif ()
 	  endif () # MINGW
 	endif () # WIN32
 endif () # OGRE_INSTALL_DEPENDENCIES


Remove nested parenthesis, not supported on CMake 2.6 (only 2.8)

--HG--
branch : v1-7


Update clBLAS tag to staged branch

Update clBLAS tag to staged branch

--- CMakeModules/build_clBLAS.cmake
+++ CMakeModules/build_clBLAS.cmake
@@ -14,7 +14,7 @@
 ExternalProject_Add(
     clBLAS-ext
     GIT_REPOSITORY https://github.com/arrayfire/clBLAS.git
-    GIT_TAG af3.3.1
+    GIT_TAG arrayfire-release-test
     PREFIX "${prefix}"
     INSTALL_DIR "${prefix}"
     UPDATE_COMMAND ""


Fixes multiple definitions in different translation units (C++11 only?)

--- Code/RDGeneral/versions.h.cmake
+++ Code/RDGeneral/versions.h.cmake
@@ -5,10 +5,10 @@
 //   @@ All Rights Reserved  @@
 //
 namespace RDKit {
-  const char *rdkitVersion="@RDKit_RELEASENAME@";
+  const char * const rdkitVersion="@RDKit_RELEASENAME@";

   // The Boost version as detected at build time.
   // CMake's Boost_LIB_VERSION is defined by the FindBoost.cmake module
   // to be the same as the value from <boost/version.hpp>
-  const char *boostVersion="@Boost_LIB_VERSION@";
+  const char * const boostVersion="@Boost_LIB_VERSION@";
 }


Always dynamically lookup egl functions

Always dynamically lookup egl functions

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

Change-Id: I718e28c7422faf3c7b964ca70b86a1711a08ae54
Affects: EGL
Bug: 1873

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


ENH: Try a checkin.

ENH: Try a checkin.

--- Rendering/vtkTestingObjectFactory.cmake
+++ Rendering/vtkTestingObjectFactory.cmake
@@ -68,3 +68,4 @@
 )
 CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx ${MyTests}
                        EXTRA_INCLUDE ${VTK_SOURCE_DIR}/Rendering/vtkTestingObjectFactory.h)
+


Update for parallel make

Update for parallel make

--- test/claw_reference_test.cmake
+++ test/claw_reference_test.cmake
@@ -279,6 +279,9 @@
   if("${claw_add_advanced_test_WORKING_DIRECTORY}" STREQUAL "")
     set(claw_add_advanced_test_WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
   endif()
+
+  # Specifiy the output directory if the module files
+  set(CMAKE_Fortran_MODULE_DIRECTORY ${claw_add_advanced_test_WORKING_DIRECTORY})

   # Define input and output file name
   set(MAIN_F90 ${claw_add_advanced_test_WORKING_DIRECTORY}/main.f90)
@@ -320,8 +323,8 @@
   set(EXECUTABLE_TRANSFORMED_GPU transformed_code_gpu_${claw_add_advanced_test_NAME})

   # Define directory for build
-  set (XMOD_DIR ${claw_add_advanced_test_WORKING_DIRECTORY}/__xmod__)
-  set (OMNI_TMP_DIR ${claw_add_advanced_test_WORKING_DIRECTORY}/__omni_tmp__)
+  set(XMOD_DIR ${claw_add_advanced_test_WORKING_DIRECTORY}/__xmod__)
+  set(OMNI_TMP_DIR ${claw_add_advanced_test_WORKING_DIRECTORY}/__omni_tmp__)

   # Directory where OMNI xmod files will be placed
   if (NOT EXISTS ${XMOD_DIR})
@@ -391,7 +394,7 @@
     # Execute the CLAW Compiler for CPU target
     add_custom_command(
       OUTPUT  ${OUTPUT_MAIN_CPU}
-      COMMAND touch ${MAIN_F90} # to force new compilation
+      #COMMAND touch ${MAIN_F90} # to force new compilation
       COMMAND ${CMAKE_COMMAND} -E env CLAW_TRANS_SET_PATH=${CLAW_TRANS_SET_PATH}
         ${CLAWFC} ${claw_add_advanced_test_CLAW_FLAGS} --target=cpu
         ${claw_add_advanced_test_CLAW_FLAGS_TARGET_CPU}
@@ -413,23 +416,12 @@
       DEPENDS ${MAIN_F90} ${OUTPUT_FILE_GPU} ${OUTPUT_FILE_EXTRA_GPU}
       COMMENT "${CLAWFC} for GPU target on file ${MAIN_F90}"
     )
-
-    # Target for the transformation
-    add_custom_target(
-      transform-${claw_add_advanced_test_NAME}
-      DEPENDS
-      ${OUTPUT_MAIN_CPU} ${OUTPUT_FILE_CPU} ${OUTPUT_FILE_EXTRA_CPU}
-      ${OUTPUT_MAIN_GPU} ${OUTPUT_FILE_GPU} ${OUTPUT_FILE_EXTRA_GPU}
-      ${EXECUTABLE_ORIGINAL} ${EXECUTABLE_TRANSFORMED_CPU}
-      ${EXECUTABLE_TRANSFORMED_GPU}
-    )
-
   else()

     # Execute the CLAW Compiler for CPU target
     add_custom_command(
       OUTPUT  ${OUTPUT_MAIN_CPU}
-      COMMAND touch ${MAIN_F90} # to force new compilation
+      #COMMAND touch ${MAIN_F90} # to force new compilation
       COMMAND ${CMAKE_COMMAND} -E env CLAW_TRANS_SET_PATH=${CLAW_TRANS_SET_PATH}
         ${CLAWFC} ${claw_add_advanced_test_CLAW_FLAGS} --target=cpu
         ${claw_add_advanced_test_CLAW_FLAGS_TARGET_CPU}
@@ -442,7 +434,7 @@
     # Execute the CLAW Compiler for GPU target
     add_custom_command(
       OUTPUT  ${OUTPUT_MAIN_GPU}
-      COMMAND touch ${MAIN_F90} # to force new compilation
+      #COMMAND touch ${MAIN_F90} # to force new compilation
       COMMAND ${CMAKE_COMMAND} -E env CLAW_TRANS_SET_PATH=${CLAW_TRANS_SET_PATH}
         ${CLAWFC} ${claw_add_advanced_test_CLAW_FLAGS} --target=gpu
         ${claw_add_advanced_test_CLAW_FLAGS_TARGET_GPU}
@@ -451,16 +443,6 @@
       DEPENDS ${MAIN_F90} ${OUTPUT_FILE_GPU}
       COMMENT "${CLAWFC} for GPU target on file ${MAIN_F90}"
     )
-
-    # Target for the transformation
-    add_custom_target(
-      transform-${claw_add_advanced_test_NAME}
-      DEPENDS
-      ${OUTPUT_MAIN_CPU} ${OUTPUT_FILE_CPU} ${OUTPUT_MAIN_GPU}
-      ${OUTPUT_FILE_GPU} ${EXECUTABLE_ORIGINAL} ${EXECUTABLE_TRANSFORMED_CPU}
-      ${EXECUTABLE_TRANSFORMED_GPU}
-    )
-
   endif()

   # Target to clean the generated file (Output of clawfc)
@@ -508,6 +490,16 @@
       "${OUTPUT_FILE_GPU}" "${OUTPUT_MAIN_GPU}")
     target_compile_definitions(${EXECUTABLE_TRANSFORMED_GPU} PRIVATE -D_CLAW)
   endif()
+
+  # Target for the transformation
+  add_custom_target(
+    transform-${claw_add_advanced_test_NAME}
+    DEPENDS ${EXECUTABLE_TRANSFORMED_CPU} ${EXECUTABLE_TRANSFORMED_GPU}
+  )
+
+  add_dependencies(${EXECUTABLE_TRANSFORMED_GPU} ${EXECUTABLE_ORIGINAL})
+  add_dependencies(${EXECUTABLE_TRANSFORMED_CPU} ${EXECUTABLE_ORIGINAL})
+  add_dependencies(${EXECUTABLE_TRANSFORMED_CPU} ${EXECUTABLE_TRANSFORMED_GPU})

   # Set target specific compilation options
   if(OPENACC_ENABLE)


Improve documentation

Improve documentation

--- ProjectInfo.cmake
+++ ProjectInfo.cmake
@@ -1,5 +1,10 @@
 # Copyright (c) 2014 Stefan.Eilemann@epfl.ch
 #  Writes ProjectInfo.cmake for installed html docs
+#
+# Input Variables:
+# * ${UPPER_PROJECT_NAME}_MATURITY EP, RD or RS
+# * ${UPPER_PROJECT_NAME}_PACKAGE_URL pointing to the package repository
+# * ${UPPER_PROJECT_NAME}_ISSUES_URL pointing to the ticket tracker

 include(GithubInfo)


[benchmarks] ARC is not the default like I assumed

We are hence leaking ...

--- benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake
+++ benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake
@@ -296,6 +296,7 @@
         "-O3"
         "-target" "${target}"
         "-isysroot" "${sdk}"
+        "-fobjc-arc"
         "-arch" "${BENCH_COMPILE_ARCHOPTS_ARCH}"
         "-F" "${sdk}/../../../Developer/Library/Frameworks"
         "-m${triple_platform}-version-min=${ver}"


emscripten: Removing unnecessary stuff

emscripten: Removing unnecessary stuff

--- core/cmake/sketch.cmake
+++ core/cmake/sketch.cmake
@@ -117,7 +117,7 @@
   )

 elseif (PLATFORM MATCHES emscripten)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s WASM=0 -s ERROR_ON_UNDEFINED_SYMBOLS=0 -s TOTAL_MEMORY=67108864")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s ERROR_ON_UNDEFINED_SYMBOLS=0 -s TOTAL_MEMORY=67108864")

 elseif (PLATFORM MATCHES ios)
   list(APPEND LIBRARIES


indent

indent

--- Qmitk/files.cmake
+++ Qmitk/files.cmake
@@ -1,70 +1,70 @@
 SET(QMITK_CPP
-  # main.cpp
-# mitkNavigator.cpp
-# mitkSliderNavigator.cpp
-popupactionhistory.cpp
-popupundoredo.cpp
-QmitkAlgorithmFunctionalityComponent.cpp
-QmitkBaseAlgorithmComponent.cpp
-QmitkBaseFunctionalityComponent.cpp
-QmitkCallbackFromGUIThread.cpp
-QmitkColorTransferFunctionCanvas.cpp
-QmitkFctCompMediator.cpp
-QmitkFunctionalityComponentContainer.cpp
-QmitkHelpBrowser.cpp
-QmitkInteractionFunctionalityComponent.cpp
-QmitkLevelWindowWidgetContextMenu.cpp
-QmitkLineEditLevelWindowWidget.cpp
-QmitkPiecewiseFunctionCanvas.cpp
-QmitkPropertyListViewItem.cpp
-QmitkRenderingManager.cpp
-QmitkRenderingManagerFactory.cpp
-QmitkRenderWindow.cpp
-QmitkSliderLevelWindowWidget.cpp
-QmitkStatusBar.cpp
-QmitkStepperAdapter.cpp
-QmitkTransferFunctionCanvas.cpp
-QmitkUndoRedoButton.cpp
-qundoredobutton.cpp
-VtkQRenderWindowInteractor.cpp
+    # main.cpp
+  # mitkNavigator.cpp
+  # mitkSliderNavigator.cpp
+  popupactionhistory.cpp
+  popupundoredo.cpp
+  QmitkAlgorithmFunctionalityComponent.cpp
+  QmitkBaseAlgorithmComponent.cpp
+  QmitkBaseFunctionalityComponent.cpp
+  QmitkCallbackFromGUIThread.cpp
+  QmitkColorTransferFunctionCanvas.cpp
+  QmitkFctCompMediator.cpp
+  QmitkFunctionalityComponentContainer.cpp
+  QmitkHelpBrowser.cpp
+  QmitkInteractionFunctionalityComponent.cpp
+  QmitkLevelWindowWidgetContextMenu.cpp
+  QmitkLineEditLevelWindowWidget.cpp
+  QmitkPiecewiseFunctionCanvas.cpp
+  QmitkPropertyListViewItem.cpp
+  QmitkRenderingManager.cpp
+  QmitkRenderingManagerFactory.cpp
+  QmitkRenderWindow.cpp
+  QmitkSliderLevelWindowWidget.cpp
+  QmitkStatusBar.cpp
+  QmitkStepperAdapter.cpp
+  QmitkTransferFunctionCanvas.cpp
+  QmitkUndoRedoButton.cpp
+  qundoredobutton.cpp
+  VtkQRenderWindowInteractor.cpp
 )
 SET(QMITK_UI
-QmitkFunctionalityComponentContainerGUI.ui
-QmitkLevelWindowPresetDefinition.ui
-QmitkLevelWindowRangeChange.ui
-QmitkLevelWindowWidget.ui
-QmitkMaterialEditor.ui
-QmitkMaterialShowcase.ui
-QmitkPointListWidget.ui
-QmitkPrimitiveMovieNavigator.ui
-QmitkPropertyListView.ui
-QmitkSelectableGLWidget.ui
-QmitkSliceWidget.ui
-QmitkSliderNavigator.ui
-QmitkStdMultiWidget.ui
-QmitkTransferFunctionWidget.ui
-QmitkTwoButtonNavigator.ui
-QmitkVolumetryWidget.ui
+  QmitkFunctionalityComponentContainerGUI.ui
+  QmitkLevelWindowPresetDefinition.ui
+  QmitkLevelWindowRangeChange.ui
+  QmitkLevelWindowWidget.ui
+  QmitkMaterialEditor.ui
+  QmitkMaterialShowcase.ui
+  QmitkPointListWidget.ui
+  QmitkPrimitiveMovieNavigator.ui
+  QmitkPropertyListView.ui
+  QmitkSelectableGLWidget.ui
+  QmitkSliceWidget.ui
+  QmitkSliderNavigator.ui
+  QmitkStdMultiWidget.ui
+  QmitkTransferFunctionWidget.ui
+  QmitkTwoButtonNavigator.ui
+  QmitkVolumetryWidget.ui
 )
 SET(QMITK_MOC_H
-popupactionhistory.h
-popupundoredo.h
-QmitkAlgorithmFunctionalityComponent.h
-QmitkBaseFunctionalityComponent.h
-QmitkCallbackFromGUIThread.h
-QmitkColorTransferFunctionCanvas.h
-QmitkFctCompMediator.h
-QmitkFunctionalityComponentContainer.h
-QmitkHelpBrowser.h
-QmitkInteractionFunctionalityComponent.h
-QmitkLevelWindowWidgetContextMenu.h
-QmitkLineEditLevelWindowWidget.h
-QmitkPiecewiseFunctionCanvas.h
-QmitkPropertyListViewItem.h
-QmitkRenderingManager.h
-QmitkSliderLevelWindowWidget.h
-QmitkStepperAdapter.h
-QmitkTransferFunctionCanvas.h
-QmitkUndoRedoButton.h
-qundoredobutton.h
+  popupactionhistory.h
+  popupundoredo.h
+  QmitkAlgorithmFunctionalityComponent.h
+  QmitkBaseFunctionalityComponent.h
+  QmitkCallbackFromGUIThread.h
+  QmitkColorTransferFunctionCanvas.h
+  QmitkFctCompMediator.h
+  QmitkFunctionalityComponentContainer.h
+  QmitkHelpBrowser.h
+  QmitkInteractionFunctionalityComponent.h
+  QmitkLevelWindowWidgetContextMenu.h
+  QmitkLineEditLevelWindowWidget.h
+  QmitkPiecewiseFunctionCanvas.h
+  QmitkPropertyListViewItem.h
+  QmitkRenderingManager.h
+  QmitkSliderLevelWindowWidget.h
+  QmitkStepperAdapter.h
+  QmitkTransferFunctionCanvas.h
+  QmitkUndoRedoButton.h
+  qundoredobutton.h
 )


getdeps: export a property that contains the path to the output executable

Summary:
Export a property that indicates the path to the test executable.  This is
useful for callers that want to install the binary or run it from other CMake
rules.

Reviewed By: simpkins

Differential Revision: D17647146

fbshipit-source-id: b32e2694e44a07d7c234e53a7a5c8443cb144487

--- build/fbcode_builder/CMake/FBPythonBinary.cmake
+++ build/fbcode_builder/CMake/FBPythonBinary.cmake
@@ -156,6 +156,12 @@
   # Add an "ALL" target that depends on force ${EXE_NAME},
   # so that ${EXE_NAME} will be included in the default list of build targets.
   add_custom_target("${EXE_NAME}.GEN_PY_EXE" ALL DEPENDS "${output_file}")
+
+  # Allow resolving the executable path for the target that we generate
+  # via a generator expression like:
+  # "WATCHMAN_WAIT_PATH=$<TARGET_PROPERTY:watchman-wait.GEN_PY_EXE,EXECUTABLE>"
+  set_property(TARGET "${EXE_NAME}.GEN_PY_EXE"
+      PROPERTY EXECUTABLE "${CMAKE_CURRENT_BINARY_DIR}/${output_file}")
 endfunction()

 #


SVN_SILENT made messages (.desktop file)

--- plasma-runner-ktp-contact.desktop.cmake
+++ plasma-runner-ktp-contact.desktop.cmake
@@ -14,6 +14,7 @@
 Name[ia]=Messageria instantanee
 Name[it]=Messaggistica istantanea
 Name[kk]=Лезде хабарласу
+Name[nb]=Lynmelding
 Name[nl]=Instant Messaging
 Name[pt]=Mensagens Instantâneas
 Name[pt_BR]=Mensagens instantâneas
@@ -42,6 +43,7 @@
 Comment[ia]=Initia conversation con qualcunque de tu contactos de IM o modifica tu status de IM
 Comment[it]=Avvia una chat con un tuo contatto di MI oppure cambia il tuo stato di MI
 Comment[kk]=Кез-келген лезде хабарласу контактыңызбен чат-әңгімені бастау не күй-жайын өзгерту
+Comment[nb]=Start en prat med en av dine LM-kontakter eller endre din LM-status
 Comment[nl]=Begin een chat met een van uw IM-contactpersonen of wijzig uw IM-status
 Comment[pt]=Iniciar uma conversa com qualquer um dos seus contactos MI ou mudar o seu estado
 Comment[pt_BR]=Inicia um bate-papo com um dos seus contatos de MI ou altera o seu status


[C++, Build] removed explicit dependency to 'jsmn' from AddTest

Change-Id: If91fae8cec17897a236300bd392abcb3850048f6

--- cpp/tests/AddTest.cmake
+++ cpp/tests/AddTest.cmake
@@ -10,5 +10,4 @@
     )
     add_dependencies(${TARGET} googletest)
     add_dependencies(${TARGET} googlemock)
-    add_dependencies(${TARGET} jsmn)
 endfunction(add_test)


remove unnecessary configurations in ctestconfig; keep file to suppress a ctest warning when it doesnt find config file

--- ctest/CTestConfig.cmake
+++ ctest/CTestConfig.cmake
@@ -1,15 +0,0 @@
-## This file should be placed in the root directory of your project.
-## Then modify the CMakeLists.txt file in the root directory of your
-## project to incorporate the testing dashboard.
-##
-## # The following are required to submit to the CDash dashboard:
-##   ENABLE_TESTING()
-##   INCLUDE(CTest)
-
-set(CTEST_PROJECT_NAME "openfast")
-set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")
-
-set(CTEST_DROP_METHOD "http")
-set(CTEST_DROP_SITE "localhost")
-set(CTEST_DROP_LOCATION        "/cdash/public/submit.php?project=openfast")
-set(CTEST_DROP_SITE_CDASH TRUE)


Zlib 1.2.7 (patch from Niall Moody)

Zlib 1.2.7 (patch from Niall Moody)

--- CMake/ExternalPNG.cmake
+++ CMake/ExternalPNG.cmake
@@ -17,8 +17,8 @@
     PREFIX ${libpng_PREFIX}

     DOWNLOAD_DIR ${POLYCODE_DEPS_DOWNLOAD_DIR}
-    URL http://zlib.net/zlib-1.2.6.tar.gz
-    URL_MD5 618e944d7c7cd6521551e30b32322f4a
+    URL http://zlib.net/zlib-1.2.7.tar.gz
+    URL_MD5 60df6a37c56e7c1366cca812414f7b85

     PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PolycodeDependencies_SOURCE_DIR}/../CMake/zlib.cmake <SOURCE_DIR>/CMakeLists.txt && ${CMAKE_COMMAND} -E remove <SOURCE_DIR>/zconf.h


COMP: explicitly include UseGenerateCLP.cmake

--- DTIProcess.cmake
+++ DTIProcess.cmake
@@ -45,8 +45,9 @@
 ##  This logic will include SlicerExectionModel only if it
 ##  has not already been included by a previous package.

-find_package(SlicerExecutionModel REQUIRED)
+find_package(SlicerExecutionModel REQUIRED GenerateCLP)
 include(${SlicerExecutionModel_USE_FILE})
+include(${GenerateCLP_USE_FILE})

 set( LIST_ITK_COMPONENTS
   ITKDiffusionTensorImage


ENH: Update Tcl/Tk 8.5

ENH: Update Tcl/Tk 8.5

--- CMake/FindTCL.cmake
+++ CMake/FindTCL.cmake
@@ -37,18 +37,26 @@

 GET_FILENAME_COMPONENT(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH)
 GET_FILENAME_COMPONENT(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH)
+STRING(REGEX REPLACE
+  "^.*tclsh([0-9]\\.*[0-9]).*$" "\\1" TCL_TCLSH_VERSION "${TCL_TCLSH}")

 GET_FILENAME_COMPONENT(TK_WISH_PATH "${TK_WISH}" PATH)
 GET_FILENAME_COMPONENT(TK_WISH_PATH_PARENT "${TK_WISH_PATH}" PATH)
+STRING(REGEX REPLACE
+  "^.*wish([0-9]\\.*[0-9]).*$" "\\1" TK_WISH_VERSION "${TK_WISH}")

 GET_FILENAME_COMPONENT(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
 GET_FILENAME_COMPONENT(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)

 GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH "${TCL_LIBRARY}" PATH)
 GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH)
+STRING(REGEX REPLACE
+  "^.*tcl([0-9]\\.*[0-9]).*$" "\\1" TCL_LIBRARY_VERSION "${TCL_LIBRARY}")

 GET_FILENAME_COMPONENT(TK_LIBRARY_PATH "${TK_LIBRARY}" PATH)
 GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LIBRARY_PATH}" PATH)
+STRING(REGEX REPLACE
+  "^.*tk([0-9]\\.*[0-9]).*$" "\\1" TK_LIBRARY_VERSION "${TK_LIBRARY}")

 SET(TCLTK_POSSIBLE_LIB_PATHS
   "${TCL_INCLUDE_PATH_PARENT}/lib"
@@ -81,7 +89,9 @@
 ENDIF(WIN32)

 FIND_LIBRARY(TCL_LIBRARY
-  NAMES tcl
+  NAMES
+  tcl
+  tcl${TK_LIBRARY_VERSION} tcl${TCL_TCLSH_VERSION} tcl${TK_WISH_VERSION}
   tcl86 tcl8.6
   tcl85 tcl8.5
   tcl84 tcl8.4
@@ -92,7 +102,9 @@
   )

 FIND_LIBRARY(TK_LIBRARY
-  NAMES tk
+  NAMES
+  tk
+  tk${TCL_LIBRARY_VERSION} tk${TCL_TCLSH_VERSION} tk${TK_WISH_VERSION}
   tk86 tk8.6
   tk85 tk8.5
   tk84 tk8.4
@@ -135,6 +147,8 @@
   "${TK_WISH_PATH_PARENT}/include"
   /usr/include
   /usr/local/include
+  /usr/include/tcl${TK_LIBRARY_VERSION}
+  /usr/include/tcl${TCL_LIBRARY_VERSION}
   /usr/include/tcl8.6
   /usr/include/tcl8.5
   /usr/include/tcl8.4
@@ -178,7 +192,6 @@
   PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
   )

-
 MARK_AS_ADVANCED(
   TCL_TCLSH_PATH
   TK_WISH_PATH


Adding path hints to locate ZMQ when built from source in Windows.

--- Findlibzmq.cmake
+++ Findlibzmq.cmake
@@ -44,7 +44,7 @@
     set(_zmq_TOOLSET "-v90")
   endif()

-  set(_zmq_versions "4_0_4" "4_0_3" "4_0_2" "4_0_1" "4_0_0"
+  set(_zmq_versions "4_0_5" "4_0_4" "4_0_3" "4_0_2" "4_0_1" "4_0_0"
                     "3_2_5" "3_2_4" "3_2_3" "3_2_2"  "3_2_1" "3_2_0" "3_1_0")
   set(_zmq_release_names)
   set(_zmq_debug_names)
@@ -55,17 +55,24 @@
     list(APPEND _zmq_debug_names "libzmq${_zmq_TOOLSET}-mt-gd-${ver}")
   endforeach()

+  list(APPEND _zmq_debug_names "libzmq_d")
+
+  set(_zmq_hint_paths ${LIBZMQ_ROOT_DIR}/bin ${LIBZMQ_ROOT_DIR}/lib)
+  if(CMAKE_CL_64)
+    list(APPEND _zmq_hint_paths ${LIBZMQ_ROOT_DIR}/lib/x64)
+  else()
+    list(APPEND _zmq_hint_paths ${LIBZMQ_ROOT_DIR}/lib/Win32)
+  endif()
+
   #now try to find the release and debug version
   find_library(LIBZMQ_LIBRARY_RELEASE
     NAMES ${_zmq_release_names} zmq libzmq
-    HINTS ${LIBZMQ_ROOT_DIR}/bin
-          ${LIBZMQ_ROOT_DIR}/lib
+    HINTS ${_zmq_hint_paths}
     )

   find_library(LIBZMQ_LIBRARY_DEBUG
     NAMES ${_zmq_debug_names} zmq libzmq
-    HINTS ${LIBZMQ_ROOT_DIR}/bin
-          ${LIBZMQ_ROOT_DIR}/lib
+    HINTS ${_zmq_hint_paths}
     )

   if(LIBZMQ_LIBRARY_RELEASE AND LIBZMQ_LIBRARY_DEBUG)


cmake: Omit if statement that is always true

We had an if-statement around policy 79 because we used to need to
support CMake versions before 3.13.0. But now 3.13.1 is the minimum
required version so the if statement always evaluates to true and can
be omitted.

Signed-off-by: Sebastian Bøe <edee888afd63e94916688495334700803eba20a0@nordicsemi.no>

--- cmake/app/boilerplate.cmake
+++ cmake/app/boilerplate.cmake
@@ -28,12 +28,10 @@
 # CMP0002: "Logical target names must be globally unique"
 cmake_policy(SET CMP0002 NEW)

-if(NOT (${CMAKE_VERSION} VERSION_LESS "3.13.0"))
-  # Use the old CMake behaviour until 3.13.x is required and the build
-  # scripts have been ported to the new behaviour.
-  # CMP0079: "target_link_libraries() allows use with targets in other directories"
-  cmake_policy(SET CMP0079 OLD)
-endif()
+# Use the old CMake behaviour until the build scripts have been ported
+# to the new behaviour.
+# CMP0079: "target_link_libraries() allows use with targets in other directories"
+cmake_policy(SET CMP0079 OLD)

 define_property(GLOBAL PROPERTY ZEPHYR_LIBS
     BRIEF_DOCS "Global list of all Zephyr CMake libs that should be linked in"


Fixes add_file_ios_app for absolute paths

--- Googlify.cmake
+++ Googlify.cmake
@@ -171,7 +171,7 @@
     COMMAND mkdir -p ${DEST_DIR}
     VERBATIM)
   get_source_file_property(GENERATED ${FULL_SRC} GENERATED)
-  if (EXISTS "${FULL_SRC}" OR GENERATED)
+  if ("${SRC}" MATCHES "^/" OR EXISTS "${FULL_SRC}" OR GENERATED)
     add_custom_command(
       TARGET ${FULL_TARGET} POST_BUILD
       COMMAND ditto ${FULL_SRC} ${DEST}


cmake: board alias message when hiding existing board

This commit will print a CMake notice if a user defines a board alias
that is identical to an existing board name.

Signed-off-by: Torsten Rasmussen <a7c5b1d5a1f41fce6edfa3f7c2392ae0c59deafe@nordicsemi.no>

--- cmake/app/boilerplate.cmake
+++ cmake/app/boilerplate.cmake
@@ -292,6 +292,16 @@
 foreach(root ${BOARD_ROOT})
   # NB: find_path will return immediately if the output variable is
   # already set
+  if (BOARD_ALIAS)
+    find_path(BOARD_HIDDEN_DIR
+      NAMES ${BOARD_ALIAS}_defconfig
+      PATHS ${root}/boards/*/*
+      NO_DEFAULT_PATH
+      )
+    if(BOARD_HIDDEN_DIR)
+      message("Board alias ${BOARD_ALIAS} is hiding the real board of same name")
+    endif()
+  endif()
   find_path(BOARD_DIR
     NAMES ${BOARD}_defconfig
     PATHS ${root}/boards/*/*


Fixes for no found libraries in FindFFMPEG.cmake

--- FindFFMPEG.cmake
+++ FindFFMPEG.cmake
@@ -81,8 +81,17 @@
 ENDFOREACH( INC_ )

 # clear out duplicates
-LIST( REMOVE_DUPLICATES FFMPEG_INCLUDE_DIR )
-LIST( REMOVE_DUPLICATES FFMPEG_LIBRARY_DIR )
+SET( TMP_ TMP-NOTFOUND )
+LIST(LENGTH FFMPEG_INCLUDE_DIR ${TMP_})
+IF (${TMP_} GREATER 0)
+  LIST( REMOVE_DUPLICATES FFMPEG_INCLUDE_DIR )
+ENDIF (${TMP_} GREATER 0)
+
+SET( TMP_ TMP-NOTFOUND )
+LIST(LENGTH FFMPEG_LIBRARY_DIR TMP_)
+IF (${TMP_} GREATER 0)
+  LIST( REMOVE_DUPLICATES FFMPEG_LIBRARY_DIR )
+ENDIF (${TMP_} GREATER 0)

 # find the full paths of the libraries
 SET( TMP_ TMP-NOTFOUND )


Use "default" theme for Sphinx < 1.3

Use "default" theme for Sphinx < 1.3

--- salome_adm/cmake_files/FindSphinx.cmake
+++ salome_adm/cmake_files/FindSphinx.cmake
@@ -48,7 +48,7 @@
   STRING(REGEX REPLACE ".* ([0-9.]+)$" "\\1" SPHINX_VERSION "${SPHINX_VERSION}" )
   MESSAGE(STATUS "Sphinx version is ${SPHINX_VERSION}")
   IF(SPHINX_VERSION VERSION_LESS "1.3")
-    SET(SPHINX_THEME "basic")
+    SET(SPHINX_THEME "default")
   ELSE()
     SET(SPHINX_THEME "classic")
   ENDIF()


Prereq has to be in MODULE_ENV

Prereq has to be in MODULE_ENV

--- GNUModules.cmake
+++ GNUModules.cmake
@@ -57,11 +57,6 @@
   set(MODULE_MODULEFILES "modulefiles")
 endif()

-# optional: list of required modules that need to be loaded before this module
-if(NOT MODULE_PREREQ)
-  set(MODULE_PREREQ "none")
-endif()
-

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

@@ -95,8 +90,6 @@
   "#\n"
   "# Module:      ${MODULE_FILENAME}\n"
   "#\n"
-  "# Prereq:\n"
-  "#   ${MODULE_PREREQ}\n"
   "#\n"
   "\n"
   "# Set internal variables\n"


Do not quote options list.

Do not quote options list.

	* build-aux/cmake/modules/Makeinfo.cmake: Do that.

Signed-off-by: Nicolas Despres <abdeb541ca46f1651c9cc594d44e707056e73d5d@gostai.com>

--- build-aux/cmake/modules/Makeinfo.cmake
+++ build-aux/cmake/modules/Makeinfo.cmake
@@ -37,8 +37,8 @@
 # of path to add to the include path list.
 function(MAKEINFO_FILE input output includepaths)
   # Set options depending on the system.
-  set(html_opts "--html --no-split --no-headers")
-  set(txt_opts "--plaintext")
+  set(html_opts --html --no-split --no-headers)
+  set(txt_opts --plaintext)
   if(UNIX)
     if(CYGWIN)
       set(opts ${html_opts})


Add variable to disable sub projects

Add variable to disable sub projects

--- SubProject.cmake
+++ SubProject.cmake
@@ -23,6 +23,9 @@
 # - CMAKE_BINARY_DIR should be changed to PROJECT_BINARY_DIR
 # - CMAKE_SOURCE_DIR should be changed to PROJECT_SOURCE_DIR
 #
+# Respects the following variables:
+# - DISABLE_SUBPROJECTS: when set, does not load sub projects. Useful for
+#   example for continuous integration builds
 # A sample project can be found at https://github.com/Eyescale/Collage.git

 include(${CMAKE_CURRENT_LIST_DIR}/GitExternal.cmake)
@@ -76,7 +79,7 @@
 endfunction()

 macro(git_subproject name url tag)
-  if(NOT BUILDYARD)
+  if(NOT BUILDYARD AND NOT DISABLE_SUBPROJECTS)
     string(TOUPPER ${name} NAME)
     if(NOT ${NAME}_FOUND)
       get_property(__included GLOBAL PROPERTY ${name}_IS_SUBPROJECT)


COMP: Disable some warnings on HP compiler.

--- CMake/vtkDetermineCompilerFlags.cmake
+++ CMake/vtkDetermineCompilerFlags.cmake
@@ -59,6 +59,12 @@
     SET(VTK_REQUIRED_SHARED_LINKER_FLAGS "${VTK_REQUIRED_SHARED_LINKER_FLAGS} -bhalt:5")
     SET(VTK_REQUIRED_MODULE_LINKER_FLAGS "${VTK_REQUIRED_MODULE_LINKER_FLAGS} -bhalt:5")
   ENDIF(CMAKE_SYSTEM MATCHES "AIX.*")
+  IF(CMAKE_SYSTEM MATCHES "HP-UX.*")
+     SET(VTK_REQUIRED_C_FLAGS
+         "${VTK_REQUIRED_C_FLAGS} +W2111 +W2236 +W4276")
+     SET(VTK_REQUIRED_CXX_FLAGS
+         "${VTK_REQUIRED_CXX_FLAGS} +W2111 +W2236 +W4276")
+  ENDIF(CMAKE_SYSTEM MATCHES "HP-UX.*")
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)

 IF(APPLE)


BUG: update test properties

BUG: update test properties

--- Packaging/testing.cmake
+++ Packaging/testing.cmake
@@ -28,4 +28,4 @@
   DEPENDS
   )

-set_tests_properties ( TuOtbLoader PROPERTIES DEPENDS TuExtractPackage)
+set_tests_properties ( Tu_selftester PROPERTIES DEPENDS Tu_install_package)


Fix CMake variable type of MITK_XVFB_TESTING_COMMAND

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -431,7 +431,7 @@
     -DMITK_BUILD_CONFIGURATION:STRING=${MITK_BUILD_CONFIGURATION}
     -DMITK_FAST_TESTING:BOOL=${MITK_FAST_TESTING}
     -DMITK_XVFB_TESTING:BOOL=${MITK_XVFB_TESTING}
-    -DMITK_XVFB_TESTING_COMMAND:BOOL=${MITK_XVFB_TESTING_COMMAND}
+    -DMITK_XVFB_TESTING_COMMAND:STRING=${MITK_XVFB_TESTING_COMMAND}
     -DCTEST_USE_LAUNCHERS:BOOL=${CTEST_USE_LAUNCHERS}
     # ----------------- Miscellaneous ---------------
     -DCMAKE_LIBRARY_PATH:PATH=${CMAKE_LIBRARY_PATH}


CMake: Remove utility function dependency on mbed-os target

The utility function may be called by targets other than mbed-os
when it is broken into multiple libraries.

--- cmake/util.cmake
+++ cmake/util.cmake
@@ -4,8 +4,7 @@
 # PREFIX - TARGET or similar (can be empty string)
 # KEYWORD_LIST - list of labels that are used to include directories
 function(mbed_add_cmake_directory_if_labels PREFIX)
-    get_target_property(target_labels mbed-os MBED_TARGET_LABELS)
-    foreach(key ${target_labels})
+    foreach(key ${MBED_TARGET_LABELS})
         if(NOT "${PREFIX}" STREQUAL "")
             string(PREPEND key ${PREFIX} "_")
         endif()


zlib 1.2.9 -> 1.2.10 (#122)

zlib 1.2.9 -> 1.2.10 (#122)

--- cmake/zlib.cmake
+++ cmake/zlib.cmake
@@ -10,8 +10,8 @@
   set(zlib_source  "${CMAKE_CURRENT_BINARY_DIR}/zlib-src")
   set(zlib_build   "${CMAKE_CURRENT_BINARY_DIR}/zlib")
   set(zlib_install "${CMAKE_CURRENT_BINARY_DIR}/prefix")
-  set(zlib_file "http://zlib.net/zlib129.zip")
-  set(zlib_md5 "9553a573137c2225c6c57b2aa2124c0f")
+  set(zlib_file "http://zlib.net/zlib1210.zip")
+  set(zlib_md5 "5327bdff96926cf9c479008bae983bc0")

   if(CMAKE_CFG_INTDIR STREQUAL ".")
     set(zlib_build_type ${CMAKE_BUILD_TYPE})


try to add to main test

try to add to main test

--- software/ipab/control/CTestConfig.cmake
+++ software/ipab/control/CTestConfig.cmake
@@ -4,10 +4,10 @@
 ## # The following are required to uses Dart and the Cdash dashboard
 ##   ENABLE_TESTING()
 ##   INCLUDE(CTest)
-set(CTEST_PROJECT_NAME "DRCControl")
+set(CTEST_PROJECT_NAME "DRC")
 set(CTEST_NIGHTLY_START_TIME "22:00:00 EDT")

 set(CTEST_DROP_METHOD "http")
 set(CTEST_DROP_SITE "kobol.csail.mit.edu")
-set(CTEST_DROP_LOCATION "/cd/submit.php?project=DRCControl")
+set(CTEST_DROP_LOCATION "/cd/submit.php?project=DRC")
 set(CTEST_DROP_SITE_CDASH TRUE)


COMP: Add OpenIGTLink binary dir to PATH

--- CMake/MITKDashboardSetup.cmake
+++ CMake/MITKDashboardSetup.cmake
@@ -79,7 +79,8 @@
   set(SOFA_BINARY_DIR "${CTEST_BINARY_DIRECTORY}/SOFA-build/bin/${CTEST_BUILD_CONFIGURATION}")
   set(REDLAND_BINARY_DIR "${CTEST_BINARY_DIRECTORY}/Redland-install/bin")
   set(BLUEBERRY_OSGI_DIR "${CTEST_BINARY_DIRECTORY}/MITK-build/bin/BlueBerry/org.blueberry.osgi/bin/${CTEST_BUILD_CONFIGURATION}")
-  set(CTEST_PATH "${CTEST_PATH};${CPPUNIT_BINARY_DIR};${QT_BINARY_DIR};${VTK_BINARY_DIR};${ANN_BINARY_DIR};${GLUT_BINARY_DIR};${GLEW_BINARY_DIR};${TINYXML_BINARY_DIR};${QWT_BINARY_DIR};${ACVD_BINARY_DIR};${ITK_BINARY_DIR};${BOOST_BINARY_DIR};${GDCM_BINARY_DIR};${DCMTK_BINARY_DIR};${OPENCV_BINARY_DIR};${POCO_BINARY_DIR};${SOFA_BINARY_DIR};${REDLAND_BINARY_DIR};${BLUEBERRY_OSGI_DIR}")
+  set(OpenIGTLink_DIR "${CTEST_BINARY_DIRECTORY}/OpenIGTLink-build/bin")
+  set(CTEST_PATH "${CTEST_PATH};${CPPUNIT_BINARY_DIR};${QT_BINARY_DIR};${VTK_BINARY_DIR};${ANN_BINARY_DIR};${GLUT_BINARY_DIR};${GLEW_BINARY_DIR};${TINYXML_BINARY_DIR};${QWT_BINARY_DIR};${ACVD_BINARY_DIR};${ITK_BINARY_DIR};${BOOST_BINARY_DIR};${GDCM_BINARY_DIR};${DCMTK_BINARY_DIR};${OPENCV_BINARY_DIR};${POCO_BINARY_DIR};${SOFA_BINARY_DIR};${REDLAND_BINARY_DIR};${BLUEBERRY_OSGI_DIR};${OpenIGTLink_DIR}")
 endif()
 set(ENV{PATH} "${CTEST_PATH}")


COMP: Merge branch 'bug-18261-Fix1'

COMP: Merge branch 'bug-18261-Fix1'

--- CMakeExternals/PatchACVD.cmake
+++ CMakeExternals/PatchACVD.cmake
@@ -1,10 +1,11 @@
+set(path "CMakeLists.txt")
+file(STRINGS ${path} contents NEWLINE_CONSUME)
 if(DESIRED_QT_VERSION MATCHES "5")
-  set(path "CMakeLists.txt")
-  file(STRINGS ${path} contents NEWLINE_CONSUME)
   string(REPLACE "find_package(VTK" "find_package(Qt5Widgets REQUIRED)\nfind_package(VTK" contents ${contents})
-  set(CONTENTS ${contents})
-  configure_file(${TEMPLATE_FILE} ${path} @ONLY)
 endif()
+string(REPLACE "ENDIF(BUILD_VOLUMEPROCESSING)" "ENDIF(BUILD_VOLUMEPROCESSING)\n\nCONFIGURE_FILE(ACVDConfig.cmake.in ACVDConfig.cmake @ONLY)" contents ${contents})
+set(CONTENTS ${contents})
+configure_file(${TEMPLATE_FILE} ${path} @ONLY)

 # Create <name>Config.cmake file to make ACVD findable through config mode of find_package()

@@ -13,8 +14,6 @@
 set(ACVD_LIBRARY_DIRS \"@PROJECT_BINARY_DIR@/bin\")
 set(ACVD_LIBRARIES vtkSurface vtkDiscreteRemeshing vtkVolumeProcessing)
 add_definitions(-DDOmultithread)")
-
-file(APPEND "CMakeLists.txt" "CONFIGURE_FILE(ACVDConfig.cmake.in ACVDConfig.cmake @ONLY)")

 # Add vtkVersionMacros.h header file


- fix libnuml detection

- fix libnuml detection

--- CMakeModules/FindLIBNUML.cmake
+++ CMakeModules/FindLIBNUML.cmake
@@ -30,7 +30,7 @@

 else()

-find_path(LIBNUML_INCLUDE_DIR sbml/SBase.h
+find_path(LIBNUML_INCLUDE_DIR numl/NMBase.h
     PATHS $ENV{LIBNUML_DIR}/include
           $ENV{LIBNUML_DIR}
           ${LIBSEDML_DEPENDENCY_DIR}
@@ -45,11 +45,11 @@
     NO_DEFAULT_PATH)

 if (NOT LIBNUML_INCLUDE_DIR)
-    message(FATAL_ERROR "libsbml include dir not found not found!")
+    message(FATAL_ERROR "libnuml include dir not found not found!")
 endif (NOT LIBNUML_INCLUDE_DIR)

 if (NOT LIBNUML_INCLUDE_DIR)
-    find_path(LIBNUML_INCLUDE_DIR sbml/SBase.h)
+    find_path(LIBNUML_INCLUDE_DIR numl/NMBase.h)
 endif (NOT LIBNUML_INCLUDE_DIR)

 find_library(LIBNUML_LIBRARY


Tagging build_forge for af3.0

Tagging build_forge for af3.0

--- CMakeModules/build_forge.cmake
+++ CMakeModules/build_forge.cmake
@@ -18,7 +18,7 @@
 ExternalProject_Add(
     forge-ext
     GIT_REPOSITORY https://github.com/arrayfire/forge.git
-    GIT_TAG master
+    GIT_TAG af3.0
     PREFIX "${prefix}"
     INSTALL_DIR "${prefix}"
     UPDATE_COMMAND ""


Improve check for conflicting config_kernel.h

--- cmake/arch.cmake
+++ cmake/arch.cmake
@@ -83,8 +83,7 @@
     endif ()
   endif ()

-  CHECK_INCLUDE_FILE ("${PROJECT_SOURCE_DIR}/config_kernel.h" TRAP)
-  if (TRAP)
+  if (EXISTS ${PROJECT_SOURCE_DIR}/config_kernel.h)
 	  message (FATAL_ERROR "Your build directory contains a file config_kernel.h, probably from a previous compilation with make. This will conflict with the cmake compilation and cause strange compiler errors - please remove the file before trying again")
   endif ()


fix glop target

fix glop target


(#4891) Don't include RPATH in PROPER builds

--- build/cmake/CondorConfigure.cmake
+++ build/cmake/CondorConfigure.cmake
@@ -496,7 +496,7 @@

 #####################################
 # RPATH option
-if (LINUX)
+if (LINUX AND NOT PROPER)
 	option(CMAKE_SKIP_RPATH "Skip RPATH on executables" OFF)
 else()
 	option(CMAKE_SKIP_RPATH "Skip RPATH on executables" ON)


Moved call to PyTuple_New(0) to after initialization of python in cmake script to make sure the example compiles for python3.7. Up until at least python 3.5 it seems to not have been an issue to call this function before python was initialized.

--- CMake/Modules/FindPython.cmake
+++ CMake/Modules/FindPython.cmake
@@ -58,8 +58,6 @@
 #endif

 		int main(int argc, char **argv){
-			PyObject *emptyTuple = PyTuple_New(0);
-
 #if PY_MAJOR_VERSION >= 3
 			wchar_t name[] = L\"plotting\";
 #else
@@ -86,6 +84,8 @@
 			PyObject *pyplot = PyImport_Import(pyplotName);
 			if(!pyplot)
 				exit(1);
+
+			PyObject *emptyTuple = PyTuple_New(0);

 			PyObject *clf = PyObject_GetAttrString(pyplot, \"clf\");
 			PyObject *clfReturnValue = PyObject_CallObject(
@@ -123,8 +123,6 @@
 #endif

 			int main(int argc, char **argv){
-				PyObject *emptyTuple = PyTuple_New(0);
-
 #if PY_MAJOR_VERSION >= 3
 				wchar_t name[] = L\"plotting\";
 #else
@@ -144,6 +142,8 @@
 				PyObject *pyplot = PyImport_Import(pyplotName);
 				if(!pyplot)
 					exit(1);
+
+				PyObject *emptyTuple = PyTuple_New(0);

 				PyObject *clf = PyObject_GetAttrString(pyplot, \"clf\");
 				PyObject *clfReturnValue = PyObject_CallObject(


- add else branch to ensure cblas is properly included

--- CMakeModules/FindCLAPACK.cmake
+++ CMakeModules/FindCLAPACK.cmake
@@ -65,7 +65,7 @@
     )

     if (CLAPACK_INCLUDE_DIR)
-    add_definitions(-DHAVE_CBLAS_H)
+      add_definitions(-DHAVE_CBLAS_H)
     endif()

     if (NOT CLAPACK_INCLUDE_DIR)
@@ -73,6 +73,10 @@
       set(CLAPACK_INCLUDE_DIR "${COPASI_SOURCE_DIR}")
     endif (NOT CLAPACK_INCLUDE_DIR)

+  else()
+
+    add_definitions(-DHAVE_CBLAS_H)
+
   endif (NOT CLAPACK_INCLUDE_DIR)


Fix issue 24

Fix issue 24

--- CMakeModules/FindCityGML.cmake
+++ CMakeModules/FindCityGML.cmake
@@ -99,9 +99,8 @@
 	IF(NOT CITYGML_LIBRARY_DEBUG)
 		MESSAGE("-- Warning Debug LibCityGML not found, using: ${CITYGML_LIBRARY}")
 		SET(CITYGML_LIBRARY_DEBUG "${CITYGML_LIBRARY}" CACHE FILEPATH "Path to a library." FORCE)
-	ELSE(NOT CITYGML_LIBRARY_DEBUG)
-		#set the conditional linking library if debug is present
-		SET(CITYGML_LIBRARIES optimized ${CITYGML_LIBRARY} debug ${CITYGML_LIBRARY_DEBUG})
 	ENDIF(NOT CITYGML_LIBRARY_DEBUG)
 ENDIF(CITYGML_LIBRARY AND CITYGML_INCLUDE_DIR)

+SET(CITYGML_LIBRARIES optimized ${CITYGML_LIBRARY} debug ${CITYGML_LIBRARY_DEBUG})
+


[Conf] CM074 is not supported by CMake 3.11 yet

--- config/project_config_embeddable.cmake
+++ config/project_config_embeddable.cmake
@@ -518,7 +518,7 @@

 # ~~~~~~~~~~ ICU ~~~~~~~~~
 macro (get_icu)
-  cmake_policy(SET CMP0074 NEW)
+  # cmake_policy(SET CMP0074 NEW)
   unset (_required_version)
   if (${ARGC} GREATER 0)
     set (_required_version ${ARGV0})


Improve SDK cross compiling in macOS

Improve SDK cross compiling in macOS

--- contrib/cmake/build_from_scratch.cmake
+++ contrib/cmake/build_from_scratch.cmake
@@ -246,14 +246,11 @@
             OUTPUT_VARIABLE HOST_ARCHITECTURE
             OUTPUT_STRIP_TRAILING_WHITESPACE)

-        # Are we building on Apple Silicon?
-        if (HOST_ARCHITECTURE STREQUAL "arm64")
-            # Are we building for x86_64?
-            if (VCPKG_OSX_ARCHITECTURES STREQUAL "x86_64")
-                # Then make sure we build using the correct toolchain.
-                set(_toolchain_cross_compile_args
-                    "-DCMAKE_OSX_ARCHITECTURES=${VCPKG_OSX_ARCHITECTURES}")
-            endif ()
+        # Are we crosscompiling?
+        if (NOT HOST_ARCHITECTURE STREQUAL VCPKG_OSX_ARCHITECTURES)
+            set(_toolchain_cross_compile_args
+                "-DCMAKE_OSX_ARCHITECTURES=${VCPKG_OSX_ARCHITECTURES}")
+                message(STATUS "Cross compiling for arch ${VCPKG_OSX_ARCHITECTURES} in ${HOST_ARCHITECTURE} system.")
         endif ()

         # Clean up after ourselves.


build: account for greatfet_firmware flag change

--- firmware/cmake/greatfet.cmake
+++ firmware/cmake/greatfet.cmake
@@ -68,7 +68,7 @@
 	add_dfu_executable(${EXECUTABLE_NAME}.dfu ${EXECUTABLE_NAME}.bin ${LINKER_SCRIPT_FLASH} ${LINKER_SCRIPT_DFU})

 	# Program/flash targets
-	add_custom_target(${EXECUTABLE_NAME}-flash   DEPENDS ${EXECUTABLE_NAME}.bin COMMAND greatfet_firmware -v -Rw ${EXECUTABLE_NAME}.bin)
+	add_custom_target(${EXECUTABLE_NAME}-flash   DEPENDS ${EXECUTABLE_NAME}.bin COMMAND greatfet_firmware -Rw ${EXECUTABLE_NAME}.bin)
 	add_custom_target(${EXECUTABLE_NAME}-program DEPENDS ${EXECUTABLE_NAME}.dfu COMMAND dfu-util --device 1fc9:000c --alt 0 --download ${EXECUTABLE_NAME}.dfu)

 endfunction(add_greatfet_targets)


Added cuda-version to the search path to support the slotted gentoo ebuild for the CUDA toolkit.

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

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


Remove capnp and libz for XDC parser PR.

Signed-off-by: Keith Rothman <1bc19627a439baf17510dc2d0b2d250c96d445a5@users.noreply.github.com>

--- fpga_interchange/family.cmake
+++ fpga_interchange/family.cmake
@@ -1,4 +1,3 @@
-
 find_package(TCL)
 if(NOT ${TCL_FOUND})
     message(FATAL_ERROR "Tcl is required for FPGA interchange Arch.")
@@ -7,7 +6,4 @@
 foreach (target ${family_targets})
     target_link_libraries(${target} LINK_PUBLIC ${TCL_LIBRARY})
     include_directories (${TCL_INCLUDE_PATH})
-    target_link_libraries(${target} LINK_PUBLIC capnp)
-    target_link_libraries(${target} LINK_PUBLIC kj)
-    target_link_libraries(${target} LINK_PUBLIC z)
 endforeach()


[C++] Fix a typo in `FindClangTools.cmake`. (#2404)

--- cpp/cmake_modules/FindClangTools.cmake
+++ cpp/cmake_modules/FindClangTools.cmake
@@ -31,7 +31,7 @@
 #  CLANG_TIDY_FOUND, Whether clang format was found

 if (DEFINED ENV{HOMEBREW_PREFIX})
-  set(HOMEBREW_PREFIX "${ENV{HOMEBREW_PREFIX}")
+  set(HOMEBREW_PREFIX "$ENV{HOMEBREW_PREFIX}")
 else()
   set(HOMEBREW_PREFIX "/usr/local")
 endif()


Added functionality to extract externals which are tarballs compressed with bzip.

--- build/cmake/modules/ExternalProjectPatched.cmake
+++ build/cmake/modules/ExternalProjectPatched.cmake
@@ -264,6 +264,10 @@
     set(args xfz)
   endif()

+  if(filename MATCHES ".bz2$")
+    set(args xfj)
+  endif()
+
   if(filename MATCHES ".tar.gz$")
     set(args xfz)
   endif()
@@ -648,7 +652,7 @@
     set(work_dir ${download_dir})

     string(REGEX MATCH "[^/]*$" fname "${url}")
-    if(NOT "${fname}" MATCHES "\\.(tar|tgz|zip|tar\\.gz)$")
+    if(NOT "${fname}" MATCHES "\\.(tar|tgz|zip|tar\\.gz|bz2)$")
 		message(FATAL_ERROR "Could not extract tarball filename from url:\n  ${url}")
     endif()


Fix documentation and bad variable name.

	* build-aux/cmake/modules/DynLibDep.cmake (dldep_ldd): Here.

Signed-off-by: Nicolas Despres <abdeb541ca46f1651c9cc594d44e707056e73d5d@gostai.com>

--- build-aux/cmake/modules/DynLibDep.cmake
+++ build-aux/cmake/modules/DynLibDep.cmake
@@ -27,8 +27,10 @@
     message(FATAL_ERROR "dldep: error: ${msg}")
   endfunction(dldep_error)

-  # Puts respectively the name and the path of the binary _binary_ in
-  # _list_names_ and _libthe dependent libraries of _binary_.
+  # Puts respectively the name and the path of the dependent libraries of the
+  # binary _binary_ in _list_names_ and _lib_paths_.
+  #
+  # It uses 'ldd' to gather the list of dependencies.
   function(dldep_ldd binary lib_names lib_paths)

     set(tools ldd)
@@ -47,7 +49,7 @@
       )

     if(err)
-      dldep_info("${LDD_EXECUTABLE} prints some error: '${err}'")
+      dldep_info("${tool} prints some error: '${err}'")
     endif(err)

     set(_lib_names "")


fix EQUAL unknown

fix EQUAL unknown

--- cmake/external/openblas.cmake
+++ cmake/external/openblas.cmake
@@ -115,7 +115,7 @@
 # linear algebra libraries for cc_library(xxx SRCS xxx.c DEPS cblas)
 SET(dummyfile ${CMAKE_CURRENT_BINARY_DIR}/cblas_dummy.c)
 FILE(WRITE ${dummyfile} "const char * dummy = \"${dummyfile}\";")
-IF(${CBLAS_PROVIDER} EQUAL MKLML)
+IF("${CBLAS_PROVIDER}" STREQUAL "MKLML")
     ADD_LIBRARY(cblas SHARED ${dummyfile})
 ELSE()
     ADD_LIBRARY(cblas STATIC ${dummyfile})