Add support for armv7s to cmake av1 build.

BUG=https://bugs.chromium.org/p/aomedia/issues/detail?id=76

Change-Id: I1e2cfafb537af65f0393e764026567729f2667ee

--- av1/av1.cmake
+++ av1/av1.cmake
@@ -185,6 +185,9 @@
     "${AOM_ROOT}/av1/encoder/x86/error_intrin_avx2.c"
     "${AOM_ROOT}/av1/encoder/x86/hybrid_fwd_txfm_avx2.c")

+set(AOM_AV1_ENCODER_NEON_INTRIN
+    "${AOM_ROOT}/av1/encoder/arm/neon/quantize_neon.c")
+
 if (CONFIG_ACCOUNTING)
   set(AOM_AV1_COMMON_SOURCES
       ${AOM_AV1_COMMON_SOURCES}
@@ -202,10 +205,20 @@
       ${AOM_AV1_COMMON_AVX2_INTRIN}
       "${AOM_ROOT}/av1/common/x86/highbd_inv_txfm_avx2.c")

+  set(AOM_AV1_ENCODER_NEON_INTRIN
+      ${AOM_AV1_ENCODER_NEON_INTRIN}
+      "${AOM_ROOT}/av1/encoder/arm/neon/dct_neon.c"
+      "${AOM_ROOT}/av1/encoder/arm/neon/error_neon.c")
+
   set(AOM_AV1_ENCODER_SSE4_1_INTRIN
       ${AOM_AV1_ENCODER_SSE4_1_INTRIN}
       "${AOM_ROOT}/av1/encoder/x86/av1_highbd_quantize_sse4.c"
       "${AOM_ROOT}/av1/encoder/x86/highbd_fwd_txfm_sse4.c")
+else ()
+  set(AOM_AV1_COMMON_NEON_INTRIN
+      ${AOM_AV1_COMMON_NEON_INTRIN}
+      "${AOM_ROOT}/av1/common/arm/neon/iht4x4_add_neon.c"
+      "${AOM_ROOT}/av1/common/arm/neon/iht8x8_add_neon.c")
 endif ()

 if (CONFIG_CDEF)
@@ -238,6 +251,10 @@
       ${AOM_AV1_COMMON_SSE4_1_INTRIN}
       "${AOM_ROOT}/av1/common/clpf_sse4.c")

+  set(AOM_AV1_COMMON_NEON_INTRIN
+      ${AOM_AV1_COMMON_NEON_INTRIN}
+      "${AOM_ROOT}/av1/common/clpf_neon.c")
+
   set(AOM_AV1_ENCODER_SSE2_INTRIN
       ${AOM_AV1_ENCODER_SSE2_INTRIN}
       "${AOM_ROOT}/av1/encoder/clpf_rdo_sse2.c")
@@ -251,6 +268,10 @@
       "${AOM_ROOT}/av1/encoder/clpf_rdo_sse4.c"
       "${AOM_ROOT}/av1/common/x86/od_dering_sse4.c"
       "${AOM_ROOT}/av1/common/x86/od_dering_sse4.h")
+
+  set(AOM_AV1_ENCODER_NEON_INTRIN
+      ${AOM_AV1_ENCODER_NEON_INTRIN}
+      "${AOM_ROOT}/av1/encoder/clpf_rdo_neon.c")
 endif ()

 if (CONFIG_EXT_INTER)
@@ -439,6 +460,21 @@
     endif ()
   endif ()

+  if (HAVE_NEON)
+    if (AOM_AV1_COMMON_NEON_INTRIN)
+      add_intrinsics_object_library("${AOM_NEON_INTRIN_FLAG}"
+                                    "neon"
+                                    "aom_av1_common"
+                                    "AOM_AV1_COMMON_NEON_INTRIN")
+    endif ()
+
+    if (AOM_AV1_ENCODER_NEON_INTRIN)
+      add_intrinsics_object_library("${AOM_NEON_INTRIN_FLAG}"
+                                    "neon"
+                                    "aom_av1_encoder"
+                                    "AOM_AV1_ENCODER_NEON_INTRIN")
+    endif ()
+  endif ()
   # Pass the new lib targets up to the parent scope instance of
   # $AOM_LIB_TARGETS.
   set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} PARENT_SCOPE)


Specified which boost modules should be included

--- CMake/PackageDepends/MITK_Boost_Config.cmake
+++ CMake/PackageDepends/MITK_Boost_Config.cmake
@@ -1,9 +1,6 @@
 IF(MITK_USE_Boost)

-FIND_PACKAGE(Boost REQUIRED)
-
-#here we could also choose the desired components:
-#FIND_PACKAGE(Boost COMPONENTS graph math/special_functions)
+FIND_PACKAGE(Boost COMPONENTS graph math/special_functions)

 LIST(APPEND ALL_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS})
 LIST(APPEND ALL_LIBRARIES ${Boost_LIBRARIES})


PKG: rerun configure to have empty directory after clean

--- SuperBuild/Packaging/PMacros.cmake
+++ SuperBuild/Packaging/PMacros.cmake
@@ -111,6 +111,7 @@
     COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_BINARY_DIR}/PACKAGE-${pkg}"
     COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_BINARY_DIR}/PACKAGE-TOOLS"
     COMMAND ${CMAKE_COMMAND} -E remove "${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}${PACKAGE_EXTENSION}"
+    COMMAND ${CMAKE_COMMAND} "${CMAKE_BINARY_DIR}"
     WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
     )


[nuemrics] extract difficult from the list to treat them apart

--- numerics/numerics_tests.cmake
+++ numerics/numerics_tests.cmake
@@ -240,8 +240,12 @@
   NEW_TEST(FC3D_DefaultSolverOptionstest fc3d_DefaultSolverOptions_test.c)
   NEW_TEST(FC3D_sparse_test fc3d_sparse_test.c)

-  SET(FC3D_DATA_SET
-    "Capsules-i100-1090.dat;Capsules-i100-889.dat;Capsules-i101-404.dat;Capsules-i103-990.dat;Capsules-i122-1617.dat;Example1_Fc3D.dat;Example1_Fc3D_SBM.dat;FrictionContact3D_1c.dat;FrictionContact3D_RR_1c.dat;NESpheres_10_1.dat;NESpheres_30_1.dat;Rover1039.dat;Rover1040.dat;Rover1041.dat;Rover11035.dat;Rover11211.dat;Rover3865.dat;Rover4144.dat;Rover4396.dat;Rover4493.dat;Rover4516.dat;Rover4609.dat;Rover4613.dat;Rover4622.dat;Rover9770.dat;Confeti-ex13-Fc3D-SBM.dat;BoxesStack1-i100000-32.hdf5.dat")
+  STRING(CONCAT FC3D_DATA_SET "Capsules-i100-1090.dat;Capsules-i100-889.dat;Capsules-i101-404.dat;Capsules-i103-990.dat;Capsules-i122-1617.dat;")
+  STRING(CONCAT FC3D_DATA_SET "Example1_Fc3D.dat;Example1_Fc3D_SBM.dat;FrictionContact3D_1c.dat;FrictionContact3D_RR_1c.dat;")
+  STRING(CONCAT FC3D_DATA_SET "NESpheres_10_1.dat;NESpheres_30_1.dat;")
+  STRING(CONCAT FC3D_DATA_SET "Rover1039.dat;Rover1040.dat;Rover1041.dat;Rover11035.dat;Rover11211.dat;Rover3865.dat;Rover4144.dat;")
+  STRING(CONCAT FC3D_DATA_SET "Rover4493.dat;Rover4516.dat;Rover4609.dat;Rover4613.dat;Rover4622.dat;Rover9770.dat;")
+  STRING(CONCAT FC3D_DATA_SET "Confeti-ex13-Fc3D-SBM.dat;")

   foreach(_DAT ${FC3D_DATA_SET})
     # --- GAMS Solvers ---
@@ -256,22 +260,26 @@

     # --- NSGS on FC3D_DATA_SET ---
     NEW_FC_3D_TEST(${_DAT} SICONOS_FRICTION_3D_NSGS 1e-5 10000)
+
     NEW_FC_3D_TEST(${_DAT} SICONOS_FRICTION_3D_NSGS 1e-5 10000
       SICONOS_FRICTION_3D_ONECONTACT_NSN_GP 0 0
       INTERNAL_IPARAM 10 1)
+
+    NEW_FC_3D_TEST(${_DAT} SICONOS_FRICTION_3D_NSGS 1e-5 10000
+      SICONOS_FRICTION_3D_ONECONTACT_ProjectionOnConeWithLocalIteration 1e-12  10)
+
     NEW_FC_3D_TEST(${_DAT} SICONOS_FRICTION_3D_NSGS 1e-5 10000
       SICONOS_FRICTION_3D_ONECONTACT_NSN_GP 0 0
       INTERNAL_IPARAM SICONOS_FRICTION_3D_NSN_HYBRID_STRATEGY SICONOS_FRICTION_3D_NSN_HYBRID_STRATEGY_PLI_NSN_LOOP)

     # --- Nonsmooth Newton on FC3D_DATA_SET ---
-    NEW_FC_3D_TEST(${_DAT} SICONOS_FRICTION_3D_NSN_AC 1e-5 100
+    NEW_FC_3D_TEST(${_DAT} SICONOS_FRICTION_3D_NSN_AC 1e-5 1000
       0 0 0
-      IPARAM 1 1)
+      IPARAM 1 1)
     NEW_FC_3D_TEST(${_DAT} SICONOS_FRICTION_3D_NSN_AC 1e-3 1000)
     NEW_FC_3D_TEST(${_DAT} SICONOS_FRICTION_3D_NSN_FB 1e-3 1000)
     NEW_FC_3D_TEST(${_DAT} SICONOS_FRICTION_3D_NSN_NM 1e-3 1000)
   endforeach()
-  set(fc3d_NSGS_Tol_1e-5_Max_10000_inTol_0_inMax_0___Rover4396_PROPERTIES WILL_FAIL TRUE)

@@ -589,24 +597,72 @@
   NEW_FC_3D_TEST(OneObject-i100000-499.hdf5.dat SICONOS_FRICTION_3D_NSN_AC 1e-3 1000)
   NEW_FC_3D_TEST(OneObject-i100000-499.hdf5.dat SICONOS_FRICTION_3D_NSN_FB 1e-3 1000)
   NEW_FC_3D_TEST(OneObject-i100000-499.hdf5.dat SICONOS_FRICTION_3D_NSN_NM 1e-3 1000)
-
   NEW_FC_3D_TEST(OneObject-i100000-499.hdf5.dat
     SICONOS_FRICTION_3D_PROX  1e-8 100000
     0 0 0
     DPARAM 3 1e4
     IPARAM 1 1)
-
-
   NEW_FC_3D_TEST(OneObject-i100000-499.hdf5.dat
     SICONOS_FRICTION_3D_TFP 1e-8 100
     0 0 0
     DPARAM 3 1e4
     WILL_FAIL)

+  # BoxesStack1-i100000-32.hdf5.dat
+  NEW_FC_3D_TEST(BoxesStack1-i100000-32.hdf5.dat
+    SICONOS_FRICTION_3D_NSGS 1e-5 100000
+    SICONOS_FRICTION_3D_ONECONTACT_NSN_GP 0 0
+    WILL_FAIL)
+  NEW_FC_3D_TEST(BoxesStack1-i100000-32.hdf5.dat SICONOS_FRICTION_3D_NSGS 1e-5 10000
+    SICONOS_FRICTION_3D_ONECONTACT_NSN_GP 0 0
+    INTERNAL_IPARAM 10 1
+    WILL_FAIL)
+  NEW_FC_3D_TEST(BoxesStack1-i100000-32.hdf5.dat SICONOS_FRICTION_3D_NSGS 1e-5 10000
+    SICONOS_FRICTION_3D_ONECONTACT_NSN_GP 0 0
+    INTERNAL_IPARAM SICONOS_FRICTION_3D_NSN_HYBRID_STRATEGY SICONOS_FRICTION_3D_NSN_HYBRID_STRATEGY_PLI_NSN_LOOP
+    WILL_FAIL)
+  NEW_FC_3D_TEST(BoxesStack1-i100000-32.hdf5.dat SICONOS_FRICTION_3D_NSN_AC 1e-5 500
+    0 0 0
+    IPARAM 1 1)
+  NEW_FC_3D_TEST(BoxesStack1-i100000-32.hdf5.dat SICONOS_FRICTION_3D_NSN_AC 1e-3 1000)
+  NEW_FC_3D_TEST(BoxesStack1-i100000-32.hdf5.dat SICONOS_FRICTION_3D_NSN_FB 1e-3 1000)
+  NEW_FC_3D_TEST(BoxesStack1-i100000-32.hdf5.dat SICONOS_FRICTION_3D_NSN_NM 1e-3 1000)
+  NEW_FC_3D_TEST(BoxesStack1-i100000-32.hdf5.dat
+    SICONOS_FRICTION_3D_PROX  1e-8 100000
+    0 0 0
+    DPARAM 3 1e4
+    IPARAM 1 1)
+  NEW_FC_3D_TEST(BoxesStack1-i100000-32.hdf5.dat
+    SICONOS_FRICTION_3D_TFP 1e-8 100
+    0 0 0
+    DPARAM 3 1e4
+    WILL_FAIL)
+
+  # Rover4396.dat
+  NEW_FC_3D_TEST(Rover4396.dat SICONOS_FRICTION_3D_NSGS 1e-5 10000
+    SICONOS_FRICTION_3D_ONECONTACT_NSN_GP 0 0
+    WILL_FAIL)
+
+  NEW_FC_3D_TEST(Rover4396.dat SICONOS_FRICTION_3D_NSGS 1e-5 10000
+    SICONOS_FRICTION_3D_ONECONTACT_NSN_GP 0 0
+    INTERNAL_IPARAM 10 1)
+
+  NEW_FC_3D_TEST(Rover4396.dat SICONOS_FRICTION_3D_NSGS 1e-5 10000
+    SICONOS_FRICTION_3D_ONECONTACT_ProjectionOnConeWithLocalIteration 1e-12  10)
+
+  NEW_FC_3D_TEST(Rover4396.dat SICONOS_FRICTION_3D_NSGS 1e-5 10000
+    SICONOS_FRICTION_3D_ONECONTACT_NSN_GP 0 0
+    INTERNAL_IPARAM SICONOS_FRICTION_3D_NSN_HYBRID_STRATEGY SICONOS_FRICTION_3D_NSN_HYBRID_STRATEGY_PLI_NSN_LOOP WILL_FAIL)
+  NEW_FC_3D_TEST(Rover4396.dat SICONOS_FRICTION_3D_NSN_AC 1e-5 1000
+    0 0 0
+    IPARAM 1 1)
+  NEW_FC_3D_TEST(Rover4396.dat SICONOS_FRICTION_3D_NSN_AC 1e-3 1000)
+  NEW_FC_3D_TEST(Rover4396.dat SICONOS_FRICTION_3D_NSN_FB 1e-3 1000)
+  NEW_FC_3D_TEST(Rover4396.dat SICONOS_FRICTION_3D_NSN_NM 1e-3 1000)

   # --- LMGC driver ---
-
+
   NEW_TEST(FC3DNewFromFortranData fc3d_newFromFortranData.c)
   NEW_TEST(FC3DLmgcDriver1 fc3d_LmgcDriver_test1.c)
   NEW_TEST(FC3DLmgcDriver2 fc3d_LmgcDriver_test2.c)


build: Update code coverage flag

build: Update code coverage flag

--- Builds/CMake/CompileOptions.cmake
+++ Builds/CMake/CompileOptions.cmake
@@ -128,14 +128,18 @@
 	)
 endif()

-if (NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-	set(DEFAULT_COMPILE_OPTIONS ${DEFAULT_COMPILE_OPTIONS}
-	    -fprofile-arcs
-	    -ftest-coverage
-	)
+# Code coverage - Debug only
+# NOTE: Code coverage results with an optimized (non-Debug) build may be misleading
+if (CMAKE_BUILD_TYPE MATCHES Debug AND (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+    set(DEFAULT_COMPILE_OPTIONS ${DEFAULT_COMPILE_OPTIONS}
+        -g
+        -O0
+        -fprofile-arcs
+        -ftest-coverage
+    )

-	set(DEFAULT_LINKER_OPTIONS ${DEFAULT_LINKER_OPTIONS}
-	    -fprofile-arcs
-	    -ftest-coverage
-	)
+    set(DEFAULT_LINKER_OPTIONS ${DEFAULT_LINKER_OPTIONS}
+        -fprofile-arcs
+        -ftest-coverage
+    )
 endif()


fixed: wrong component dependency check

fixed: wrong component dependency check

git-svn-id: 9c86407f91444b2cc93bb44d37d96a685973386f@2454 4683daeb-ad0f-0410-a623-93161e962ae5

--- CMake/ExternalProjectHelper.cmake
+++ CMake/ExternalProjectHelper.cmake
@@ -107,15 +107,22 @@

   MESSAGE(STATUS "Need fileio deps :${_OSG_USE_FILEIO}")
   MESSAGE(STATUS "Need imgfileio deps :${_OSG_USE_IMAGEFILEIO}")
-
-  IF(_OSG_USE_IMAGEFILEIO)
+  MESSAGE(STATUS "Need cuda deps :${_OSG_USE_CONTRIBCOMPUTE}")
+
+  IF(NOT _OSG_USE_IMAGEFILEIO EQUAL -1)
+
+    MESSAGE(STATUS "Configure image file io")
+
     OSG_CONFIGURE_TIFF()
     OSG_CONFIGURE_PNG()
     OSG_CONFIGURE_JPEG()
     OSG_CONFIGURE_OPENEXR()
-  ENDIF(_OSG_USE_IMAGEFILEIO)
-
-  IF(_OSG_USE_FILEIO)
+  ENDIF(NOT _OSG_USE_IMAGEFILEIO EQUAL -1)
+
+  IF(NOT _OSG_USE_FILEIO EQUAL -1)
+
+    MESSAGE(STATUS "Configure file io")
+
     OSG_CONFIGURE_COLLADA()

     IF(COLLADA_FOUND)
@@ -140,9 +147,12 @@
         SET(OSG_COLLADA_LIBS "")

     ENDIF(COLLADA_FOUND)
-  ENDIF(_OSG_USE_FILEIO)
-
-  IF(_OSG_USE_CONTRIBCOMPUTE)
+  ENDIF(NOT _OSG_USE_FILEIO EQUAL -1)
+
+  IF(NOT _OSG_USE_CONTRIBCOMPUTE EQUAL -1)
+
+    MESSAGE(STATUS "Configure cuda deps")
+
     FIND_PACKAGE(CUDA QUIET REQUIRED)

     INCLUDE(ConfigurePackages.OSGContribComputeBase)
@@ -159,7 +169,7 @@
     MESSAGE(STATUS "NV Status: NV:${OSG_NVSDKCOMMON_FOUND}")
     MESSAGE(STATUS "Cuda Status: CC:${OSG_CUDACOMMON_FOUND} CU:${OSG_CUDAUTIL_FOUND} CP:${OSG_CUDPP_FOUND}")
     MESSAGE(STATUS "OCL Status : NV:${OSG_NVOCLUTILS_FOUND}")
-  ENDIF(_OSG_USE_CONTRIBCOMPUTE)
+  ENDIF(NOT _OSG_USE_CONTRIBCOMPUTE EQUAL -1)

   CHECK_BUILD_DIR()


OpenSSL: ++PACKAGE_INTERNAL_DEPS_ID

OpenSSL: ++PACKAGE_INTERNAL_DEPS_ID

--- cmake/projects/OpenSSL/hunter.cmake
+++ cmake/projects/OpenSSL/hunter.cmake
@@ -263,4 +263,4 @@
 endif()

 hunter_cacheable(OpenSSL)
-hunter_download(PACKAGE_NAME OpenSSL PACKAGE_INTERNAL_DEPS_ID 5)
+hunter_download(PACKAGE_NAME OpenSSL PACKAGE_INTERNAL_DEPS_ID 6)


cmake: Remove FindCapnProto.cmake

cmake: Remove FindCapnProto.cmake

This file is obsoleted by the CMake config package files that the autotools build now installs. Since FindCapnProto.cmake contains an implementation of capnp_generate_cpp(), in which I just fixed a bug, this file seems like a maintenance liability  now, so I'd like to delete it.

--- c++/cmake/FindCapnProto.cmake
+++ c++/cmake/FindCapnProto.cmake
@@ -1,197 +0,0 @@
-#
-# Finds the Cap'n Proto libraries, and compiles schema files.
-#
-# Configuration variables (optional):
-#   CAPNPC_OUTPUT_DIR
-#       Directory to place compiled schema sources (default: the same directory as the schema file).
-#   CAPNPC_IMPORT_DIRS
-#       List of additional include directories for the schema compiler.
-#       (CMAKE_CURRENT_SOURCE_DIR and CAPNP_INCLUDE_DIRS are always included.)
-#   CAPNPC_SRC_PREFIX
-#       Schema file source prefix (default: CMAKE_CURRENT_SOURCE_DIR).
-#   CAPNPC_FLAGS
-#       Additional flags to pass to the schema compiler.
-#
-# Variables that are discovered:
-#   CAPNP_EXECUTABLE
-#       Path to the `capnp` tool (can be set to override).
-#   CAPNPC_CXX_EXECUTABLE
-#       Path to the `capnpc-c++` tool (can be set to override).
-#   CAPNP_INCLUDE_DIRS
-#       Include directories for the library's headers (can be set to override).
-#   CANP_LIBRARIES
-#       The Cap'n Proto library paths.
-#   CAPNP_LIBRARIES_LITE
-#       Paths to only the 'lite' libraries.
-#   CAPNP_DEFINITIONS
-#       Compiler definitions required for building with the library.
-#   CAPNP_FOUND
-#       Set if the libraries have been located.
-#
-# Example usage:
-#
-#   find_package(CapnProto REQUIRED)
-#   include_directories(${CAPNP_INCLUDE_DIRS})
-#   add_definitions(${CAPNP_DEFINITIONS})
-#
-#   capnp_generate_cpp(CAPNP_SRCS CAPNP_HDRS schema.capnp)
-#   add_executable(a a.cc ${CAPNP_SRCS} ${CAPNP_HDRS})
-#   target_link_library(a ${CAPNP_LIBRARIES})
-#
-# For out-of-source builds:
-#
-#   set(CAPNPC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
-#   include_directories(${CAPNPC_OUTPUT_DIR})
-#   capnp_generate_cpp(...)
-#
-
-# CAPNP_GENERATE_CPP ===========================================================
-
-function(CAPNP_GENERATE_CPP SOURCES HEADERS)
-  if(NOT ARGN)
-    message(SEND_ERROR "CAPNP_GENERATE_CPP() called without any source files.")
-  endif()
-  if(NOT CAPNP_EXECUTABLE)
-    message(SEND_ERROR "Could not locate capnp executable (CAPNP_EXECUTABLE).")
-  endif()
-  if(NOT CAPNPC_CXX_EXECUTABLE)
-    message(SEND_ERROR "Could not locate capnpc-c++ executable (CAPNPC_CXX_EXECUTABLE).")
-  endif()
-  if(NOT CAPNP_INCLUDE_DIRS)
-    message(SEND_ERROR "Could not locate capnp header files (CAPNP_INCLUDE_DIRS).")
-  endif()
-
-  # Default compiler includes
-  set(include_path -I ${CMAKE_CURRENT_SOURCE_DIR} -I ${CAPNP_INCLUDE_DIRS})
-
-  if(DEFINED CAPNPC_IMPORT_DIRS)
-    # Append each directory as a series of '-I' flags in ${include_path}
-    foreach(directory ${CAPNPC_IMPORT_DIRS})
-      get_filename_component(absolute_path "${directory}" ABSOLUTE)
-      list(APPEND include_path -I ${absolute_path})
-    endforeach()
-  endif()
-
-  if(DEFINED CAPNPC_OUTPUT_DIR)
-    # Prepend a ':' to get the format for the '-o' flag right
-    set(output_dir ":${CAPNPC_OUTPUT_DIR}")
-  else()
-    set(output_dir ":.")
-  endif()
-
-  if(NOT DEFINED CAPNPC_SRC_PREFIX)
-    set(CAPNPC_SRC_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}")
-  endif()
-  get_filename_component(CAPNPC_SRC_PREFIX "${CAPNPC_SRC_PREFIX}" ABSOLUTE)
-
-  set(${SOURCES})
-  set(${HEADERS})
-  foreach(schema_file ${ARGN})
-    get_filename_component(file_path "${schema_file}" ABSOLUTE)
-    get_filename_component(file_dir "${file_path}" PATH)
-
-    # Figure out where the output files will go
-    if (NOT DEFINED CAPNPC_OUTPUT_DIR)
-      set(output_base "${file_path}")
-    else()
-      # Output files are placed in CAPNPC_OUTPUT_DIR, at a location as if they were
-      # relative to CAPNPC_SRC_PREFIX.
-      string(LENGTH "${CAPNPC_SRC_PREFIX}" prefix_len)
-      string(SUBSTRING "${file_path}" 0 ${prefix_len} output_prefix)
-      if(NOT "${CAPNPC_SRC_PREFIX}" STREQUAL "${output_prefix}")
-        message(SEND_ERROR "Could not determine output path for '${schema_file}' ('${file_path}') with source prefix '${CAPNPC_SRC_PREFIX}' into '${CAPNPC_OUTPUT_DIR}'.")
-      endif()
-
-      string(SUBSTRING "${file_path}" ${prefix_len} -1 output_path)
-      set(output_base "${CAPNPC_OUTPUT_DIR}${output_path}")
-    endif()
-
-    add_custom_command(
-      OUTPUT "${output_base}.c++" "${output_base}.h"
-      COMMAND "${CAPNP_EXECUTABLE}"
-      ARGS compile
-          -o ${CAPNPC_CXX_EXECUTABLE}${output_dir}
-          --src-prefix ${CAPNPC_SRC_PREFIX}
-          ${include_path}
-          ${CAPNPC_FLAGS}
-          ${file_path}
-      DEPENDS "${schema_file}"
-      COMMENT "Compiling Cap'n Proto schema ${schema_file}"
-      VERBATIM
-    )
-    list(APPEND ${SOURCES} "${output_base}.c++")
-    list(APPEND ${HEADERS} "${output_base}.h")
-  endforeach()
-
-  set_source_files_properties(${${SOURCES}} ${${HEADERS}} PROPERTIES GENERATED TRUE)
-  set(${SOURCES} ${${SOURCES}} PARENT_SCOPE)
-  set(${HEADERS} ${${HEADERS}} PARENT_SCOPE)
-endfunction()
-
-# Find Libraries/Paths =========================================================
-
-# Use pkg-config to get path hints and definitions
-find_package(PkgConfig QUIET)
-pkg_check_modules(PKGCONFIG_CAPNP capnp)
-pkg_check_modules(PKGCONFIG_CAPNP_RPC capnp-rpc QUIET)
-pkg_check_modules(PKGCONFIG_CAPNP_JSON capnp-json QUIET)
-
-find_library(CAPNP_LIB_KJ kj
-  HINTS "${PKGCONFIG_CAPNP_LIBDIR}" ${PKGCONFIG_CAPNP_LIBRARY_DIRS}
-)
-find_library(CAPNP_LIB_KJ-ASYNC kj-async
-  HINTS "${PKGCONFIG_CAPNP_RPC_LIBDIR}" ${PKGCONFIG_CAPNP_RPC_LIBRARY_DIRS}
-)
-find_library(CAPNP_LIB_CAPNP capnp
-  HINTS "${PKGCONFIG_CAPNP_LIBDIR}" ${PKGCONFIG_CAPNP_LIBRARY_DIRS}
-)
-find_library(CAPNP_LIB_CAPNP-RPC capnp-rpc
-  HINTS "${PKGCONFIG_CAPNP_RPC_LIBDIR}" ${PKGCONFIG_CAPNP_RPC_LIBRARY_DIRS}
-)
-find_library(CAPNP_LIB_CAPNP-JSON capnp-json
-  HINTS "${PKGCONFIG_CAPNP_JSON_LIBDIR}" ${PKGCONFIG_CAPNP_JSON_LIBRARY_DIRS}
-)
-mark_as_advanced(CAPNP_LIB_KJ CAPNP_LIB_KJ-ASYNC CAPNP_LIB_CAPNP CAPNP_LIB_CAPNP-RPC CAPNP_LIB_CAPNP-JSON)
-set(CAPNP_LIBRARIES_LITE
-  ${CAPNP_LIB_CAPNP}
-  ${CAPNP_LIB_KJ}
-)
-set(CAPNP_LIBRARIES
-  ${CAPNP_LIB_CAPNP-JSON}
-  ${CAPNP_LIB_CAPNP-RPC}
-  ${CAPNP_LIB_CAPNP}
-  ${CAPNP_LIB_KJ-ASYNC}
-  ${CAPNP_LIB_KJ}
-)
-
-# Was only the 'lite' library found?
-if(CAPNP_LIB_CAPNP AND NOT CAPNP_LIB_CAPNP-RPC)
-  set(CAPNP_DEFINITIONS -DCAPNP_LITE)
-else()
-  set(CAPNP_DEFINITIONS)
-endif()
-
-find_path(CAPNP_INCLUDE_DIRS capnp/generated-header-support.h
-  HINTS "${PKGCONFIG_CAPNP_INCLUDEDIR}" ${PKGCONFIG_CAPNP_INCLUDE_DIRS}
-)
-
-find_program(CAPNP_EXECUTABLE
-  NAMES capnp
-  DOC "Cap'n Proto Command-line Tool"
-  HINTS "${PKGCONFIG_CAPNP_PREFIX}/bin"
-)
-
-find_program(CAPNPC_CXX_EXECUTABLE
-  NAMES capnpc-c++
-  DOC "Capn'n Proto C++ Compiler"
-  HINTS "${PKGCONFIG_CAPNP_PREFIX}/bin"
-)
-
-# Only *require* the include directory, libkj, and libcapnp. If compiling with
-# CAPNP_LITE, nothing else will be found.
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(CAPNP DEFAULT_MSG
-  CAPNP_INCLUDE_DIRS
-  CAPNP_LIB_KJ
-  CAPNP_LIB_CAPNP
-)


Updated cmake module

Updated cmake module

--- cmake/OsIROSECMakeTools.cmake
+++ cmake/OsIROSECMakeTools.cmake
@@ -179,8 +179,8 @@
     ADD_CUSTOM_COMMAND(
       OUTPUT "${H_FILE}"
       COMMAND ${CMAKE_COMMAND} -E make_directory ${OUTPATH}
-      COMMAND "/usr/bin/env"
-      ARGS python ${SQLPP_INCLUDE_DIR}/../scripts/ddl2cpp ${MATCH_PATH} "${OUTPATH}/${ARG_NAME}" ${ARG_NAME}
+      COMMAND python
+      ARGS ${SQLPP_INCLUDE_DIR}/../scripts/ddl2cpp ${MATCH_PATH} "${OUTPATH}/${ARG_NAME}" ${ARG_NAME}
       DEPENDS ${ABS_FILE}
       COMMENT "Running C++ sqlpp11 ddl12cpp compiler on ${MATCH_PATH} with root ${SQLROOT}, generating: ${H_FILE}"
       VERBATIM)


finally got rid of the nasty buildinfo bug, thanks chfast!

--- cmake/scripts/buildinfo.cmake
+++ cmake/scripts/buildinfo.cmake
@@ -48,7 +48,7 @@
 set(OUTFILE "${ETH_DST_DIR}/BuildInfo.h")

 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-	set(OUTFILE "${ETH_DST_DIR}/CMakeFiles/BuildInfo.h")
+	set(OUTFILE "${ETH_DST_DIR}/BuildInfo.h")
 endif()

 message("ETH_FATDB: ${ETH_FATDB}")


[cmake] quote variable in cmake string replace

--- cmake/swig_python_tools.cmake
+++ cmake/swig_python_tools.cmake
@@ -19,7 +19,7 @@
     foreach(_F ${${COMP}_HDRS})
       get_filename_component(_XFWE ${_F} NAME_WE)
       get_filename_component(_EXT ${_F} EXT)
-      string(REPLACE "_" "__" _FWE ${_XFWE})
+      string(REPLACE "_" "__" _FWE "${_XFWE}")
       file(GLOB ${_FWE}_XMLS
 	${DOXYGEN_OUTPUT}/xml/*class${_FWE}.xml
 	${DOXYGEN_OUTPUT}/xml/*struct${_FWE}.xml


remove useless CMake messages

remove useless CMake messages

--- libs/g3log/Build.cmake
+++ libs/g3log/Build.cmake
@@ -8,8 +8,6 @@
   #  1) http://kjellkod.wordpress.com/2013/09/23/experimental-g2log-with-clang/
   #  2) https://github.com/maidsafe/MaidSafe/wiki/Hacking-with-Clang-llvm-abi-and-llvm-libc
 IF (${CMAKE_CXX_COMPILER_ID} MATCHES ".*Clang")
-   MESSAGE("")
-   MESSAGE("cmake for Clang ")
    IF (APPLE)
        set(PLATFORM_LINK_LIBRIES c++abi)
    ELSE()
@@ -20,7 +18,6 @@

 ELSEIF(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
-   MESSAGE("cmake for GCC ")
    IF (APPLE)
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wunused -std=c++11  -pthread -D_GLIBCXX_USE_NANOSLEEP")
    ELSEIF (MINGW)
@@ -47,7 +44,6 @@
 # GENERIC STEPS
 file(GLOB SRC_FILES ${LOG_SRC}/*.h ${LOG_SRC}/*.hpp ${LOG_SRC}/*.cpp ${LOG_SRC}/*.ipp)
 file(GLOB HEADER_FILES ${LOG_SRC}/*.h ${LOG_SRC}/*.hpp)
-#MESSAGE(" HEADER FILES ARE: ${HEADER_FILES}")

 IF (MSVC OR MINGW)
 	 list(REMOVE_ITEM SRC_FILES  ${LOG_SRC}/crashhandler_unix.cpp)
@@ -59,7 +55,6 @@

 # Create the g3log library
 include_directories(${LOG_SRC})
-#MESSAGE("  g3logger files: [${SRC_FILES}]")
 add_library(g3logger ${SRC_FILES})
 set_target_properties(g3logger PROPERTIES LINKER_LANGUAGE CXX)
 target_link_libraries(g3logger ${PLATFORM_LINK_LIBRIES})


Warning bug in GCC 4.9

Warning bug in GCC 4.9

--- cmake/AddGnuCompiler.cmake
+++ cmake/AddGnuCompiler.cmake
@@ -30,8 +30,6 @@
 if (NOT CMAKE_CXX_COMPILER_ID MATCHES GNU)
     return()
 endif ()
-
-message(STATUS "${CMAKE_CXX_COMPILER_VERSION}")

 set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -std=c++11)

@@ -225,7 +223,8 @@
     )
 endif()

-if (CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.9)
+if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.8 AND
+        CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
     set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}
         -Wno-missing-field-initializers
     )


clang: -Wno-unused-command-line-argument

--- cmake/CompileOptions.cmake
+++ cmake/CompileOptions.cmake
@@ -127,7 +127,8 @@
   set(CLANG_DISABLED_FLAGS_LEGIT
     # https://stackoverflow.com/questions/13905200/is-it-wise-to-ignore-gcc-clangs-wmissing-braces-warning/13905432
     "-Wno-missing-braces"
-  )
+    "-Wno-unused-command-line-argument"
+    )

   # Those flags should be activated later (they denote real issues)
   set(CLANG_DISABLED_FLAGS_DUBIOUS


Fix gtest library target properites

Fix gtest library target properites

--- cmake/External_gtest.cmake
+++ cmake/External_gtest.cmake
@@ -76,13 +76,8 @@
 file(MAKE_DIRECTORY ${GTEST_INCLUDES})

 # Create a libgtest target to be used as a dependency by test programs
-if (CMAKE_SHARED_LIBRARY_PREFIX)
-  add_library("${CMAKE_SHARED_LIBRARY_PREFIX}gtest" IMPORTED SHARED GLOBAL)
-  add_dependencies("${CMAKE_SHARED_LIBRARY_PREFIX}gtest" gtest)
-else()
-  set_target_properties("${CMAKE_SHARED_LIBRARY_PREFIX}gtest"
-    PROPERTIES IMPORTED SHARED GLOBAL)
-endif()
+add_library("${CMAKE_SHARED_LIBRARY_PREFIX}gtest" IMPORTED SHARED GLOBAL)
+add_dependencies("${CMAKE_SHARED_LIBRARY_PREFIX}gtest" gtest)
 add_library(${CMAKE_SHARED_LIBRARY_PREFIX}gtest_main IMPORTED SHARED GLOBAL)
 add_dependencies(${CMAKE_SHARED_LIBRARY_PREFIX}gtest_main gtest)


trailing whitespace

trailing whitespace

Patch by Matthias Kretz

--- cmake/FindPulseAudio.cmake
+++ cmake/FindPulseAudio.cmake
@@ -34,7 +34,7 @@
    ${PC_PULSEAUDIO_INCLUDE_DIRS}
    )

-FIND_LIBRARY(PULSEAUDIO_LIBRARY NAMES pulse libpulse
+FIND_LIBRARY(PULSEAUDIO_LIBRARY NAMES pulse libpulse
    HINTS
    ${PC_PULSEAUDIO_LIBDIR}
    ${PC_PULSEAUDIO_LIBRARY_DIRS}


Use target_file in test

Use target_file in test

--- cmake/MyPackageCheck.cmake
+++ cmake/MyPackageCheck.cmake
@@ -35,7 +35,7 @@

   FOREACH (_name ${name} ${name}_static)
     ADD_TEST (NAME ${_name}
-      COMMAND ${CMAKE_COMMAND} -E env "PATH=${_test_path}" ${_name}
+      COMMAND ${CMAKE_COMMAND} -E env "PATH=${_test_path}" $<TARGET_FILE:${_name}>
       WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH})
     ADD_DEPENDENCIES(check ${_name})
   ENDFOREACH ()


Fix for manpage

Fix for manpage

--- cmake/MyPackageStart.cmake
+++ cmake/MyPackageStart.cmake
@@ -136,6 +136,7 @@
   # We consider that if there is a README.pod, then it is a candidate for installation
   #
   IF (EXISTS README.pod)
+    STRING (TOUPPER ${PROJECT_NAME} _PROJECTNAME)
     MYPACKAGEMAN(README.pod ${_PROJECTNAME} "3" "${${PROJECT_NAME}}_VERSION")
   ENDIF ()
   #


[CMake] Support constructing output paths from LLVM variables

This tweak to constructing output paths allows compiler-rt to use LLVM
output variables if they are set regardless of whether or not the build
is in-tree.

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

--- cmake/base-config-ix.cmake
+++ cmake/base-config-ix.cmake
@@ -9,7 +9,13 @@
 # Top level target used to build all compiler-rt libraries.
 add_custom_target(compiler-rt ALL)

-if (NOT COMPILER_RT_STANDALONE_BUILD)
+# Setting these variables from an LLVM build is sufficient that compiler-rt can
+# construct the output paths, so it can behave as if it were in-tree here.
+if (LLVM_LIBRARY_OUTPUT_INTDIR AND LLVM_RUNTIME_OUTPUT_INTDIR AND PACKAGE_VERSION)
+  set(LLVM_TREE_AVAILABLE On)
+endif()
+
+if (LLVM_TREE_AVAILABLE)
   # Compute the Clang version from the LLVM version.
   # FIXME: We should be able to reuse CLANG_VERSION variable calculated
   #        in Clang cmake files, instead of copying the rules here.


update cmake/gsJITConfigXml.cmake

Without this, for me a call to "#include <gismo.h>" in the JIT-code
causes an error of the kind "cannot find gsCore/gsConfig.h". This
change fixes that.

git-svn-id: 6b1c4fe79111c0bc0cce83313250759594f8984b@9069 e128ff1e-fa79-4151-a8cb-522299a2c450

--- cmake/gsJITConfigXml.cmake
+++ cmake/gsJITConfigXml.cmake
@@ -78,7 +78,7 @@
   string(REPLACE "-fvisibility-inlines-hidden" "" JIT_CXX_FLAGS ${JIT_CXX_FLAGS})

   # Set includes
-  string(REPLACE ";" " -I" JIT_INCLUDES "-I${GISMO_INCLUDE_DIRS} -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_CURRENT_SOURCE_DIR}/src")
+  string(REPLACE ";" " -I" JIT_INCLUDES "-I${GISMO_INCLUDE_DIRS} -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_CURRENT_SOURCE_DIR}/src  -I${CMAKE_CURRENT_SOURCE_DIR}/build")

   # Set library directories
   string(REPLACE ";" " -L" JIT_LIBRARIES "-L${GISMO_LIBRARY_DIR}")


vita.cmake: rebuild vpk when resources are changed (#126)

--- cmake_toolchain/vita.cmake
+++ cmake_toolchain/vita.cmake
@@ -160,6 +160,7 @@
     list(GET vita_create_vpk_FILE 0 fname)
     list(GET vita_create_vpk_FILE 1 fdest)
     get_filename_component(fpath ${fname} ABSOLUTE)
+    list(APPEND resources "${fpath}")
     list(REMOVE_AT vita_create_vpk_FILE 0 1)
     set(VITA_PACK_VPK_FLAGS "${VITA_PACK_VPK_FLAGS} -a ${fpath}=${fdest}")
     list(LENGTH vita_create_vpk_FILE left)
@@ -180,7 +181,7 @@
   separate_arguments(VITA_PACK_VPK_FLAGS)
   add_custom_command(OUTPUT ${target}
     COMMAND ${VITA_PACK_VPK} ${VITA_PACK_VPK_FLAGS} -s ${target}_param.sfo -b ${eboot} ${target}
-    DEPENDS ${target}_param.sfo ${eboot}
+    DEPENDS ${target}_param.sfo ${eboot} ${resources}
     COMMENT "Building vpk ${target}"
   )
   add_custom_target(${target}_ ALL DEPENDS ${target})


[OSX] Forgot to add resources to the new CMake macro

--HG--
branch : v1-9

--- CMake/Utils/OgreConfigTargets.cmake
+++ CMake/Utils/OgreConfigTargets.cmake
@@ -231,6 +231,8 @@
       set_target_properties(${LIBNAME} PROPERTIES PUBLIC_HEADER "${HEADER_FILES} ${PLATFORM_HEADERS}")
       set_target_properties(${LIBNAME} PROPERTIES XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES")
       set_target_properties(${LIBNAME} PROPERTIES XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${OGRE_SOURCE_DIR}/OgreMain/include/OgreStableHeaders.h")
+      set_target_properties(${LIBNAME} PROPERTIES RESOURCE "${RESOURCE_FILES}")
+      set_source_files_properties("${RESOURCE_FILES}" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)

       set_target_properties(${LIBNAME} PROPERTIES OUTPUT_NAME ${LIBNAME})
   endif()


Use a short name to avoid Windows problems.

--- CMake/mitkTestPluginGenerator.cmake
+++ CMake/mitkTestPluginGenerator.cmake
@@ -1,6 +1,6 @@
 if(BUILD_TESTING)

-  set(proj GeneratedTestProject)
+  set(proj GP) # Means GenerateProject (use a short name due to Windows limitations)
   set(test_project_out_dir "${MITK_BINARY_DIR}")
   set(test_project_source_dir "${MITK_BINARY_DIR}/${proj}")
   set(test_project_binary_dir "${MITK_BINARY_DIR}/${proj}-bin")


Remove debug statement

Remove debug statement

--- core/rosbuild/rosconfig.cmake
+++ core/rosbuild/rosconfig.cmake
@@ -88,7 +88,6 @@
                   OUTPUT_STRIP_TRAILING_WHITESPACE)
   if(NOT _cxx_version_failed)
     STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" _cxx_version_major "${_cxx_version}")
-    message("_cxx_version_major: ${_cxx_version_major}")
     if(_cxx_version_major)
       if(${_cxx_version_major} LESS 4)
         set(ROS_COMPILE_FLAGS "${ROS_COMPILE_FLAGS} -pthread")


making embree/tbb the preferred location when finding TBB

--- common/cmake/FindTBB.cmake
+++ common/cmake/FindTBB.cmake
@@ -15,10 +15,12 @@
 ## ======================================================================== ##

 IF (WIN32)
-  FIND_PATH(TBB_ROOT include/tbb/task_scheduler_init.h
+  FIND_PATH(TBB_ROOT include/tbb/tbb.h
     DOC "Root of TBB installation"
     PATHS ${PROJECT_SOURCE_DIR}/tbb "C:/Program Files (x86)/Intel/Composer XE/tbb"
+    NO_DEFAULT_PATH
   )
+  FIND_PATH(TBB_ROOT include/tbb/tbb.h)

   IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
     SET(TBB_ARCH intel64)
@@ -52,11 +54,13 @@

 ELSE ()

-  FIND_PATH(TBB_ROOT include/tbb/task_scheduler_init.h
+  FIND_PATH(TBB_ROOT include/tbb/tbb.h
     DOC "Root of TBB installation"
     PATHS ${PROJECT_SOURCE_DIR}/tbb /opt/intel/composerxe/tbb
+    NO_DEFAULT_PATH
   )
-
+  FIND_PATH(TBB_ROOT include/tbb/tbb.h)
+
   IF (TBB_ROOT STREQUAL "")
     FIND_PATH(TBB_INCLUDE_DIR tbb/task_scheduler_init.h)
     FIND_LIBRARY(TBB_LIBRARY tbb)


sdc: add correct generated sdc file location to the sdc VPR parameter

Signed-off-by: Alessandro Comodi <622632e70fd6771cf2cd943f69e5e51ab66adef8@antmicro.com>

--- common/cmake/devices.cmake
+++ common/cmake/devices.cmake
@@ -1441,7 +1441,8 @@
   set(SDC_ARG "")
   if(NOT "${ADD_FPGA_TARGET_INPUT_XDC_FILE}" STREQUAL "")
     append_file_dependency(VPR_DEPS ${OUT_SDC_REL})
-    set(SDC_ARG --sdc_file ${OUT_SDC_REL})
+    get_file_location(SDC_LOCATION ${OUT_SDC_REL})
+    set(SDC_ARG --sdc_file ${SDC_LOCATION})
   endif()

   # Overrides the SDC if the INPUT_SDC_FILE parameter is set


Fix lib names for embree-config

Fix lib names for embree-config

On Linux and Mac OS X the lib names to be linked against should contain
the API version (SOVERSION).

--- common/cmake/package.cmake
+++ common/cmake/package.cmake
@@ -94,11 +94,15 @@
   INSTALL(PROGRAMS "${PROJECT_BINARY_DIR}/uninstall.command" DESTINATION ${CMAKE_INSTALL_BINDIR}/.. COMPONENT lib)
 ENDIF()

+# why does this have to be so complicated...
 IF (WIN32)
-  SET(EMBREE_LIBRARY_NAME embree.lib)
-ELSE()
-  SET(EMBREE_LIBRARY_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}embree${CMAKE_SHARED_LIBRARY_SUFFIX})
-ENDIF()
+  SET(EMBREE_LIBRARY_NAME ${CMAKE_IMPORT_LIBRARY_PREFIX}embree${CMAKE_IMPORT_LIBRARY_SUFFIX})
+ELSEIF (APPLE)
+  SET(EMBREE_LIBRARY_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}embree.${EMBREE_CONFIG_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ELSE()
+  SET(EMBREE_LIBRARY_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}embree${CMAKE_SHARED_LIBRARY_SUFFIX}.${EMBREE_CONFIG_VERSION})
+ENDIF()
+
 IF (WIN32 OR EMBREE_ZIP_MODE)
   # for local "installs" and on Windows we want the cmake config files placed
   # in the install root, such that users can point the CMake variable


Address CMP0054 warning with "unused" string/variable

Use standard regex MATCH approach to avoid a string being confused
with a variable. This patch addressed the following CMake warning:

CMake Warning (dev) at
CMake/sitkTargetLinkLibrariesWithDynamicLookup.cmake:466 (if):
Policy CMP0054 is not set: Only interpret if() arguments as
variables or
keywords when unquoted. Run "cmake --help-policy CMP0054" for
policy
details. Use the cmake_policy command to set the policy and
suppress this
warning.

Quoted variables like "unused" will no longer be dereferenced when
the
policy is set to NEW. Since the policy is not set the OLD behavior
will be
used.

--- CMake/sitkTargetLinkLibrariesWithDynamicLookup.cmake
+++ CMake/sitkTargetLinkLibrariesWithDynamicLookup.cmake
@@ -463,7 +463,7 @@
     ${link_flags_var}
     )
   set(${has_dynamic_lookup_var} ${${has_dynamic_lookup_var}} PARENT_SCOPE)
-  if(NOT link_flags_var STREQUAL "unused")
+  if(NOT "x${link_flags_var}x" MATCHES "^xunusedx$")
     set(${link_flags_var} ${${link_flags_var}} PARENT_SCOPE)
   endif()
 endfunction()


Fix "requires list to be present" CMake error

--- cmake/FindCAF.cmake
+++ cmake/FindCAF.cmake
@@ -102,7 +102,9 @@
   endif ()
 endforeach ()

-list(REMOVE_DUPLICATES CAF_INCLUDE_DIRS)
+if (DEFINED CAF_INCLUDE_DIRS)
+  list(REMOVE_DUPLICATES CAF_INCLUDE_DIRS)
+endif()

 # let CMake check whether all requested components have been found
 include(FindPackageHandleStandardArgs)


cmake/FindICU.cmake 58.2 update

cmake/FindICU.cmake 58.2 update

--- cmake/FindICU.cmake
+++ cmake/FindICU.cmake
@@ -350,7 +350,25 @@
       SET (${_ICU_LIBRARY_BASE} ${${_ICU_LIBRARY_BASE}_RELEASE})
     ELSE (${_ICU_LIBRARY_BASE}_DEBUG AND ${_ICU_LIBRARY_BASE}_RELEASE)
       # Component missing: record it for a later report
-      LIST (APPEND _ICU_MISSING_COMPONENTS ${_ICU_COMPONENT})
+      # Starting from ICU 58.2 layout has been removed
+      SET (_ICU_MISSING_COMPONENT_BUT_OK FALSE)
+      IF ((${ICU_VERSION_MAJOR} GREATER 58) OR (${ICU_VERSION_MAJOR} EQUAL 58))
+        IF ((${ICU_VERSION_MINOR} GREATER 2) OR (${ICU_VERSION_MINOR} EQUAL 2))
+          IF ("${_ICU_COMPONENT}" STREQUAL "icule")
+            SET (_ICU_MISSING_COMPONENT_BUT_OK TRUE)
+            SET (_ICU_MISSING_COMPONENT_BUT_OK_REASON "Layout was removed starting from ICU 58.2")
+          ENDIF ()
+          IF ("${_ICU_COMPONENT}" STREQUAL "iculx")
+            SET (_ICU_MISSING_COMPONENT_BUT_OK TRUE)
+            SET (_ICU_MISSING_COMPONENT_BUT_OK_REASON "Layout was removed starting from ICU 58.2")
+          ENDIF ()
+        ENDIF ()
+      ENDIF ()
+      IF (${_ICU_MISSING_COMPONENT_BUT_OK})
+        MESSAGE (STATUS "ICU component ${_ICU_COMPONENT} is missing but this is ok: ${_ICU_MISSING_COMPONENT_BUT_OK_REASON}")
+      ELSE ()
+        LIST (APPEND _ICU_MISSING_COMPONENTS ${_ICU_COMPONENT})
+      ENDIF ()
       SET (ICU_${_ICU_COMPONENT_UPPER}_FOUND FALSE)
     ENDIF (${_ICU_LIBRARY_BASE}_DEBUG AND ${_ICU_LIBRARY_BASE}_RELEASE)

@@ -463,7 +481,7 @@

 IF(ICU_FOUND)
   MESSAGE(STATUS "-----------------------------------------")
-  MESSAGE(STATUS "ICU Setup:")
+  MESSAGE(STATUS "Setup ICU:")
   MESSAGE(STATUS "")
   MESSAGE(STATUS "           ROOT_DIR: ${ICU_ROOT_DIR}")
   MESSAGE(STATUS "        INCLUDE_DIR: ${ICU_INCLUDE_DIR}")
@@ -480,13 +498,6 @@
   MESSAGE(STATUS "      LINK_IO_FLAGS: ${ICU_LINK_IO_FLAGS}")
   MESSAGE(STATUS "            LDFLAGS: ${ICU_LDFLAGS}")
   MESSAGE(STATUS "-----------------------------------------")
-  GET_FILENAME_COMPONENT(ICU_DIRECTORY "${ICU_LIBRARIES}" DIRECTORY CACHE)
-  IF ("${CMAKE_HOST_SYSTEM}" MATCHES ".*Windows.*")
-    SET (ICU_RUNTIME_DIRECTORY "${ICU_DIRECTORY}/../bin")
-  ELSE ()
-    SET (ICU_RUNTIME_DIRECTORY "${ICU_DIRECTORY}")
-  ENDIF ()
-  MESSAGE(STATUS "  RUNTIME_DIRECTORY: ${ICU_RUNTIME_DIRECTORY}")
 ENDIF()

 MARK_AS_ADVANCED (


Set dashboard to cdash.inria.fr project Medular

--- cmake/medDart.cmake
+++ cmake/medDart.cmake
@@ -17,11 +17,11 @@
 ##
 ######################################################################

-set(CTEST_PROJECT_NAME "medular")
+set(CTEST_PROJECT_NAME "Medular")
 set(NIGHTLY_START_TIME "21:00:00 EST")
 set(DROP_METHOD "http")
 set(DROP_SITE "cdash.inria.fr")
-set(DROP_LOCATION "/CDash/submit.php?project=medular")
+set(DROP_LOCATION "/CDash/submit.php?project=Medular")
 set(DROP_SITE_CDASH TRUE)
 set(CTEST_UPDATE_TYPE "git")
 set(UPDATE_COMMAND "git")


r11016/sofa : CMake: modified default options
- deactivating SofaBatch (not up-to-date and runSofa can be run in batch mode)
- activating GenerateRigid (indispensable to compute a correct inertia matrix for rigid bodies)
- activating Cuda Thrust

Former-commit-id: c2cfe434ee549ade5268a64b0b91551508bb4280

--- cmake/options.cmake
+++ cmake/options.cmake
@@ -9,8 +9,8 @@

     if(NOT PS3)
         override_default(SOFA-APPLICATION_RUNSOFA BOOL ON "Build RunSofa application")
-        override_default(SOFA-APPLICATION_SOFABATCH BOOL ON "Build SofaBatch application")
         override_default(SOFA-APPLICATION_MODELER BOOL ON "Build Modeler application")
+        override_default(SOFA-APPLICATION_GENERATERIGID BOOL ON "Build GenerateRigid application")
     endif()
 endif()

@@ -64,6 +64,7 @@
     set(SOFA-EXTERNAL_BOOST 1 CACHE INTERNAL "Use the system / user compiled boost library instead of miniBoost" FORCE)
     list(APPEND compilerDefines SOFA_HAVE_BOOST)
 endif()
+

 ## geometric tools
 sofa_option(SOFA-EXTERNAL_GEOMETRIC_TOOLS_PATH PATH "" "Path to Geometric tools folder containing the cmake project")
@@ -438,7 +439,7 @@

 # Option to activate THRUST (for RadixSort)
 # Note: THRUST is included in CUDA SDK 4.0+, it is recommended to use it if available
-sofa_option(SOFA-CUDA_THRUST BOOL OFF "SOFA-CUDA_THRUST")
+sofa_option(SOFA-CUDA_THRUST BOOL ON "SOFA-CUDA_THRUST")
 if(SOFA-CUDA_THRUST)
     add_definitions("-DSOFA_GPU_THRUST")
     AddCompilerDefinitions("SOFA_GPU_THRUST")


Fixed windows build: taget name for sha256 password plugin wasn't specified

--- cmake/plugins.cmake
+++ cmake/plugins.cmake
@@ -39,7 +39,7 @@

 # AUTHENTICATION
 IF(WIN32 OR WITH_SSL STREQUAL "OPENSSL")
-  REGISTER_PLUGIN("AUTH_SHA256PW" "${CC_SOURCE_DIR}/plugins/auth/sha256_pw.c" "sha256_password_client_plugin" "DYNAMIC" "" 0)
+  REGISTER_PLUGIN("AUTH_SHA256PW" "${CC_SOURCE_DIR}/plugins/auth/sha256_pw.c" "sha256_password_client_plugin" "DYNAMIC" sha256_password 1)
 ENDIF()
 REGISTER_PLUGIN("AUTH_NATIVE" "${CC_SOURCE_DIR}/plugins/auth/my_auth.c" "native_password_client_plugin" "STATIC" "" 0)
 REGISTER_PLUGIN("AUTH_OLDPASSWORD" "${CC_SOURCE_DIR}/plugins/auth/old_password.c" "old_password_client_plugin" "STATIC" "" 1)


fix typo in plugins.cmake

fix typo in plugins.cmake

--- cmake/plugins.cmake
+++ cmake/plugins.cmake
@@ -46,7 +46,7 @@
 REGISTER_PLUGIN("AUTH_OLDPASSWORD" "${CC_SOURCE_DIR}/plugins/auth/old_password.c" "old_password_client_plugin" "STATIC" "" 1)
 SET(DIALOG_SOURCES ${CC_SOURCE_DIR}/plugins/auth/dialog.c ${CC_SOURCE_DIR}/libmariadb/get_password.c)
 REGISTER_PLUGIN("AUTH_DIALOG" "${DIALOG_SOURCES}" "auth_dialog_plugin" "DYNAMIC" dialog 1)
-REGISTER_PLUGIN("AUTH_CLEARTEXT" "${CC_SOURCE_DIR}/plugins/auth/mariadb_clear_text.c" "auth_cleartext_plugin" "DYNAMIC" "mysql_clear_password" 1)
+REGISTER_PLUGIN("AUTH_CLEARTEXT" "${CC_SOURCE_DIR}/plugins/auth/mariadb_cleartext.c" "auth_cleartext_plugin" "DYNAMIC" "mysql_clear_password" 1)
 IF(WIN32)
     SET(GSSAPI_SOURCES ${CC_SOURCE_DIR}/plugins/auth/auth_gssapi_client.c ${CC_SOURCE_DIR}/plugins/auth/sspi_client.c ${CC_SOURCE_DIR}/plugins/auth/sspi_errmsg.c)
     REGISTER_PLUGIN("AUTH_GSSAPI" "${GSSAPI_SOURCES}" "auth_gssapi_plugin" "DYNAMIC" "auth_gssapi_client" 1)


Brought windows installation code for the SheafScope up-to-date with respect to it's Linux counterpart. Preparing for first test of SheafScope executable on Windows.

--- tools/component_definitions.cmake
+++ tools/component_definitions.cmake
@@ -339,6 +339,7 @@
                 install(FILES ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/${${COMPONENT}_JAVA_BINDING_JAR} DESTINATION ${CMAKE_BUILD_TYPE}/lib)
                 install(PROGRAMS ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/SheafScope.jar DESTINATION ${CMAKE_BUILD_TYPE}/lib)
                 install(PROGRAMS ${JMF_JAR} DESTINATION ${CMAKE_BUILD_TYPE}/lib)
+                install(PROGRAMS ${VTK_JAR} DESTINATION ${CMAKE_BUILD_TYPE}/lib)
                 install(PROGRAMS ${JDK_LIBS} DESTINATION ${CMAKE_BUILD_TYPE}/lib)
                 # Only install python binding if the component has a target for it.
                 if(TARGET ${${COMPONENT}_PYTHON_BINDING_LIB})
@@ -359,6 +360,9 @@
                 install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/\${BUILD_TYPE}/${${COMPONENT}_JAVA_BINDING_JAR} DESTINATION lib/\${BUILD_TYPE})
                 install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/\${BUILD_TYPE}/SheafScope.jar DESTINATION bin/\${BUILD_TYPE})
                 install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/\${BUILD_TYPE}/dumpsheaf.exe DESTINATION bin/\${BUILD_TYPE})
+                install(PROGRAMS ${JMF_JAR} DESTINATION lib/\${BUILD_TYPE})
+                install(PROGRAMS ${VTK_JAR} DESTINATION lib/\${BUILD_TYPE})
+                install(PROGRAMS ${JDK_LIBS} DESTINATION lib/\${BUILD_TYPE})
                 # Only install python binding if the component has a target for it.
                 if(TARGET ${${COMPONENT}_PYTHON_BINDING_LIB})
                     install(TARGETS ${${COMPONENT}_PYTHON_BINDING_LIB} ARCHIVE DESTINATION lib/\${BUILD_TYPE})


SVN_SILENT made messages (.desktop file)

--- plasma-runner-ktp-contact.desktop.cmake
+++ plasma-runner-ktp-contact.desktop.cmake
@@ -14,6 +14,7 @@
 Name[sv]=Direktmeddelanden
 Name[uk]=Миттєвий обмін повідомленнями
 Name[x-test]=xxInstant Messagingxx
+Name[zh_CN]=即时通讯
 Comment=Start a chat with any of your IM contacts or change your IM status
 Comment[bs]=Počnite ćaskanje s nekim od IM kontakta ili promijenite vaš IM status
 Comment[ca]=Inicia un xat amb qualsevol dels vostres contactes de MI o canvia el vostre estat de MI
@@ -29,6 +30,7 @@
 Comment[sv]=Börja chatta med någon direktmeddelandekontakt eller ändra din direktmeddelandestatus
 Comment[uk]=Почати спілкування з будь-яким з ваших контактів або змінити ваш запис стану у системах обміну повідомленнями
 Comment[x-test]=xxStart a chat with any of your IM contacts or change your IM statusxx
+Comment[zh_CN]=与任意您的即时通讯联系人开始聊天或修改您的状态
 Icon=user-online

 X-KDE-ServiceTypes=Plasma/Runner


Add Cmake support to autodetect compiler openmp support #2919

--- build/cmake/CondorConfigure.cmake
+++ build/cmake/CondorConfigure.cmake
@@ -182,6 +182,7 @@
 endif()
 include (FindThreads)
 include (GlibcDetect)
+find_package (OpenMP)

 add_definitions(-D${OS_NAME}="${OS_NAME}_${OS_VER}")
 if (CONDOR_PLATFORM)
@@ -1000,6 +1001,12 @@
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CONDOR_CXX_FLAGS}")
 endif()

+if (OPENMP_FOUND)
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
+endif()
+
 if(MSVC)
 	#disable autolink settings
 	add_definitions(-DBOOST_ALL_NO_LIB)


Determine OGRE_DEP_DIR relative to OIS in case someone uses one of the alternate auto locations

--HG--
branch : v1-7

--- CMake/InstallDependencies.cmake
+++ CMake/InstallDependencies.cmake
@@ -14,11 +14,9 @@
   return()
 endif()

-if (OGRE_DEPENDENCIES_DIR)
-	set(OGRE_DEP_DIR ${OGRE_DEPENDENCIES_DIR})
-else()
-	set(OGRE_DEP_DIR "${OGRE_SOURCE_DIR}/Dependencies")
-endif()
+# TODO - most of this file assumes a common dependencies root folder
+# This is not robust, we should instead source dependencies from their individual locations
+get_filename_component(OGRE_DEP_DIR ${OIS_INCLUDE_DIR}/../../ ABSOLUTE)

 option(OGRE_INSTALL_DEPENDENCIES "Install dependency libs needed for samples" TRUE)
 option(OGRE_COPY_DEPENDENCIES "Copy dependency libs to the build directory" TRUE)


Add some platform variables for cmake

Add some platform variables for cmake

--- CMake/Modules/UrhoOptions.cmake
+++ CMake/Modules/UrhoOptions.cmake
@@ -36,6 +36,21 @@
         endif ()
     endif ()
 endforeach()
+
+# Set platform variables
+if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux")
+    set (LINUX ON)
+endif ()
+
+if (ANDROID OR IOS)
+    set (MOBILE ON)
+elseif (APPLE)
+    set (MACOS ON)
+endif ()
+
+if (WIN32 OR LINUX OR MACOS)
+    set (DESKTOP ON)
+endif ()

 option(URHO3D_ENABLE_ALL "Enables all optional subsystems by default" OFF)


disable LTO on android mips, as it is not supported by NDK

--- toolchains/android-studio.toolchain.cmake
+++ toolchains/android-studio.toolchain.cmake
@@ -72,9 +72,15 @@
 elseif( ANDROID_ABI STREQUAL "mips" ) # psiha/build has incomplete mips support
     set( TNUN_ABI mipsel-linux-android )
     unset( TNUN_ARCH )
+    # mips does not support LTO (tested with NDK r15b)
+    unset( TNUN_compiler_LTO )
+    unset( TNUN_linker_LTO )
 elseif( ANDROID_ABI STREQUAL "mips64" )
     set( TNUN_ABI mips64el-linux-android )
     unset( TNUN_ARCH )
+    # mips64 does not support LTO (tested with NDK r15b)
+    unset( TNUN_compiler_LTO )
+    unset( TNUN_linker_LTO )
 endif()

 if ( TNUN_ARCH )


Disable MSVC Warning 4290

Disable MSVC Warning 4290

--- cmake/CMakeCompilerSettings.cmake
+++ cmake/CMakeCompilerSettings.cmake
@@ -14,5 +14,6 @@
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
     endif()
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-    # no msvc flags for now
+        # Suppress warning C4290: C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4290")
 endif()


* Fixe windev assets location. * Issue https://github.com/Softmotions/ejdb/issues/359

--- cmake/Modules/Win32LIBTools.cmake
+++ cmake/Modules/Win32LIBTools.cmake
@@ -15,7 +15,7 @@
 endif()

 set(WINTOOLS_DIR ${CMAKE_BINARY_DIR}/WINTOOLS)
-set(WINTOOLS_DL_ROOT "http://softmotions.com/windev")
+set(WINTOOLS_DL_ROOT "https://assets.softmotions.com/windev")

 if (NOT EXISTS ${WINTOOLS_DIR})
 	file(MAKE_DIRECTORY ${WINTOOLS_DIR})


a fix for open issue 4772

a fix for open issue 4772

--- cmake/OpenCVCompilerOptions.cmake
+++ cmake/OpenCVCompilerOptions.cmake
@@ -248,7 +248,9 @@
 # Extra link libs if the user selects building static libs:
 if(NOT BUILD_SHARED_LIBS AND CMAKE_COMPILER_IS_GNUCXX AND NOT ANDROID)
   # Android does not need these settings because they are already set by toolchain file
-  set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} stdc++)
+  if(NOT MINGW)
+    set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} stdc++)
+  endif()
   set(OPENCV_EXTRA_FLAGS "-fPIC ${OPENCV_EXTRA_FLAGS}")
 endif()


Use stricter conditions for setting a default build type

CMAKE_BUILD_TYPE is ignored by multi-configuration generators,
so setting a build type doesn't make sense in this case. Moreover,
flags from a build type get appended after all other flags, so they
overwrite flags passed by the user with -DCMAKE_<LANG>_FLAGS="...".
Therefore, only set the build type if the flags would be otherwise
empty. The check is moved to the beginning of the file since there
are places in which we append warning flags, etc to CMAKE_CXX_FLAGS.


From Pere:
fixes the installation problem on Windows.

git-svn-id: acec3fd5b7ea1eb9e79d6329d318e8118ee2e14f@48180 27541ba8-7e3a-0410-8455-c3a389f83636

--- cmake/modules/RootNewMacros.cmake
+++ cmake/modules/RootNewMacros.cmake
@@ -325,7 +325,7 @@
                                COMPONENT libraries)
     #install(EXPORT ${CMAKE_PROJECT_NAME}Exports DESTINATION cmake/modules)
   endif()
-  if(WIN32)
+  if(WIN32 AND ARG_TYPE STREQUAL SHARED)
     if(CMAKE_GENERATOR MATCHES "Visual Studio")
       install(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Debug/lib${library}.pdb
               CONFIGURATIONS Debug


hash that was commented out turned out to be the correct one

--- yapsy.cmake
+++ yapsy.cmake
@@ -12,7 +12,7 @@
 external_source (yapsy
     1.10.1
     Yapsy-1.10.1-pythons2n3.tar.gz
-    468274aa078bd56a5ab4a41cd6c0c8ef #d41d8cd98f00b204e9800998ecf8427e
+    d41d8cd98f00b204e9800998ecf8427e
     http://pypi.python.org/packages/source/Y/Yapsy
     FORCE)


Add prefix to files generated during virtual graph generation.

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

--- make/devices.cmake
+++ make/devices.cmake
@@ -442,10 +442,9 @@
         --echo_file on
         --min_route_chan_width_hint 1
         --write_rr_graph ${OUT_RRXML_VIRT}
+        --outfile_prefix ${DEVICE}_${PACKAGE}
         --pack
         --place
-      COMMAND
-        ${CMAKE_COMMAND} -E remove wire.{net,place,route}
       COMMAND
         ${CMAKE_COMMAND} -E copy vpr_stdout.log
         rr_graph_${DEVICE}_${PACKAGE}.virt.out


ENH:  Updating ITK.

ENH:  Updating ITK.

--- SuperBuild/External_ITKv4.cmake
+++ SuperBuild/External_ITKv4.cmake
@@ -154,7 +154,7 @@
   ### --- End Project specific additions
   set(${proj}_REPOSITORY ${git_protocol}://itk.org/ITK.git)
   set(${proj}_REPOSITORY "https://github.com/InsightSoftwareConsortium/ITK.git")
-  set(${proj}_GIT_TAG 63a970e3d607555a3315270e06c99d272c0a242f)
+  set(${proj}_GIT_TAG 042875b0246b0b2da1c1c58bf2f606b9590f6979)
   set(ITK_VERSION_ID ITK-4.8) ### NOTE: When updating GIT_TAG, also update ITK_VERSION_ID

   ExternalProject_Add(${proj}


Python doesn't look packaged correctly for windows

--- Code/Ports/PyPort/system-python.cmake
+++ Code/Ports/PyPort/system-python.cmake
@@ -109,7 +109,7 @@
 	#include in install/packaging
 	option(PACKAGE_PYTHON "Package python libs in c-pack installer" ON)
 	if(PACKAGE_PYTHON)
-		set(PACK_NAMES python expat zlib tinfo sqlite readline ncurses mpdec lzma ffi db5 bz2)
+		set(PACK_NAMES python python${PYTHON_NUM} python${PYTHON_NUM}${PYTHON_DEBUG_POSTFIX} expat zlib tinfo sqlite readline ncurses mpdec lzma ffi db5 bz2)
 		find_path(PYTHON_STDLIB_DIR _pydecimal.py
 			PATHS ${PYTHON_HOME}/lib/${PYTHON_VER} ${PYTHON_HOME}/lib64/${PYTHON_VER} ${PYTHON_HOME}/Lib
 			NO_DEFAULT_PATH


ditto.

ditto.

--- mod_cmake/ModularDeps.cmake
+++ mod_cmake/ModularDeps.cmake
@@ -4,7 +4,13 @@

 find_package(Git REQUIRED)

-function(add_dependency DEP_NAME DEP_REPO)
+function(add_dependency)
+  set(options)
+  set(oneValueArgs NAME REPO)
+  cmake_parse_arguments(AD "${options}" "${oneValueArgs}" "" ${ARGN})
+  set(DEP_NAME "${AD_NAME}")
+  set(DEP_REPO "${AD_REPO}")
+
   # Determine if the dependency has already been satisfied.
   if(${DEP_NAME}_DEP_SATISFIED)
     message(STATUS "The dependency '${DEP_NAME}' is already satisfied.")


use go lib instead of c lib

use go lib instead of c lib

--- golang.cmake
+++ golang.cmake
@@ -59,15 +59,9 @@
   endif()

   if (GO_LIBRARY_SHARED)
-    set(BUILD_MODE -buildmode=c-shared)
-    if(APPLE)
-      set(LIB_NAME "lib${GO_LIBRARY_NAME}.dylib")
-    else()
-      set(LIB_NAME "lib${GO_LIBRARY_NAME}.so")
-    endif()
+    set(BUILD_MODE -buildmode=shared)
   else()
-    set(BUILD_MODE -buildmode=c-archive)
-    set(LIB_NAME "lib${GO_LIBRARY_NAME}.a")
+    set(BUILD_MODE -buildmode=archive)
   endif()

   if (NOT DEFINED GO_LIBRARY_SOURCE_FILES)
@@ -75,7 +69,7 @@
   endif()

   add_custom_target(${GO_LIBRARY_TARGET} COMMAND GOPATH=${GOPATH} ${CMAKE_Go_COMPILER} build ${BUILD_MODE}
-    -o "${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}"
+    -o "${CMAKE_CURRENT_BINARY_DIR}/${GO_LIBRARY_NAME}"
     ${CMAKE_GO_FLAGS} ${GO_LIBRARY_SOURCE_FILES}
     WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})


comments

comments

--- CMake/mitkMacroInstallPython.cmake
+++ CMake/mitkMacroInstallPython.cmake
@@ -32,7 +32,7 @@

     if(UNIX AND NOT APPLE)
       # if the realpath is different from the linked dependency
-      # we got a symlink
+      # we got a symlink on a linux system
       if( NOT("${_dep}" STREQUAL "${_realpath}"))
         # install symlink
         install(FILES ${_dep} DESTINATION bin)
@@ -52,7 +52,7 @@
   foreach(_lib ${VTK_LIBRARIES})
     # exclude system libs
     if(${_lib} MATCHES "^vtk.+")
-      # use only python wrapped modules
+      # use only python wrapped modules ( targets end with PythonD )
       if(TARGET ${_lib}PythonD)
         list(APPEND _VTK_PYTHON_TARGETS ${_lib}Python)
       endif()
@@ -61,13 +61,17 @@

   # install the python modules and loaders
   foreach(_target ${_VTK_PYTHON_TARGETS})
-    # get target properties
+    # get the properties of the python wrapped target
     get_target_property(_target_lib_debug   "${_target}D" IMPORTED_LOCATION_DEBUG)
     get_filename_component(_filepath_debug "${_target_lib_debug}" PATH)
     get_target_property(_target_lib_release "${_target}D" IMPORTED_LOCATION_RELEASE)
     get_filename_component(_filepath_release "${_target_lib_release}" PATH)

-    MESSAGE("${_filepath_debug}/${_target}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+    #MESSAGE("${_filepath_debug}/${_target}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+
+    # install the loader library for the python module. The loader library don't got a target but is
+    # linked against the python wrapped target (PythonD). All dependencies of the loader will be packed
+    # into the installer
     if(_target_lib_debug)
       MITK_FUNCTION_INSTALL_PYTHON_MODULE("${_filepath_debug}/${_target}${CMAKE_SHARED_LIBRARY_SUFFIX}" "Debug")
     endif()
@@ -77,7 +81,7 @@
     endif()
   endforeach()

-  # install vtk python
+  # install vtk python. This folder contains all *.py files for VTK module loading.
   install(DIRECTORY ${VTK_DIR}/Wrapping/Python/vtk
           DESTINATION bin/Python
           USE_SOURCE_PERMISSIONS


drop the "clangxx works" check from the vecmathlib age

--- cmake/LLVM.cmake
+++ cmake/LLVM.cmake
@@ -576,51 +576,6 @@

 ####################################################################
 #
-# clangxx works check
-#
-
-# TODO clang + vecmathlib doesn't work on Windows yet...
-if(CLANGXX AND (NOT WIN32) AND ENABLE_HOST_CPU_DEVICES)
-
-  message(STATUS "Checking if clang++ works (required by vecmathlib)")
-
-  set(CXX_WORKS 0)
-  set(CXX_STDLIB "")
-
-  if(NOT DEFINED CLANGXX_WORKS)
-
-    custom_try_compile_clangxx("namespace std { class type_info; } \n  #include <iostream> \n  #include <type_traits>" "std::cout << \"Hello clang++ world!\" << std::endl;" _STATUS_FAIL "-std=c++11")
-
-    if(NOT _STATUS_FAIL)
-      set(CXX_WORKS 1)
-    else()
-      custom_try_compile_clangxx("namespace std { class type_info; } \n  #include <iostream> \n  #include <type_traits>" "std::cout << \"Hello clang++ world!\" << std::endl;" _STATUS_FAIL "-stdlib=libstdc++" "-std=c++11")
-      if (NOT _STATUS_FAIL)
-        set(CXX_STDLIB "-stdlib=libstdc++")
-        set(CXX_WORKS 1)
-      else()
-        custom_try_compile_clangxx("namespace std { class type_info; } \n  #include <iostream> \n  #include <type_traits>" "std::cout << \"Hello clang++ world!\" << std::endl;" _STATUS_FAIL "-stdlib=libc++" "-std=c++11")
-        if(NOT _STATUS_FAIL)
-          set(CXX_STDLIB "-stdlib=libc++")
-          set(CXX_WORKS 1)
-        endif()
-      endif()
-    endif()
-
-    set(CLANGXX_WORKS ${CXX_WORKS} CACHE INTERNAL "Clang++ ")
-    set(CLANGXX_STDLIB ${CXX_STDLIB} CACHE INTERNAL "Clang++ stdlib")
-  endif()
-
-
-endif()
-
-if(CLANGXX_STDLIB AND (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
-  set(LLVM_CXXFLAGS "${CLANGXX_STDLIB} ${LLVM_CXXFLAGS}")
-  set(LLVM_LDFLAGS "${CLANGXX_STDLIB} ${LLVM_LDFLAGS}")
-endif()
-
-####################################################################
-#
 # - '-DNDEBUG' is a work-around for llvm bug 18253
 #
 # llvm-config does not always report the "-DNDEBUG" flag correctly


pass ARGN

pass ARGN

--- cmake/MCKL.cmake
+++ cmake/MCKL.cmake
@@ -392,7 +392,7 @@
         STRING(TOLOWER ${RNG} rng)
         CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/src/${basename}_${testname}.cpp.in
             ${PROJECT_SOURCE_DIR}/src/${basename}_${testname}_${rng}.cpp)
-        MCKL_ADD_TEST(${basename} ${testname}_${rng})
+        MCKL_ADD_TEST(${basename} ${testname}_${rng} ${ARGN})
         ADD_DEPENDENCIES(${basename}_${testname}
             ${basename}_${testname}_${rng})
         ADD_DEPENDENCIES(${basename}_${testname}-check
@@ -407,7 +407,7 @@
         STRING(TOLOWER ${RNG} rng)
         CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/src/${basename}_${testname}.cpp.in
             ${PROJECT_SOURCE_DIR}/src/${basename}_${testname}_${rng}.cpp)
-        MCKL_ADD_TEST(${basename} ${testname}_${rng})
+        MCKL_ADD_TEST(${basename} ${testname}_${rng} ${ARGN})
         ADD_DEPENDENCIES(${basename}_${testname}
             ${basename}_${testname}_${rng})
         ADD_DEPENDENCIES(${basename}_${testname}-check
@@ -486,7 +486,7 @@
         STRING(TOLOWER ${Distribution} dist)
         CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/src/${basename}_${testname}.cpp.in
             ${PROJECT_SOURCE_DIR}/src/${basename}_${testname}_${dist}.cpp)
-        MCKL_ADD_TEST(${basename} ${testname}_${dist})
+        MCKL_ADD_TEST(${basename} ${testname}_${dist} ${ARGN})
         ADD_DEPENDENCIES(${basename}_${testname}
             ${basename}_${testname}_${dist})
         ADD_DEPENDENCIES(${basename}_${testname}-check
@@ -494,7 +494,7 @@
         IF(MKL_FOUND)
             CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/src/${basename}_${testname}.cpp.in
                 ${PROJECT_SOURCE_DIR}/src/${basename}_${testname}_${dist}_novml.cpp)
-            MCKL_ADD_TEST(${basename} ${testname}_${dist}_novml)
+            MCKL_ADD_TEST(${basename} ${testname}_${dist}_novml ${ARGN})
             SET_TARGET_PROPERTIES(${basename}_${testname}_${dist}_novml
                 PROPERTIES COMPILE_FLAGS "-DMCKL_USE_MKL_VML=0")
             ADD_DEPENDENCIES(${basename}_${testname}


cmake: Fix glop only build

cmake: Fix glop only build

--- cmake/glop.cmake
+++ cmake/glop.cmake
@@ -376,6 +376,3 @@
   "${PROJECT_BINARY_DIR}/glopConfigVersion.cmake"
   DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/glop"
   COMPONENT Devel)
-
-# Build glop samples
-add_subdirectory(ortools/glop/samples)


New ec2 version

New ec2 version

--- cmake/sdks.cmake
+++ cmake/sdks.cmake
@@ -39,7 +39,7 @@
 list(APPEND C2J_LIST "ds:2015-04-16")
 list(APPEND C2J_LIST "dynamodb:2012-08-10")
 if(NOT PLATFORM_ANDROID OR NOT CMAKE_HOST_WIN32)  # ec2 isn't building for android on windows atm due to an internal compiler error, TODO: investigate further
-    list(APPEND C2J_LIST "ec2:2016-09-15")
+    list(APPEND C2J_LIST "ec2:2016-11-15")
 endif()
 list(APPEND C2J_LIST "ecr:2015-09-21")
 list(APPEND C2J_LIST "ecs:2014-11-13")


ENH: update shark version for ensemble model

--- SuperBuild/CMake/External_shark.cmake
+++ SuperBuild/CMake/External_shark.cmake
@@ -30,8 +30,8 @@

 ExternalProject_Add(SHARK
   PREFIX SHARK
-  URL "https://github.com/Shark-ML/Shark/archive/a48155fb9ce2f01b33d958ec6a3aaf115f330fbf.zip"
-  URL_MD5 a43fb09673b7a99f83b4bcf88dc5a109
+  URL "https://github.com/Shark-ML/Shark/archive/91595920f02ad90217465e7f4c100cd165d9947e.zip"
+  URL_MD5 09ee12050ed4236db252adbc407a52ce
   SOURCE_DIR ${SHARK_SB_SRC}
   BINARY_DIR ${SHARK_SB_BUILD_DIR}
   INSTALL_DIR ${SB_INSTALL_PREFIX}


build: bump to version 3

build: bump to version 3

--- CMake/version.cmake
+++ CMake/version.cmake
@@ -1,3 +1,3 @@
-set (VV_VERSION_MAJOR 2)
-set (VV_VERSION_MINOR 5)
-set (VV_VERSION_PATCH 2)
+set (VV_VERSION_MAJOR 3)
+set (VV_VERSION_MINOR 0)
+set (VV_VERSION_PATCH 0)


Add CVS Web

Add CVS Web

--- DartConfig.cmake
+++ DartConfig.cmake
@@ -15,8 +15,8 @@

 # Dart server configuration
 SET (ROLLUP_URL "http://${DROP_SITE}/cgi-bin/xdmf-rollup-dashboard.sh")
-#SET (CVS_WEB_URL "http://${DROP_SITE}/cgi-bin/cvsweb.cgi/Xdmf/")
-#SET (CVS_WEB_CVSROOT "Xdmf")
+SET (CVS_WEB_URL "http://${DROP_SITE}/cgi-bin/cvsweb.cgi/Xdmf/")
+SET (CVS_WEB_CVSROOT "Xdmf")
 #SET (DOXYGEN_URL "http://${DROP_SITE}/" )
 #SET (GNATS_WEB_URL "http://${DROP_SITE}/")


Fixing the url for cvs web.

Fixing the url for cvs web.

--- DartConfig.cmake
+++ DartConfig.cmake
@@ -7,7 +7,7 @@
        "http://${DROP_SITE}/cgi-bin/Submit-vtk-TestingResults.pl")

 # Dart server configuration
-SET (CVS_WEB_URL "http://${DROP_SITE}/cgi-bin/cvsweb.cgi/")
+SET (CVS_WEB_URL "http://${DROP_SITE}/cgi-bin/cvsweb.cgi/VTK")
 SET (CVS_WEB_CVSROOT "VTK")
 SET (DOXYGEN_URL "http://${DROP_SITE}/" )
 SET (GNATS_WEB_URL "http://${DROP_SITE}/")


STYLE: Remove DartConfig.cmake file. It is no longer necessary when building with the minimum required version of CMake 2.4. CTestConfig.cmake has the settings you're looking for.

--- DartConfig.cmake
+++ DartConfig.cmake
@@ -1,4 +0,0 @@
-# This file is no longer strictly necessary, since VTK's CMakeLists.txt file
-# uses "INCLUDE(CTest)" and requires building with CMake 2.4 or greater...
-#
-# Remove this file from CVS after tonight's Nightly dashboards.


ITKDoxygenXML downloaded, upacked

ITKDoxygenXML downloaded, upacked

--- superbuild/External-ITKDoxygenXML.cmake
+++ superbuild/External-ITKDoxygenXML.cmake
@@ -1,3 +1,9 @@
 ExternalProject_Add( ITKDoxygenXML
   URL http://dl.dropbox.com/u/15135983/itk-doxygen-xml.tar.bz2
+  SOURCE_DIR ITKDoxygenXML
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND ""
+  INSTALL_COMMAND ""
   )
+
+set( ITKDoxygenXML_DIR ${CMAKE_BINARY_DIR}/ITKDoxygenXML )


Nagios Monitoring 6.0.2-1 Gold

Nagios Monitoring 6.0.2-1 Gold

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

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


Bump version number

Bump version number

--- version.cmake
+++ version.cmake
@@ -1 +1 @@
-set(LeapSerial_VERSION 0.2.1)
+set(LeapSerial_VERSION 0.2.2)


Update version

Update version

--- version.cmake
+++ version.cmake
@@ -1 +1 @@
-set(LeapIPC_VERSION 0.1.6)
+set(LeapIPC_VERSION 0.1.7)


[ioninja] release 3.3.0

[ioninja] release 3.3.0

recognizers and automaton functions

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

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


nagios Monitoring 5.2.0-1 Gold

nagios Monitoring 5.2.0-1 Gold

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

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


Trying my own Eigen fork to fix SVD segfault

Former-commit-id: c50c3ceef8a93af17b0e3438c236c17440fa6bb0

--- cmake-modules/Fetch_Ceres.cmake
+++ cmake-modules/Fetch_Ceres.cmake
@@ -21,12 +21,13 @@
 #    set(FLAGS "-DEIGEN_MAX_STATIC_ALIGN_BYTES=0 -DNDEBUG -O3 -fstack-protector  -g -fno-omit-frame-pointer -D_GLIBCXX_DEBUG_PEDANTIC -D_GLIBCXX_DEBUG -D_FORTIFY_SOURCE=2")
 #    set(FLAGS "-DEIGEN_MAX_STATIC_ALIGN_BYTES=0 -DNDEBUG -O3 -fstack-protector  -g -fno-omit-frame-pointer -D_FORTIFY_SOURCE=2")
     unset(FLAGS CACHE)
-    if(CMAKE_BUILD_TYPE MATCHES Release)
-        set(FLAGS "-DEIGEN_MAX_STATIC_ALIGN_BYTES=0 -O3 -g -D_FORTIFY_SOURCE=2  -DNDEBUG")
-    elseif(CMAKE_BUILD_TYPE MATCHES Debug)
-        set(FLAGS "-DEIGEN_MAX_STATIC_ALIGN_BYTES=0 -O0 -g -D_GLIBCXX_DEBUG_PEDANTIC -D_GLIBCXX_DEBUG -D_FORTIFY_SOURCE=2")
+    set(FLAGS "${COMMON_OPTIONS}")
+    if(CMAKE_BUILD_TYPE MATCHES Debug)
+        set(FLAGS "${FLAGS} ${DEBUG_OPTIONS}")
+    elseif(CMAKE_BUILD_TYPE MATCHES Release)
+        set(FLAGS "${FLAGS} ${RELEASE_OPTIONS}")
     elseif(CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
-        set(FLAGS "-DEIGEN_MAX_STATIC_ALIGN_BYTES=0 -O3 -g -D_GLIBCXX_DEBUG_PEDANTIC -D_GLIBCXX_DEBUG -D_FORTIFY_SOURCE=2")
+        set(FLAGS "${FLAGS} ${RELWITHDEBINFO_OPTIONS}")
     endif()

@@ -34,9 +35,9 @@
     ### Compiler-dependent flags ###
     ################################

-    if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-        set(FLAGS "${FLAGS} -static --gcc-toolchain=${GCC_TOOLCHAIN} -stdlib=libstdc++")
-    endif()
+#    if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+#        set(FLAGS "${FLAGS} -static --gcc-toolchain=${GCC_TOOLCHAIN} -stdlib=libstdc++")
+#    endif()
     set(FLAGS "${FLAGS} -I${GLOG_INCLUDE_DIR} -L${GLOG_LIBRARY_DIR} -I${GFLAGS_INCLUDE_DIR}  -L${GFLAGS_LIBRARY_DIR}")


Add OpenMP flags if supported

Add OpenMP flags if supported

--- common/cmake/CommonHeader.cmake
+++ common/cmake/CommonHeader.cmake
@@ -31,6 +31,11 @@

 add_compile_options (-Wall -Wextra)

+find_package (OpenMP)
+if (OPENMP_FOUND)
+	add_compile_options(${OpenMP_CXX_FLAGS})
+endif (OPENMP_FOUND)
+
 if (MVSC)
         # So that Visual Studio will define M_PI
         add_definitions (-D_USE_MATH_DEFINES)


Load options when finding package

Load options when finding package

--- PackageConfig.cmake
+++ PackageConfig.cmake
@@ -195,8 +195,8 @@
   "  endif()\n"
   "\n"
 # include options.cmake if existing
-  "  if(EXISTS \${${PROJECT_NAME}_PREFIX_DIR}/${CMAKE_MODULE_INSTALL_PATH}/options.cmake)\n"
-  "    include(\${${PROJECT_NAME}_PREFIX_DIR}/${CMAKE_MODULE_INSTALL_PATH}/options.cmake)\n"
+  "  if(EXISTS \${${PROJECT_NAME}_PREFIX_DIR}/options.cmake)\n"
+  "    include(\${${PROJECT_NAME}_PREFIX_DIR}/options.cmake)\n"
   "  endif()\n"
   "endif()\n"
   "\n"


Upgrade TensorFlow to include fixes for MSVC2015 compile errors.

This includes...
- d24f13691: Fix function template expansion in elementwise
- 6394d3c18: Workaround internal compiler errors when building Eigen

Change-Id: I96314a4a640daf32c187421129a17bce7f7693f5
Bug: 188207085

--- sdk/cpp/external/tensorflow.cmake
+++ sdk/cpp/external/tensorflow.cmake
@@ -23,8 +23,8 @@
 OverridableFetchContent_Declare(
   tensorflow
   GIT_REPOSITORY https://github.com/tensorflow/tensorflow.git
-  # Fix MSVC2017 build issue due to templated function with constexpr argument.
-  GIT_TAG d781a9ef9f56bdbbf9c4cb57e6ce99dafb89e14a
+  # Fix MSVC2015 build issues.
+  GIT_TAG d24f1369180d52d0ad79db5fd4df369776c2dc14
   # It's not currently possible to shallow clone with a GIT TAG
   # as cmake attempts to git checkout the commit hash after the clone
   # which doesn't work as it's a shallow clone hence a different commit hash.


Wrap cmake_policy CMP0042 with a version check

--- cmake/fips.cmake
+++ cmake/fips.cmake
@@ -3,7 +3,9 @@
 #   Main cmake header for fips, this must be included in the top-level
 #   CMakeLists.txt file of a fips project
 #-------------------------------------------------------------------------------
-cmake_policy(SET CMP0042 NEW)
+if (${CMAKE_VERSION} VERSION_GREATER 3.0)
+    cmake_policy(SET CMP0042 NEW)
+endif()

 get_filename_component(FIPS_PROJECT_DIR "." ABSOLUTE)
 get_filename_component(FIPS_DEPLOY_DIR "../fips-deploy" ABSOLUTE)


Fix CMake dev warning in iwyu.cmake

Fix CMake dev warning in iwyu.cmake

This gets rid of the following CMake warning that I was always getting in CLion:

```
CMake Warning (dev) at cmake/iwyu.cmake:20:
  Syntax Warning in cmake code at column 85

  Argument not separated from preceding token by whitespace.
Call Stack (most recent call first):
  CMakeLists.txt:119 (include)
This warning is for project developers.  Use -Wno-dev to suppress it.
```

Test: Run IWYU before and after and see that the resulting `iwyu.diff`s are
identical.

--- cmake/iwyu.cmake
+++ cmake/iwyu.cmake
@@ -17,7 +17,7 @@
     # Create a custom version of compile_commands.json which does not include any compilation units from third_party
     # or any generated cpp-files. This will be used by include-what-you-use.
     add_custom_command(OUTPUT iwyu_commands.json
-      COMMAND jq 'map(select(.file | test(\"third_party|/build_|/build/\") != true))' > iwyu_commands.json < compile_commands.json
+      COMMAND jq 'map(select(.file | test(\"third_party|/build_|/build/\") != true)) ' > iwyu_commands.json < compile_commands.json
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
     )


only link iomp when with MKLDNN and MKLML

--- cmake/util.cmake
+++ cmake/util.cmake
@@ -97,6 +97,10 @@
         target_link_libraries(${TARGET_NAME} log)
     endif(ANDROID)

+    if(WITH_MKLDNN AND WITH_MKLML AND MKLDNN_IOMP_DIR)
+      target_link_libraries(${TARGET_NAME} "-L${MKLDNN_IOMP_DIR} -liomp5 -Wl,--as-needed")
+    endif()
+
     add_dependencies(${TARGET_NAME} ${external_project_dependencies})
 endfunction()


Fix find of transients if errors occurred before

--- PackageConfig.cmake
+++ PackageConfig.cmake
@@ -34,6 +34,13 @@
   "\n"
 # add helper stuff from CMakePackageConfigHelpers
   "@PACKAGE_INIT@\n"
+  "\n"
+# reset before using them
+  "set(_output_type)\n"
+  "set(_out)\n"
+  "set(_req)\n"
+  "set(_quiet)\n"
+  "set(_fail)\n"
   "\n"
 # add transient library finding
   "@TRANSIENTS@"


Revert "ENH add all cesbios remote modules"

This reverts commit 572d15e883821e2fc789fc8889cd0afd7bd41507.

--- SuperBuild/CMake/External_otb.cmake
+++ SuperBuild/CMake/External_otb.cmake
@@ -142,9 +142,9 @@
     list(APPEND OTB_MODULES_CONFIG -DModule_${remote_module}:BOOL=ON)
   endforeach()

-  # Add CESBIO'S remote modules if OTB is compiled with GSL support
+  # Add CESBIO'S remote modules if OTB is compiled with GSL support (for now only TemporalGapFilling)
   if(OTB_USE_GSL)
-    foreach(remote_module OTBTemporalGapFilling OTBBioVars OTBPhenology)
+    foreach(remote_module OTBTemporalGapFilling)
       list(APPEND OTB_MODULES_CONFIG -DModule_${remote_module}:BOOL=ON)
     endforeach()
   endif()


Suppress MSVC's equivalent of -Wshadow warnings

IMO we need to clean up some of these, but the member variable one
(C4458) has false positives on static methods.  It is currently firing
on Twine, which has a static method like:
  struct Twine {
    uintptr_t LHS, RHS;
    static void staticMethod() {
      // warning C4458: declaration of 'LHS' hides class member
      uintptr_t LHS;
      ...
    }
  };

We should fix up clang's -Wshadow and clean it up, and then we can
re-enable some of these MSVC warnings.

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

--- cmake/modules/HandleLLVMOptions.cmake
+++ cmake/modules/HandleLLVMOptions.cmake
@@ -243,6 +243,10 @@
     -wd4345 # Suppress 'behavior change: an object of POD type constructed with an initializer of the form () will be default-initialized'
     -wd4351 # Suppress 'new behavior: elements of array 'array' will be default initialized'
     -wd4355 # Suppress ''this' : used in base member initializer list'
+    -wd4456 # Suppress 'declaration of 'var' hides local variable'
+    -wd4457 # Suppress 'declaration of 'var' hides function parameter'
+    -wd4458 # Suppress 'declaration of 'var' hides class member'
+    -wd4459 # Suppress 'declaration of 'var' hides global declaration'
     -wd4503 # Suppress ''identifier' : decorated name length exceeded, name was truncated'
     -wd4624 # Suppress ''derived class' : destructor could not be generated because a base class destructor is inaccessible'
     -wd4722 # Suppress 'function' : destructor never returns, potential memory leak


odb-boost: ++PACKAGE_INTERNAL_DEPS_ID

odb-boost: ++PACKAGE_INTERNAL_DEPS_ID

--- cmake/projects/odb-boost/hunter.cmake
+++ cmake/projects/odb-boost/hunter.cmake
@@ -27,5 +27,5 @@
     PACKAGE_UNRELOCATABLE_TEXT_FILES
     "lib/libodb-boost.la"
     "lib/pkgconfig/libodb-boost.pc"
-    PACKAGE_INTERNAL_DEPS_ID "3"
+    PACKAGE_INTERNAL_DEPS_ID "4"
 )


ENH: Commenint for now the SuperBuild option to retrieve CIP and built it

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -24,7 +24,7 @@
 ##
 set(inner_DEPENDENCIES "CIP")

-SlicerMacroCheckExternalProjectDependency(inner)
+#SlicerMacroCheckExternalProjectDependency(inner)

 set(ep_cmake_args)
 foreach(dep ${EXTENSION_DEPENDS})


Remove unused unity build

Remove unused unity build

--- UnityBuild.cmake
+++ UnityBuild.cmake
@@ -1,15 +0,0 @@
-function(enable_unity_build UB_SUFFIX SOURCE_VARIABLE_NAME)
-  set(files ${${SOURCE_VARIABLE_NAME}})
-  # Generate a unique filename for the unity build translation unit
-  set(unit_build_file ${CMAKE_CURRENT_BINARY_DIR}/ub_${UB_SUFFIX}.cpp)
-  # Exclude all translation units from compilation
-  set_source_files_properties(${files} PROPERTIES HEADER_FILE_ONLY true)
-  # Open the ub file
-  FILE(WRITE ${unit_build_file} "// Unity Build generated by CMake\n")
-  # Add include statement for each translation unit
-  foreach(source_file ${files} )
-    FILE( APPEND ${unit_build_file} "#include <${source_file}>\n")
-  endforeach(source_file)
-  # Complement list of translation units with the name of ub
-  set(${SOURCE_VARIABLE_NAME} ${${SOURCE_VARIABLE_NAME}} ${unit_build_file} PARENT_SCOPE)
-endfunction(enable_unity_build)


remove arch3.0 from cu110.cmake (#19309)

Co-authored-by: Wei Chu <8d245f651bcd08b285ac3f36f14f72e6c2a75cb1@amazon.com>

--- config/distribution/linux_cu110.cmake
+++ config/distribution/linux_cu110.cmake
@@ -34,4 +34,4 @@
 set(USE_DIST_KVSTORE ON CACHE BOOL "Build with DIST_KVSTORE support")

 set(CUDACXX "/usr/local/cuda-11.0/bin/nvcc" CACHE STRING "Cuda compiler")
-set(MXNET_CUDA_ARCH "3.0;5.0;6.0;7.0;8.0" CACHE STRING "Cuda architectures")
+set(MXNET_CUDA_ARCH "5.0;6.0;7.0;8.0" CACHE STRING "Cuda architectures")


Updated for the 5.9.4 release.

Updated for the 5.9.4 release.

svn path=/trunk/; revision=9951

--- cmake/modules/plplot_version.cmake
+++ cmake/modules/plplot_version.cmake
@@ -1,15 +1,15 @@
 # For now, must set this by hand before each release.  This value affects
 # at least the documentation build and perhaps other parts of the release.
-set(RELEASE_DATE "2009-05-03")
+set(RELEASE_DATE "2009-05-10")

 # Version data that need review and possible modification for each release.

-set(VERSION 5.9.3)
+set(VERSION 5.9.4)

 # CPack version numbers for release tarball name.
 set(CPACK_PACKAGE_VERSION_MAJOR 5)
 set(CPACK_PACKAGE_VERSION_MINOR 9)
-set(CPACK_PACKAGE_VERSION_PATCH 3)
+set(CPACK_PACKAGE_VERSION_PATCH 4)

 # PLplot library version information.


building sqlite dll from amalgamated source and .def

--- CMake/External_SQLite.cmake
+++ CMake/External_SQLite.cmake
@@ -37,5 +37,33 @@
     )
   else(MSVC)

+    ExternalProject_Add(${proj}_def
+      PREFIX ${proj}/_def
+      URL "http://www.sqlite.org/2015/sqlite-dll-win32-x86-3080801.zip"
+      URL_MD5 0111362e9260805a90c26d60778cca60
+      SOURCE_DIR ${SQLITE_SB_BUILD_DIR}
+      INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
+      CONFIGURE_COMMAND ""
+      BUILD_COMMAND ""
+      INSTALL_COMMAND ""
+      )
+
+    ExternalProject_Add(${proj}
+      PREFIX ${proj}
+      URL "http://www.sqlite.org/2015/sqlite-amalgamation-3080801.zip"
+      URL_MD5 b1cbcbd710bdfd762dc169f1676053b5
+      BINARY_DIR ${SQLITE_SB_BUILD_DIR}
+      INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
+      PATCH_COMMAND  cl ${SQLITE_SB_SRC}/sqlite3.c /DSQLITE_ENABLE_COLUMN_METADATA=1 /DSQLITE_ENABLE_RTREE=1 -link -dll -out:${SQLITE_SB_BUILD_DIR}/sqlite3.dll /DEF:${SQLITE_SB_BUILD_DIR}/sqlite3.def
+      UPDATE_COMMAND ${CMAKE_COMMAND} -E copy ${SQLITE_SB_BUILD_DIR}/sqlite3.dll ${CMAKE_INSTALL_PREFIX}/bin/
+      CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy ${SQLITE_SB_BUILD_DIR}/sqlite3.lib ${CMAKE_INSTALL_PREFIX}/lib/
+      BUILD_COMMAND ${CMAKE_COMMAND} -E copy ${SQLITE_SB_SRC}/sqlite3.h ${CMAKE_INSTALL_PREFIX}/include/
+      INSTALL_COMMAND ${CMAKE_COMMAND} -E copy ${SQLITE_SB_SRC}/sqlite3ext.h ${CMAKE_INSTALL_PREFIX}/include/
+      DEPENDS ${proj}_def
+      )
+
   endif()
+
+
+  message(STATUS "  Using SQLite SuperBuild version")
 endif()


Updated OpenCV version to 2.4.11.

Updated OpenCV version to 2.4.11.

Uncommented patch command, which might not be necessary any more.

--- CMakeExternals/OpenCV.cmake
+++ CMakeExternals/OpenCV.cmake
@@ -60,15 +60,15 @@
           )
     endif()

-    set(opencv_url ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/OpenCV-2.4.8.2.tar.gz)
-    set(opencv_url_md5 07fa7c1d225ea7fe8eeb1270a6b00e69)
+    set(opencv_url ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/OpenCV-2.4.11.tar.gz)
+    set(opencv_url_md5 29d1b7d2b93aa48e813523ba4207d14a)

     ExternalProject_Add(${proj}
       LIST_SEPARATOR ${sep}
       URL ${opencv_url}
       URL_MD5 ${opencv_url_md5}
       # Related bug: http://bugs.mitk.org/show_bug.cgi?id=5912
-      PATCH_COMMAND ${PATCH_COMMAND} -N -p1 -i ${CMAKE_CURRENT_LIST_DIR}/OpenCV-2.4.8.2.patch
+      # PATCH_COMMAND ${PATCH_COMMAND} -N -p1 -i ${CMAKE_CURRENT_LIST_DIR}/OpenCV-2.4.8.2.patch
       CMAKE_GENERATOR ${gen}
       CMAKE_ARGS
         ${ep_common_args}


* Applied patch by Lee Rumler(princerocker)

git-svn-id: f7af7ee4793470f1ef3ffd19ba4ec4c4b402648a@132 a19be42f-918d-4297-8077-ab25d1e4f51f

--- CMakeScripts/FindOGRE.cmake
+++ CMakeScripts/FindOGRE.cmake
@@ -23,7 +23,7 @@
     SET(OGRE_LIBRARIES debug OgreMain_d optimized OgreMain)
 ELSE (WIN32) #Unix
     FIND_PACKAGE(PkgConfig)
-    PKG_SEARCH_MODULE(OGRE /usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1/lib/pkgconfig) # tardis specific hack
+    PKG_SEARCH_MODULE(OGRE OGRE)
     SET(OGRE_INCLUDE_DIR ${OGRE_INCLUDE_DIRS})
     SET(OGRE_LIB_DIR ${OGRE_LIBDIR})
     SET(OGRE_LIBRARIES ${OGRE_LIBRARIES} CACHE STRING "")


[FIX] Fixing demo tests on Windows.

[FIX] Fixing demo tests on Windows.

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

--- util/cmake/SeqAnBuildSystem.cmake
+++ util/cmake/SeqAnBuildSystem.cmake
@@ -427,7 +427,11 @@
         endif()

         # Add the test.
-        add_test (NAME test_${EXECUTABLE} COMMAND ${CHECKER_PATH} ${ARGS})
+        find_package (PythonInterp)
+        if (PYTHONINTERP_FOUND)
+          add_test (NAME test_${EXECUTABLE}
+                    COMMAND ${PYTHON_EXECUTABLE} ${CHECKER_PATH} ${ARGS})
+        endif (PYTHONINTERP_FOUND)
     endif ()
 endmacro (_seqan_setup_demo_test CPP_FILE)


Added BUILD_TEST into the CMake cache

Added BUILD_TEST into the CMake cache

--- Config.cmake
+++ Config.cmake
@@ -11,6 +11,13 @@
     )
 endif()

+# Set the default test build option to false
+if(NOT BUILD_TEST)
+    set(BUILD_TEST FALSE
+        CACHE STRING "TRUE to build the unit tests (requires the Boost Test Library), FALSE otherwise."
+    )
+endif()
+
 # define install directory for miscelleneous files
 if(WIN32 AND NOT UNIX)
     set(INSTALL_MISC_DIR .)


Download virgil-sdk-cpp lib branch - release ( v3.2.1 )

--- ext/virgil_sdk/virgil_sdk.cmake
+++ ext/virgil_sdk/virgil_sdk.cmake
@@ -52,8 +52,8 @@

 ExternalProject_Add (${PROJECT_NAME}
     DOWNLOAD_DIR "@VIRGIL_DEPENDS_PACKAGE_DOWNLOAD_DIR@"
-    URL "https://github.com/VirgilSecurity/virgil-sdk-cpp/archive/v3.2.0.tar.gz"
-    URL_HASH SHA1=402d510b32f738f6e53c25d75c565ad1d245342b
+    URL "https://github.com/VirgilSecurity/virgil-sdk-cpp/archive/633930229a9ac8bdb929944c4738fb4a092c63c5.tar.gz"
+    URL_HASH SHA1=1b2d87310c0d2b9890f0b051196254a177dba1df
     PREFIX "@VIRGIL_DEPENDS_PACKAGE_BUILD_DIR@"
     CMAKE_ARGS "@VIRGIL_DEPENDS_CMAKE_ARGS@"
 )


ENH: fix check for monteverdi, python, qt4

--- SuperBuild/Packaging/PackageHelper.cmake
+++ SuperBuild/Packaging/PackageHelper.cmake
@@ -94,10 +94,27 @@
     endif()
   endforeach(req)

+  set(HAVE_QT4 FALSE CACHE INTERNAL "HAVE_QT4")
+  if(EXISTS "${SUPERBUILD_INSTALL_DIR}/bin/otbApplicationLauncherQt${EXE_EXT}")
+    set(HAVE_QT4 TRUE)
+  endif()
+
+  set(HAVE_MVD FALSE  CACHE INTERNAL "HAVE_MVD")
+  if(EXISTS "${SUPERBUILD_INSTALL_DIR}/bin/monteverdi${EXE_EXT}")
+    set(HAVE_MVD TRUE)
+  endif()
+
+  set(HAVE_PYTHON FALSE CACHE INTERNAL "HAVE_PYTHON")
+  if(EXISTS "${SUPERBUILD_INSTALL_DIR}/lib/otb/python/_otbApplication${PYMODULE_EXT}")
+    set(HAVE_PYTHON TRUE)
+  endif()

   # find_loader_and_args(LOADER_PROGRAM LOADER_PROGRAM_ARGS)
-  find_python_soname(python_INSTALLED_SONAME)
-
+
+  if(HAVE_PYTHON)
+    find_python_soname(python_INSTALLED_SONAME)
+  endif()
+
   set(PKG_SEARCHDIRS)

   if(MSVC)
@@ -159,12 +176,10 @@
   endif()

-############# otb_loader executable ################
-add_executable(otb_loader ${PACKAGE_SUPPORT_FILES_DIR}/otb_loader.cxx)
-target_link_libraries(otb_loader ${CMAKE_DL_LIBS})
-install(TARGETS otb_loader DESTINATION ${PKG_STAGE_DIR}/bin)
-
-
+  ############# otb_loader executable ################
+  add_executable(otb_loader ${PACKAGE_SUPPORT_FILES_DIR}/otb_loader.cxx)
+  target_link_libraries(otb_loader ${CMAKE_DL_LIBS})
+  install(TARGETS otb_loader DESTINATION ${PKG_STAGE_DIR}/bin)

   set(PKG_PEFILES)
@@ -203,14 +218,20 @@

  func_install_xdk_files()

-   # check if monteverdi executable is built?
-  if(EXISTS "${SUPERBUILD_INSTALL_DIR}/bin/monteverdi${EXE_EXT}")
+  if(HAVE_MVD)
     func_install_monteverdi_support_files()
   endif()

-  install_script_files()
-
-
+  install_script_files()
+
+  if(WIN32)
+    install( PROGRAMS "${SUPERBUILD_INSTALL_DIR}/bin/otbcli.bat" DESTINATION ${PKG_STAGE_DIR}/bin)
+    install( PROGRAMS "${SUPERBUILD_INSTALL_DIR}/bin/otbgui.bat" DESTINATION ${PKG_STAGE_DIR}/bin)
+  else()
+    install( PROGRAMS "${SUPERBUILD_INSTALL_DIR}/bin/otbcli" DESTINATION ${PKG_STAGE_DIR}/bin)
+    install( PROGRAMS "${SUPERBUILD_INSTALL_DIR}/bin/otbgui" DESTINATION ${PKG_STAGE_DIR}/bin)
+  endif()
+
    if(MSVC)
     install(FILES
       "${PACKAGE_SUPPORT_FILES_DIR}/OTB Project.zip"
@@ -248,6 +269,7 @@
     endif()
   endif()

+
   foreach(prog ${program_list})
     install( PROGRAMS ${prog} DESTINATION ${PKG_STAGE_DIR})
   endforeach()


- updated FindCairo.cmake (#1455)

- updated FindCairo.cmake (#1455)

--- Code/cmake/Modules/FindCairo.cmake
+++ Code/cmake/Modules/FindCairo.cmake
@@ -1,48 +1,84 @@
-# - Try to find the cairo library
-# Once done this will define
+# Grabbed from here:
+# https://github.com/adobe/webkit/blob/master/Source/cmake/FindCairo.cmake
 #
-#  CAIRO_FOUND - system has cairo
-#  CAIRO_INCLUDE_DIRS - the cairo include directory
-#  CAIRO_LIBRARIES - Link these to use cairo
+# - Try to find Cairo
+# Once done, this will define
 #
-# Define CAIRO_MIN_VERSION for which version desired.
+#  CAIRO_FOUND - system has Cairo
+#  CAIRO_INCLUDE_DIRS - the Cairo include directories
+#  CAIRO_LIBRARIES - link these to use Cairo
 #
-# grabbed from: https://raw.githubusercontent.com/stevedekorte/io/9c76c405746843087bb94e15c3ef12b9edf041af/modules/FindCairo.cmake
+# Copyright (C) 2012 Raphael Kubo da Costa <rakuco@webkit.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1.  Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+# 2.  Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
+# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-INCLUDE(FindPkgConfig)
+FIND_PACKAGE(PkgConfig)
+PKG_CHECK_MODULES(PC_CAIRO cairo) # FIXME: After we require CMake 2.8.2 we can pass QUIET to this call.

-IF(Cairo_FIND_REQUIRED)
-	SET(_pkgconfig_REQUIRED "REQUIRED")
-ELSE(Cairo_FIND_REQUIRED)
-	SET(_pkgconfig_REQUIRED "")
-ENDIF(Cairo_FIND_REQUIRED)
+FIND_PATH(CAIRO_INCLUDE_DIRS
+    NAMES cairo.h
+    HINTS ${PC_CAIRO_INCLUDEDIR}
+          ${PC_CAIRO_INCLUDE_DIRS}
+    PATH_SUFFIXES cairo
+)

-IF(CAIRO_MIN_VERSION)
-	PKG_SEARCH_MODULE(CAIRO ${_pkgconfig_REQUIRED} cairo>=${CAIRO_MIN_VERSION})
-ELSE(CAIRO_MIN_VERSION)
-	PKG_SEARCH_MODULE(CAIRO ${_pkgconfig_REQUIRED} cairo)
-ENDIF(CAIRO_MIN_VERSION)
+FIND_LIBRARY(CAIRO_LIBRARIES
+    NAMES cairo
+    HINTS ${PC_CAIRO_LIBDIR}
+          ${PC_CAIRO_LIBRARY_DIRS}
+)

-IF(NOT CAIRO_FOUND AND NOT PKG_CONFIG_FOUND)
-	FIND_PATH(CAIRO_INCLUDE_DIRS cairo.h)
-	FIND_LIBRARY(CAIRO_LIBRARIES cairo)
+IF (CAIRO_INCLUDE_DIRS)
+    IF (EXISTS "${CAIRO_INCLUDE_DIRS}/cairo-version.h")
+        FILE(READ "${CAIRO_INCLUDE_DIRS}/cairo-version.h" CAIRO_VERSION_CONTENT)

-	# Report results
-	IF(CAIRO_LIBRARIES AND CAIRO_INCLUDE_DIRS)
-		SET(CAIRO_FOUND 1)
-		IF(NOT Cairo_FIND_QUIETLY)
-			MESSAGE(STATUS "Found Cairo: ${CAIRO_LIBRARIES}")
-		ENDIF(NOT Cairo_FIND_QUIETLY)
-	ELSE(CAIRO_LIBRARIES AND CAIRO_INCLUDE_DIRS)
-		IF(Cairo_FIND_REQUIRED)
-			MESSAGE(SEND_ERROR "Could not find Cairo")
-		ELSE(Cairo_FIND_REQUIRED)
-			IF(NOT Cairo_FIND_QUIETLY)
-				MESSAGE(STATUS "Could not find Cairo")
-			ENDIF(NOT Cairo_FIND_QUIETLY)
-		ENDIF(Cairo_FIND_REQUIRED)
-	ENDIF(CAIRO_LIBRARIES AND CAIRO_INCLUDE_DIRS)
-ENDIF(NOT CAIRO_FOUND AND NOT PKG_CONFIG_FOUND)
+        STRING(REGEX MATCH "#define +CAIRO_VERSION_MAJOR +([0-9]+)" _dummy "${CAIRO_VERSION_CONTENT}")
+        SET(CAIRO_VERSION_MAJOR "${CMAKE_MATCH_1}")

-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED(CAIRO_LIBRARIES CAIRO_INCLUDE_DIRS)+        STRING(REGEX MATCH "#define +CAIRO_VERSION_MINOR +([0-9]+)" _dummy "${CAIRO_VERSION_CONTENT}")
+        SET(CAIRO_VERSION_MINOR "${CMAKE_MATCH_1}")
+
+        STRING(REGEX MATCH "#define +CAIRO_VERSION_MICRO +([0-9]+)" _dummy "${CAIRO_VERSION_CONTENT}")
+        SET(CAIRO_VERSION_MICRO "${CMAKE_MATCH_1}")
+
+        SET(CAIRO_VERSION "${CAIRO_VERSION_MAJOR}.${CAIRO_VERSION_MINOR}.${CAIRO_VERSION_MICRO}")
+    ENDIF ()
+ENDIF ()
+
+# FIXME: Should not be needed anymore once we start depending on CMake 2.8.3
+SET(VERSION_OK TRUE)
+IF (Cairo_FIND_VERSION)
+    IF (Cairo_FIND_VERSION_EXACT)
+        IF ("${Cairo_FIND_VERSION}" VERSION_EQUAL "${CAIRO_VERSION}")
+            # FIXME: Use IF (NOT ...) with CMake 2.8.2+ to get rid of the ELSE block
+        ELSE ()
+            SET(VERSION_OK FALSE)
+        ENDIF ()
+    ELSE ()
+        IF ("${Cairo_FIND_VERSION}" VERSION_GREATER "${CAIRO_VERSION}")
+            SET(VERSION_OK FALSE)
+        ENDIF ()
+    ENDIF ()
+ENDIF ()
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Cairo DEFAULT_MSG CAIRO_INCLUDE_DIRS CAIRO_LIBRARIES VERSION_OK)


ENH: Bump tag for wiki examples

ENH: Bump tag for wiki examples

Wiki examples now support the vtk rendering backend selection added to
vtk 6.

Change-Id: I8f07e8cd57d33075132c69d6be0d8e6642b4a0c5

--- Modules/Remote/WikiExamples.remote.cmake
+++ Modules/Remote/WikiExamples.remote.cmake
@@ -5,6 +5,6 @@
 itk_fetch_module(WikiExamples
   "A collection of examples that illustrate how to use ITK."
   GIT_REPOSITORY https://github.com/InsightSoftwareConsortium/ITKWikiExamples.git
-  # July 09, 2015
-  GIT_TAG 1c53a9346e914959f1afb8df79cf449ff99ac7fa
+  # September 27, 2015
+  GIT_TAG 29f456945d7ff9a35ac8bfaf8985601f8ddf9cba
   )


Android: Fixed shortcut launching

Android: Fixed shortcut launching

--- client/Android/aFreeRDP/AndroidManifest.xml.cmake
+++ client/Android/aFreeRDP/AndroidManifest.xml.cmake
@@ -32,16 +32,19 @@
 				android:theme="@android:style/Theme.NoDisplay"
 				android:noHistory="true"
 				android:excludeFromRecents="true">
+				<intent-filter>
+				    <action android:name="android.intent.action.MAIN"/>
+	            </intent-filter>
 			</activity>

-	       		<activity-alias android:name=".services.SessionRequestHandlerActivity"
-		            android:targetActivity="com.freerdp.freerdpcore.services.SessionRequestHandlerActivity">
+       		<activity-alias android:name=".services.SessionRequestHandlerActivity"
+	            android:targetActivity="com.freerdp.freerdpcore.services.SessionRequestHandlerActivity">
 				<intent-filter>
 					<action android:name="android.intent.action.SEARCH" />
 				</intent-filter>
 				<meta-data android:name="android.app.searchable"
 					android:resource="@xml/searchable" />
-		        </activity-alias>
+	        </activity-alias>

 			<provider android:name="com.freerdp.freerdpcore.services.FreeRDPSuggestionProvider"
 				android:authorities="com.freerdp.afreerdp.services.freerdpsuggestionprovider"


- fix of issue 2123: since swig 3.x produce invalid c# files those need to be fixed during the build process.

--- copasi/bindings/csharp/compile-native-files.cmake
+++ copasi/bindings/csharp/compile-native-files.cmake
@@ -1,3 +1,8 @@
+# Copyright (C) 2012 - 2015 by Pedro Mendes, Virginia Tech Intellectual
+# Properties, Inc., University of Heidelberg, and The University
+# of Manchester.
+# All rights reserved.
+
 ###############################################################################
 #
 # Description       : CMake build script for native C# library
@@ -32,11 +37,23 @@
 file(GLOB_RECURSE SOURCE_FILES RELATIVE ${BIN_DIRECTORY} ${BIN_DIRECTORY}/csharp-files/*.cs)
 set(SOURCE_FILES ${SOURCE_FILES} ${SRC_DIRECTORY}/AssemblyInfo.cs)

+SET(PATCH_SWIG_FILES ON)
+
 # convert paths
 set(NATIVE_FILES)
 foreach(csFile ${SOURCE_FILES})
 	file(TO_NATIVE_PATH ${csFile} temp)
 	set(NATIVE_FILES ${NATIVE_FILES} ${temp})
+
+  if (PATCH_SWIG_FILES)
+
+    # read file, prepend using statement, write again ...
+    file(READ ${csFile} content)
+    file(WRITE ${csFile} "using System;\nusing System.Runtime.InteropServices;\n\n${content}")
+
+  endif(PATCH_SWIG_FILES)
+
+
 endforeach()

 # delete file if it exists
@@ -45,6 +62,7 @@
 endif()

 # the compile run disables the following warnings
+# -  105: duplicated using statement, due to the patch above
 # -  108: 'method name' hides inherited member 'base member name'. Use the
 #         new keyword if hiding was intended.
 # -  114: 'method name' hides inherited member 'base member name'. To make


Fix jsoncpp header finder function to avoid weird compile errors.

--- indra/cmake/FindJsonCpp.cmake
+++ indra/cmake/FindJsonCpp.cmake
@@ -9,8 +9,7 @@
 #  also defined, but not for general use are
 #  JSONCPP_LIBRARY, where to find the jsoncpp library.

-FIND_PATH(JSONCPP_INCLUDE_DIRS json.h
-  PATH_SUFFIXES jsoncpp jsoncpp/json )
+FIND_PATH(JSONCPP_INCLUDE_DIRS jsoncpp/json.h)

 # Get the GCC compiler version
 EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
@@ -31,6 +30,7 @@

 IF (JSONCPP_LIBRARY AND JSONCPP_INCLUDE_DIRS)
     SET(JSONCPP_LIBRARIES ${JSONCPP_LIBRARY})
+    SET(JSONCPP_INCLUDE_DIR ${JSONCPP_INCLUDE_DIRS})
     SET(JSONCPP_FOUND "YES")
 ELSE (JSONCPP_LIBRARY AND JSONCPP_INCLUDE_DIRS)
   SET(JSONCPP_FOUND "NO")


Fix finding lua executable when not explicitly set.

When the SITK_LUA_EXECUTABLE was not explicitly set, the executable
was not search for.

Remove the variable evaluation, to allow CMake to determine if the
variable exists. This allows the initial value of SITK_LUA_EXECUTABLE
to be set, when not explicitly set ( as the superbuild does ).

Remove unconditional find to preserve the lua version used for the
target for wrapping.

Change-Id: I7040fecd8f78db020d8a6ce688fcfc62ca6b54c5

--- CMake/generate_filter_source.cmake
+++ CMake/generate_filter_source.cmake
@@ -1,7 +1,5 @@

-find_package( LuaInterp REQUIRED 5.1 )
-
-if ( NOT ${SITK_LUA_EXECUTABLE} )
+if ( NOT SITK_LUA_EXECUTABLE )
   find_package( LuaInterp REQUIRED 5.1 )
   set( SITK_LUA_EXECUTABLE ${LUA_EXECUTABLE} CACHE PATH "Lua executable used for code generation." )
   unset( LUA_EXECUTABLE CACHE )


cmake: compiler: arm: Whitespace-align flags

This commit whitespace-aligns the toolchain flags.

Signed-off-by: Stephanos Ioannidis <dc76e9f0c0006e8f919e0c515c66dbba3982f785@stephanos.io>

--- cmake/compiler/gcc/target_arm.cmake
+++ cmake/compiler/gcc/target_arm.cmake
@@ -29,14 +29,14 @@
   set(FPU_FOR_cortex-m33     fpv5-${PRECISION_TOKEN}d16)

   if(CONFIG_FLOAT)
-    list(APPEND TOOLCHAIN_C_FLAGS -mfpu=${FPU_FOR_${GCC_M_CPU}})
-    list(APPEND TOOLCHAIN_LD_FLAGS -mfpu=${FPU_FOR_${GCC_M_CPU}})
+    list(APPEND TOOLCHAIN_C_FLAGS   -mfpu=${FPU_FOR_${GCC_M_CPU}})
+    list(APPEND TOOLCHAIN_LD_FLAGS  -mfpu=${FPU_FOR_${GCC_M_CPU}})
     if    (CONFIG_FP_SOFTABI)
-      list(APPEND TOOLCHAIN_C_FLAGS -mfloat-abi=softfp)
-      list(APPEND TOOLCHAIN_LD_FLAGS -mfloat-abi=softfp)
+      list(APPEND TOOLCHAIN_C_FLAGS   -mfloat-abi=softfp)
+      list(APPEND TOOLCHAIN_LD_FLAGS  -mfloat-abi=softfp)
     elseif(CONFIG_FP_HARDABI)
-      list(APPEND TOOLCHAIN_C_FLAGS -mfloat-abi=hard)
-      list(APPEND TOOLCHAIN_LD_FLAGS -mfloat-abi=hard)
+      list(APPEND TOOLCHAIN_C_FLAGS   -mfloat-abi=hard)
+      list(APPEND TOOLCHAIN_LD_FLAGS  -mfloat-abi=hard)
     endif()
   endif()
 endif()


Fix Windows slashes

Fix Windows slashes

--- cmake/modules/hunter_download.cmake
+++ cmake/modules/hunter_download.cmake
@@ -446,10 +446,14 @@
       "${HUNTER_DOWNLOAD_TOOLCHAIN}"
       "set(HUNTER_CACHE_SERVERS \"${HUNTER_CACHE_SERVERS}\" CACHE INTERNAL \"\")\n"
   )
-  file(
-      APPEND
-      "${HUNTER_DOWNLOAD_TOOLCHAIN}"
-      "set(HUNTER_PASSWORDS_PATH \"${HUNTER_PASSWORDS_PATH}\" CACHE INTERNAL \"\")\n"
+  # Fix Windows slashes
+  get_filename_component(
+      passwords_path "${HUNTER_PASSWORDS_PATH}" ABSOLUTE
+  )
+  file(
+      APPEND
+      "${HUNTER_DOWNLOAD_TOOLCHAIN}"
+      "set(HUNTER_PASSWORDS_PATH \"${passwords_path}\" CACHE INTERNAL \"\")\n"
   )
   file(
       APPEND


Commit the changes to the options to the cache

--- cmake/platform/win32/platform.cmake
+++ cmake/platform/win32/platform.cmake
@@ -3,19 +3,19 @@

 add_compiler_flags(-D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS) # Remove all of the really annoying c++17 deprection warnings

-if("$<CONFIG>" STREQUAL ".")
+if("${CMAKE_CFG_INTDIR}" STREQUAL ".")
   set(MAKEFILES TRUE)
 else()
   set(MSBUILD TRUE)
 endif()

 if(MAKEFILES AND "${BUILD_TYPE}" STREQUAL "Release")
-  set(OFFICIAL_BUILD ON)
-  set(BUILD_TOOLS OFF)
-  set(BUILD_TESTS OFF)
-  set(WITH_GTEST OFF)
-  set(WITH_GMOCK OFF)
-  set(DEBUG OFF)
+  set(OFFICIAL_BUILD ON CACHE BOOL "" FORCE)
+  set(BUILD_TOOLS OFF CACHE BOOL "" FORCE)
+  set(BUILD_TESTS OFF CACHE BOOL "" FORCE)
+  set(WITH_GTEST OFF CACHE BOOL "" FORCE )
+  set(WITH_GMOCK OFF CACHE BOOL "" FORCE )
+  set(DEBUG OFF CACHE BOOL "" FORCE)
 endif()

 macro(use_unicode_here)


findsuitesparse updated

findsuitesparse updated

--- cmake_modules/FindSuiteSparse.cmake
+++ cmake_modules/FindSuiteSparse.cmake
@@ -6,10 +6,34 @@
 # SUITESPARSE_INCLUDE_DIRS
 # SUITESPARSE_LIBRARIES

+
+# HINTS
+LIST(APPEND SUITESPARSE_CHECK_INCLUDE_DIRS
+  ${SUITESPARSE_INCLUDE_DIR_HINTS}
+  /opt/local/include
+  /opt/local/include/ufsparse # Mac OS X
+  /usr/local/homebrew/include # Mac OS X
+  /usr/local/include
+  /usr/local/include/suitesparse
+  /usr/include/suitesparse # Ubuntu
+  /usr/include)
+LIST(APPEND SUITESPARSE_CHECK_LIBRARY_DIRS
+  ${SUITESPARSE_LIBRARY_DIR_HINTS}
+  /opt/local/lib
+  /opt/local/lib/ufsparse # Mac OS X
+  /usr/local/homebrew/lib # Mac OS X
+  /usr/local/lib
+  /usr/local/lib/suitesparse
+  /usr/lib/suitesparse # Ubuntu
+  /usr/lib)
+
+
+
 FIND_PATH(
   SUITESPARSE_INCLUDE_DIR
   NAMES umfpack.h
-    )
+  PATHS ${SUITESPARSE_CHECK_INCLUDE_DIRS}
+)
 mark_as_advanced(SUITESPARSE_INCLUDE_DIR)
 set(SUITESPARSE_INCLUDE_DIRS ${SUITESPARSE_INCLUDE_DIR})

@@ -23,6 +47,7 @@
   SET(SUITESPARSE_${suitesparse_lib}_LIBRARY "SUITESPARSE_${suitesparse_lib}_LIBRARY-NOTFOUND")
   FIND_LIBRARY(SUITESPARSE_${suitesparse_lib}_LIBRARY
     NAMES ${suitesparse_lib}
+    PATHS ${SUITESPARSE_CHECK_LIBRARY_DIRS}
   )
   mark_as_advanced(SUITESPARSE_${suitesparse_lib}_LIBRARY)
   list(APPEND SUITESPARSE_LIBRARIES ${SUITESPARSE_${suitesparse_lib}_LIBRARY})


ENH: Fixed relative path to vista_common.cmake.

--- Scripts/setupTestingDashboardBuild.cmake
+++ Scripts/setupTestingDashboardBuild.cmake
@@ -18,4 +18,4 @@

 #Path to the Git Executable.
 set(CTEST_GIT_COMMAND /usr/bin/git)
-include(${CTEST_SCRIPT_DIRECTORY}/../vista_common.cmake)
+include(${CTEST_SCRIPT_DIRECTORY}/vista_common.cmake)


Remove message from lib/CMake/Documentation.cmake

--- lib/CMake/Documentation.cmake
+++ lib/CMake/Documentation.cmake
@@ -39,9 +39,6 @@

     	# Copy Doxyfile in each project and replace all variable like @@PROJECT_OUTPUT_NAME@_SOURCE_DIR@ by its value
     	configure_file(${CMAKE_CURRENT_BINARY_DIR}/doc/Doxyfile-html ${CMAKE_CURRENT_BINARY_DIR}/doc/Doxyfile-html @ONLY)
-
-
-      message(STATUS ${PROJECT_OUTPUT_NAME})

     	# Set variable so as to build the documentation with doxygen
     	set(DOCUMENTATION_OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/doc/html/index.html)


Corrected the preprocessor binary name

Corrected the preprocessor binary name

--- os/android.toolchain.cmake
+++ os/android.toolchain.cmake
@@ -1143,7 +1143,7 @@
   endif()
  endif()
  set( CMAKE_ASM_COMPILER "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc${TOOL_OS_SUFFIX}"     CACHE PATH "assembler" )
- set( CMAKE_C_PREPROCESSOR "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc${TOOL_OS_SUFFIX}"     CACHE PATH "preprocessor" )
+ set( CMAKE_C_PREPROCESSOR "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-cpp${TOOL_OS_SUFFIX}"     CACHE PATH "preprocessor" )
  set( CMAKE_STRIP        "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-strip${TOOL_OS_SUFFIX}"   CACHE PATH "strip" )
  set( CMAKE_AR           "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-ar${TOOL_OS_SUFFIX}"      CACHE PATH "archive" )
  set( CMAKE_LINKER       "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-ld${TOOL_OS_SUFFIX}"      CACHE PATH "linker" )