Fix typo

Fix typo

--- tensorflow/contrib/cmake/tf_core_kernels.cmake
+++ tensorflow/contrib/cmake/tf_core_kernels.cmake
@@ -21,7 +21,7 @@
      "${tensorflow_source_dir}/tensorflow/core/kernels/no_op.cc"
      "${tensorflow_source_dir}/tensorflow/core/kernels/sendrecv_ops.h"
      "${tensorflow_source_dir}/tensorflow/core/kernels/sendrecv_ops.cc"
- t )
+  )
 endif(tensorflow_BUILD_ALL_KERNELS)

 if(tensorflow_BUILD_CONTRIB_KERNELS)


BUG: wrap in macro and call it filename

BUG: wrap in macro and call it filename

--- Packaging/cleanup_package.cmake
+++ Packaging/cleanup_package.cmake
@@ -1,3 +1,4 @@
+macro(cleanup_package)
 message(STATUS "Empty package staging directory: ${CMAKE_INSTALL_PREFIX}/${PKG_STAGE_DIR}")
 execute_process(COMMAND
 g  ${CMAKE_COMMAND} -E remove_directory
@@ -7,3 +8,4 @@
 execute_process(COMMAND
   ${CMAKE_COMMAND} -E remove -f "${PACKAGE_OUTPUT_FILE}"
   )
+endmacro()


Made the llvm-gcc and llvm-g++ not required, as they shouldn't be required currently.

--- FindLLVM.cmake
+++ FindLLVM.cmake
@@ -23,17 +23,17 @@
       /opt/local/bin
   )

-  find_program(LLVM_GXX_EXECUTABLE
-      NAMES llvm-g++ llvmg++
-      PATHS
-      /opt/local/bin
-  )
+#  find_program(LLVM_GXX_EXECUTABLE
+#     NAMES llvm-g++ llvmg++
+#     PATHS
+#     /opt/local/bin
+# )

-  if (LLVM_GXX_EXECUTABLE)
-      MESSAGE(STATUS "LLVM llvm-g++ found at: ${LLVM_GXX_EXECUTABLE}")
-  else(LLVM_GXX_EXECUTABLE)
-      MESSAGE(FATAL_ERROR "LLVM llvm-g++ is required, but not found!")
-  endif(LLVM_GXX_EXECUTABLE)
+#if (LLVM_GXX_EXECUTABLE)
+#      MESSAGE(STATUS "LLVM llvm-g++ found at: ${LLVM_GXX_EXECUTABLE}")
+# else(LLVM_GXX_EXECUTABLE)
+#     MESSAGE(FATAL_ERROR "LLVM llvm-g++ is required, but not found!")
+# endif(LLVM_GXX_EXECUTABLE)

   MACRO(FIND_LLVM_LIBS LLVM_CONFIG_EXECUTABLE _libname_ LIB_VAR OBJECT_VAR)
     exec_program( ${LLVM_CONFIG_EXECUTABLE} ARGS --libs ${_libname_}  OUTPUT_VARIABLE ${LIB_VAR} )


Update Toolchain.cmake

Update Toolchain.cmake

--- linux/armv7sf/Toolchain.cmake
+++ linux/armv7sf/Toolchain.cmake
@@ -12,4 +12,3 @@
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_SYSROOT ${sys_root})


More portable coding for CFitIO

More portable coding for CFitIO

--- modules/FindCFitsIO.cmake
+++ modules/FindCFitsIO.cmake
@@ -36,7 +36,9 @@
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(
   CFitsIO
-  FOUND_VAR CFitsIO_FOUND
   REQUIRED_VARS CFitsIO_LIBRARY CFitsIO_INCLUDE_DIR
   VERSION_VAR CFitsIO_VERSION_STRING
 )
+if(CFITSIO_FOUND AND NOT CFitsIO_FOUND)
+    set(CFitsIO_FOUND ${CFITSIO_FOUND})
+endif()


Updated FindCorrade.cmake from Corrade repository.

--- modules/FindCorrade.cmake
+++ modules/FindCorrade.cmake
@@ -124,8 +124,13 @@
 # CMake module dir
 find_path(_CORRADE_MODULE_DIR
     NAMES UseCorrade.cmake CorradeLibSuffix.cmake
+    PATH_SUFFIXES share/cmake/Corrade)
+
+# If not found, try system module dir
+find_path(_CORRADE_MODULE_DIR
+    NAMES UseCorrade.cmake CorradeLibSuffix.cmake
     PATHS ${CMAKE_ROOT}/Modules
-    PATH_SUFFIXES share/cmake/Corrade)
+    NO_CMAKE_FIND_ROOT_PATH)

 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Corrade DEFAULT_MSG


Print an informative message when -DFORCE_CUSTOM_BOOST=ON

--- modules/boost/boost.cmake
+++ modules/boost/boost.cmake
@@ -78,6 +78,7 @@
 set(BUILD_CUSTOM_BOOST FALSE)
 if(FORCE_CUSTOM_BOOST)
     set(BUILD_CUSTOM_BOOST TRUE)
+    message(STATUS "Force automatic build of Boost")
     # Just to avoid unused variable warning from CMake
     set(BOOST_INCLUDEDIR "")
     set(BOOST_LIBRARYDIR "")


Moved shared cmake flags to the CMAKE_C_FLAGS var

--- SetFlags.cmake
+++ SetFlags.cmake
@@ -16,14 +16,8 @@
 endmacro()

 macro(add_flags_cxx FLAGS)
-	#set(CMAKE_CXX_FLAGS          "${CMAKE_CXX_FLAGS}          ${FLAGS}")
-	#set(CMAKE_C_FLAGS            "${CMAKE_C_FLAGS}            ${FLAGS}")
-	set(CMAKE_CXX_FLAGS_DEBUG    "${CMAKE_CXX_FLAGS_DEBUG}    ${FLAGS}")
-	set(CMAKE_C_FLAGS_DEBUG      "${CMAKE_C_FLAGS_DEBUG}      ${FLAGS}")
-	set(CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_CXX_FLAGS_COVERAGE} ${FLAGS}")
-	set(CMAKE_C_FLAGS_COVERAGE   "${CMAKE_C_FLAGS_COVERAGE}   ${FLAGS}")
-	set(CMAKE_CXX_FLAGS_RELEASE  "${CMAKE_CXX_FLAGS_RELEASE}  ${FLAGS}")
-	set(CMAKE_C_FLAGS_RELEASE    "${CMAKE_C_FLAGS_RELEASE}    ${FLAGS}")
+	set(CMAKE_CXX_FLAGS          "${CMAKE_CXX_FLAGS} ${FLAGS}")
+	set(CMAKE_C_FLAGS            "${CMAKE_C_FLAGS}   ${FLAGS}")
 endmacro()


CMake: in CONFIG mode, adding NO_CMAKE_SYSTEM_PATH option to avoid looking into system directories. See documentation of macro SALOME_FIND_PACKAGE().

--- salome_adm/cmake_files/SalomeMacros.cmake
+++ salome_adm/cmake_files/SalomeMacros.cmake
@@ -210,6 +210,9 @@
 #
 # Modus is either MODULE or CONFIG (cf standard FIND_PACKAGE() documentation).
 # The last argument is optional and if set to TRUE will force the search to be OPTIONAL and QUIET.
+# If the package is looked for in CONFIG mode, the standard system paths are skipped. If you still want a
+# system installation to be found in this mode, you have to set the ROOT_DIR variable explicitly to /usr (for
+# example).
 #
 # This macro is to be called from within the FindSalomeXXXX.cmake file.
 #
@@ -251,12 +254,12 @@
         FIND_PACKAGE(${stdPkg} ${${englobPkg}_FIND_VERSION} ${_tmp_exact}
               NO_MODULE ${_tmp_quiet} ${_tmp_req} COMPONENTS ${${englobPkg}_FIND_COMPONENTS}
               PATH_SUFFIXES "salome_adm/cmake_files" "adm_local/cmake_files"
-              NO_CMAKE_BUILDS_PATH NO_CMAKE_PACKAGE_REGISTRY NO_CMAKE_SYSTEM_PACKAGE_REGISTRY)
+              NO_CMAKE_BUILDS_PATH NO_CMAKE_PACKAGE_REGISTRY NO_CMAKE_SYSTEM_PACKAGE_REGISTRY NO_CMAKE_SYSTEM_PATH)
       ELSE()
         FIND_PACKAGE(${stdPkg} ${${englobPkg}_FIND_VERSION} ${_tmp_exact}
               NO_MODULE ${_tmp_quiet} ${_tmp_req}
               PATH_SUFFIXES "salome_adm/cmake_files" "adm_local/cmake_files"
-              NO_CMAKE_BUILDS_PATH NO_CMAKE_PACKAGE_REGISTRY NO_CMAKE_SYSTEM_PACKAGE_REGISTRY)
+              NO_CMAKE_BUILDS_PATH NO_CMAKE_PACKAGE_REGISTRY NO_CMAKE_SYSTEM_PACKAGE_REGISTRY NO_CMAKE_SYSTEM_PATH)
       ENDIF()
       MARK_AS_ADVANCED(${stdPkg}_DIR)


Drop CUDA driver library from cmake scripts again

there is no need for it any more, now that context push/pop has been eliminated

--- CMake/hoomd/HOOMDCommonLibsSetup.cmake
+++ CMake/hoomd/HOOMDCommonLibsSetup.cmake
@@ -72,7 +72,7 @@
 endif (WIN32)

 if (ENABLE_CUDA)
-    list(APPEND HOOMD_COMMON_LIBS ${CUDA_LIBRARIES} ${CUDA_CUDA_LIBRARY} ${CUDA_cufft_LIBRARY})
+    list(APPEND HOOMD_COMMON_LIBS ${CUDA_LIBRARIES} ${CUDA_cufft_LIBRARY})
 endif (ENABLE_CUDA)

 if (ENABLE_MPI)


[compiler-rt] Rework the object build support

The initial implementation didn't properly support cross-compilation
via the runtime build, the updated implementation should address that
by expanding the CMAKE_C_COMPILE_OBJECT variable with correct values.

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

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

--- cmake/Modules/AddCompilerRT.cmake
+++ cmake/Modules/AddCompilerRT.cmake
@@ -274,16 +274,41 @@
     endif()

     if(type STREQUAL "OBJECT")
-      string(TOUPPER ${CMAKE_BUILD_TYPE} config)
-      get_property(cflags SOURCE ${sources_${libname}} PROPERTY COMPILE_FLAGS)
-      separate_arguments(cflags)
+      get_property(cflags_${libname} SOURCE ${sources_${libname}} PROPERTY COMPILE_FLAGS)
+      if(CMAKE_C_COMPILER_ID MATCHES Clang AND CMAKE_C_COMPILER_TARGET)
+        list(APPEND cflags_${libname} "-target ${CMAKE_C_COMPILER_TARGET}")
+      endif()
+      string(REPLACE ";" " " extra_cflags_${libname} "${extra_cflags_${libname}}")
+      string(REGEX MATCHALL "<[A-Za-z0-9_]*>" substitutions
+             ${CMAKE_C_COMPILE_OBJECT})
+      set(compile_command_${libname} "${CMAKE_C_COMPILE_OBJECT}")
+      set(output_file_${libname} ${output_name_${libname}}${CMAKE_C_OUTPUT_EXTENSION})
+      foreach(substitution ${substitutions})
+        if(substitution STREQUAL "<CMAKE_C_COMPILER>")
+          string(REPLACE "<CMAKE_C_COMPILER>" "${CMAKE_C_COMPILER}"
+                 compile_command_${libname} ${compile_command_${libname}})
+        elseif(substitution STREQUAL "<OBJECT>")
+          string(REPLACE "<OBJECT>" "${output_dir_${libname}}/${output_file_${libname}}"
+                 compile_command_${libname} ${compile_command_${libname}})
+        elseif(substitution STREQUAL "<SOURCE>")
+          string(REPLACE "<SOURCE>" "${sources_${libname}}"
+                 compile_command_${libname} ${compile_command_${libname}})
+        elseif(substitution STREQUAL "<FLAGS>")
+          string(REPLACE "<FLAGS>" "${CMAKE_C_FLAGS} ${cflags_${libname}} ${extra_cflags_${libname}}"
+                 compile_command_${libname} ${compile_command_${libname}})
+        else()
+          string(REPLACE "${substitution}" "" compile_command_${libname}
+                 ${compile_command_${libname}})
+        endif()
+      endforeach()
+      separate_arguments(compile_command_${libname})
       add_custom_command(
-          OUTPUT ${output_dir_${libname}}/${output_name_${libname}}.o
-          COMMAND ${CMAKE_C_COMPILER} ${sources_${libname}} ${cflags} ${extra_cflags_${libname}} -c -o ${output_dir_${libname}}/${output_name_${libname}}.o
+          OUTPUT ${output_dir_${libname}}/${output_file_${libname}}
+          COMMAND ${compile_command_${libname}}
           DEPENDS ${sources_${libname}}
-          COMMENT "Building C object ${output_name_${libname}}.o")
-      add_custom_target(${libname} DEPENDS ${output_dir_${libname}}/${output_name_${libname}}.o)
-      install(FILES ${output_dir_${libname}}/${output_name_${libname}}.o
+          COMMENT "Building C object ${output_file_${libname}}")
+      add_custom_target(${libname} DEPENDS ${output_dir_${libname}}/${output_file_${libname}})
+      install(FILES ${output_dir_${libname}}/${output_file_${libname}}
         DESTINATION ${install_dir_${libname}}
         ${COMPONENT_OPTION})
     else()


fix wasm option cmake

fix wasm option cmake


Propagating prior merge from 'llvm.org/master'.

--- cmake/caches/Fuchsia-stage2.cmake
+++ cmake/caches/Fuchsia-stage2.cmake
@@ -67,6 +67,7 @@
 foreach(target x86_64;aarch64)
   set(RUNTIMES_${target}-fuchsia_CMAKE_SYSTEM_NAME Fuchsia CACHE STRING "")
   set(RUNTIMES_${target}-fuchsia_CMAKE_BUILD_TYPE ${FUCHSIA_RUNTIMES_BUILD_TYPE} CACHE STRING "")
+  set(RUNTIMES_${target}-fuchsia_CMAKE_BUILD_WITH_INSTALL_RPATH ON CACHE STRING "")
   set(RUNTIMES_${target}-fuchsia_CMAKE_ASM_FLAGS ${FUCHSIA_${target}_C_FLAGS} CACHE PATH "")
   set(RUNTIMES_${target}-fuchsia_CMAKE_C_FLAGS ${FUCHSIA_${target}_C_FLAGS} CACHE PATH "")
   set(RUNTIMES_${target}-fuchsia_CMAKE_CXX_FLAGS ${FUCHSIA_${target}_CXX_FLAGS} CACHE PATH "")
@@ -108,6 +109,7 @@
   llvm-readelf
   llvm-readobj
   llvm-size
+  llvm-strip
   llvm-symbolizer
   opt
   sancov


compiler: clang: Include missing target

compiler: clang: Include missing target

Adding baremetal target when using clang/llvm.

Signed-off-by: Flavio Ceolin <979b9165500b0741b9d0500e2efd74fc1547bff7@intel.com>

--- cmake/compiler/clang/target.cmake
+++ cmake/compiler/clang/target.cmake
@@ -59,3 +59,4 @@
 include(${ZEPHYR_BASE}/cmake/compiler/gcc/target_optimizations.cmake)
 include(${ZEPHYR_BASE}/cmake/compiler/gcc/target_cpp.cmake)
 include(${ZEPHYR_BASE}/cmake/compiler/gcc/target_asm.cmake)
+include(${ZEPHYR_BASE}/cmake/compiler/gcc/target_baremetal.cmake)


cmake update

cmake update

--- cmake/modules/FindRedPitaya.cmake
+++ cmake/modules/FindRedPitaya.cmake
@@ -1,22 +0,0 @@
-# FindRedPitaya.cmake - Try to find the wiringPi library
-
-FIND_PATH(REDPITAYA_INCLUDE_DIR NAMES rp.h
-   PATHS
-   /usr
-   /usr/local
-   /opt
-   PATH_SUFFIXES
-   )
-
-FIND_LIBRARY(WIRINGPI_LIBRARIES NAMES rp
-   PATHS
-   /usr
-   /usr/local
-   /opt
-   )
-
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(rp DEFAULT_MSG REDPITAYA_LIBRARIES REDPITAYA_INCLUDE_DIR)
-
-MARK_AS_ADVANCED(REDPITAYA_INCLUDE_DIR REDPITAYA_LIBRARIES)


toolchain: Do not hardcode where the toolchain was installed

Contrary to all other toolchains, the xcc toolchain had a hardocded
installation path. Replace this with XTENSA_TOOLCHAIN_PATH so users can
install in different locations.

Signed-off-by: Anas Nashif <0d9952ec84ac43c159f6b7e7ed99a9080c00dd6e@intel.com>

--- cmake/toolchain/xcc/generic.cmake
+++ cmake/toolchain/xcc/generic.cmake
@@ -1,4 +1,12 @@
-set(TOOLCHAIN_HOME /opt/xtensa/XtDevTools/install/tools/$ENV{TOOLCHAIN_VER}/XtensaTools)
+set_ifndef(XTENSA_TOOLCHAIN_PATH "$ENV{XTENSA_TOOLCHAIN_PATH}")
+set(       XTENSA_TOOLCHAIN_PATH ${XTENSA_TOOLCHAIN_PATH} CACHE PATH "xtensa tools install directory")
+assert(    XTENSA_TOOLCHAIN_PATH "XTENSA_TOOLCHAIN_PATH is not set")
+
+if(NOT EXISTS ${XTENSA_TOOLCHAIN_PATH})
+  message(FATAL_ERROR "Nothing found at XTENSA_TOOLCHAIN_PATH: '${XTENSA_TOOLCHAIN_PATH}'")
+endif()
+
+set(TOOLCHAIN_HOME ${XTENSA_TOOLCHAIN_PATH}/XtDevTools/install/tools/$ENV{TOOLCHAIN_VER}/XtensaTools)

 set(COMPILER xcc)


Remove /nologo MSVC flag

Remove /nologo MSVC flag

--- simdjson-flags.cmake
+++ simdjson-flags.cmake
@@ -39,7 +39,6 @@
 target_link_libraries(simdjson-internal-flags INTERFACE simdjson-flags)

 if(MSVC)
-  target_compile_options(simdjson-internal-flags INTERFACE /nologo)
   target_compile_options(simdjson-internal-flags INTERFACE /WX /W3 /sdl)
 else()
   target_compile_options(simdjson-internal-flags INTERFACE -fPIC)


Add additional hints for finding spirv-as & glslc. (#9)

Adds additional hints that can find these binaries from within the
ANDROID_NDK.

--- cmake/uvkc_find_vulkan_toolchain.cmake
+++ cmake/uvkc_find_vulkan_toolchain.cmake
@@ -29,7 +29,7 @@
   else(WIN32)
     find_program(Vulkan_GLSLC_EXECUTABLE
       NAME glslc
-      HINTS "$ENV{VULKAN_SDK}/bin")
+      HINTS "$ENV{VULKAN_SDK}/bin" "$ENV{ANDROID_NDK}/shader-tools/*")
   endif(WIN32)
 endif()

@@ -69,7 +69,7 @@
   else(WIN32)
     find_program(Vulkan_SPIRVAS_EXECUTABLE
       NAME spirv-as
-      HINTS "$ENV{VULKAN_SDK}/bin")
+      HINTS "$ENV{VULKAN_SDK}/bin" "$ENV{ANDROID_NDK}/shader-tools/*")
   endif(WIN32)
 endif()


Avoid exporting unnecessary symbols when using -static-intel

--- cmake/icc.cmake
+++ cmake/icc.cmake
@@ -14,7 +14,7 @@
 ## limitations under the License.                                           ##
 ## ======================================================================== ##

-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fPIC -no-ansi-alias -static-intel -std=c++11")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fPIC -no-ansi-alias -std=c++11")
 SET(CMAKE_CXX_FLAGS_DEBUG          "-DDEBUG  -g")
 SET(CMAKE_CXX_FLAGS_RELEASE        "-DNDEBUG -O3")
 #SET(CMAKE_CXX_FLAGS_RELEASE        "-DNDEBUG    -O3 -no-ansi-alias -restrict -fp-model fast -fimf-precision=low -no-prec-div -no-prec-sqrt -fma -no-inline-max-total-size -inline-factor=200 ")
@@ -26,6 +26,10 @@
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.7") # we only use MacOSX 10.7 features
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") # link against C++11 stdlib
 ENDIF()
+
+# enable -static-intel and avoid to export ICC specific symbols from OSPRay
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-intel")
+SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--exclude-libs=ALL")

 # these flags apply ONLY to how embree is built; the rest of the ospray C++ code is ISA-agnostic
 SET(OSPRAY_ARCH_SSE3    "-xsse3")


Simplify h5pp external build

Simplify h5pp external build

Former-commit-id: cb06eaeb3e07279da9d53420ccb71254bbfa9fad

--- cmake-modules/Fetch_h5pp.cmake
+++ cmake-modules/Fetch_h5pp.cmake
@@ -22,7 +22,7 @@
         get_target_property(EIGEN3_INCLUDE_DIR Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES)
         list(APPEND H5PP_CMAKE_OPTIONS  -DEIGEN3_INCLUDE_DIR:PATH=${CMAKE_INSTALL_PREFIX}/Eigen3/include/eigen3)
     endif()
-    list(APPEND H5PP_CMAKE_OPTIONS  -DH5PP_DIRECTORY_HINTS:PATH=${CMAKE_INSTALL_PREFIX})
+    list(APPEND H5PP_CMAKE_OPTIONS  -DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH})
     list(APPEND H5PP_CMAKE_OPTIONS  -DH5PP_DOWNLOAD_METHOD:BOOL=${DMRG_DOWNLOAD_METHOD})
     list(APPEND H5PP_CMAKE_OPTIONS  -DH5PP_PREFER_CONDA_LIBS:BOOL=${DMRG_PREFER_CONDA_LIBS})
     build_dependency(h5pp "${CMAKE_INSTALL_PREFIX}" "${H5PP_CMAKE_OPTIONS}")


cmake/gtest: fix for unix

cmake/gtest: fix for unix

--- cmake/Modules/BuildGTest.cmake
+++ cmake/Modules/BuildGTest.cmake
@@ -16,13 +16,14 @@
   source_dir
 )

+set(GTEST_INCLUDE_DIRS "${source_dir}/include")
+set(GTEST_INSTALL_LIB "${source_dir}/${CMAKE_SHARED_LIBRARY_PREFIX}gtest${CMAKE_SHARED_LIBRARY_SUFFIX}")
+if(WIN32)
+  set(GTEST_LIBRARIES "${source_dir}/${CMAKE_IMPORT_LIBRARY_PREFIX}gtest${CMAKE_IMPORT_LIBRARY_SUFFIX}")
+else()
+  set(GTEST_LIBRARIES "${GTEST_INSTALL_LIB}")
+endif()

-set(GTEST_INCLUDE_DIRS "${source_dir}/include")
+set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES})

-# TODO: handle UNIX here
-set(GTEST_LIBRARIES "${source_dir}/${CMAKE_SHARED_LIBRARY_PREFIX}gtest${CMAKE_LINK_LIBRARY_SUFFIX}")
-set(GTEST_INSTALL_LIBS "${source_dir}/${CMAKE_SHARED_LIBRARY_PREFIX}gtest${CMAKE_SHARED_LIBRARY_SUFFIX}")
-
-set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES})
-
-install_external_library(gtest ${GTEST_INSTALL_LIBS})
+install_external_library(gtest ${GTEST_INSTALL_LIB})


[exotica_core] Export Wall to dependant projects

--- exotica_core/cmake/exotica.cmake
+++ exotica_core/cmake/exotica.cmake
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8.3)

 message(STATUS "Compiling using c++ 11 (required by EXOTica)")
-add_compile_options(-std=c++11 -Wfloat-conversion)
+add_compile_options(-std=c++11 -Wfloat-conversion -Wall)
 # add_compile_options(-Werror)

 # MoveIt Core Robot Model isnt aligned :'(


android NDK already comes with zlib, no need for own static copy see: docs/STABLE-APIS.html

--- CMake/Utils/AndroidMacros.cmake
+++ CMake/Utils/AndroidMacros.cmake
@@ -48,7 +48,7 @@
         add_static_libs("${OGRE_DEPENDENCIES_DIR}/lib/@ANDROID_ABI@"  "glsl_optimizer" "glcpp-library" "mesa")
 	endif()

-	add_static_libs("${OGRE_DEPENDENCIES_DIR}/lib/@ANDROID_ABI@" "OIS" "freetype" "FreeImage" "zlib" "zzip")
+	add_static_libs("${OGRE_DEPENDENCIES_DIR}/lib/@ANDROID_ABI@" "OIS" "freetype" "FreeImage" "zzip")

     if(APPLE OR WIN32)
       SET(ANDROID_EXECUTABLE "android")


try backport also with current cmake

try backport also with current cmake

--- CMake/hoomd/HOOMDMPISetup.cmake
+++ CMake/hoomd/HOOMDMPISetup.cmake
@@ -63,10 +63,7 @@
         endif(MPI_CUDA)
     endif (ENABLE_HIP AND NOT DEFINED ENABLE_MPI_CUDA)

-# backport CMake FindMPI fix from 3.12 to earlier versions
-# https://gitlab.kitware.com/cmake/cmake/merge_requests/2529/diffs
-
-if (CMAKE_VERSION VERSION_LESS 3.12.0 AND ENABLE_HIP)
+if (ENABLE_HIP)
     string(REPLACE "-pthread" "$<$<AND:$<COMPILE_LANGUAGE:CUDA>,$<STREQUAL:${HIP_PLATFORM},nvcc>>:-Xcompiler>;-pthread"
       _MPI_C_COMPILE_OPTIONS "${MPI_C_COMPILE_OPTIONS}")
     set_property(TARGET MPI::MPI_C PROPERTY INTERFACE_COMPILE_OPTIONS "${_MPI_C_COMPILE_OPTIONS}")


Require libraries when a wrapping for a language is enabled

At the Superbuild level when wrapping for a language was enabled, the
requirements for the language were not marked as required. Not when a
language is enabled the cmake package is required.

Change-Id: Ibc5e83fd1342b3330ca7196b183f6c4c09fa80fc

--- CMake/sitkLanguageOptions.cmake
+++ CMake/sitkLanguageOptions.cmake
@@ -12,7 +12,9 @@
 #
 # Setup the option for each language
 #
-if (NOT WRAP_LUA)
+if (DEFINED  WRAP_LUA AND WRAP_LUA)
+  set(_QUIET "REQUIRED")
+else()
   set(_QUIET "QUIET")
 endif()
 if (CMAKE_VERSION VERSION_LESS "3")
@@ -42,12 +44,15 @@
   )

-find_package ( PythonInterp QUIET)

 # If you're not using python or it's the first time, be quiet
-if (NOT WRAP_PYTHON)
-  set(_QUIET "QUIET")
-endif()
+if (DEFINED  WRAP_PYTHON AND WRAP_PYTHON)
+  set(_QUIET "REQUIRED")
+else()
+  set(_QUIET "QUIET")
+endif()
+
+find_package ( PythonInterp ${_QUIET})

 find_package ( PythonLibs ${PYTHON_VERSION_STRING} EXACT ${_QUIET} )

@@ -77,8 +82,14 @@
 endif()
 option( WRAP_PYTHON "Wrap Python" ${WRAP_PYTHON_DEFAULT} )

-find_package ( Java COMPONENTS Development Runtime QUIET )
-find_package ( JNI QUIET )
+if (DEFINED  WRAP_JAVA AND WRAP_JAVA)
+  set(_QUIET "REQUIRED")
+else()
+  set(_QUIET "QUIET")
+endif()
+
+find_package ( Java COMPONENTS Development Runtime ${_QUIET} )
+find_package ( JNI ${_QUIET} )
 if ( ${JAVA_FOUND} AND ${JNI_FOUND} )
   set( WRAP_JAVA_DEFAULT ON )
 else ( ${JAVA_FOUND} AND ${JNI_FOUND} )
@@ -107,7 +118,14 @@
   )
 option ( WRAP_JAVA "Wrap Java" ${WRAP_JAVA_DEFAULT} )

-find_package ( TCL QUIET )
+
+if (DEFINED  WRAP_TCL AND WRAP_TCL)
+  set(_QUIET "REQUIRED")
+else()
+  set(_QUIET "QUIET")
+endif()
+
+find_package ( TCL ${_QUIET} )
 if ( ${TCL_FOUND} )
   set ( WRAP_TCL_DEFAULT ON )
 else ( ${TCL_FOUND} )
@@ -137,7 +155,14 @@
   RUBY_INCLUDE_PATH )
 option ( WRAP_RUBY "Wrap Ruby" ${WRAP_RUBY_DEFAULT} )

-find_package( CSharp QUIET )
+
+if (DEFINED  WRAP_CSHARP AND WRAP_CSHARP)
+  set(_QUIET "REQUIRED")
+else()
+  set(_QUIET "QUIET")
+endif()
+
+find_package( CSharp ${_QUIET} )
 if ( ${CSHARP_FOUND} AND NOT MINGW )
   set ( WRAP_CSHARP_DEFAULT ON )
 else ()
@@ -150,7 +175,13 @@
 )
 option ( WRAP_CSHARP "Wrap C#" ${WRAP_CSHARP_DEFAULT} )

-find_package(R QUIET)
+if (DEFINED  WRAP_R AND WRAP_R)
+  set(_QUIET "REQUIRED")
+else()
+  set(_QUIET "QUIET")
+endif()
+
+find_package(R ${_QUIET})
 if ( ${R_FOUND} AND NOT WIN32 )
   set ( WRAP_R_DEFAULT ON )
 else( )


Fix UploadPPA

Fix UploadPPA

--- UploadPPA.cmake
+++ UploadPPA.cmake
@@ -218,4 +218,4 @@
   upload_ppa(oneiric)
   upload_ppa(precise)
   add_custom_target(dput DEPENDS ${DPUT_TARGETS})
-endif()
+endfunction()


Changed configuration to use vpm_include_directories

--- configure.cmake
+++ configure.cmake
@@ -5,4 +5,4 @@
   crunch_base
   crunch_concurrency)

-include_directories(${CMAKE_CURRENT_LIST_DIR}/include)+vpm_include_directories(${CMAKE_CURRENT_LIST_DIR}/include)


Investigating eigenvalue bug on cluster

Investigating eigenvalue bug on cluster

Former-commit-id: bfa82ebed6ff51d6f8b03717d7113147899b2e3f

--- tests/lapacke_test.cmake
+++ tests/lapacke_test.cmake
@@ -1,7 +1,9 @@
 add_executable(lapacke_test_target tests/lapacke_test.cpp
-                                   source/general/class_eigsolver.cpp
-#                                   source/general/arpack_extra/arpackpp_solver.cpp
-                                   source/general/class_tic_toc.cpp)
+        source/general/class_eigsolver.h
+        source/general/class_eigsolver.cpp
+        source/general/arpack_extra/arpackpp_solver.cpp
+        source/general/arpack_extra/matrix_product_stl.cpp
+        source/general/class_tic_toc.cpp)

 set_target_properties(lapacke_test_target PROPERTIES OUTPUT_NAME  lapacke_test)
@@ -25,7 +27,7 @@

 target_link_libraries(lapacke_test_target PRIVATE -lstdc++fs)
 target_link_libraries(lapacke_test_target PRIVATE -flto)
-target_link_libraries(lapacke_test_target PRIVATE  blas lapack lapacke  h5pp::h5pp hdf5 Eigen3::Eigen spdlog::spdlog)
+target_link_libraries(lapacke_test_target PRIVATE  arpack++  h5pp::h5pp hdf5 Eigen3::Eigen spdlog::spdlog )

 set_target_properties  (lapacke_test_target PROPERTIES CXX_STANDARD_REQUIRED 17)
@@ -35,4 +37,4 @@
 target_compile_options (lapacke_test_target PRIVATE "$<$<CONFIG:RELEASE>:${RELEASE_OPTIONS}>")           ### Release build options
 add_test(NAME lapacke_test COMMAND lapacke_test_target)

-add_dependencies(lapacke_test_target blas lapack lapacke  h5pp::h5pp hdf5 Eigen3::Eigen spdlog::spdlog)+add_dependencies(lapacke_test_target arpack++  h5pp::h5pp hdf5 Eigen3::Eigen spdlog::spdlog )


[cmake] skip tests that depend on HAVE_QL0001

--- numerics/numerics_tests.cmake
+++ numerics/numerics_tests.cmake
@@ -60,7 +60,7 @@

   SET(SICONOS_LCP_SOLVERS
     "ENUM;LEMKE;CPG;PGS;RPGS;LATIN;LATIN_W;AVI_CAOFERRIS;NEWTONMIN;NEWTON_FBLSA;NEWTON_MINFBLSA;BARD;MURTY;PIVOT;PIVOT_LUMOD;PATHSEARCH;CONVEXQP_PG")
- if(HAS_FORTRAN)
+ if(HAS_FORTRAN AND HAVE_QL0001)
    LIST(APPEND SICONOS_LCP_SOLVERS "QP;NSQP;")
  endif()
  IF(HAVE_PATHFERRIS)


Finishing touches before sim

Finishing touches before sim

Former-commit-id: 52cedf153ca086d5e1a86299cf69bf37075b0320

--- tests/hdf5_test.cmake
+++ tests/hdf5_test.cmake
@@ -21,7 +21,7 @@

 target_link_libraries(hdf5_test_target PRIVATE Eigen3::Eigen)
-target_link_libraries(hdf5_test_target PRIVATE hdf5      )
+target_link_libraries(hdf5_test_target PRIVATE hdf5::hdf5   )
 target_link_libraries(hdf5_test_target PRIVATE spdlog::spdlog)
 target_link_libraries(hdf5_test_target PRIVATE h5pp::h5pp)
 target_link_libraries(hdf5_test_target PRIVATE -lstdc++fs)
@@ -35,4 +35,4 @@

 add_test(NAME hdf5_test COMMAND hdf5_test_target)
 #add_dependencies(hdf5_test_target Eigen3 hdf5::hdf5 hdf5::hdf5_hl hdf5::hdf5_cpp hdf5::hdf5_hl_cpp)
-add_dependencies(hdf5_test_target Eigen3::Eigen hdf5 spdlog::spdlog  h5pp::h5pp)+add_dependencies(hdf5_test_target Eigen3::Eigen hdf5::hdf5 spdlog::spdlog  h5pp::h5pp)


build: fix unsupported CMake comparison operation

VERSION_GREATER_EQUAL is not supported before CMake version 3.7.

Type: fix

Signed-off-by: Jianlin Lv <752eae91a476c3d35f9a7fd15fcd40979a048de4@arm.com>
Change-Id: Id690b7b7c26121f9d289ebd0aaea0860be63795f

--- src/cmake/cpu.cmake
+++ src/cmake/cpu.cmake
@@ -76,7 +76,7 @@
   endif()
   check_c_compiler_flag("-march=armv8.1-a+crc+crypto -mtune=thunderx2t99" compiler_flag_march_thunderx2t99)
   if(compiler_flag_march_thunderx2t99)
-    if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 8.3)
+    if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 8.3))
       list(APPEND MARCH_VARIANTS "thunderx2t99\;-march=armv8.1-a+crc+crypto -mtune=thunderx2t99 -DCLIB_N_PREFETCHES=8")
     else()
       list(APPEND MARCH_VARIANTS "thunderx2t99\;-march=armv8.1-a+crc+crypto -DCLIB_N_PREFETCHES=8")


COMP: Update superbuild version of OpenCV to 4.1.2

--- SuperBuild/CMake/External_opencv.cmake
+++ SuperBuild/CMake/External_opencv.cmake
@@ -34,8 +34,8 @@

 ExternalProject_Add(OPENCV
   PREFIX OPENCV
-  URL "https://github.com/opencv/opencv/archive/4.1.1.tar.gz"
-  URL_MD5 d9d3138d12e52bb0684f4a5862f6a46c
+  URL "https://github.com/opencv/opencv/archive/4.1.2.tar.gz"
+  URL_MD5 631f23b142665072969debbe39e1c958
   BINARY_DIR ${OPENCV_SB_BUILD_DIR}
   INSTALL_DIR ${SB_INSTALL_PREFIX}
   DOWNLOAD_DIR ${DOWNLOAD_LOCATION}


fix using only SOABI on Python 3.5, remove obsolete MULTIARCH

--- python_cmake_module/cmake/Modules/FindPythonExtra.cmake
+++ python_cmake_module/cmake/Modules/FindPythonExtra.cmake
@@ -162,32 +162,6 @@
       "The SOABI suffix for Python native extensions. See PEP-3149: https://www.python.org/dev/peps/pep-3149/.")
   endif()

-  if(NOT DEFINED PYTHON_MULTIARCH)
-    set(_python_code
-      "from sysconfig import get_config_var"
-      "print(get_config_var('MULTIARCH'))"
-    )
-    execute_process(
-      COMMAND
-      "${PYTHON_EXECUTABLE}"
-      "-c"
-      "${_python_code}"
-      OUTPUT_VARIABLE _output
-      RESULT_VARIABLE _result
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    if(NOT _result EQUAL 0)
-      message(FATAL_ERROR
-        "execute_process(${PYTHON_EXECUTABLE} -c '${_python_code}') returned "
-        "error code ${_result}")
-    endif()
-
-    set(PYTHON_MULTIARCH
-      "${_output}"
-      CACHE INTERNAL
-      "The MULTIARCH suffix for Python native extensions. See PEP-3149: https://www.python.org/dev/peps/pep-3149/.")
-  endif()
-
   if("${PYTHON_SOABI} " STREQUAL " " OR "${PYTHON_SOABI} " STREQUAL "None ")
     set(PythonExtra_EXTENSION_SUFFIX
       ""
@@ -195,19 +169,11 @@
       "The full suffix for Python native extensions. See PEP-3149: https://www.python.org/dev/peps/pep-3149/."
     )
   else()
-    if("${PYTHON_MULTIARCH} " STREQUAL " " OR "${PYTHON_SOABI} " STREQUAL "None ")
-      set(PythonExtra_EXTENSION_SUFFIX
-        ".${PYTHON_SOABI}"
-        CACHE INTERNAL
-        "The full suffix for Python native extensions. See PEP-3149: https://www.python.org/dev/peps/pep-3149/."
-      )
-    else()
-      set(PythonExtra_EXTENSION_SUFFIX
-        ".${PYTHON_SOABI}-${PYTHON_MULTIARCH}"
-        CACHE INTERNAL
-        "The full suffix for Python native extensions. See PEP-3149: https://www.python.org/dev/peps/pep-3149/."
-      )
-    endif()
+    set(PythonExtra_EXTENSION_SUFFIX
+      ".${PYTHON_SOABI}"
+      CACHE INTERNAL
+      "The full suffix for Python native extensions. See PEP-3149: https://www.python.org/dev/peps/pep-3149/."
+    )
   endif()

   if(WIN32)


added NavigationDataSourceTest (which was already implemented) to files.cmake

--- Modules/IGT/Testing/files.cmake
+++ Modules/IGT/Testing/files.cmake
@@ -11,6 +11,7 @@
    mitkNavigationDataRecorderTest.cpp
    mitkNavigationDataReferenceTransformFilterTest.cpp
    mitkNavigationDataSequentialPlayerTest.cpp
+   mitkNavigationDataSourceTest.cpp
    mitkNavigationDataToMessageFilterTest.cpp
    mitkNavigationDataToNavigationDataFilterTest.cpp
    mitkNavigationDataToPointSetFilterTest.cpp


COMP: disabled mitkTrackingDeviceSourceTest

--- Modules/IGT/Testing/files.cmake
+++ Modules/IGT/Testing/files.cmake
@@ -16,7 +16,7 @@
    mitkNDIProtocolTest.cpp
    mitkNDITrackingDeviceTest.cpp
    mitkTimeStampTest.cpp
-   mitkTrackingDeviceSourceTest.cpp
+   #mitkTrackingDeviceSourceTest.cpp
    mitkTrackingVolumeTest.cpp
    mitkTrackingDeviceTest.cpp
    mitkTrackingToolTest.cpp
@@ -24,4 +24,4 @@
    mitkNavigationToolStorageTest.cpp
    # deactivated, see bug 3073
    # mitkNavigationDataPlayerTest.cpp
-)+)


FindLLVM updates

FindLLVM updates

--- atdna/FindLLVM.cmake
+++ atdna/FindLLVM.cmake
@@ -33,7 +33,8 @@
 get_filename_component(LLVM_ROOT_DIR [HKEY_LOCAL_MACHINE\\Software\\LLVM\\LLVM] ABSOLUTE)
 endif()

-set(llvm_config_names llvm-config-3.7 llvm-config37
+set(llvm_config_names llvm-config-3.8 llvm-config38
+                      llvm-config-3.7 llvm-config37
                       llvm-config-3.6 llvm-config36
                       llvm-config-3.5 llvm-config35
                       llvm-config-3.4 llvm-config34
@@ -144,7 +145,7 @@
         )
         file(TO_CMAKE_PATH "${tmplibs}" tmplibs)
         string(REGEX REPLACE "([$^.[|*+?()]|])" "\\\\\\1" pattern "${prefix}/")
-        string(REGEX MATCHALL "${pattern}[^ ]+" LLVM_${var} ${tmplibs})
+        string(REGEX MATCHALL "${pattern}[^ ]+" "LLVM_${var}" "${tmplibs}")
     endmacro()

     llvm_set(VERSION_STRING version)


Added iostreams to initial boost search, fixes iostreams undefined reference when using boost versions earlier than 1.35

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

--- src/CMake/hoomd/HOOMDBoostSetup.cmake
+++ src/CMake/hoomd/HOOMDBoostSetup.cmake
@@ -21,7 +21,7 @@
 set(Boost_ADDITIONAL_VERSIONS "1.45.1;1.45.0;1.45;1.44.1;1.44.0;1.44;1.43.1;1.43.0;1.43;1.42.1;1.42.0;1.42;1.41.0;1.41;1.41;1.40.0;1.40;1.39.0;1.39;1.38.0;1.38")

 # first, see if we can get any supported version of Boost
-find_package(Boost 1.32.0 COMPONENTS thread filesystem python signals program_options unit_test_framework REQUIRED)
+find_package(Boost 1.32.0 COMPONENTS thread filesystem python signals program_options unit_test_framework iostreams REQUIRED)

 # if we get boost 1.35 or greator, we need to get the system library too


FIX: vtkRenderingExternal module is OFF by default

Change-Id: I837ebd9166cfb17ee2f675ee1f1604f25178af8d

--- Rendering/External/module.cmake
+++ Rendering/External/module.cmake
@@ -1,8 +1,4 @@
 vtk_module(vtkRenderingExternal
-  GROUPS
-    Rendering
-  PRIVATE_DEPENDS
-    vtksys
   DEPENDS
     vtkRenderingCore
     vtkRenderingOpenGL


CMake: Fixed typo in target comments.

CMake: Fixed typo in target comments.

Review: https://reviews.apache.org/r/50658/

--- 3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
+++ 3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
@@ -157,7 +157,7 @@
   MESOS_HEALTH_CHECK mesos-health-check
   CACHE STRING "Target for healt-check")

-# Define target for health-master.
+# Define target for master.
 set(
   MESOS_MASTER mesos-master
   CACHE STRING "Target for master")


Windows: Updated libprocess CMake setup for Glog patch.

The additional Windows library `Dbghelp` must be linked for the
in addition to glog, in order to enable stack traces.

NOTE: CMake's dependency graph does not pull in the `Dbghelp` library
automatically as the glog dependency is added into Mesos as an
"external" project.  If we were to, instead, add glog's CMake files
to the build system directly (such as, as a git submodule), glog's
targets would be inherited.

Review: https://reviews.apache.org/r/57491/

--- 3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
+++ 3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
@@ -31,9 +31,9 @@
 if (NOT WIN32)
   EXTERNAL("glog" ${GLOG_VERSION} "${MESOS_3RDPARTY_BIN}")
 elseif (WIN32)
-  # Glog 0.3.3 does not compile out of the box on Windows. Therefore, we
-  # require 0.3.4.
-  EXTERNAL("glog" "0.3.4" "${MESOS_3RDPARTY_BIN}")
+  # Glog 0.3.3 does not compile out of the box on Windows.
+  # Therefore, we require a specific commit on glog master.
+  EXTERNAL("glog" "da816ea70" "${MESOS_3RDPARTY_BIN}")

   # NOTE: We expect cURL and zlib exist on Unix (usually pulled in with a
   # package manager), but Windows has no package manager, so we have to go
@@ -111,6 +111,14 @@

   # Windows requires a static build of zlib.
   set(ZLIB_LFLAG     zlibstaticd)
+
+  # Windows requires Dbghelp.lib when linking to glog.
+  # NOTE: CMake's dependency graph does not pull in the `Dbghelp` library
+  # automatically as the glog dependency is added into Mesos as an
+  # "external" project.  If we were to, instead, add glog's CMake files
+  # to the build system directly (such as, as a git submodule), glog's
+  # targets would be inherited.
+  set(GLOG_LFLAG     glog Dbghelp)
 else (WIN32)
   set(CURL_LFLAG     curl)
   set(DL_LFLAG       dl)


CMake: Windows: Fixed configuration-dependent linkage of protobuf.

The library generated by protobuf differs based on the configuration.
In Debug mode, the library generated is `libprotobufd`, whereas in
Release mode, the library is just `libprotobuf`.

Review: https://reviews.apache.org/r/59779/

--- 3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
+++ 3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
@@ -107,10 +107,15 @@
   # libcurl.lib. Hence, we have to special case it here because CMake assumes
   # the library names are generated correctly.
   set(CURL_LFLAG     libcurl)
-  set(PROTOBUF_LFLAG libprotobufd)

   # Windows requires a static build of zlib.
   set(ZLIB_LFLAG     zlibstaticd)
+
+  set(PROTOBUF_LFLAG libprotobuf)
+
+  # The generator expression below appends the letter "d"
+  # when building the Debug configuration.
+  string(APPEND PROTOBUF_LFLAG $<$<CONFIG:Debug>:d>)

   # Windows requires Dbghelp.lib when linking to glog.
   # NOTE: CMake's dependency graph does not pull in the `Dbghelp` library


ifort and pgfort need "recursive" for compiling LAPACK as well

as shown in Reference-LAPACK issue 401 (their PR 403)

--- cmake/fc.cmake
+++ cmake/fc.cmake
@@ -76,14 +76,12 @@
   endif ()
 endif ()

-if (${F_COMPILER} STREQUAL "IFORT")
+if (${F_COMPILER} STREQUAL "INTEL")
   set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_INTEL")
-  if (MSVC)
-    set(FCOMMON_OPT "${FCOMMON_OPT} -names:lowercase -assume:underscore")
-  endif ()
   if (INTERFACE64)
     set(FCOMMON_OPT "${FCOMMON_OPT} -i8")
   endif ()
+  set(FCOMMON_OPT "${FCOMMON_OPT} -recursive")
   if (USE_OPENMP)
     set(FCOMMON_OPT "${FCOMMON_OPT} -openmp")
   endif ()
@@ -123,6 +121,7 @@
   else ()
     set(FCOMMON_OPT "${FCOMMON_OPT} -tp p7")
   endif ()
+  set(FCOMMON_OPT "${FCOMMON_OPT} -Mrecursive")
   if (USE_OPENMP)
     set(FCOMMON_OPT "${FCOMMON_OPT} -mp")
   endif ()


cmake: editable packages fix is flawed removed

--- cmake/os.cmake
+++ cmake/os.cmake
@@ -35,12 +35,9 @@
   if (CONAN_EXPORTED)
     include(${CMAKE_CURRENT_BINARY_DIR}/conanbuildinfo.cmake)
     conan_basic_setup()
-    #hack for editable package
-    set(INCLUDEOS_PREFIX ${CONAN_INCLUDEOS_ROOT})
-  else()
-    #hack for editable package
-    set(INCLUDEOS_PREFIX ${CONAN_INCLUDEOS_ROOT}/install)
-  endif()
+  endif()
+
+  set(INCLUDEOS_PREFIX ${CONAN_INCLUDEOS_ROOT})

   #TODO use these


COMP: Update boost to avoid compiler issues with clang.

--- SuperBuild/External_Boost.cmake
+++ SuperBuild/External_Boost.cmake
@@ -4,7 +4,7 @@

 ExternalProject_add(Boost
   SVN_REPOSITORY http://svn.boost.org/svn/boost/trunk
-  SVN_REVISION -r "77936"
+  SVN_REVISION -r "82586"
 #  URL http://sourceforge.net/projects/boost/files/boost/1.49.0/boost_1_49_0.tar.gz
 #  URL_MD5 e0defc8c818e4f1c5bbb29d0292b76ca
   SOURCE_DIR Boost


COMP: update to itk 4.11 ... let us see if this works.

--- SuperBuild/External_ITKv4.cmake
+++ SuperBuild/External_ITKv4.cmake
@@ -163,6 +163,9 @@
   set(${proj}_REPOSITORY ${git_protocol}://github.com/InsightSoftwareConsortium/ITK.git)
   set(${proj}_GIT_TAG f60bbd3aadc4b9fbf2cff1cf7227cef1e92b979a) ##
   set(ITK_VERSION_ID ITK-4.10) ### NOTE: When updating GIT_TAG, also update ITK_VERSION_ID
+
+  set(${proj}_GIT_TAG 9405479927dc36c95ff7b658cfb25580705be5ba) ##
+  set(ITK_VERSION_ID ITK-4.11) ### NOTE: When updating GIT_TAG, also update ITK_VERSION_ID

   ExternalProject_Add(${proj}
     GIT_REPOSITORY ${${proj}_REPOSITORY}


ENH: Added link directory to vtkexpat library.

--- vtkCMakeOptions.cmake
+++ vtkCMakeOptions.cmake
@@ -102,6 +102,7 @@
   LINK_DIRECTORIES(${VTK_BINARY_DIR}/Utilities/zlib)
   LINK_DIRECTORIES(${VTK_BINARY_DIR}/Utilities/jpeg)
   LINK_DIRECTORIES(${VTK_BINARY_DIR}/Utilities/tiff)
+  LINK_DIRECTORIES(${VTK_BINARY_DIR}/Utilities/expat)
 ENDIF (NOT VTK_LIBRARY_PATH)

 #


cmake: remove unneeded install

cmake: remove unneeded install

All dependencies are built using FetchContent so we don't rely anymore
on configure time dependencies install...

--- cmake/cpp.cmake
+++ cmake/cpp.cmake
@@ -312,26 +312,6 @@
 # Install rules
 include(GNUInstallDirs)

-# Install builded dependencies
-if(INSTALL_BUILD_DEPS)
-  if( BUILD_ZLIB OR
-      BUILD_absl OR
-      BUILD_gflags OR
-      BUILD_glog OR
-      BUILD_Protobuf OR
-      BUILD_CoinUtils OR
-      BUILD_Osi OR
-      BUILD_Clp OR
-      BUILD_Cgl OR
-      BUILD_Cbc
-      )
-    install(
-      DIRECTORY ${CMAKE_BINARY_DIR}/dependencies/install/
-      DESTINATION ${CMAKE_INSTALL_PREFIX}
-      )
-  endif()
-endif()
-
 include(GenerateExportHeader)
 GENERATE_EXPORT_HEADER(${PROJECT_NAME})
 install(FILES ${PROJECT_BINARY_DIR}/${PROJECT_NAME}_export.h


cmake: dts: Fix building with dtc 1.4.6

cmake: dts: Fix building with dtc 1.4.6

dtc 1.4.6 doesn't support the -Wno-unique_unit_address flag.  We need to
check that the flag is supported before using it on pre dtc-1.4.7
versions.

Fixes #12685

Signed-off-by: Kumar Gala <a5e5248af4cd4f0ed8c515f61d40a6e2db46a66e@linaro.org>

--- cmake/dts.cmake
+++ cmake/dts.cmake
@@ -86,13 +86,18 @@
   if (check)
     set(DTC_WARN_UNIT_ADDR_IF_ENABLED "-Wunique_unit_address_if_enabled")
   endif()
+  set(DTC_NO_WARN_UNIT_ADDR "")
+  check_dtc_flag("-Wno-unique_unit_address" check)
+  if (check)
+    set(DTC_NO_WARN_UNIT_ADDR "-Wno-unique_unit_address")
+  endif()
   execute_process(
     COMMAND ${DTC}
     -O dts
     -o ${BOARD}.dts_compiled
     -b 0
     -E unit_address_vs_reg
-    -W no-unique_unit_address
+    ${DTC_NO_WARN_UNIT_ADDR}
     ${DTC_WARN_UNIT_ADDR_IF_ENABLED}
     ${EXTRA_DTC_FLAGS} # User settable
     ${BOARD}.dts.pre.tmp


always use the env.sh in CMAKE_BINARY_DIR; it doesn't make any sense to use the one that happens to be installed

--- cmake/all.cmake
+++ cmake/all.cmake
@@ -7,17 +7,13 @@
 endif()
 set(CATKIN_ALL_INCLUDED)

+set(CATKIN_ENV ${CMAKE_BINARY_DIR}/env.sh CACHE INTERNAL "catkin env")
 if(catkin_BINARY_DIR)
   set(CATKIN_CONTEXT_FILE ${catkin_BINARY_DIR}/catkin-context.py
     CACHE INTERNAL "catkin context file")
-  set(CATKIN_ENV ${CMAKE_BINARY_DIR}/env.sh CACHE INTERNAL "catkin env")
-  message(STATUS "Shell environment is defined in build directory ${CMAKE_BINARY_DIR}/env.sh")
 else()
   set(CATKIN_CONTEXT_FILE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/catkin-context.py
     CACHE INTERNAL "catkin context file")
-  set(CATKIN_ENV ${catkin_INSTALL_PREFIX}/env.sh
-    CACHE INTERNAL "catkin env")
-  message(STATUS "Shell environment is defined in catkin installation at ${catkin_INSTALL_PREFIX}/env.sh")
 endif()
 configure_file(${catkin_EXTRAS_DIR}/templates/catkin-context.in
   ${CATKIN_CONTEXT_FILE}


qt-gui: fix dependency

qt-gui: fix dependency

--- scripts/cmake/Modules/PackagingDebian.cmake
+++ scripts/cmake/Modules/PackagingDebian.cmake
@@ -224,7 +224,7 @@
 	)
 	set (
 		CPACK_DEBIAN_ELEKTRA-QT-GUI_PACKAGE_DEPENDS
-		"qml-module-qtquick2, qml-module-qtquick-window2, qml-module-qtquick-dialogs, qml-module-qt-labs-folderlistmodel, qml-module-qt-labs-settings"
+		"qml-module-qtquick2, qml-module-qtquick-window2, qml-module-qtquick-dialogs, qml-module-qt-labs-folderlistmodel, qml-module-qt-labs-settings, qml-module-qtquick-controls"
 	)
 else ()
 	set (


COMP: Specify "patched" git branch in DCMTK external project

--- CMakeExternals/DCMTK.cmake
+++ CMakeExternals/DCMTK.cmake
@@ -21,6 +21,7 @@

     ExternalProject_Add(${proj}
         GIT_REPOSITORY "${git_protocol}://github.com/commontk/DCMTK.git"
+        GIT_TAG "patched"
         CMAKE_GENERATOR ${gen}
         BUILD_COMMAND ""
         CMAKE_ARGS


change order of _CONFIG_EXTRAS_POST #140

--- ament_cmake_core/cmake/core/ament_package.cmake
+++ ament_cmake_core/cmake/core/ament_package.cmake
@@ -85,8 +85,8 @@
     extra
     ${PACKAGE_CONFIG_EXTRAS}
     ${${PROJECT_NAME}_CONFIG_EXTRAS}
+    ${${PROJECT_NAME}_CONFIG_EXTRAS_POST}
     ${PACKAGE_CONFIG_EXTRAS_POST}
-    ${${PROJECT_NAME}_CONFIG_EXTRAS_POST}
   )
     assert_file_exists("${extra}"
       "ament_package() called with extra file '${extra}' which does not exist")


BUG: Superbuild - ExternalProject - If git_tag different from master it should alawys be specified

--- CMake/ExternalProject.cmake
+++ CMake/ExternalProject.cmake
@@ -749,11 +749,9 @@
     endif()

     get_property(git_tag TARGET ${name} PROPERTY _EP_GIT_TAG)
-    # Since the default branch in git repository may be different from 'master',
-    # let's NOT default to 'master'
-    #if(NOT git_tag)
-    #  set(git_tag "master")
-    #endif()
+    if(NOT git_tag)
+      set(git_tag "master")
+    endif()

     set(repository ${git_repository})
     set(module)
@@ -870,11 +868,9 @@
     set(comment "Performing update step (git fetch) for '${name}'")
     set(work_dir ${source_dir})
     get_property(git_tag TARGET ${name} PROPERTY _EP_GIT_TAG)
-    # Since the default branch in git repository may be different from 'master',
-    # let's NOT default to 'master'
-    #if(NOT git_tag)
-    #  set(git_tag "master")
-    #endif()
+    if(NOT git_tag)
+      set(git_tag "master")
+    endif()

     set(cmd ${git_EXECUTABLE} fetch
       COMMAND ${git_EXECUTABLE} checkout ${git_tag}


BUG: Disable explicit visibility with OSX gcc  and llvm gcc 4.2

Change-Id: I3f345f20a1a10ec35d34439eafaee6faa4de0255

--- CMake/ITKModuleMacros.cmake
+++ CMake/ITKModuleMacros.cmake
@@ -6,6 +6,11 @@
 include(${_ITKModuleMacros_DIR}/ITKModuleDoxygen.cmake)
 include(${_ITKModuleMacros_DIR}/ITKModuleHeaderTest.cmake)

+# With Apple's GGC <=4.2 and LLVM-GCC <=4.2 visibility of template
+# don't work. Set the option to off and hide it.
+if(APPLE AND CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION  VERSION_LESS "4.3")
+  set( USE_COMPILER_HIDDEN_VISIBILITY OFF CACHE INTERNAL "" )
+endif()
 include(GenerateExportHeader)

 if(ITK_CPPCHECK_TEST)


Fix finding Ogre framework on OS X

Fix finding Ogre framework on OS X

--HG--
branch : v1-8

--- CMake/Packages/FindOGRE.cmake
+++ CMake/Packages/FindOGRE.cmake
@@ -69,7 +69,11 @@
 endif ()

-set(OGRE_LIBRARY_NAMES "OgreMain${OGRE_LIB_SUFFIX}")
+if(APPLE)
+	set(OGRE_LIBRARY_NAMES "Ogre${OGRE_LIB_SUFFIX}")
+else()
+    set(OGRE_LIBRARY_NAMES "OgreMain${OGRE_LIB_SUFFIX}")
+endif()
 get_debug_names(OGRE_LIBRARY_NAMES)

 # construct search paths from environmental hints and


fixed windows boost library names

fixed windows boost library names

--- indra/cmake/LLPrimitive.cmake
+++ indra/cmake/LLPrimitive.cmake
@@ -9,17 +9,16 @@
 set(LLPRIMITIVE_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llprimitive
     )
-
 if (WINDOWS)
 	set(LLPRIMITIVE_LIBRARIES
         debug llprimitive
         optimized llprimitive
         debug libcollada14dom22-d
         optimized libcollada14dom22
-        debug libboost_filesystem-d
-        optimized libboost_filesystem
-        debug libboost_system-d
-        optimized libboost_system
+        debug libboost_filesystem-vc100-mt-gd-1_45
+        optimized libboost_filesystem-vc100-mt-1_45
+        debug libboost_system-vc100-mt-gd-1_45
+        optimized libboost_system-vc100-mt-1_45
         )
 else (WINDOWS)
     set(LLPRIMITIVE_LIBRARIES


Disable Vivado targets if XRAY_VIVADO_SETTINGS is not set.

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

--- xc7/make/vivado.cmake
+++ xc7/make/vivado.cmake
@@ -35,6 +35,11 @@
   )

   set(NAME ${ADD_VIVADO_TARGET_NAME})
+  if(NOT DEFINED ENV{XRAY_VIVADO_SETTINGS})
+      message( WARNING "Vivado targets for ${NAME} not emitted, XRAY_VIVADO_SETTINGS env var must be set to point to Vivado settings.sh" )
+      return()
+  endif()
+

   get_target_property_required(BITSTREAM ${ADD_VIVADO_TARGET_PARENT_NAME} BIN)
   get_target_property_required(BIT_VERILOG ${ADD_VIVADO_TARGET_PARENT_NAME} BIT_V)
@@ -59,10 +64,6 @@

   get_target_property_required(PYTHON3 env PYTHON3)
   get_target_property(PYTHON3_TARGET env PYTHON3_TARGET)
-
-  if(NOT DEFINED ENV{XRAY_VIVADO_SETTINGS})
-      message( FATAL_ERROR "XRAY_VIVADO_SETTINGS must be set to a Vivado settings.sh" )
-  endif()

   set(CREATE_RUNME ${symbiflow-arch-defs_SOURCE_DIR}/xc7/utils/vivado_create_runme.py)
   add_custom_command(


COMP Fixed MITK-Data for 3d interpolation

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

 if(BUILD_TESTING)
-  set(revision_tag 471fe26f)
+  set(revision_tag de3b31f9)
 #                  ^^^^^^^^  these are just to check correct length of hash part

   ExternalProject_Add(${proj}


Introduce configuration variable CUDA_DIR to select CUDA installation

--- cmake/configure/configure_1_cuda.cmake
+++ cmake/configure/configure_1_cuda.cmake
@@ -42,6 +42,11 @@
   IF(CUDA_FOUND)

     SET(${var} TRUE)
+
+    IF(DEFINED CUDA_DIR)
+      SET(CUDA_TOOLKIT_ROOT_DIR "${CUDA_DIR}")
+    ENDIF()
+    MESSAGE(STATUS "Configured to use CUDA installation at ${CUDA_TOOLKIT_ROOT_DIR}")

     IF("${CUDA_NVCC_FLAGS}" MATCHES "-arch")


tools: stop building if compiler is unsupported

--- tools/cmake/crosstool_version_check.cmake
+++ tools/cmake/crosstool_version_check.cmake
@@ -1,11 +1,11 @@
 # Function to check the toolchain used the expected version
 # of crosstool, and warn otherwise

-set(ctng_version_warning "Check Getting Started documentation or proceed at own risk.")
+set(ctng_version_warning "Check Getting Started documentation or proceed at own risk.\n")

 function(gcc_version_check expected_gcc_version)
     if(NOT "${CMAKE_C_COMPILER_VERSION}" STREQUAL "${expected_gcc_version}")
-        message(WARNING "Xtensa toolchain ${CMAKE_C_COMPILER} version ${CMAKE_C_COMPILER_VERSION} "
+        message(WARNING "Toolchain ${CMAKE_C_COMPILER} version ${CMAKE_C_COMPILER_VERSION} "
             "is not the supported version ${expected_gcc_version}. ${ctng_version_warning}")
     endif()
 endfunction()
@@ -22,11 +22,20 @@
     # the expected version string.
     string(FIND "${ctng_version}" "${expected_ctng_version}" found_expected_version)
     if(NOT ctng_version)
-        message(WARNING "Xtensa toolchain ${CMAKE_C_COMPILER} does not appear to be built with crosstool-ng. "
+        message(WARNING "Toolchain ${CMAKE_C_COMPILER} does not appear to be built with crosstool-ng. "
             "${ctng_version_warning}")
     elseif(found_expected_version EQUAL -1)
-        message(WARNING "Xtensa toolchain ${CMAKE_C_COMPILER} crosstool-ng version ${ctng_version} "
-            "doesn't match supported version ${expected_ctng_version}. ${ctng_version_warning}")
+        set(wrong_compiler_msg "\nToolchain: ${CMAKE_C_COMPILER}, "
+            "crosstool-ng version ${ctng_version} doesn't match supported version ${expected_ctng_version}"
+            "\nPlease try to run 'idf.py fullclean' to solve it quickly.\n")
+        set(IDF_MAINTAINER $ENV{IDF_MAINTAINER})
+        if(IDF_MAINTAINER)
+            message(WARNING ${wrong_compiler_msg} ${ctng_version_warning})
+        else()
+            set(ctng_version_error "Check Getting Started documentation if the error continues."
+        "\nYou can override this error and proceed with build by defining the IDF_MAINTAINER environment variable.\n")
+            message(FATAL_ERROR ${wrong_compiler_msg} ${ctng_version_error})
+        endif()
     endif()
 endfunction()


[Config][CMake] Migrated to new FindPython3 (from deprecated FindPythonLibs)

--- config/project_config_embeddable.cmake
+++ config/project_config_embeddable.cmake
@@ -479,48 +479,36 @@
   unset (_required_version)
   if (${ARGC} GREATER 0)
     set (_required_version ${ARGV0})
-    message (STATUS "Requires PythonLibs-${_required_version}")
+    message (STATUS "Requires Python with version ${_required_version}; however just Python3 is considered here")
   else (${ARGC} GREATER 0)
-    message (STATUS "Requires PythonLibs without specifying any version")
+    message (STATUS "Requires Python3; any version will do")
   endif (${ARGC} GREATER 0)

   # The first check searches for the libraries and include paths.
   # However, on some older versions (e.g., on RedHat/CentOS 5.x),
   # only the static library is searched.
-  find_package (PythonLibs ${_required_version} REQUIRED)
+  find_package (Python3 COMPONENTS Interpreter Development REQUIRED)

   # The second check is to get the dynamic library for sure.
-  find_package (PythonLibsWrapper ${_required_version} REQUIRED)
-
-  if (PYTHONLIBS_FOUND)
-	# Derive the version of Python (for whatever reason, FindPythonLibs
-	# does not seem to provide that version variable.
-	get_filename_component (PYTHONLIBS_LIB_FILENAME ${PYTHON_LIBRARIES} NAME)
-	string (REGEX REPLACE "^libpython([0-9]+.[0-9]+).*$" "\\1"
-	  PYTHONLIBS_VERSION "${PYTHONLIBS_LIB_FILENAME}")
-
-	if (${PYTHONLIBS_VERSION_STRING} MATCHES "([0-9]).([0-9]).([0-9])")
-	  set (PY_MAJOR_VERSION "${CMAKE_MATCH_1}")
-	  set (PY_MINOR_VERSION "${CMAKE_MATCH_2}")
-	  set (PY_PATCH_VERSION "${CMAKE_MATCH_3}")
-	endif (${PYTHONLIBS_VERSION_STRING} MATCHES "([0-9]).([0-9]).([0-9])")
-
-	message (STATUS "Found PythonLibs ${PYTHONLIBS_VERSION} (${PYTHONLIBS_VERSION_STRING} / ${PY_MAJOR_VERSION}.${PY_MINOR_VERSION}.${PY_PATCH_VERSION})")
-
-	# Set the Python installation directory
-	set (INSTALL_PY_LIB_DIR
-	  ${INSTALL_LIB_DIR}/python${PYTHONLIBS_VERSION}/site-packages/py${PROJECT_NAME}
-	  CACHE PATH "Installation directory for Python libraries")
-
-	# Update the list of include directories for the project
-    include_directories (${PYTHON_INCLUDE_DIRS})
+  #find_package (PythonLibsWrapper ${_required_version} REQUIRED)
+
+  if (Python3_FOUND)
+    message (STATUS "Found Python3 ${Python3_VERSION} (${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}.${Python3_VERSION_PATCH})")
+
+    # Set the Python installation directory
+    set (INSTALL_PY_LIB_DIR
+      ${INSTALL_LIB_DIR}/python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}/site-packages/py${PROJECT_NAME}
+      CACHE PATH "Installation directory for Python libraries")
+
+    # Update the list of include directories for the project
+    include_directories (${Python3_INCLUDE_DIRS})

     # Update the list of dependencies for the project
-    list (APPEND PROJ_DEP_LIBS_FOR_LIB ${PYTHON_LIBRARIES})
-
-  else (PYTHONLIBS_FOUND)
+    list (APPEND PROJ_DEP_LIBS_FOR_LIB ${Python3_LIBRARIES})
+
+  else (Python3_FOUND)
 	message (FATAL_ERROR "Python libraries are missing. Please install them (e.g., 'python-devel' for the Fedora/RedHat package)")
-  endif (PYTHONLIBS_FOUND)
+  endif (Python3_FOUND)

 endmacro (get_python)

@@ -618,8 +606,8 @@
   #         On some platform/Boost version combinations, the Python version
   #         may be just the major version (2 or 3 as of 2019) or the major
   #         and minor versions (e.g., 27, 28, 34, 36, 37 as of 2019)
-  set (python_cpt_name1 "python${PY_MAJOR_VERSION}")
-  set (python_cpt_name2 "python${PY_MAJOR_VERSION}${PY_MINOR_VERSION}")
+  set (python_cpt_name1 "python${Python3_VERSION_MAJOR}")
+  set (python_cpt_name2 "python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}")
   set (Boost_USE_STATIC_LIBS OFF)
   set (Boost_USE_MULTITHREADED ON)
   set (Boost_USE_STATIC_RUNTIME OFF)
@@ -1473,7 +1461,7 @@
   set (exec_prefix   ${prefix})
   set (bindir        ${exec_prefix}/bin)
   set (libdir        ${exec_prefix}/${LIBDIR})
-  set (pylibdir	     ${libdir}/python${PYTHONLIBS_VERSION}/site-packages/py${PACKAGE})
+  set (pylibdir	     ${libdir}/python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}/site-packages/py${PACKAGE})
   set (libexecdir    ${exec_prefix}/libexec)
   set (sbindir       ${exec_prefix}/sbin)
   set (sysconfdir    ${prefix}/etc)
@@ -2555,27 +2543,26 @@

 # Python
 macro (display_python)
-  if (PYTHONLIBS_FOUND)
+  if (Python3_FOUND)
     message (STATUS)
-	message (STATUS "* Python:")
-	message (STATUS "  - PYTHONLIBS_VERSION ............ : ${PYTHONLIBS_VERSION}")
-	message (STATUS "  - PY_{MAJOR,MINOR,PATCH}_VERSION  : ${PY_MAJOR_VERSION}.${PY_MINOR_VERSION}.${PY_PATCH_VERSION}")
-	message (STATUS "  - PYTHON_LIBRARIES .............. : ${PYTHON_LIBRARIES}")
-	message (STATUS "  - PYTHON_INCLUDE_PATH ........... : ${PYTHON_INCLUDE_PATH}")
-	message (STATUS "  - PYTHON_INCLUDE_DIRS ........... : ${PYTHON_INCLUDE_DIRS}")
-	message (STATUS "  - PYTHON_DEBUG_LIBRARIES ........ : ${PYTHON_DEBUG_LIBRARIES}")
-	message (STATUS "  - Python_ADDITIONAL_VERSIONS .... : ${Python_ADDITIONAL_VERSIONS}")
-  endif (PYTHONLIBS_FOUND)
+    message (STATUS "* Python:")
+    message (STATUS "  - Python3_VERSION ............... : ${Python3_VERSION}")
+    message (STATUS "  - Python3_VERSION_{MJR,MNR,PTCH}  : ${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}.${Python3_VERSION_PATCH}")
+    message (STATUS "  - Python3_INCLUDE_DIRS .......... : ${Python3_INCLUDE_DIRS}")
+    message (STATUS "  - Python3_LIBRARIES ............. : ${Python3_LIBRARIES}")
+    message (STATUS "  - Python3_LIBRARY_DIRS .......... : ${Python3_LIBRARY_DIRS}")
+    message (STATUS "  - Python3_RUNTIME_LIBRARY_DIRS .. : ${Python3_RUNTIME_LIBRARY_DIRS}")
+  endif (Python3_FOUND)
 endmacro (display_python)

 # ICU
 macro (display_icu)
   if (ICU_FOUND)
     message (STATUS)
-	message (STATUS "* ICU:")
-	message (STATUS "  - ICU_VERSION ................... : ${ICU_VERSION}")
-	message (STATUS "  - ICU_LIBRARIES ................. : ${ICU_LIBRARIES}")
-	message (STATUS "  - ICU_INCLUDE_DIRS .............. : ${ICU_INCLUDE_DIR}")
+    message (STATUS "* ICU:")
+    message (STATUS "  - ICU_VERSION ................... : ${ICU_VERSION}")
+    message (STATUS "  - ICU_LIBRARIES ................. : ${ICU_LIBRARIES}")
+    message (STATUS "  - ICU_INCLUDE_DIRS .............. : ${ICU_INCLUDE_DIR}")
   endif (ICU_FOUND)
 endmacro (display_icu)


Add Visual Studio 14 2015 support

Add Visual Studio 14 2015 support

Hunter is now able to find the vcvarsall.bat for Visual Studio 2015

--- cmake/modules/hunter_setup_msvc_vcvarsall.cmake
+++ cmake/modules/hunter_setup_msvc_vcvarsall.cmake
@@ -18,6 +18,7 @@
     string(REPLACE " 2010" "" _hunter_result "${_hunter_result}")
     string(REPLACE " 2012" "" _hunter_result "${_hunter_result}")
     string(REPLACE " 2013" "" _hunter_result "${_hunter_result}")
+    string(REPLACE " 2015" "" _hunter_result "${_hunter_result}")

     set(_hunter_result "${_hunter_result}0")
     set(_hunter_result "VS${_hunter_result}COMNTOOLS")


BUG: Incorrect pathname.  Should use "Build" instead of "build"

--- CMake/SuperBuild.cmake
+++ CMake/SuperBuild.cmake
@@ -267,7 +267,7 @@
   GIT_REPOSITORY "${GIT_PROTOCOL}://github.com/Slicer/SlicerExecutionModel.git"
   GIT_TAG "origin/master"
   SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
-  BINARY_DIR ${proj}-build
+  BINARY_DIR ${proj}-Build
   CMAKE_GENERATOR ${gen}
   CMAKE_ARGS
     -DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
@@ -285,7 +285,7 @@
   DEPENDS
     ${SlicerExecutionModel_DEPENDS}
   )
-set( SlicerExecutionModel_DIR ${CMAKE_BINARY_DIR}/${proj}-build )
+set( SlicerExecutionModel_DIR ${CMAKE_BINARY_DIR}/${proj}-Build )
 set( TubeTK_DEPENDS ${TubeTK_DEPENDS} "SlicerExecutionModel" )

 if( TubeTK_USE_QT )


CmakeFedoraScript: cmake>=2.8 should be able to find the cmake fedora modules, if not, specify cmake_fedora_modules_dir


broke header search in windows

broke header search in windows

--- PyPort/system-python.cmake
+++ PyPort/system-python.cmake
@@ -31,7 +31,7 @@
 	endif()

 	find_path(PYTHON_INCLUDE_DIRS Python.h
-		PATHS ${PYTHON_HOME}/include/${PYTHON_VER}m
+		PATHS ${PYTHON_HOME}/include/${PYTHON_VER}m ${PYTHON_HOME}/include/
 		NO_DEFAULT_PATH
 		CMAKE_FIND_ROOT_PATH_BOTH)


Bugfix

Bugfix

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

--- deal.II/contrib/cmake/configure/configure_trilinos.cmake
+++ deal.II/contrib/cmake/configure/configure_trilinos.cmake
@@ -89,7 +89,7 @@
     #
     # TODO: Refine this check...
     #
-    IF("${TRILINOS_MPI_LIBRARIES}" EQUAL "")
+    IF(NOT "${Trilinos_MPI_EXEC}" EQUAL "")
       SET(TRILINOS_USE_MPI TRUE)
     ENDIF()
     IF( (TRILINOS_USE_MPI AND NOT DEAL_II_COMPILER_SUPPORTS_MPI) OR


update

update

--- CPackConfig.cmake
+++ CPackConfig.cmake
@@ -1,5 +1,5 @@
 SET(CPACK_GENERATOR "DEB")
-SET(CPACK_INSTALLED_DIRECTORIES "/home/xuh/git/cpacktest/lib" "/usr/lib" "/home/xuh/git/cpacktest/include" "/usr/include")
+SET(CPACK_INSTALLED_DIRECTORIES "${CMAKE_CURRENT_LIST_DIR}/lib" "/usr/lib" "${CMAKE_CURRENT_LIST_DIR}/include" "/usr/include")
 SET(CPACK_PACKAGE_DESCRIPTION_FILE "LICENSE.txt")
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "QueryArrow is a semantically unified SQL and NoSQL query system")
 # SET(CPACK_PACKAGE_EXECUTABLES "QueryArrow")


updates

updates

--- 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 c5e2111312bf8004ded2d53ab6bd903ad6e76584)
+set(TEST_MODELS_HASH 99ec031b11b08afec271357e4cb9326cf8ac9942)

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


update models images

update models images

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -2,5 +2,4 @@
 ## SPDX-License-Identifier: Apache-2.0

 set(CTEST_PROJECT_NAME "Embree")
-set(TEST_MODELS_HASH 3f32d3837ae09de19aeff412096e95ab903b8568)
-#set(TEST_MODELS_HASH 9f7aa420e2f931c51c8a72a812da0631d04f9ed9)
+set(TEST_MODELS_HASH f7869349babc4000bd3c3fe98a2f09506c3d95e8)


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 99ec031b11b08afec271357e4cb9326cf8ac9942)
+set(TEST_MODELS_HASH d07c61adf3d9257d556fdcc2e4c29289b665af7c)

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


Revert "if we determine that GCC is too old it is not an error - the opposite would be, but I have no idea how to flag that in the dashboard"

This reverts commit 5fc5cac74297a54e3d61730e349c950fae59a971.

The change didn't work. Apparently CTest cannot ignore errors at
configure time.

--- CTestCustom.cmake
+++ CTestCustom.cmake
@@ -21,7 +21,6 @@
    )

 set(CTEST_CUSTOM_ERROR_EXCEPTION ${CTEST_CUSTOM_ERROR_EXCEPTION}
-   "Vc 1\\.x requires C\\+\\+11 support\\. This requires at least GCC 4\\.6\\."
    "^make\\[[1-9]\\]: "
    "^collect2: ld returned . exit status"
    "^make: \\*\\*\\* \\[all\\] Error ")


--- CommonCTest.cmake
+++ CommonCTest.cmake
@@ -16,8 +16,12 @@
       ${LCOV_VERSION})
   endif()
   if( GCC_COMPILER_VERSION VERSION_GREATER 4.6.99 AND
-      LCOV_VERSION VERSION_LESS 1.10)
+      LCOV_VERSION VERSION_LESS 1.10 )
     message(STATUS "Need lcov >= 1.10 for gcc ${GCC_COMPILER_VERSION}, found lcov ${LCOV_VERSION}")
+    set(LCOV)
+  endif()
+  if($ENV{TRAVIS})
+    message(STATUS "Disable code coverage on Travis, causes build timeouts")
     set(LCOV)
   endif()


* revert to rev. 12126

* revert to rev. 12126

git-svn-id: 41bd7e47c31e4d43f97241d7529f6785d233c6d8@12275 23f926e6-80f1-49ca-85a0-60d4a27bb3ac


Make target warnings visible in ninja

Make target warnings visible in ninja

--- DoxygenRule.cmake
+++ DoxygenRule.cmake
@@ -142,11 +142,13 @@
       DEPENDS ${PROJECT_NAME}_doxygen VERBATIM)
   else()
     add_custom_target(${PROJECT_NAME}_doxycopy
-      COMMENT "doxycopy target not available, missing ${_GIT_DOC_SRC_DIR}")
+      COMMAND ${CMAKE_COMMAND} -E echo
+      "doxycopy target not available, missing ${_GIT_DOC_SRC_DIR}")
   endif()
 else()
   add_custom_target(${PROJECT_NAME}_doxycopy
-    COMMENT "doxycopy target not available, missing GIT_DOCUMENTATION_REPO")
+    COMMAND ${CMAKE_COMMAND} -E echo
+    "doxycopy target not available, missing GIT_DOCUMENTATION_REPO for ${PROJECT_NAME}")
 endif()

 if(NOT TARGET doxycopy)


Delete unused FEATURE flags (#22781)

Delete unused FEATURE flags (#22781)

--- clrdefinitions.cmake
+++ clrdefinitions.cmake
@@ -185,9 +185,6 @@
   add_definitions(-DFEATURE_REJIT)
 endif(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386)

-add_definitions(-DFEATURE_STANDALONE_SN)
-add_definitions(-DFEATURE_STRONGNAME_DELAY_SIGNING_ALLOWED)
-add_definitions(-DFEATURE_STRONGNAME_MIGRATION)
 if (CLR_CMAKE_PLATFORM_UNIX OR CLR_CMAKE_TARGET_ARCH_ARM64)
     add_definitions(-DFEATURE_STUBS_AS_IL)
 endif ()


Pass cmake build type to external project

--- cmake/BuildSdk.cmake
+++ cmake/BuildSdk.cmake
@@ -26,8 +26,8 @@
 set(DEPS_BUILD "${DEPS}/build")
 file(MAKE_DIRECTORY ${DEPS} ${DEPS_BUILD})
 file(WRITE "${DEPS}/CMakeLists.txt" "${CMAKE_LIST_CONTENT}")
-execute_process(WORKING_DIRECTORY "${DEPS_BUILD}" COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} ..)
-execute_process(WORKING_DIRECTORY "${DEPS_BUILD}" COMMAND ${CMAKE_COMMAND} --build .)
+execute_process(WORKING_DIRECTORY "${DEPS_BUILD}" COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ..)
+execute_process(WORKING_DIRECTORY "${DEPS_BUILD}" COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE})

 set(ENV{OCL_ROOT} "${SDK_ROOT}")


Escape parameters in macdeployqt.

Escape parameters in macdeployqt.

--- cmake/DeployQt.cmake
+++ cmake/DeployQt.cmake
@@ -67,7 +67,7 @@
 function(macdeployqt target)
     add_custom_command(TARGET ${target} POST_BUILD
         COMMAND "${MACDEPLOYQT_EXECUTABLE}"
-            "$<TARGET_FILE_DIR:${target}>/../.."
+            \"$<TARGET_FILE_DIR:${target}>/../..\"
             -always-overwrite
         COMMENT "Deploying Qt..."
     )


Revert of a harmful change (A.Goel)

Revert of a harmful change (A.Goel)

--- cmake/FindDATE.cmake
+++ cmake/FindDATE.cmake
@@ -3,7 +3,7 @@
 # Author: Johny Jose (johny.jose@cern.ch)
 #         Port of previous Makefile build to cmake

-cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.8 FATAL_ERROR)

 find_program(DATE_CONFIG date-config)
 message(STATUS "Check for Date : ${DATE_CONFIG}")
@@ -13,9 +13,10 @@
   set(DATE_COMMON_DEFS $ENV{DATE_COMMON_DEFS})
   set(DATE_MONITOR_DIR $ENV{DATE_MONITOR_DIR})
   execute_process(COMMAND date-config --cflags OUTPUT_VARIABLE DATEFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+  string(REGEX REPLACE "\"" "'" DATEFLAGS ${DATEFLAGS})
+  set(DATEFLAGS "-DALI_DATE ${DATEFLAGS}")
   execute_process(COMMAND date-config --monitorlibs OUTPUT_VARIABLE DMONLIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
 else()
   set(DATEFLAGS "-D${CMAKE_SYSTEM_NAME} -DDATE_SYS=${CMAKE_SYSTEM_NAME} -Dlong32='int' -Dlong64='long long' -DdatePointer='long'")
 endif(DATE_CONFIG)
-string ( REPLACE "\\" "" DATEFLAGS "${DATEFLAGS}" )
-message(STATUS "DATEFLAGS: ${DATEFLAGS}")
+


Find local llvm-config first

Find local llvm-config first

Distro's llvm usually have a 6.0 suffix.Any custom llvm build
names the binary as llvm-config.Keeping 6.0 variant first causes
the distro's llvm to be compiled in place of a custom one even if
given using CMAKE_PREFIX_PATH.

--- cmake/Findllvm.cmake
+++ cmake/Findllvm.cmake
@@ -8,7 +8,7 @@
 # LLVM_LIBDIRS

 find_program(LLVM_CONFIG_EXE
-    NAMES llvm-config-6.0 llvm-config
+    NAMES llvm-config llvm-config-6.0
     PATHS
         "/mingw64/bin"
         "/c/msys64/mingw64/bin"


Added dependency of concept on opencv.

Added dependency of concept on opencv.

--- cmake/ROCSDeps.cmake
+++ cmake/ROCSDeps.cmake
@@ -32,6 +32,7 @@
 	set(ROCS_BUILD_MODULE_ML yes)
 	set(ROCS_BUILD_MODULE_CORE yes)
 	set(ROCS_BUILD_THIRDPARTY_LIBDAI yes)
+	set(ROCS_FIND_OPENCV yes)
 endif(ROCS_BUILD_MODULE_CONCEPT)

 # Module Vision Apps


this AddCompilerFlag should only test whether the flag is usable, not add it to CXX_FLAGS

--- cmake/VcMacros.cmake
+++ cmake/VcMacros.cmake
@@ -412,7 +412,7 @@
          endif()
          string(REPLACE " " ";" _flag_list "${_flag}")
          foreach(_flag ${_flag_list})
-            AddCompilerFlag(${_flag} CXX_RESULT _ok)
+            AddCompilerFlag(${_flag} CXX_RESULT _ok CXX_FLAGS _tmp)
             if(NOT _ok)
                break()
             endif()


fpta: '-Wno-invalid-offsetof' only for GCC < 5.x

--- cmake/compiler.cmake
+++ cmake/compiler.cmake
@@ -463,11 +463,10 @@
     add_compile_flags("C;CXX" "-Wextra")
   endif()

-  if(CMAKE_COMPILER_IS_GNUCXX)
+  if(CMAKE_COMPILER_IS_GNUCXX
+      AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5)
     # G++ bug. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31488
-    add_compile_flags("CXX"
-      "-Wno-invalid-offsetof"
-      )
+    add_compile_flags("CXX" "-Wno-invalid-offsetof")
   endif()

   add_definitions("-D__STDC_FORMAT_MACROS=1")


erthink-cmake: refine clang detection.

erthink-cmake: refine clang detection.

--- cmake/compiler.cmake
+++ cmake/compiler.cmake
@@ -64,11 +64,11 @@

 # We support building with Clang and gcc. First check
 # what we're using for build.
-if(CMAKE_C_COMPILER_LOADED AND CMAKE_C_COMPILER_ID STREQUAL "Clang")
+if(CMAKE_C_COMPILER_LOADED AND CMAKE_C_COMPILER_ID MATCHES ".*[Cc][Ll][Aa][Nn][Gg].*")
   set(CMAKE_COMPILER_IS_CLANG  ON)
   set(CMAKE_COMPILER_IS_GNUCC  OFF)
 endif()
-if(CMAKE_CXX_COMPILER_LOADED AND CMAKE_CXx_COMPILER_ID STREQUAL "Clang")
+if(CMAKE_CXX_COMPILER_LOADED AND CMAKE_CXX_COMPILER_ID MATCHES ".*[Cc][Ll][Aa][Nn][Gg].*")
   set(CMAKE_COMPILER_IS_CLANG  ON)
   set(CMAKE_COMPILER_IS_GNUCXX OFF)
 endif()


cmake: Set NO_QEMU_SERIAL_BT_SERVER when CONFIG_BT_NO_DRIVER is set

When not driver is selected there should be no need to have a serial
attached.

Signed-off-by: Luiz Augusto von Dentz <8530c5ea66a1bdbc08f98bfcf183c8be901b5990@intel.com>

--- cmake/emu/qemu.cmake
+++ cmake/emu/qemu.cmake
@@ -64,6 +64,9 @@
 # Add a BT serial device when building for bluetooth, unless the
 # application explicitly opts out with NO_QEMU_SERIAL_BT_SERVER.
 if(CONFIG_BT)
+  if(CONFIG_BT_NO_DRIVER)
+      set(NO_QEMU_SERIAL_BT_SERVER 1)
+  endif()
   if(NOT NO_QEMU_SERIAL_BT_SERVER)
     list(APPEND QEMU_FLAGS -serial unix:/tmp/bt-server-bredr)
   endif()


Updating to latest hash on ITK release branch for 4.9

This addresses compilation issue with ITK and explicit instantiation
for <=gcc 4.2

Change-Id: I27b8d9e8425fb67c6aef3d833dd2ee51271ba178

--- SuperBuild/External_ITK.cmake
+++ SuperBuild/External_ITK.cmake
@@ -35,7 +35,7 @@
 set(ITK_REPOSITORY git://itk.org/ITK.git)

 # NOTE: it is very important to update the ITK_DIR path with the ITK version
-set(ITK_TAG_COMMAND GIT_TAG 0c4381bbca1c5595bf397e2d4f2646aaf394a973 )
+set(ITK_TAG_COMMAND GIT_TAG 5908767d9ad53585c59c4fde3b8cba79eba9a40b )

 if( ${ITK_WRAPPING} OR ${BUILD_SHARED_LIBS} )
   set( ITK_BUILD_SHARED_LIBS ON )


Updating superbuild along ITK v4.7.0 release branch

825b759 Merge branch 'FixVS2015finddeclaration_for_release' into
release
9b9feba Merge branch
'RestoreScaleTransformFixedParameters_for_release' into release
589443a BUG: restore the center point fixed parameters for scale
transforms
c0c1f55 COMP: check for search.h in libtiff
c8c8bf0 BUG: Fix incorrectly ordering of template parameters

Change-Id: I6ba98f47439baf55e00d805f8dce75c4a00d1f6e

--- SuperBuild/External_ITK.cmake
+++ SuperBuild/External_ITK.cmake
@@ -35,7 +35,7 @@
 set(ITK_REPOSITORY git://itk.org/ITK.git)

 # NOTE: it is very important to update the ITK_DIR path with the ITK version
-set(ITK_TAG_COMMAND GIT_TAG  4e8c47738607b1bc03beda8fe7dd6c0835588031 ) # v4.7.0 with patches on release
+set(ITK_TAG_COMMAND GIT_TAG 825b75955962f40c0514ddc4a52c033dba62f704) # v4.7.0 with patches on release

 if( ${ITK_WRAPPING} OR ${BUILD_SHARED_LIBS} )
   set( ITK_BUILD_SHARED_LIBS ON )


Bad idea... revert.

Bad idea... revert.

--- cmake/ConfigCompilerFlags.cmake
+++ cmake/ConfigCompilerFlags.cmake
@@ -27,10 +27,6 @@
         CACHE STRING
 		"Flags used by the compiler during release builds." FORCE)

-    set(CMAKE_${_lang}_LINK_FLAGS "${CMAKE_${_lang}_LINK_FLAGS}"
-        CACHE STRING
-		"Flags used by the linker during linking." FORCE)
-
 	set (DEFAULT_${_lang}_COMPILER_FLAGS_SET ON
 		CACHE INTERNAL
 		"Flag that the default ${_lang} compiler flags have been set.")


Removed debug print

Removed debug print

--- cmake/Modules/FindOpenRTM.cmake
+++ cmake/Modules/FindOpenRTM.cmake
@@ -50,7 +50,6 @@
 set(OPENRTM_LIBRARIES ${OPENRTM_LIBRARY} ${COIL_LIBRARY} uuid dl pthread
     omniORB4 omnithread omniDynamic4)

-message(STATUS "Include dirs is ${OPENRTM_INCLUDE_DIR}")
 file(STRINGS ${OPENRTM_INCLUDE_DIR}/rtm/version.h OPENRTM_VERSION
     NEWLINE_CONSUME)
 #set(OPENRTM_VERSION "1.1.0")


Fix a message

Fix a message

--- cmake/MyPackageDependency.cmake
+++ cmake/MyPackageDependency.cmake
@@ -52,7 +52,7 @@
     MESSAGE(STATUS "Looking for ${dependTarget}")
     FIND_PACKAGE (${dependTarget})
     IF (NOT ${_FINDPACKAGE}_FOUND)
-      MESSAGE (FATAL ERROR "find ${dependTarget} failure")
+      MESSAGE (FATAL_ERROR "find ${dependTarget} failure")
     ENDIF ()
     #
     # The following lines are experimental


Remove unfinished code for release

Remove unfinished code for release

--- cmake/RuntimeDependencies.cmake
+++ cmake/RuntimeDependencies.cmake
@@ -17,27 +17,3 @@
     # install(FILES ... COMPONENT runtime)

 endif()
-
-
-
-# [WIP]
-
-# Paths to executables
-#set(apps
-#    "\${CMAKE_INSTALL_PREFIX}/${INSTALL_BIN}/fibgui${CMAKE_EXECUTABLE_SUFFIX}"
-#)
-
-#install(CODE "
-#    include(\"${CMAKE_ROOT}/Modules/GetPrerequisites.cmake\")
-
-#    foreach(app ${apps})
-#        message(\"Dependencies for \${app}\")
-
-#        get_prerequisites(\${app} prereqs 1 1 \"\" \"\")
-#        foreach(lib \${prereqs})
-#            message(\"- \${lib}\")
-#        endforeach(lib)
-#    endforeach(app)
-#    "
-#    COMPONENT runtime
-#)


fix runtime deps for self contaied installer msvc

--- cmake/RuntimeDependencies.cmake
+++ cmake/RuntimeDependencies.cmake
@@ -13,7 +13,7 @@

 if(OPTION_SELF_CONTAINED)

-    if(SYSTEM_WINDOWS)
+    if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC")

         # Install 3rd-party runtime dependencies into runtime-component
         # install(FILES ... COMPONENT runtime)


#24 assimp hackery

#24 assimp hackery

--- cmake_modules/FindASSIMPM.cmake
+++ cmake_modules/FindASSIMPM.cmake
@@ -34,7 +34,7 @@
 		${ASSIMP_ROOT}/lib
 	)
 	set(ASSIMP_LIBRARIES
-		debug ${ASSIMP_LIBRARIES_DEBUG}
+		debug ${ASSIMP_LIBRARIES_RELEASE}
 		optimized ${ASSIMP_LIBRARIES_RELEASE}
 		)
 endif()
@@ -64,7 +64,7 @@
     )

 	set(ASSIMP_LIBRARIES
-		debug ${ASSIMP_LIBRARIES_DEBUG}
+		debug ${ASSIMP_LIBRARIES_RELEASE}
 		optimized ${ASSIMP_LIBRARIES_RELEASE}
 		)
 endif(ASSIMP_INCLUDE_DIR AND ASSIMP_LIBRARIES)


Cosmetic fix to the Tidy cmake module

Cosmetic fix to the Tidy cmake module

--- cmake_modules/FindLibTidy.cmake
+++ cmake_modules/FindLibTidy.cmake
@@ -17,6 +17,7 @@
 MARK_AS_ADVANCED(LIBTIDY_INCLUDE_DIR)

 # Look for the library.
+# FIND_LIBRARY(LIBTIDY_LIBRARY NAMES tidy PATHS ${LIBTIDY_LIBRARIES})
 FIND_LIBRARY(LIBTIDY_LIBRARY NAMES tidy)
 MARK_AS_ADVANCED(LIBTIDY_LIBRARY)

@@ -34,8 +35,8 @@
   SET(LIBTIDY_FOUND 1)
   SET(LIBTIDY_LIBRARIES ${LIBTIDY_LIBRARY})
   SET(LIBTIDY_INCLUDE_DIRS ${LIBTIDY_INCLUDE_DIR})
-  MESSAGE("-- Found libtidy library -- " ${LIBTIDY_LIBRARY})
-  MESSAGE("-- Found libtidy include path -- " ${LIBTIDY_INCLUDE_DIR})
+  MESSAGE(STATUS "Found libtidy library -- " ${LIBTIDY_LIBRARY})
+  MESSAGE(STATUS "Found libtidy include path -- " ${LIBTIDY_INCLUDE_DIR})
 ELSE (LIBTIDY_INCLUDE_DIR AND LIBTIDY_LIBRARY)
   SET(LIBTIDY_FOUND 0)
   SET(LIBTIDY_LIBRARIES)


find xerces on the server

find xerces on the server

--- cmake_modules/FindXercesC.cmake
+++ cmake_modules/FindXercesC.cmake
@@ -14,7 +14,9 @@
 FIND_PATH(
   XERCESC_INCLUDE
   NAMES util/XercesVersion.hpp
-  PATHS ${XERCES_INCLUDE_DIR}
+  PATHS
+  c:\Libs\xerces-c_2_8_0\
+  ${XERCES_INCLUDE_DIR}
   PATH_SUFFIXES xercesc)

 FIND_LIBRARY(


PKG: small exception for Qt plugins rpath check on macos


Revert workaround for CTK external library dirs

--- CMake/PackageDepends/MITK_CTK_Config.cmake
+++ CMake/PackageDepends/MITK_CTK_Config.cmake
@@ -4,13 +4,4 @@
 list(APPEND ALL_LIBRARIES ${CTK_LIBRARIES})
 link_directories(${CTK_LIBRARY_DIRS} ${CTK_EXTERNAL_LIBRARY_DIRS})

-# Temporary workaround for CTK bug of not exposing external project library dirs.
-# Should be removed as soon as this is fixed in CTK. (espakm)
-if(EXISTS "${CTK_DIR}/qRestAPI-build/qRestAPIConfig.cmake")
-  include(${CTK_DIR}/qRestAPI-build/qRestAPIConfig.cmake)
-  link_directories(${qRestAPI_LIBRARY_DIRS})
-endif()
-if(EXISTS "${CTK_DIR}/QuaZip-build/QuaZipConfig.cmake")
-  include(${CTK_DIR}/QuaZip-build/QuaZipConfig.cmake)
-  link_directories(${QUAZIP_LIBRARY_DIRS})
-endif()
+


Added support to overwrite the generator type. Eigen'fied the new variables.

--- test/testsuite.cmake
+++ test/testsuite.cmake
@@ -27,6 +27,13 @@
 #  - EIGEN_WORK_DIR: directory used to download the source files and make the builds
 #      default: folder which contains this script
 #  - EIGEN_CMAKE_ARGS: additional arguments passed to cmake
+#  - EIGEN_GENERATOR_TYPE: allows to overwrite the generator type
+#      default: nmake (windows
+#      See http://www.cmake.org/cmake/help/cmake2.6docs.html#section_Generators for a complete
+#      list of supported generators.
+#  - EIGEN_NO_UPDATE: allows to submit dash boards from local repositories
+#      This might be interesting in case you want to submit dashboards
+#      including local changes.
 #  - CTEST_SOURCE_DIRECTORY: path to eigen's src (use a new and empty folder, not the one you are working on)
 #      default: <EIGEN_WORK_DIR>/src
 #  - CTEST_BINARY_DIRECTORY: build directory
@@ -132,11 +139,11 @@

 ## mandatory variables (the default should be ok in most cases):

-if(NOT IGNORE_CVS)
+if(NOT EIGEN_NO_UPDATE)
   SET (CTEST_CVS_COMMAND "hg")
   SET (CTEST_CVS_CHECKOUT "${CTEST_CVS_COMMAND} clone http://bitbucket.org/eigen/eigen2 \"${CTEST_SOURCE_DIRECTORY}\"")
   SET(CTEST_BACKUP_AND_RESTORE TRUE) # the backup is CVS related ...
-endif(NOT IGNORE_CVS)
+endif(NOT EIGEN_NO_UPDATE)

 # which ctest command to use for running the dashboard
 SET (CTEST_COMMAND "${EIGEN_CMAKE_DIR}ctest -D ${EIGEN_MODE}")
@@ -158,15 +165,24 @@
 # any quotes inside of this string if you use it
 if(WIN32 AND NOT UNIX)
   #message(SEND_ERROR "win32")
-  set(CTEST_CMAKE_COMMAND "${CTEST_CMAKE_COMMAND} -G \"NMake Makefiles\" -DCMAKE_MAKE_PROGRAM=nmake")
-  SET (CTEST_INITIAL_CACHE "
-    MAKECOMMAND:STRING=nmake -i
-    CMAKE_MAKE_PROGRAM:FILEPATH=nmake
-    CMAKE_GENERATOR:INTERNAL=NMake Makefiles
-    CMAKE_BUILD_TYPE:STRING=Release
-    BUILDNAME:STRING=${EIGEN_BUILD_STRING}
-    SITE:STRING=${EIGEN_SITE}
-  ")
+  if(EIGEN_GENERATOR_TYPE)
+    set(CTEST_CMAKE_COMMAND "${CTEST_CMAKE_COMMAND} -G \"${EIGEN_GENERATOR_TYPE}\"")
+    SET (CTEST_INITIAL_CACHE "
+      CMAKE_BUILD_TYPE:STRING=Release
+      BUILDNAME:STRING=${EIGEN_BUILD_STRING}
+      SITE:STRING=${EIGEN_SITE}
+    ")
+  else(EIGEN_GENERATOR_TYPE)
+    set(CTEST_CMAKE_COMMAND "${CTEST_CMAKE_COMMAND} -G \"NMake Makefiles\" -DCMAKE_MAKE_PROGRAM=nmake")
+    SET (CTEST_INITIAL_CACHE "
+      MAKECOMMAND:STRING=nmake -i
+      CMAKE_MAKE_PROGRAM:FILEPATH=nmake
+      CMAKE_GENERATOR:INTERNAL=NMake Makefiles
+      CMAKE_BUILD_TYPE:STRING=Release
+      BUILDNAME:STRING=${EIGEN_BUILD_STRING}
+      SITE:STRING=${EIGEN_SITE}
+    ")
+  endif(EIGEN_GENERATOR_TYPE)
 else(WIN32 AND NOT UNIX)
   SET (CTEST_INITIAL_CACHE "
     BUILDNAME:STRING=${EIGEN_BUILD_STRING}


ENH: added compilation flags for code coverage.

--- cmake/DOConfigureCompiler.cmake
+++ cmake/DOConfigureCompiler.cmake
@@ -55,9 +55,12 @@
 endif ()

 if (UNIX)
+  # Base compilation flags.
   set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wunused-variable -fPIE")
+  # Additional flags for Release builds.
   set(CMAKE_CXX_RELEASE_FLAGS "-03 -ffast-math")
-  set(CMAKE_CXX_DEBUG_FLAGS "-00 -g -DDEBUG -D_DEBUG --coverage -fprofile-arcs -ftest-coverage")
+  # Additional flags for Debug builds, which include code coverage.
+  set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -g -DDEBUG -D_DEBUG --coverage -fprofile-arcs -ftest-coverage -fno-inline -fno-inline-small-functions -fno-default-inline")
 endif ()


Squashed '3rdparty/github/cmake-utils/' changes from ca4cd210..c86b9bea

c86b9bea cmake/MyPackageDependency.cmake: if STATIC, then ADD_SUBDIRECTORY uses EXCLUDE_FROM_ALL

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

--- cmake/MyPackageDependency.cmake
+++ cmake/MyPackageDependency.cmake
@@ -116,7 +116,11 @@
     IF (_ALL_IN_ONE)
       GET_FILENAME_COMPONENT(packageDependSourceDirAbsolute ${packageDependSourceDir} ABSOLUTE)
       MESSAGE (STATUS "[${PROJECT_NAME}-DEPEND-STATUS] Adding subdirectory ${packageDependSourceDirAbsolute}")
-      ADD_SUBDIRECTORY(${packageDependSourceDirAbsolute})
+      IF (_STATIC)
+        ADD_SUBDIRECTORY(${packageDependSourceDirAbsolute} EXCLUDE_FROM_ALL)
+      ELSE ()
+        ADD_SUBDIRECTORY(${packageDependSourceDirAbsolute})
+      ENDIF ()
     ELSE ()
       MESSAGE(STATUS "[${PROJECT_NAME}-DEPEND-STATUS] Looking for ${packageDepend}")
       FIND_PACKAGE (${packageDepend})


Build the Apple-style stage2 with modules

Green dragon had a green stage2 modules bot for a long time now[1] and
it is time to retire it and make a modules build the default for
Apple-style stage2 builds.

This patch turns on LLVM_ENABLE_MODULES.

[1] http://green.lab.llvm.org/green/job/clang-stage2-cmake-modulesRDA_build/
rdar://problem/28672159

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

git-svn-id: ffe668792ed300d6c2daa1f6eba2e0aa28d7ec6c@302556 91177308-0d34-0410-b5e6-96231b3b80d8

--- cmake/caches/Apple-stage2.cmake
+++ cmake/caches/Apple-stage2.cmake
@@ -13,6 +13,7 @@
 set(CMAKE_MACOSX_RPATH ON CACHE BOOL "")
 set(LLVM_ENABLE_ZLIB ON CACHE BOOL "")
 set(LLVM_ENABLE_BACKTRACES OFF CACHE BOOL "")
+set(LLVM_ENABLE_MODULES ON CACHE BOOL "")
 set(LLVM_EXTERNALIZE_DEBUGINFO ON CACHE BOOL "")
 set(CLANG_PLUGIN_SUPPORT OFF CACHE BOOL "")
 set(BUG_REPORT_URL "http://developer.apple.com/bugreporter/" CACHE STRING "")


cmake: gcc: no need to force add system include

There is no need to force add system include by adding
${SYSROOT_DIR}/include. Let GCC tell us what include paths
are needed with --print-file-name and feed them via -isystem.

Signed-off-by: Daniel Leung <d94e04d205b5962d7873a139ef298b03c1717f72@intel.com>

--- cmake/compiler/gcc/target.cmake
+++ cmake/compiler/gcc/target.cmake
@@ -86,7 +86,6 @@
     )

   set(LIBC_LIBRARY_DIR "\"${SYSROOT_DIR}\"/lib/${NEWLIB_DIR}")
-  set(LIBC_INCLUDE_DIR ${SYSROOT_DIR}/include)
 endif()

 # For CMake to be able to test if a compiler flag is supported by the


Prevent linker errors when building dispatch with instrumentation (#41819)

When building Swift with IRPGO, libdispatch needs the CMAKE_*_LINKER_FLAGS in order to properly statically link to the clang runtimes library.

--- cmake/modules/Libdispatch.cmake
+++ cmake/modules/Libdispatch.cmake
@@ -89,6 +89,8 @@
                           ${SWIFT_LIBDISPATCH_COMPILER_TRIPLE_CMAKE_ARGS}
                           -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
                           -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+                          -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
+                          -DCMAKE_SHARED_LINKER_FLAGS=${CMAKE_SHARED_LINKER_FLAGS}
                           -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
                           -DCMAKE_INSTALL_LIBDIR=lib
                           -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>


Fix build, edit, build loop on Windows

Fix build, edit, build loop on Windows

--- cmake/modules/SwiftSource.cmake
+++ cmake/modules/SwiftSource.cmake
@@ -494,6 +494,8 @@
     add_custom_command_target(
         module_dependency_target
         COMMAND
+          "${CMAKE_COMMAND}" "-E" "remove" "-f" "${module_file}"
+        COMMAND
           "${PYTHON_EXECUTABLE}" "${line_directive_tool}" "@${file_path}" --
           "${swift_compiler_tool}" "-emit-module" "-o" "${module_file}" ${swift_flags}
           "@${file_path}"


Move setup of RPATH directory lists to better locations in the logic
where there has been complete success at finding the associated Tcl
extension package.

svn path=/trunk/; revision=12927

--- cmake/modules/tcl-related.cmake
+++ cmake/modules/tcl-related.cmake
@@ -78,9 +78,6 @@

     get_filename_component(TCL_LIBRARY_PATH ${TCL_LIBRARY} PATH)
     message(STATUS "TCL_LIBRARY_PATH = ${TCL_LIBRARY_PATH}")
-    set(TCL_RPATH ${TCL_LIBRARY_PATH})
-    set(TCL_TK_RPATH ${TCL_RPATH})
-    set(TCL_TK_ITCL_ITK_RPATH ${TCL_RPATH})

     if(TCL_TCLSH)
       message(STATUS "Looking for tclsh - found")
@@ -125,6 +122,10 @@
 if(ENABLE_tcl)
   message(STATUS "PLPLOT_TCL_VERSION = ${PLPLOT_TCL_VERSION}")

+  set(TCL_RPATH ${TCL_LIBRARY_PATH})
+  set(TCL_TK_RPATH ${TCL_RPATH})
+  set(TCL_TK_ITCL_ITK_RPATH ${TCL_RPATH})
+
   # Sanity checking of Tcl version consistency _if_ a Tcl version string
   # can be extracted from the Tcl library name.
   string(REGEX MATCH "[0-9]+[.]?[0-9]+" library_version ${TCL_LIBRARY})
@@ -255,10 +256,6 @@
     message(STATUS "TK_INCLUDE_PATH = ${TK_INCLUDE_PATH}")
     message(STATUS "TK_LIBRARY = ${TK_LIBRARY}")
     message(STATUS "TK_STUB_LIBRARY = ${TK_STUB_LIBRARY}")
-
-    get_filename_component(TK_LIBRARY_PATH ${TK_LIBRARY} PATH)
-    list(APPEND TCL_TK_RPATH ${TK_LIBRARY_PATH})
-    list(APPEND TCL_TK_ITCL_ITK_RPATH ${TK_LIBRARY_PATH})

     message(STATUS "TK_LIBRARY_PATH = ${TK_LIBRARY_PATH}")
     if(NOT ${TK_LIBRARY_PATH} STREQUAL ${TCL_LIBRARY_PATH})
@@ -382,10 +379,14 @@
     endif(WIN32 AND NOT CYGWIN)
   endif(ENABLE_tk AND NOT X11_FOUND)

-  if(NOT ENABLE_tk)
+  if(ENABLE_tk)
+    get_filename_component(TK_LIBRARY_PATH ${TK_LIBRARY} PATH)
+    list(APPEND TCL_TK_RPATH ${TK_LIBRARY_PATH})
+    list(APPEND TCL_TK_ITCL_ITK_RPATH ${TK_LIBRARY_PATH})
+  else(ENABLE_tk)
     message(STATUS "WARNING: Because Tk is disabled must disable Itk as well")
     set(ENABLE_itk OFF CACHE BOOL "Enable Itk interface code" FORCE)
-  endif(NOT ENABLE_tk)
+  endif(ENABLE_tk)

   if(ENABLE_itk)
     if(USE_INCRTCL_VERSION_4)
@@ -472,8 +473,6 @@
           message(STATUS "Looking for itk library - found")
 	  message(STATUS "ITK_LIBRARY = ${ITK_LIBRARY}")
 	  set(HAVE_ITK ON)
-	  get_filename_component(ITK_LIBRARY_PATH ${ITK_LIBRARY} PATH)
-	  list(APPEND TCL_TK_ITCL_ITK_RPATH ${ITK_LIBRARY_PATH})

 	  # Test version consistency between iwidgets, itk, and itcl.
 	  if(NOT IWIDGETS_VERSIONS_LIST)
@@ -535,6 +534,8 @@
 	    message(STATUS "Checking that the Iwidgets, Itk, and Itcl packages are consistent")
 	    if(CONSISTENT_ITCL_VERSION STREQUAL PLPLOT_ITCL_VERSION AND CONSISTENT_ITK_VERSION STREQUAL PLPLOT_ITK_VERSION)
 	      message(STATUS "Checking that the Iwidgets, Itk, and Itcl packages are consistent - true")
+	      get_filename_component(ITK_LIBRARY_PATH ${ITK_LIBRARY} PATH)
+	      list(APPEND TCL_TK_ITCL_ITK_RPATH ${ITK_LIBRARY_PATH})
 	    else(CONSISTENT_ITCL_VERSION STREQUAL PLPLOT_ITCL_VERSION AND CONSISTENT_ITK_VERSION STREQUAL PLPLOT_ITK_VERSION)
 	      message(STATUS "PLPLOT_ITK_VERSION = ${PLPLOT_ITK_VERSION}")
 	      message(STATUS "CONSISTENT_ITK_VERSION = ${CONSISTENT_ITK_VERSION}")


add missing msvc.cmake file to install

add missing msvc.cmake file to install

--- cmake/ospray_cmake_config.cmake
+++ cmake/ospray_cmake_config.cmake
@@ -60,6 +60,7 @@
   ${CMAKE_SOURCE_DIR}/cmake/ispc.cmake
   ${CMAKE_SOURCE_DIR}/cmake/gcc.cmake
   ${CMAKE_SOURCE_DIR}/cmake/mpi.cmake
+  ${CMAKE_SOURCE_DIR}/cmake/msvc.cmake
   ${CMAKE_SOURCE_DIR}/cmake/ospray.cmake
   DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/ospray-${OSPRAY_VERSION}"
   COMPONENT devel


Fixes #458. The wrong macro was used as command line argument for optimization flags when in release, for all non-Windows platforms and for MinGW.

--- src/cmake/common-settings.cmake
+++ src/cmake/common-settings.cmake
@@ -131,21 +131,21 @@

 if(NOT WIN32)
-	set(CMAKE_CXX_FLAGS_RELEASE         "${YUNI_COMMON_CC_OPTIONS_UNIX} ${YUNI_COMMON_CXX_OPTIONS} ${YUNI_HAS_COMPILER_OPTIMIZATION_LEVEL_4} -fomit-frame-pointer -fstrict-aliasing -momit-leaf-frame-pointer -fno-tree-pre -falign-loops -mfpmath=sse -msse -msse2 -Wuninitialized")
-	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO  "${YUNI_COMMON_CC_OPTIONS_UNIX} ${YUNI_COMMON_CXX_OPTIONS} ${YUNI_HAS_COMPILER_OPTIMIZATION_LEVEL_4} -fomit-frame-pointer -mfpmath=sse -msse -msse2")
+	set(CMAKE_CXX_FLAGS_RELEASE         "${YUNI_COMMON_CC_OPTIONS_UNIX} ${YUNI_COMMON_CXX_OPTIONS} ${COMPILER_OPTIMIZATION_LEVEL} -fomit-frame-pointer -fstrict-aliasing -momit-leaf-frame-pointer -fno-tree-pre -falign-loops -mfpmath=sse -msse -msse2 -Wuninitialized")
+	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO  "${YUNI_COMMON_CC_OPTIONS_UNIX} ${YUNI_COMMON_CXX_OPTIONS} ${COMPILER_OPTIMIZATION_LEVEL} -fomit-frame-pointer -mfpmath=sse -msse -msse2")
 	set(CMAKE_CXX_FLAGS_DEBUG           "${YUNI_COMMON_CC_OPTIONS_UNIX} ${YUNI_COMMON_CXX_OPTIONS} -g")

-	set(CMAKE_C_FLAGS_RELEASE         "${YUNI_COMMON_CC_OPTIONS_UNIX} ${YUNI_HAS_COMPILER_OPTIMIZATION_LEVEL_4} -fomit-frame-pointer -fstrict-aliasing -momit-leaf-frame-pointer -fno-tree-pre -falign-loops -mfpmath=sse -msse -msse2 -Wuninitialized")
-	set(CMAKE_C_FLAGS_RELWITHDEBINFO  "${YUNI_COMMON_CC_OPTIONS_UNIX} ${YUNI_HAS_COMPILER_OPTIMIZATION_LEVEL_4} -fomit-frame-pointer -mfpmath=sse -msse -msse2")
+	set(CMAKE_C_FLAGS_RELEASE         "${YUNI_COMMON_CC_OPTIONS_UNIX} ${COMPILER_OPTIMIZATION_LEVEL} -fomit-frame-pointer -fstrict-aliasing -momit-leaf-frame-pointer -fno-tree-pre -falign-loops -mfpmath=sse -msse -msse2 -Wuninitialized")
+	set(CMAKE_C_FLAGS_RELWITHDEBINFO  "${YUNI_COMMON_CC_OPTIONS_UNIX} ${COMPILER_OPTIMIZATION_LEVEL} -fomit-frame-pointer -mfpmath=sse -msse -msse2")
 	set(CMAKE_C_FLAGS_DEBUG           "${YUNI_COMMON_CC_OPTIONS_UNIX} -g")
 endif()

 if(MINGW)
-	set(CMAKE_CXX_FLAGS_RELEASE         "${YUNI_COMMON_CC_OPTIONS} ${YUNI_COMMON_CXX_OPTIONS} ${YUNI_HAS_COMPILER_OPTIMIZATION_LEVEL_4} -fomit-frame-pointer -fstrict-aliasing -momit-leaf-frame-pointer -fno-tree-pre -falign-loops -mthreads -Wuninitialized")
+	set(CMAKE_CXX_FLAGS_RELEASE         "${YUNI_COMMON_CC_OPTIONS} ${YUNI_COMMON_CXX_OPTIONS} ${COMPILER_OPTIMIZATION_LEVEL} -fomit-frame-pointer -fstrict-aliasing -momit-leaf-frame-pointer -fno-tree-pre -falign-loops -mthreads -Wuninitialized")
 	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO  "${YUNI_COMMON_CC_OPTIONS} ${YUNI_COMMON_CXX_OPTIONS} -mthreads")
 	set(CMAKE_CXX_FLAGS_DEBUG           "${YUNI_COMMON_CC_OPTIONS} ${YUNI_COMMON_CXX_OPTIONS} -mthreads")

-	set(CMAKE_C_FLAGS_RELEASE         "${YUNI_COMMON_CC_OPTIONS} ${YUNI_HAS_COMPILER_OPTIMIZATION_LEVEL_4} -fomit-frame-pointer -fstrict-aliasing -momit-leaf-frame-pointer -fno-tree-pre -falign-loops -mthreads -Wuninitialized")
+	set(CMAKE_C_FLAGS_RELEASE         "${YUNI_COMMON_CC_OPTIONS} ${COMPILER_OPTIMIZATION_LEVEL} -fomit-frame-pointer -fstrict-aliasing -momit-leaf-frame-pointer -fno-tree-pre -falign-loops -mthreads -Wuninitialized")
 	set(CMAKE_C_FLAGS_RELWITHDEBINFO  "${YUNI_COMMON_CC_OPTIONS} -mthreads")
 	set(CMAKE_C_FLAGS_DEBUG           "${YUNI_COMMON_CC_OPTIONS} -mthreads")
 endif()


fixed: cmake scans .AppleDouble folders

fixed: cmake scans .AppleDouble folders

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

--- seqan/util/cmake/FindSeqAn.cmake
+++ seqan/util/cmake/FindSeqAn.cmake
@@ -472,7 +472,7 @@
 macro (seqan_add_all_subdirectories)
     file (GLOB ENTRIES
           RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-          ${CMAKE_CURRENT_SOURCE_DIR}/*)
+          ${CMAKE_CURRENT_SOURCE_DIR}/[!.]*)
     foreach (ENTRY ${ENTRIES})
         if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${ENTRY})
             # message(STATUS "Going into ${ENTRY}")
@@ -765,7 +765,7 @@
     if (CUDA_FOUND)
         file (GLOB ENTRIES
               RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-              ${CMAKE_CURRENT_SOURCE_DIR}/*.cu)
+              ${CMAKE_CURRENT_SOURCE_DIR}/[!.]*.cu)
         if (${ARGC} GREATER 0)
             if (TARGET ${ARGV0})  # Add target only if it does not exist yet.
             else (TARGET ${ARGV0})


Fix -coverage flag overriding existing source flags (e.g. -fobjc-arc on macOS)

--- prosoft/core/config/cmake/config_coverage.cmake
+++ prosoft/core/config/cmake/config_coverage.cmake
@@ -25,7 +25,7 @@

 macro(ps_enable_code_coverage TARGET_FILES)
     if(NOT WIN32)
-        set_source_files_properties(${TARGET_FILES} PROPERTIES COMPILE_FLAGS -coverage)
+        set_property(SOURCE ${TARGET_FILES} APPEND_STRING PROPERTY COMPILE_FLAGS " -coverage ")
     endif()
 endmacro()


Bump TubeTK for release

Bump TubeTK for release

--- CMake/Superbuild/External_TubeTK.cmake
+++ CMake/Superbuild/External_TubeTK.cmake
@@ -45,7 +45,7 @@
     SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
     BINARY_DIR ${${proj}_DIR}
     GIT_REPOSITORY "https://github.com/KitwareMedical/TubeTK.git"
-    GIT_TAG "662a0b73ff589f961d78bcd29f0f5a66fc535ba4"
+    GIT_TAG "fcf9dd9e054bbac22f711dc63a5a7afb40f0f487"
     CMAKE_CACHE_ARGS
       -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
       -DCMAKE_CXX_FLAGS:STRING=${ep_common_cxx_flags}


ExternalBox2D: use CMAKE_COMMAND to execute patch

--- CMake/ExternalBox2D.cmake
+++ CMake/ExternalBox2D.cmake
@@ -27,7 +27,7 @@
     URL_MD5 59d142cd8d4d73e8832c7b67591f590c

     # Box2D's source isn't in the top level directory so add a dummy file to set cmake right
-    PATCH_COMMAND cmake -E echo ADD_SUBDIRECTORY(Box2D) > <SOURCE_DIR>/CMakeLists.txt
+    PATCH_COMMAND ${CMAKE_COMMAND} -E echo ADD_SUBDIRECTORY(Box2D) > <SOURCE_DIR>/CMakeLists.txt

     INSTALL_DIR ${POLYCODE_DEPS_MODULES_PREFIX}
     CMAKE_ARGS ${box2d_CMAKE_ARGS}


MSVC: build GDAL from source

MSVC: build GDAL from source

--- CMake/External_GDAL.cmake
+++ CMake/External_GDAL.cmake
@@ -31,6 +31,24 @@
       )
     list(APPEND ${proj}_DEPENDENCIES GEOTIFF)
   endif()
+
+  if(USE_SYSTEM_PNG)
+    set(GDAL_SB_PNG_CONFIG)
+  else()
+    set(GDAL_SB_PNG_CONFIG
+      --with-png=${CMAKE_INSTALL_PREFIX}
+      )
+    list(APPEND ${proj}_DEPENDENCIES PNG)
+  endif()
+
+  # if(USE_SYSTEM_JPEG)
+    # set(GDAL_SB_JPEG_CONFIG)
+  # else()
+    # set(GDAL_SB_JPEG_CONFIG
+      # --with-jpeg=${CMAKE_INSTALL_PREFIX}
+      # )
+    # list(APPEND ${proj}_DEPENDENCIES JPEG)
+  # endif()

   if(USE_SYSTEM_OPENJPEG)
     set(GDAL_SB_OPENJPEG_CONFIG)
@@ -87,6 +105,15 @@
     list(APPEND ${proj}_DEPENDENCIES LIBKML)
   endif()

+    if(USE_SYSTEM_CURL)
+    set(GDAL_SB_CURL_CONFIG)
+  else()
+    set(GDAL_SB_CURL_CONFIG
+      --with-curl=${CMAKE_INSTALL_PREFIX}
+      )
+    list(APPEND ${proj}_DEPENDENCIES CURL)
+  endif()
+
   if(UNIX)
     ExternalProject_Add(${proj}
       PREFIX ${proj}
@@ -94,6 +121,9 @@
       URL_MD5 9fdf0f2371a3e9863d83e69951c71ec4
       BINARY_DIR ${GDAL_SB_BUILD_DIR}
       INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
+      DEPENDS ${${proj}_DEPENDENCIES}
+      UPDATE_COMMAND  ${CMAKE_COMMAND} -E copy_directory ${GDAL_SB_SRC} ${GDAL_SB_BUILD_DIR}
+      PATCH_COMMAND ${CMAKE_COMMAND} -E touch ${GDAL_SB_SRC}/config.rpath
       CONFIGURE_COMMAND
         # use 'env' because CTest launcher doesn't perform shell interpretation
         env LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib
@@ -105,77 +135,52 @@
         ${GDAL_SB_ZLIB_CONFIG}
         ${GDAL_SB_TIFF_CONFIG}
         ${GDAL_SB_GEOTIFF_CONFIG}
+        ${GDAL_SB_PNG_CONFIG}
         ${GDAL_SB_OPENJPEG_CONFIG}
         ${GDAL_SB_SQLITE_CONFIG}
         ${GDAL_SB_GEOS_CONFIG}
         ${GDAL_SB_EXPAT_CONFIG}
         ${GDAL_SB_LIBKML_CONFIG}
-        BUILD_COMMAND $(MAKE)
-        INSTALL_COMMAND $(MAKE) install
-        DEPENDS ${${proj}_DEPENDENCIES}
-        PATCH_COMMAND ${CMAKE_COMMAND} -E touch ${GDAL_SB_SRC}/config.rpath
+      BUILD_COMMAND $(MAKE)
+      INSTALL_COMMAND $(MAKE) install
+    )
+
+  else(MSVC)
+  ##add libkml
+    list(REMOVE_ITEM ${proj}_DEPENDENCIES LIBKML)
+
+    STRING(REGEX REPLACE "/" "\\\\" CMAKE_WIN_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+    configure_file(${CMAKE_SOURCE_DIR}/patches/${proj}/nmake_gdal_extra.opt.in ${CMAKE_BINARY_DIR}/nmake_gdal_extra.opt)
+
+    ExternalProject_Add(${proj}_build
+       PREFIX ${proj}
+       URL "http://download.osgeo.org/gdal/1.11.0/gdal-1.11.0.tar.gz"
+       URL_MD5 9fdf0f2371a3e9863d83e69951c71ec4
+       BINARY_DIR ${GDAL_SB_BUILD_DIR}
+       INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
+       DEPENDS ${${proj}_DEPENDENCIES}
+       PATCH_COMMAND  ${CMAKE_COMMAND} -E copy_directory  ${GDAL_SB_SRC} ${GDAL_SB_BUILD_DIR}
+       CONFIGURE_COMMAND ""
+       BUILD_COMMAND ${SB_MAKE_CMD} /f ${GDAL_SB_BUILD_DIR}/Makefile.vc MSVC_VER=${SB_MSVC_VER} EXT_NMAKE_OPT=${CMAKE_BINARY_DIR}/nmake_gdal_extra.opt
+       INSTALL_COMMAND ${CMAKE_COMMAND} -E copy  ${CMAKE_SOURCE_DIR}/patches/${proj}/CMakeLists.txt
+      ${CMAKE_BINARY_DIR}/${proj}/_install
     )

-    ExternalProject_Add_Step(${proj} copy_source
-        COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${GDAL_SB_SRC} ${GDAL_SB_BUILD_DIR}
-        DEPENDEES patch update
-        DEPENDERS configure
-    )
+    ExternalProject_Add(${proj}
+      PREFIX ${proj}/_install
+      DOWNLOAD_COMMAND ""
+      SOURCE_DIR ${proj}/_install
+      BINARY_DIR ${GDAL_SB_BUILD_DIR}
+      INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
+      CMAKE_CACHE_ARGS
+        -DCMAKE_INSTALL_PREFIX:STRING=${CMAKE_INSTALL_PREFIX}
+        -DCMAKE_BUILD_TYPE:STRING=Release
+        -DGDAL_INCLUDE_DIR:STRING=${GDAL_SB_BUILD_DIR}
+        -DGDAL_LIB_DIR:STRING=${GDAL_SB_BUILD_DIR}
+      DEPENDS ${proj}_build
+      CMAKE_COMMAND
+    )

-  else(WIN32)
-    if(MSVC10)
-        set(URL_PREFIX "release-1600")
-        set(GDAL_LIBS_URL_HASH 2a3e4db48c68d490e3101b5ca98a4bce)
-        set(GDAL_DLL_URL_HASH cc5f45081ec0d0a7604816fabf5f2588)
-    else(MSVC80)
-         set(URL_PREFIX "release-1500")
-    else(CMAKE_COMPILER_2005)
-        set(URL_PREFIX "release-1400")
-    endif()
-
-    set(GDAL_LIBS_URL "http://download.gisinternals.com/sdk/downloads/${URL_PREFIX}-gdal-1-11-1-mapserver-6-4-1-libs.zip")
-    set(GDAL_DLL_URL "http://download.gisinternals.com/sdk/downloads/${URL_PREFIX}-gdal-1-11-1-mapserver-6-4-1.zip")
-
-    #TODO: find hash for archives properly
-    set(GDAL_LIBS_URL_HASH 2a3e4db48c68d490e3101b5ca98a4bce)
-    set(GDAL_DLL_URL_HASH cc5f45081ec0d0a7604816fabf5f2588)
-
-    ExternalProject_Add(${proj}_BIN
-        PREFIX ${proj}/_BIN
-        URL ${GDAL_DLL_URL}
-        URL_MD5 ${GDAL_DLL_URL_HASH}
-        SOURCE_DIR ${GDAL_SB_SRC}
-        CONFIGURE_COMMAND ""
-        BUILD_COMMAND ""
-        INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory ${GDAL_SB_SRC} ${CMAKE_INSTALL_PREFIX}
-     )
-
-    ExternalProject_Add(${proj}
-        PREFIX ${proj}
-        URL ${GDAL_LIBS_URL}
-        URL_MD5 ${GDAL_LIBS_URL_HASH}
-        SOURCE_DIR ${GDAL_SB_SRC}
-        DEPENDS ${proj}_BIN
-        CONFIGURE_COMMAND ""
-        BUILD_COMMAND ""
-        INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory  ${GDAL_SB_SRC} ${CMAKE_INSTALL_PREFIX}
-    )
-
-    ExternalProject_Add_Step(${proj} remove_libkml_headers
-        COMMAND ${CMAKE_COMMAND} -E remove_directory
-        ${CMAKE_INSTALL_PREFIX}/include/kml
-        DEPENDEES install
-    )
-
-    foreach(KMLLIB "base" "convenience" "regionator" "dom" "engine" "xsd")
-        ExternalProject_Add_Step(${proj} remove_libkml_${KMLLIB}
-        COMMAND ${CMAKE_COMMAND} -E remove
-        ${CMAKE_INSTALL_PREFIX}/lib/libkml${KMLLIB}.lib
-        DEPENDEES remove_libkml_headers
-    )
-    endforeach()
-
   endif()

   message(STATUS "  Using GDAL SuperBuild version")