Add test filtering by dimensionality

Add test filtering by dimensionality

--- tests/system_tests/run_system_tests.sh.cmake
+++ tests/system_tests/run_system_tests.sh.cmake
@@ -57,6 +57,7 @@
 EXECUTE_WITH_VALGRIND=0

 PRIORITY=1
+DIMENSION=""
 CONFIG_ARG=""
 CONFIG_ALL=0
 DEFAULT_CONFIG=/dev/null
@@ -929,6 +930,8 @@
     echo -e "\t\tExecute the given step with Valgrind. Excution with Valgrind\n\t\tis not yet supported."
     echo -e "\t--priority <level>"
     echo -e "\t\tExecute the test cases with priority higher than or equal\n\t\tto the given level."
+    echo -e "\t--dimension <dimension>"
+    echo -e "\t\tExecute the test cases of the given dimension."
 	echo -e "\t--config <config-file-path>"
 	echo -e "\t\tRead configuration option from the file."
 	echo -e "\t--email <email-address>"
@@ -1096,10 +1099,18 @@
 		cat $cfg
 		echo "Dimension: $DIM"
 		echo "Supported targets:" ${SUPPORTED_TARGETS[@]}
+		echo "Supported dimension:" ${DIMENSION}

 		if ! find_in_array SUPPORTED_TARGETS $TARGET; then
 			# skip
 			echo "Target $TARGET not supported for this test"
+			do_test_finish $SKIP_TRANSLATE
+			popd > /dev/null
+			return $SKIP_TRANSLATE
+		fi
+
+		if [ "x" != "x$DIMENSION" -a "x$DIMENSION" != "x$DIM" ]; then
+			echo "Non-matching dimension"
 			do_test_finish $SKIP_TRANSLATE
 			popd > /dev/null
 			return $SKIP_TRANSLATE
@@ -1288,6 +1299,10 @@
 	} 2>&1 | tee -a $LOGFILE
 }

+if [ $# -eq 0 ]; then
+	print_usage
+	exit 0
+fi

 if is_sub_command $@; then
 	do_sub_command $@
@@ -1304,7 +1319,7 @@

     TESTS=$(get_test_cases)

-    TEMP=$(getopt -o ht:s:m:q --long help,clear,targets:,source:,translate,compile,execute,mpirun,machinefile:,proc-dim:,physis-nlp:,quit,with-valgrind:,priority:,trace,config:,config-all,email:,list,parallel::, -- "$@")
+    TEMP=$(getopt -o ht:s:m:q --long help,clear,targets:,source:,translate,compile,execute,mpirun,machinefile:,proc-dim:,physis-nlp:,quit,with-valgrind:,priority:,dimension:,trace,config:,config-all,email:,list,parallel::, -- "$@")

     if [ $? != 0 ]; then
 		print_error "Error in getopt. Invalid options: $@"
@@ -1361,6 +1376,10 @@
 				;;
 			--priority)
 				PRIORITY=$2
+				shift 2
+				;;
+			--dimension)
+				DIMENSION=$2
 				shift 2
 				;;
 			--trace)


[numerics] relax accuracy to avoid timeout in ci

--- numerics/numerics_tests.cmake
+++ numerics/numerics_tests.cmake
@@ -486,7 +486,7 @@
   # ---- Hyperplane Projection ----
   # HP is not converging
   NEW_FC_3D_TEST(Confeti-ex13-Fc3D-SBM.dat
-    SICONOS_FRICTION_3D_HP 1e-3 10000
+    SICONOS_FRICTION_3D_HP 1e-3 1000
     0 0 0
     WILL_FAIL)

@@ -508,7 +508,7 @@
     DPARAM 3 -1e1)

   NEW_FC_3D_TEST(BoxesStack1-i100000-32.hdf5.dat
-    SICONOS_FRICTION_3D_VI_FPP 1e-8 100000
+    SICONOS_FRICTION_3D_VI_FPP 1e-3 100000
     0 0 0
     IPARAM 2 1)


DOC: update doc of SVMLearning

DOC: update doc of SVMLearning

--- Modules/Learning/SVMLearning/otb-module.cmake
+++ Modules/Learning/SVMLearning/otb-module.cmake
@@ -1,4 +1,4 @@
-set(DOCUMENTATION "OTB implementation of the Support Vector Machine.")
+set(DOCUMENTATION "Deprecated classes for SVM learning. See module 'Supervised' for a replacement")

 otb_module(OTBSVMLearning
   DEPENDS


Add debug postfix for main executables on Windows platform. Closes #113.

--- Source/CMake/Modules/Urho3D-CMake-magic.cmake
+++ Source/CMake/Modules/Urho3D-CMake-magic.cmake
@@ -513,6 +513,9 @@
             setup_macosx_linker_flags (CMAKE_EXE_LINKER_FLAGS)
         endif ()
         setup_executable (${EXE_TYPE})
+        if (WIN32)
+            set_target_properties (${TARGET_NAME} PROPERTIES DEBUG_POSTFIX _d)
+        endif ()
     endif ()

     if (IOS)


update basholeveldb download hash for shared build tarball

--- basholeveldb.cmake
+++ basholeveldb.cmake
@@ -11,9 +11,9 @@
 include (BuildSupport)

 external_source (basholeveldb
-    1.9
-    basholeveldb-1.9.0.tar.gz
-    8b8e450aaf3d5ae07d20e604f1c9d0cb)
+    2.0.20
+    basholeveldb-2.0.20.tar.gz
+    b83fb50eb3240a7a9c4d6fa58974a9c6)

 message ("Installing ${basholeveldb_NAME} into FlyEM build area: ${BUILDEM_DIR} ...")
 if (${APPLE})


[OpenMP] Remove accidental commit to config-ix.cmake in r353747

git-svn-id: f99161ee8ccfe2101cbe1bdda2220bce2ed25485@353748 91177308-0d34-0410-b5e6-96231b3b80d8

--- runtime/cmake/config-ix.cmake
+++ runtime/cmake/config-ix.cmake
@@ -10,7 +10,6 @@

 include(CheckCCompilerFlag)
 include(CheckCSourceCompiles)
-include(CheckCXXSourceCompiles)
 include(CheckCXXCompilerFlag)
 include(CheckIncludeFile)
 include(CheckLibraryExists)
@@ -37,42 +36,6 @@
   check_c_source_compiles("${source_code}" ${retval})
   set(${retval} ${${retval}} PARENT_SCOPE)
   file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/__version_script.txt)
-endfunction()
-
-function(libomp_check_attribute_fallthrough retval)
-  set(fallthroughs "[[fallthrough]]" "[[clang::fallthrough]]" "__attribute__((__fallthrough__))")
-  foreach(fallthrough IN LISTS fallthroughs)
-    string(MAKE_C_IDENTIFIER "${fallthrough}" test_name)
-    set(source_code
-      "#include <stdio.h>
-      enum class foo_e { zero, one, two, three, four };
-      int main(int argc, char** argv) {
-        foo_e foo;
-        if (argc == 0) foo = foo_e::zero;
-        else if (argc == 1) foo = foo_e::one;
-        else if (argc == 2) foo = foo_e::two;
-        else if (argc == 3) foo = foo_e::three;
-        else if (argc == 4) foo = foo_e::four;
-        switch (foo) {
-          case foo_e::zero:
-            ${fallthrough}
-          case foo_e::one:
-            return 1;
-          case foo_e::two:
-            return 2;
-          case foo_e::three:
-            return 3;
-          case foo_e::four:
-            return 4;
-        }
-        return 0;
-      }")
-    check_cxx_source_compiles("${source_code}" ${test_name})
-    if(${test_name})
-      set(${retval} ${fallthrough} PARENT_SCOPE)
-      break()
-    endif()
-  endforeach()
 endfunction()

 # Includes the architecture flag in both compile and link phase
@@ -209,7 +172,6 @@
 # Checking features
 # Check if version symbol assembler directives are supported
 libomp_check_version_symbols(LIBOMP_HAVE_VERSION_SYMBOLS)
-libomp_check_attribute_fallthrough(LIBOMP_FALLTHROUGH)

 # Check if quad precision types are available
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")


set MKL search path with intel64 (#188)

set MKL search path with intel64 (#188)

--- cmake/cblas.cmake
+++ cmake/cblas.cmake
@@ -17,10 +17,17 @@
 ## Find MKL First.
 set(MKL_ROOT $ENV{MKL_ROOT} CACHE PATH "Folder contains MKL")

-find_path(MKL_INCLUDE_DIR mkl.h PATHS ${MKL_ROOT}/include)
-find_library(MKL_CORE_LIB NAMES mkl_core PATHS ${MKL_ROOT}/lib)
-find_library(MKL_SEQUENTIAL_LIB NAMES mkl_sequential PATHS ${MKL_ROOT}/lib)
-find_library(MKL_INTEL_LP64 NAMES mkl_intel_lp64 PATHS ${MKL_ROOT}/lib)
+find_path(MKL_INCLUDE_DIR mkl.h PATHS
+  ${MKL_ROOT}/include)
+find_library(MKL_CORE_LIB NAMES mkl_core PATHS
+  ${MKL_ROOT}/lib
+  ${MKL_ROOT}/lib/intel64)
+find_library(MKL_SEQUENTIAL_LIB NAMES mkl_sequential PATHS
+  ${MKL_ROOT}/lib
+  ${MKL_ROOT}/lib/intel64)
+find_library(MKL_INTEL_LP64 NAMES mkl_intel_lp64 PATHS
+  ${MKL_ROOT}/lib
+  ${MKL_ROOT}/lib/intel64)

 if(MKL_INCLUDE_DIR AND MKL_CORE_LIB AND MKL_SEQUENTIAL_LIB AND MKL_INTEL_LP64)


Copy over paraview plugins on Linux

Copy over paraview plugins on Linux

Signed-off-by: Patrick Avery <743342299f279e7a8c3ff5eb40671fce3e95f13a@kitware.com>

--- projects/unix/tomviz.bundle.cmake
+++ projects/unix/tomviz.bundle.cmake
@@ -95,6 +95,15 @@
 )
 endif()

+# Copy over paraview plugins
+install(CODE
+"
+  execute_process(COMMAND
+    ${CMAKE_COMMAND}
+    -E copy_directory ${install_location}/lib/paraview-5.9/plugins \${CMAKE_INSTALL_PREFIX}/lib/paraview-5.9/plugins)
+"
+)
+
 # install executables
 foreach(executable tomviz)
   install(PROGRAMS "${install_location}/bin/${executable}"


Disabled language extensions

Disabled language extensions

--- build/macros.cmake
+++ build/macros.cmake
@@ -201,6 +201,7 @@
 		elseif(NOT CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
 			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Wall")
 		endif()
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Za") #Disable VS extensions
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /sdl") #Security Development Lifecycle checks
 		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /RTCc") #Smaller type checks
 		add_definitions(-D_ALLOW_RTCc_IN_STL) #Acknowledge STL does not support this check


Update common_utils to fix compilation issue

Cf. https://github.com/openhumanoids/common_utils/pull/8

--- software/externals/cmake/externals.cmake
+++ software/externals/cmake/externals.cmake
@@ -64,7 +64,7 @@
 set(occ-map_depends libbot opencv)

 set(common_utils_url https://github.com/openhumanoids/common_utils.git)
-set(common_utils_revision 1221d2fa533a213e8e895da3716fb069df423b1a)
+set(common_utils_revision bf0c9223e02a193a3cfef4034ef82a94219f116a)
 set(common_utils_depends Eigen_pod libbot occ-map octomap)

 set(frsm_url ssh://git@github.com/openhumanoids/frsm.git)


Remove tpu_sendrecv_ops from Windows cmake file.

PiperOrigin-RevId: 164176263

--- tensorflow/contrib/cmake/tf_core_kernels.cmake
+++ tensorflow/contrib/cmake/tf_core_kernels.cmake
@@ -111,7 +111,6 @@
       "${tensorflow_source_dir}/tensorflow/contrib/tpu/ops/outfeed_ops.cc"
       "${tensorflow_source_dir}/tensorflow/contrib/tpu/ops/replication_ops.cc"
       "${tensorflow_source_dir}/tensorflow/contrib/tpu/ops/tpu_configuration_ops.cc"
-      "${tensorflow_source_dir}/tensorflow/contrib/tpu/ops/tpu_sendrecv_ops.cc"
     )
   list(APPEND tf_core_kernels_srcs ${tf_contrib_kernels_srcs})
 endif(tensorflow_BUILD_CONTRIB_KERNELS)


BUG: Path to executables was found only after reconfiguring the project

When configuring the project a first time, the path to the executables used for the installation and the packaging were not set properly. CMake was trying to fin the executable but those were not yet built. One had to compile the code first, and then configure the project again to set the paths properly

--- DTIPrepTools.cmake
+++ DTIPrepTools.cmake
@@ -10,15 +10,7 @@
     ${ARGN}
     )
   foreach( tool ${LOCAL_LIST_EXEC})
-    unset( path_to_tool CACHE )
-    find_program( path_to_tool
-       NAMES ${tool}
-       PATHS ${EXTENSION_SUPERBUILD_BINARY_DIR}/bin
-       PATH_SUFFIXES Debug Release RelWithDebInfo MinSizeRel .
-       NO_DEFAULT_PATH
-       NO_SYSTEM_ENVIRONMENT_PATH
-      )
-    install(PROGRAMS ${path_to_tool} DESTINATION ${LOCAL_OUTPUT_DIR} )
+    install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${tool} DESTINATION ${LOCAL_OUTPUT_DIR} )
   endforeach()
 endmacro()


Propagate common flag to autolinked libraries (#34853)

Summary:
I'm handling this TODO i left to unbreak the CI.
We need to make sure all the autolinked libraries are getting the folly flags and other common flags propagated correctly.

## Changelog

[Internal] [Change] - Propagate common flag to autolinked libraries

Pull Request resolved: https://github.com/facebook/react-native/pull/34853

Test Plan: Will rely on a green CI

Reviewed By: cipolleschi

Differential Revision: D40055134

Pulled By: cortinico

fbshipit-source-id: fb9afab954ab402f6a3ab417aba934035580f936

--- ReactAndroid/cmake-utils/ReactNative-application.cmake
+++ ReactAndroid/cmake-utils/ReactNative-application.cmake
@@ -101,6 +101,7 @@
 if(EXISTS ${PROJECT_BUILD_DIR}/generated/rncli/src/main/jni/Android-rncli.cmake)
         include(${PROJECT_BUILD_DIR}/generated/rncli/src/main/jni/Android-rncli.cmake)
         target_link_libraries(${CMAKE_PROJECT_NAME} ${AUTOLINKED_LIBRARIES})
-        # TODO Re-link autlinking libraries against common_flags
-        # target_link_libraries(${AUTOLINKED_LIBRARIES} PRIVATE common_flags)
+        foreach(autolinked_library ${AUTOLINKED_LIBRARIES})
+            target_link_libraries(autolinked_library INTERFACE common_flags)
+        endforeach()
 endif()


updated xnnpack to commit 01c341b597504643081ff596d8ee755bf4c59c51 in xnnpack.cmake

--- tensorflow/lite/tools/cmake/modules/xnnpack.cmake
+++ tensorflow/lite/tools/cmake/modules/xnnpack.cmake
@@ -22,7 +22,7 @@
 OverridableFetchContent_Declare(
   xnnpack
   GIT_REPOSITORY https://github.com/google/XNNPACK
-  GIT_TAG 094e692629d57ddb932fcc993193626f60daa61b
+  GIT_TAG 01c341b597504643081ff596d8ee755bf4c59c51
   GIT_PROGRESS TRUE
   PREFIX "${CMAKE_BINARY_DIR}"
   SOURCE_DIR "${CMAKE_BINARY_DIR}/xnnpack"


fix clang device compile

fix clang device compile

add path to cuda to allow clang usage for the device code

--- alpakaConfig.cmake
+++ alpakaConfig.cmake
@@ -295,6 +295,8 @@
                     LIST(APPEND _ALPAKA_COMPILE_OPTIONS_PUBLIC "--cuda-gpu-arch=sm_${_CUDA_ARCH_ELEM}")
                 ENDFOREACH()

+                LIST(APPEND _ALPAKA_COMPILE_OPTIONS_PUBLIC "--cuda-path=${CUDA_TOOLKIT_ROOT_DIR}")
+
                 # This flag silences the warning produced by the Dummy.cpp files:
                 # clang: warning: argument unused during compilation: '--cuda-gpu-arch=sm_XX'
                 # This seems to be a false positive as all flags are 'unused' for an empty file.


Clarifying error message further.

Clarifying error message further.

--- CPM.cmake
+++ CPM.cmake
@@ -697,8 +697,8 @@
       message("CPM namespace conflict.")
       message("  Current module name: ${name}.")
       message("  Conflicting propressor macro: ${__CPM_LAST_MODULE_PREPROC}.")
-      message("  Current module UNID: ${fullUNID}.")
-      message("  Conflicting module UNID: ${CPM_KV_PREPROC_NS_MAP_${__CPM_LAST_MODULE_PREPROC}}.")
+      message("  Our module UNID: ${fullUNID}.")
+      message("  Conflicting UNID: ${CPM_KV_PREPROC_NS_MAP_${__CPM_LAST_MODULE_PREPROC}}.")
       message(FATAL_ERROR "CPM cannot continue without resolving namespace conflict.")
     endif()
   else()


Change case of defined directive.

Change case of defined directive.

--- CPM.cmake
+++ CPM.cmake
@@ -159,7 +159,7 @@
 # If CPM_UNIQUE_ID exists then use that as the base directory for CPM.
 # Note that we are already in the parent's namespace (we are not in a
 # function), so we directly modify the appropriate GLOBAL variables.
-if (defined CPM_UNIQUE_ID)
+if (DEFINED CPM_UNIQUE_ID)
   set(CPM_NS_HEADER_FILE "${CPM_DIR_OF_CPM}/include/${CPM_UNIQUE_ID}/cpm/cpm.h")
   set(CPM_INCLUDE_DIRS "${CPM_DIR_OF_CPM}/include/${CPM_UNIQUE_ID}")
 else()


Remove debug hierarchy output.

Remove debug hierarchy output.

--- CPM.cmake
+++ CPM.cmake
@@ -742,7 +742,7 @@
       set(spacing "${spacing}  ")
       math( EXPR number "${number} + 1" ) # decrement number
     endwhile()
-    message("${spacing}| ${CPM_HIERARCHY_LEVEL} - ${msg}")
+    message("${spacing}| ${msg}")
   else()
     message(msg)
   endif()


Added ability to cache svn repositories.

Useful for code repositories like google test.

--- CPM.cmake
+++ CPM.cmake
@@ -1033,53 +1033,37 @@

 endmacro()

-macro(_cpm_ensure_svn_repo_is_current use_caching)
-  # Tag with a sane default if not present.
-  if (DEFINED _CPM_REPO_SVN_REVISION)
-    set(revision ${_CPM_REPO_SVN_REVISION})
-  else()
-    set(revision "HEAD")
-  endif()
-
-  find_package(Subversion)
-  if(NOT Subversion_SVN_EXECUTABLE)
-    message(FATAL_ERROR "error: could not find svn for checkout of ${_CPM_REPO_SVN_REPOSITORY}")
-  endif()
-
-  set(repo ${_CPM_REPO_SVN_REPOSITORY})
-  set(dir ${_CPM_REPO_TARGET_DIR})
-
-  if ((DEFINED _CPM_REPO_SVN_TRUST_CERT) AND (_CPM_REPO_TRUST_CERT))
-    set(trustCert "--trust-server-cert")
-  endif()
-
-  set(svn_user_pw_args "")
-  if((DEFINED _CPM_REPO_SVN_USERNAME) AND (_CPM_REPO_SVN_USERNAME))
-    set(svn_user_pw_args ${svn_user_pw_args} "--username=${_CPM_REPO_SVN_USERNAME}")
-  endif()
-  if((DEFINED _CPM_REPO_SVN_PASSWORD) AND (_CPM_REPO_SVN_PASSWORD))
-    set(svn_user_pw_args ${svn_user_pw_args} "--password=${_CPM_REPO_SVN_PASSWORD}")
-  endif()
-
-  if (NOT EXISTS "${dir}/")
-    message(STATUS "SVN checking out repo (${repo} @ revision ${revision})")
-    set(cmd ${Subversion_SVN_EXECUTABLE} co ${repo} -r ${revision}
-      --non-interactive ${trustCert} ${svn_user_pw_args} ${dir})
-    execute_process(
-      COMMAND ${cmd}
-      RESULT_VARIABLE result
-      OUTPUT_QUIET
-      ERROR_QUIET)
-    if (result)
-      set(msg "Command failed: ${result}\n")
-      set(msg "${msg} '${cmd}'")
-      message(FATAL_ERROR "${msg}")
-    endif()
-  endif()
-
-  # Update the SVN repo.
+macro(_cpm_clone_svn_repo repo dir revision trustCert svn_user_pw_args)
+  if (NOT ${trustCert} STREQUAL " ")
+    set(validTrustCert ${trustCert})
+  endif()
+  if (NOT ${svn_user_pw_args} STREQUAL " ")
+    set(valid_svn_user_pw_args ${svn_user_pw_args})
+  endif()
+  message(STATUS "SVN checking out repo (${repo} @ revision ${revision})")
+  set(cmd ${Subversion_SVN_EXECUTABLE} co ${repo} -r ${revision}
+    --non-interactive ${validTrustCert} ${valid_svn_user_pw_args} ${dir})
+  execute_process(
+    COMMAND ${cmd}
+    RESULT_VARIABLE result)
+    #OUTPUT_QUIET
+    #ERROR_QUIET)
+  if (result)
+    set(msg "Command failed: ${result}\n")
+    set(msg "${msg} '${cmd}'")
+    message(FATAL_ERROR "${msg}")
+  endif()
+endmacro()
+
+macro(_cpm_update_svn_repo dir revision trustCert svn_user_pw_args)
+  if (NOT ${trustCert} STREQUAL " ")
+    set(validTrustCert ${trustCert})
+  endif()
+  if (NOT ${svn_user_pw_args} STREQUAL " ")
+    set(valid_svn_user_pw_args ${svn_user_pw_args})
+  endif()
   set(cmd ${Subversion_SVN_EXECUTABLE} up -r ${revision}
-    --non-interactive ${trustCert} ${svn_user_pw_args})
+    --non-interactive ${validTrustCert} ${valid_svn_user_pw_args})
   execute_process(
     COMMAND ${cmd}
     RESULT_VARIABLE result
@@ -1092,6 +1076,109 @@
     set(msg "Skipping SVN update.")
     message("${msg}")
   endif()
+endmacro()
+
+macro(_cpm_ensure_svn_repo_is_current use_caching)
+  # Tag with a sane default if not present.
+  if (DEFINED _CPM_REPO_SVN_REVISION)
+    set(revision ${_CPM_REPO_SVN_REVISION})
+  else()
+    set(revision "HEAD")
+  endif()
+
+  find_package(Subversion)
+  if(NOT Subversion_SVN_EXECUTABLE)
+    message(FATAL_ERROR "error: could not find svn for checkout of ${_CPM_REPO_SVN_REPOSITORY}")
+  endif()
+
+  set(repo ${_CPM_REPO_SVN_REPOSITORY})
+  set(dir ${_CPM_REPO_TARGET_DIR})
+
+  if ((DEFINED _CPM_REPO_SVN_TRUST_CERT) AND (_CPM_REPO_TRUST_CERT))
+    set(trustCert "--trust-server-cert")
+  else()
+    set(trustCert " ")
+  endif()
+
+  set(svn_user_pw_args " ")
+  if((DEFINED _CPM_REPO_SVN_USERNAME) AND (_CPM_REPO_SVN_USERNAME))
+    set(svn_user_pw_args ${svn_user_pw_args} "--username=${_CPM_REPO_SVN_USERNAME}")
+  endif()
+  if((DEFINED _CPM_REPO_SVN_PASSWORD) AND (_CPM_REPO_SVN_PASSWORD))
+    set(svn_user_pw_args ${svn_user_pw_args} "--password=${_CPM_REPO_SVN_PASSWORD}")
+  endif()
+
+  if (NOT EXISTS "${dir}/")
+    # If there exists a cache repository, check the cache directory before
+    # cloning a new instance of the repository. This results in the following
+    # two scenarios:
+    #
+    # 1) If we determine that there is cached instance of the repo then update
+    #    the cached repo and copy the cache directory to our current directory.
+    #
+    # 2) If we do not find a cached repository, clone it into the cache
+    #    directory, then follow steps in #1.
+    #
+
+    # All modules will be cached in the cache directory.
+    if ((DEFINED CPM_MODULE_CACHE_DIR) AND (${use_caching}))
+
+      if (NOT EXISTS ${CPM_MODULE_CACHE_DIR})
+        file(MAKE_DIRECTORY ${CPM_MODULE_CACHE_DIR})
+      endif()
+
+      # Generate unique id for repo and check the cache directory.
+      set(__CPM_ENSURE_CACHE_UNID ${repo})
+      _cpm_make_valid_unid_or_path(__CPM_ENSURE_CACHE_UNID)
+
+      # Use unique id (non-versioned) to lookup the repository in
+      # the cache directory.
+      set(__CPM_ENSURE_CACHE_DIR "${CPM_MODULE_CACHE_DIR}/${__CPM_ENSURE_CACHE_UNID}")
+      if (EXISTS ${__CPM_ENSURE_CACHE_DIR})
+        # Update the repository, then copy it. Only update if we can
+        # write to the cache directory.
+        message(STATUS "Found cached version of ${repo}.")
+
+        if (NOT DEFINED CPM_MODULE_CACHE_NO_WRITE)
+          _cpm_update_svn_repo(${__CPM_ENSURE_CACHE_DIR} ${revision} ${trustCert} ${svn_user_pw_args})
+        endif()
+
+        # We are positive the directory exists, although it may not be
+        # updated. Copy it.
+        file(COPY "${__CPM_ENSURE_CACHE_DIR}/" DESTINATION ${dir})
+
+        if (DEFINED CPM_MODULE_CACHE_NO_WRITE)
+          # Update git repo once it is in the target directory.
+          _cpm_update_svn_repo(${dir} ${revision} ${trustCert} ${svn_user_pw_args})
+        endif()
+      else()
+        message(STATUS "Creating cached version of ${repo}.")
+        # If we can write to the cache directory, then clone it, update it,
+        # then copy it to the target directory.
+        if (DEFINED CPM_MODULE_CACHE_NO_WRITE)
+          # Clone directly into the target directory.
+          _cpm_clone_svn_repo(${repo} ${dir} ${revision} ${trustCert} ${svn_user_pw_args})
+          _cpm_update_svn_repo(${dir} ${revision} ${trustCert} ${svn_user_pw_args})
+        else()
+          _cpm_clone_svn_repo(${repo} ${__CPM_ENSURE_CACHE_DIR} ${revision} ${trustCert} ${svn_user_pw_args})
+          _cpm_update_svn_repo(${__CPM_ENSURE_CACHE_DIR} ${revision} ${trustCert} ${svn_user_pw_args})
+          file(COPY "${__CPM_ENSURE_CACHE_DIR}/" DESTINATION ${dir})
+        endif()
+      endif()
+
+    else()
+      # No cache directory is present, simply clone into target directory
+      # and update it.
+      _cpm_clone_svn_repo(${repo} ${dir} ${revision} ${trustCert} ${svn_user_pw_args})
+      _cpm_update_svn_repo(${dir} ${revision} ${trustCert} ${svn_user_pw_args})
+    endif()
+
+  else()
+
+    _cpm_update_svn_repo(${dir} ${revision} ${trustCert} ${svn_user_pw_args})
+
+  endif()
+
 endmacro()

 function(CPM_EnsureRepoIsCurrent)


Experimenting with using a macro instead of a function.

If this works, then CMake may have a bug using PARENT_SCOPE.

--- CPM.cmake
+++ CPM.cmake
@@ -471,7 +471,7 @@

 # name - Required as this name determines what preprocessor definition will
 #        be generated for this module.
-function(CPM_AddModule name)
+macro(CPM_AddModule name)

   # Parse all function arguments into our namespace prepended with _CPM_.
   _cpm_parse_arguments(CPM_AddModule _CPM_ "${ARGN}")


nuclearRGG: use VTK's install tree

nuclearRGG: use VTK's install tree

The CMAKE_INSTALL_PREFIX will be used to search lib/cmake/vtk-6.2
automatically. The build tree shouldn't be used because rpaths will be
wrong in the binaries.

--- superbuild/Projects/nuclearRGG.cmake
+++ superbuild/Projects/nuclearRGG.cmake
@@ -17,7 +17,6 @@
     # platforms.
     -DMACOSX_APP_INSTALL_PREFIX:PATH=<INSTALL_DIR>/Applications
     -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-    -DVTK_DIR:PATH=${CMAKE_BINARY_DIR}/vtk/src/vtk-build
     -DVTK_MOAB_SUPPORT:BOOL=ON
     ${CUBIT_ARGS}
     -DMOAB_ROOT_DIR:PATH=<INSTALL_DIR>


Execute dos2unix as part of unpackaging submissions

--- test/remote/SvnPackage.cmake
+++ test/remote/SvnPackage.cmake
@@ -148,6 +148,16 @@
   execute_process (COMMAND "${CMAKE_COMMAND}" -E tar xzf "${changefile}"
                    WORKING_DIRECTORY "${tmpdir}")
   set (chgdir "${tmpdir}/changes")
+
+  # De-Windows all text files - this also is currently Linux-specific
+  # and depends on "dos2unix" existing.
+  file (GLOB_RECURSE textfiles RELATIVE "${chgdir}"
+    *.c *.cpp *.cxx *.h *.hpp *.hxx *.txt *.cmake *.conf
+    *.xml *.xq *.txt *.res *.spec *.xqlib)
+  foreach (textfile ${textfiles})
+    execute_process (COMMAND dos2unix -k "${textfile}"
+                     WORKING_DIRECTORY "${chgdir}")
+  endforeach (textfile)

   # Checkout/update svn from specified URL and rev
   execute_process (COMMAND "${ZORBA_EXE_SCRIPT}" --omit-xml-declaration


Add tensorflow/python/layers module to tf_python.cmake

--- tensorflow/contrib/cmake/tf_python.cmake
+++ tensorflow/contrib/cmake/tf_python.cmake
@@ -183,6 +183,7 @@
 add_python_module("tensorflow/python/debug/wrappers")
 add_python_module("tensorflow/python/framework")
 add_python_module("tensorflow/python/kernel_tests")
+add_python_module("tensorflow/python/layers")
 add_python_module("tensorflow/python/lib")
 add_python_module("tensorflow/python/lib/core")
 add_python_module("tensorflow/python/lib/io")


Attempt to fix SDL OpenGLES auto-detection for Emscripten on Windows.

--- Source/ThirdParty/SDL/cmake/sdlchecks.cmake
+++ Source/ThirdParty/SDL/cmake/sdlchecks.cmake
@@ -696,7 +696,7 @@
   if(VIDEO_OPENGL)
     # Urho3D - bug fix - when cross-compiling the headers are rooted, either use "--sysroot" option or use CMAKE_REQUIRED_INCLUDES (e.g. on RPI) to cater for it
     if (CMAKE_CROSSCOMPILING AND SYSROOT AND NOT CMAKE_REQUIRED_INCLUDES)
-      set (CMAKE_REQUIRED_FLAGS "--sysroot=${SYSROOT} ${ORIG_CMAKE_REQUIRED_FLAGS}")
+      set (CMAKE_REQUIRED_FLAGS "--sysroot=\"${SYSROOT}\" ${ORIG_CMAKE_REQUIRED_FLAGS}")
     endif ()
     if (APPLE)
       check_c_source_compiles ("
@@ -732,7 +732,7 @@
   if(VIDEO_OPENGLES)
     # Urho3D - bug fix - when cross-compiling the headers are rooted, either use "--sysroot" option or use CMAKE_REQUIRED_INCLUDES (e.g. on RPI) to cater for it
     if (CMAKE_CROSSCOMPILING AND SYSROOT AND NOT CMAKE_REQUIRED_INCLUDES)
-      set (CMAKE_REQUIRED_FLAGS "--sysroot=${SYSROOT} ${ORIG_CMAKE_REQUIRED_FLAGS}")
+      set (CMAKE_REQUIRED_FLAGS "--sysroot=\"${SYSROOT}\" ${ORIG_CMAKE_REQUIRED_FLAGS}")
     endif ()
     check_c_source_compiles("
         #define EGL_API_FB
@@ -818,7 +818,7 @@
     # Urho3D - bug fix - when cross-compiling the headers are rooted, either use "--sysroot" option or use CMAKE_REQUIRED_INCLUDES (e.g. on RPI) to cater for it
     if(CMAKE_CROSSCOMPILING)
       if (SYSROOT AND NOT CMAKE_REQUIRED_INCLUDES)
-        set (CMAKE_REQUIRED_FLAGS "--sysroot=${SYSROOT} ${ORIG_CMAKE_REQUIRED_FLAGS}")
+        set (CMAKE_REQUIRED_FLAGS "--sysroot=\"${SYSROOT}\" ${ORIG_CMAKE_REQUIRED_FLAGS}")
       endif ()
       check_c_source_compiles("
         #include <pthread.h>


cylemon git repo: http -> https

cylemon git repo: http -> https

--- cylemon.cmake
+++ cylemon.cmake
@@ -18,7 +18,7 @@

 external_git_repo (cylemon
     HEAD
-    http://github.com/ilastik/cylemon)
+    https://github.com/ilastik/cylemon)

 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     set (cylemon_SPECIAL_SETUP "--no-openmp")


fix: Override DEPENDS_<Pkg>_DIR only when <Pkg>_DIR points to <Pkg>Config [BASIS]

--- CMake/Basis/CommonTools.cmake
+++ CMake/Basis/CommonTools.cmake
@@ -716,12 +716,14 @@
         endif ()
         unset (_BFP_VERSION_STRING)
         # update DEPENDS_<PKG>_DIR from variables set by find_package
-        set (_BFP_PREFIX "NOTFOUND")
         if (${PKG}_FOUND)
-          if (${PKG}_DIR)
+          if (${PKG}_DIR AND IS_ABSOLUTE "${${PKG}_DIR}" AND
+              (EXISTS "${${PKG}_DIR}/${PKG}Config.cmake" OR
+               EXISTS "${${PKG}_DIR}/${PKG_L}-config.cmake"))
             list (GET ${PKG}_DIR 0 _BFP_PREFIX)
             _basis_config_to_prefix_dir(${PKG} "${_BFP_PREFIX}" _BFP_PREFIX)
-          else ()
+            basis_update_value (DEPENDS_${PKG}_DIR "${_BFP_PREFIX}")
+          elseif (NOT DEPENDS_${PKG}_DIR)
             if (${PKG}_INCLUDE_DIR)
               list (GET ${PKG}_INCLUDE_DIR 0 _BFP_PREFIX)
               string (REGEX REPLACE "^(.*)/[iI]ncludes?(/.*)?$" "\\1" _BFP_PREFIX "${_BFP_PREFIX}")
@@ -750,9 +752,11 @@
                 endif ()
               endforeach ()
             endif ()
-          endif ()
-        endif ()
-        basis_update_value (DEPENDS_${PKG}_DIR "${_BFP_PREFIX}")
+            basis_update_value (DEPENDS_${PKG}_DIR "${_BFP_PREFIX}")
+          endif ()
+        else ()
+          basis_update_value (DEPENDS_${PKG}_DIR "NOTFOUND")
+        endif ()
         # make internal copy of DEPENDS_<PKG>_DIR used to detect change
         set (_DEPENDS_${PKG}_DIR "${DEPENDS_${PKG}_DIR}" CACHE INTERNAL "(Previous) DEPENDS_${PKG}_DIR value." FORCE)
         # make internal search path cache entries consistent with DEPENDS_<PKG>_DIR
@@ -764,8 +768,8 @@
         endforeach ()
         # make internal copy of <PKG>_DIR used to detect change via -D option
         #
-        # Note: All other alternative variables such as <PKG>_ROOT are forced to be
-        #       equal DEPENDS_<PKG>_DIR. Only <PKG>_DIR usually points to the
+        # Note: All other alternative variables such as <PKG>_ROOT are forced to
+        #       be equal DEPENDS_<PKG>_DIR. Only <PKG>_DIR usually points to the
         #       <PKG>Config, while DEPENDS_<PKG>_DIR is the installation prefix.
         set (_${PKG}_DIR "${${PKG}_DIR}" CACHE INTERNAL "(Previous) ${PKG}_DIR value." FORCE)
         # status message with information about found package


fixed: indention, headers for readablity

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


Fixed a typo

Fixed a typo

--- CMakeModules/FindOpenCL.cmake
+++ CMakeModules/FindOpenCL.cmake
@@ -41,7 +41,7 @@
   if (APPLE)
      find_path(
       OPENCL_INCLUDE_DIR
-      NAMES CL/cl.h OpenCL/cl.h
+      NAMES cl.h
     )
   else (APPLE)
     find_path(


Fixed to work under Opensuse Tumbleweed.

--- CMakeModules/FindQwtQt4.cmake
+++ CMakeModules/FindQwtQt4.cmake
@@ -1,3 +1,8 @@
+# Copyright (C) 2017 by Pedro Mendes, Virginia Tech Intellectual
+# Properties, Inc., University of Heidelberg, and University of
+# of Connecticut School of Medicine.
+# All rights reserved.
+
 # Copyright (C) 2012 - 2016 by Pedro Mendes, Virginia Tech Intellectual
 # Properties, Inc., University of Heidelberg, and The University
 # of Manchester.
@@ -20,17 +25,18 @@
           /opt/csw/include   # Blastwave
           /opt/include
           /usr/freeware/include
-    PATH_SUFFIXES qwt qwt-qt4
+    PATH_SUFFIXES qwt qwt-qt4 qwt-qt5 qwt6
     NO_DEFAULT_PATH)

 if (NOT QWT_INCLUDE_DIR)
     find_path(QWT_INCLUDE_DIR qwt.h
-        PATH_SUFFIXES qwt qwt-qt4)
+        PATH_SUFFIXES qwt qwt-qt4 qwt-qt5 qwt6)
 endif ()

 find_library(QWT_LIBRARY
     NAMES qwt-static
           qwt-qt4
+          qwt-qt5
           qwt
     PATHS $ENV{QWT_DIR}/lib
           $ENV{QWT_DIR}
@@ -47,6 +53,7 @@
     find_library(QWT_LIBRARY
         NAMES qwt-static
               qwt-qt4
+              qwt-qt5
               qwt)
 endif (NOT QWT_LIBRARY)


Fix xerces static lib names for windows

Fix xerces static lib names for windows

--- CMakeModules/FindXerces.cmake
+++ CMakeModules/FindXerces.cmake
@@ -29,14 +29,14 @@
 )

 IF (XERCESC_STATIC)
-FIND_LIBRARY(XERCESC_LIBRARY NAMES xerces-c_static_3 xerces-c-3.2 xerces-c-3.1 xerces-c
+FIND_LIBRARY(XERCESC_LIBRARY NAMES xerces-c_static_3 xerces-c-3.2 xerces-c-3.1 xerces-c xerces-c_3
  PATHS
  $ENV{XERCESC_LIBRARY_DIR}
  ${XERCESC_LIBRARY_DIR}
  /usr/lib
  /usr/local/lib
 )
-FIND_LIBRARY(XERCESC_LIBRARY_DEBUG NAMES xerces-c_static_3D xerces-c-3.2D xerces-c-3.1D
+FIND_LIBRARY(XERCESC_LIBRARY_DEBUG NAMES xerces-c_static_3D xerces-c-3.2D xerces-c-3.1D xerces-c_3D
  PATHS
  $ENV{XERCESC_LIBRARY_DIR}
  ${XERCESC_LIBRARY_DIR}


CMake: Support fine grained feature configuration constraints in tests

With this change it is now possible to restrict tests to fine grained
feature configurations (if we happen to export them to
deal.IIConfig.cmake).

Example:
  test.with_arpack=true.with_arpack_with_parpack=true.output

Will only be configured if arpack is detected with (working) parpack
support.

--- cmake/macros/macro_deal_ii_pickup_tests.cmake
+++ cmake/macros/macro_deal_ii_pickup_tests.cmake
@@ -1,6 +1,6 @@
 ## ---------------------------------------------------------------------
 ##
-## Copyright (C) 2013 - 2015 by the deal.II authors
+## Copyright (C) 2013 - 2016 by the deal.II authors
 ##
 ## This file is part of the deal.II library.
 ##
@@ -180,12 +180,18 @@
       #
       # Valid feature?
       #
-      IF(NOT DEFINED DEAL_II_WITH_${_feature})
-        MESSAGE(FATAL_ERROR "
+      # We support two variables: DEAL_II_WITH_<FEATURE> and DEAL_II_<FEATURE>
+      #
+      SET(_variable "DEAL_II_WITH_${_feature}")
+      IF(NOT DEFINED ${_variable})
+        SET(_variable "DEAL_II_${_feature}")
+        IF(NOT DEFINED ${_variable})
+          MESSAGE(FATAL_ERROR "
 Invalid feature constraint \"${_match}\" in file
 \"${_comparison}\":
-The feature \"DEAL_II_${_feature}\" does not exist.\n"
-          )
+The feature \"DEAL_II_WITH_${_feature}\" (or \"DEAL_II_${_feature}\") does not exist.\n"
+            )
+        ENDIF()
       ENDIF()

       #
@@ -201,8 +207,8 @@
         ENDIF()

         # This is why I hate CMake :-/
-        IF( (DEAL_II_WITH_${_feature} AND NOT ${_boolean}) OR
-            (NOT DEAL_II_WITH_${_feature} AND ${_boolean}) )
+        IF( (${_variable} AND NOT ${_boolean}) OR
+            (NOT ${_variable} AND ${_boolean}) )
           SET(_define_test FALSE)
         ENDIF()
       ENDIF()


Fail to configure if fail-on-missing=ON and VecCore is not found

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -1173,16 +1173,21 @@
   if(vc)
     set(VecCore_COMPONENTS Vc)
   endif()
-  find_package(VecCore 0.4.2 CONFIG QUIET COMPONENTS ${VecCore_COMPONENTS})
-  if(NOT VecCore_FOUND)
-    message(STATUS "VecCore not found, switching on 'builtin_veccore' option.")
-    set(builtin_veccore ON CACHE BOOL "Enabled because veccore requested and not found externally (${builtin_veccore_description})" FORCE)
-  else()
-    set_property(DIRECTORY APPEND PROPERTY INCLUDE_DIRECTORIES ${VecCore_INCLUDE_DIRS})
-  endif()
-endif()
-
-if(veccore AND NOT VecCore_FOUND)
+  if(fail-on-missing)
+    find_package(VecCore 0.4.2 CONFIG QUIET REQUIRED COMPONENTS ${VecCore_COMPONENTS})
+  else()
+    find_package(VecCore 0.4.2 CONFIG QUIET COMPONENTS ${VecCore_COMPONENTS})
+    if(NOT VecCore_FOUND)
+      message(STATUS "VecCore not found, switching on 'builtin_veccore' option.")
+      set(builtin_veccore ON CACHE BOOL "Enabled because veccore requested and not found externally (${builtin_veccore_description})" FORCE)
+    endif()
+  endif()
+  if(VecCore_FOUND)
+      set_property(DIRECTORY APPEND PROPERTY INCLUDE_DIRECTORIES ${VecCore_INCLUDE_DIRS})
+  endif()
+endif()
+
+if(builtin_veccore)
   set(VecCore_VERSION "0.5.2")
   set(VecCore_PROJECT "VecCore-${VecCore_VERSION}")
   set(VecCore_SRC_URI "${lcgpackages}/${VecCore_PROJECT}.tar.gz")


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Modules/ThirdParty/KWSys/src/KWSys/kwsysDateStamp.cmake
+++ Modules/ThirdParty/KWSys/src/KWSys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 08)

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


fixing issue with cmake usage, in the code OpenEXR parent is not present leading to include header error

--- DevIL/cmake/FindOpenEXR.cmake
+++ DevIL/cmake/FindOpenEXR.cmake
@@ -10,7 +10,7 @@
 # Created by Robert Osfield.

-FIND_PATH(OPENEXR_INCLUDE_DIR OpenEXR/ImfIO.h
+FIND_PATH(OPENEXR_INCLUDE_DIR ImfIO.h
     $ENV{OPENEXR_DIR}/include
     $ENV{OPENEXR_DIR}
     ~/Library/Frameworks


Fix URHO3D_INCLUDE_DIR to also include sub-dirs to 3rd-party headers.

--- Source/CMake/Modules/FindUrho3D.cmake
+++ Source/CMake/Modules/FindUrho3D.cmake
@@ -62,7 +62,7 @@
         get_filename_component (SOURCE_TREE_PATH ${SOURCE_TREE_PATH} PATH)
         set (URHO3D_INCLUDE_DIR ${SOURCE_TREE_PATH})
         foreach (DIR Audio Container Core Engine Graphics Input IO LuaScript Math Navigation Network Physics Resource Scene Script UI)
-            list (APPEND URHO3D_INCLUDE_DIR ${SOURCE_TREE_PATH}/${DIR})
+            list (APPEND URHO3D_INCLUDE_DIR ${SOURCE_TREE_PATH}/${DIR})     # Note: variable change to list context after this
         endforeach ()
         foreach (DIR Bullet/src kNet/include LZ4 SDL/include STB)
             list (APPEND URHO3D_INCLUDE_DIR ${URHO3D_HOME}/Source/ThirdParty/${DIR})
@@ -99,6 +99,13 @@
     endif ()
     find_path (URHO3D_INCLUDE_DIR Urho3D.h PATHS ${URHO3D_INC_SEARCH_PATH} PATH_SUFFIXES Urho3D)
     find_library (URHO3D_LIBRARIES NAMES ${URHO3D_LIB_NAMES} PATHS ${URHO3D_LIB_SEARCH_PATH} PATH_SUFFIXES Urho3D)
+
+    if (URHO3D_INCLUDE_DIR)
+        set (BASE_DIR ${URHO3D_INCLUDE_DIR})
+        foreach (DIR Bullet kNet LZ4 SDL STB)
+            list (APPEND URHO3D_INCLUDE_DIR ${BASE_DIR}/${DIR})     # Note: variable change to list context after this, so we need BASE_DIR to remain the same
+        endforeach ()
+    endif ()
 endif ()

 if (URHO3D_INCLUDE_DIR AND URHO3D_LIBRARIES)


Synchronize adm files

Synchronize adm files

--- adm_local_without_kernel/cmake_files/SalomeMacros.cmake
+++ adm_local_without_kernel/cmake_files/SalomeMacros.cmake
@@ -832,7 +832,8 @@
        SET(_env "${_item}=$ENV{${_item}};${_env_${_item}}${sep}${_env}")
      ENDIF()
    ELSE()
-     SET(_env "${_item}=$ENV{${_item}}:${_env_${_item}}${sep}${_env}")
+     STRING(REPLACE ";" ":" _iii "$ENV{${_item}}")
+     SET(_env "${_item}=${_iii}:${_env_${_item}}${sep}${_env}")
    ENDIF()
  ENDFOREACH()


SuperBuild: do not build freeglut on ox. manits #1194

--- SuperBuild/CMake/External_glut.cmake
+++ SuperBuild/CMake/External_glut.cmake
@@ -2,11 +2,15 @@
 set(__EXTERNAL_GLUT__ 1)

 if(USE_SYSTEM_GLUT)
-  message(STATUS "  Using glut system version")
+  message(STATUS "  Using GLUT system version")
 else()
-  set(GLUT_DEPENDENCIES)
-  set(GLUT_SB_BUILD_DIR ${CMAKE_BINARY_DIR}/GLUT/build)
-  set(GLUT_SB_SRC ${CMAKE_BINARY_DIR}/GLUT/src/GLUT)
+
+  if(APPLE)
+    message(FATAL_ERROR "Cannot activate GLUT on OSX. See manits issue #1194")
+  endif()
+
+  SETUP_SUPERBUILD(PROJECT GLUT)
+  message(STATUS "  Using GLUT SuperBuild version")

   ExternalProject_Add(GLUT
     PREFIX GLUT
@@ -15,11 +19,14 @@
     BINARY_DIR ${GLUT_SB_BUILD_DIR}
     INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
       DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
-    PATCH_COMMAND ${CMAKE_COMMAND} -E copy  ${CMAKE_SOURCE_DIR}/patches/GLUT/CMakeLists.txt ${GLUT_SB_SRC}
-    CMAKE_CACHE_ARGS
+      PATCH_COMMAND ${CMAKE_COMMAND} -E copy
+      ${CMAKE_SOURCE_DIR}/patches/GLUT/CMakeLists.txt
+      ${GLUT_SB_SRC}
+      CMAKE_CACHE_ARGS
       -DCMAKE_BUILD_TYPE:STRING=Release
       -DBUILD_SHARED_LIBS:BOOL=ON
       -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
+      CMAKE_COMMAND ${SB_CMAKE_COMMAND}
   )

   set(_SB_GLUT_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 05)

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 10)

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 09)

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 01)

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


COMP: Removed duplicate test entry.

COMP: Removed duplicate test entry.

--- Modules/Core/test/files.cmake
+++ Modules/Core/test/files.cmake
@@ -109,7 +109,6 @@
   mitkImageToSurfaceFilterTest.cpp
   mitkEqualTest.cpp
   mitkLineTest.cpp
-  mitkSurfaceVtkMapper2DTest.cpp
 )

 if(MITK_ENABLE_RENDERING_TESTING)


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 07)

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 11)

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 08)

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 03)

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 04)

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 01)

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 01)

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 08)

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 02)

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 03)

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 09)

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 03)

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


Custom upload server: More checks for upload readiness

--- cmake/modules/hunter_upload_to_custom_server.cmake
+++ cmake/modules/hunter_upload_to_custom_server.cmake
@@ -47,7 +47,29 @@
       hunter_internal_error("Unexpected 'meta' directory: '${meta_dir}'")
     endif()

-    if(EXISTS "${cache_root_dir}/${deps_id_dir}/from.server")
+    set(from_server_path "${cache_root_dir}/${deps_id_dir}/from.server")
+    if(EXISTS "${from_server_path}")
+      hunter_status_debug("Skip. File present: ${from_server_path}")
+      continue()
+    endif()
+
+    set(deps_info_path "${cache_root_dir}/${deps_id_dir}/deps.info")
+    if(NOT EXISTS "${deps_info_path}")
+      hunter_status_debug("Skip. File not found: ${deps_info_path}")
+      continue()
+    endif()
+
+    set(cache_sha1_path "${cache_root_dir}/${deps_id_dir}/cache.sha1")
+    if(NOT EXISTS "${cache_sha1_path}")
+      hunter_status_debug("Skip. File not found: ${cache_sha1_path}")
+      continue()
+    endif()
+
+    file(READ "${cache_sha1_path}" cache_sha1)
+
+    set(raw_path "${cache_root_dir}/raw/${cache_sha1}.tar.bz2")
+    if(NOT EXISTS "${raw_path}")
+      hunter_status_debug("Skip. File not found: ${raw_path}")
       continue()
     endif()

@@ -60,7 +82,6 @@
     hunter_upload_single_file(${deps_id_dir}/cache.sha1)
     hunter_upload_single_file(${deps_id_dir}/deps.info)

-    file(READ "${cache_root_dir}/${deps_id_dir}/cache.sha1" cache_sha1)
     hunter_upload_single_file(raw/${cache_sha1}.tar.bz2)

     hunter_upload_single_file(${deps_id_dir}/CACHE.DONE)


[FIX] CUDA fixes for Mac OS X

[FIX] CUDA fixes for Mac OS X

--- util/cmake/SeqAnBuildSystem.cmake
+++ util/cmake/SeqAnBuildSystem.cmake
@@ -430,8 +430,9 @@

     # Fix CUDA on OSX.
     if (APPLE AND COMPILER_IS_CLANG)
+      # (weese:) I had to deactivate the C compiler override to make it compile again
       # NVCC mistakes /usr/bin/cc as gcc.
-      list (APPEND CUDA_NVCC_FLAGS "-ccbin /usr/bin/clang")
+      #list (APPEND CUDA_NVCC_FLAGS "-ccbin /usr/bin/clang")
       # NVCC does not support libc++.
       set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libstdc++")
     endif ()


cmake: Fix Qt4 detection.

cmake: Fix Qt4 detection.

--- extras/buildsystem/cmake/include/config.cmake
+++ extras/buildsystem/cmake/include/config.cmake
@@ -392,13 +392,13 @@
 endif(Lua_FOUND)

 find_package(Qt4)
-if(Qt4_FOUND)
+if(QT4_FOUND)
   set(HAVE_QT4 TRUE)
   vlc_check_include_files (qt.h)
   vlc_enable_modules(qt4)
-  vlc_add_module_compile_flag(qt4 ${Qt4_CFLAGS} )
-  vlc_module_add_link_libraries(qt4 ${Qt4_LIBRARIES} Qt4)
-endif(Qt4_FOUND)
+  vlc_add_module_compile_flag(qt4 ${QT_CFLAGS} )
+  vlc_module_add_link_libraries(qt4 ${QT_LIBRARIES} Qt4)
+endif(QT4_FOUND)

 find_package(OpenGL)
 if(OPENGL_FOUND)


Try to find consistent Python settings and pass those on

--- SuperBuild/External_SIRF.cmake
+++ SuperBuild/External_SIRF.cmake
@@ -20,6 +20,21 @@
   set(SIRF_Install_Dir ${CMAKE_CURRENT_BINARY_DIR}/INSTALL)
   set(${proj}_URL https://github.com/CCPPETMR/SIRF )

+  # Attempt to make Python settings consistent
+  FIND_PACKAGE(PythonInterp)
+  if (PYTHONINTERP_FOUND)
+   set(Python_ADDITIONAL_VERSIONS ${PYTHON_VERSION_STRING})
+    message(STATUS "Found PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}")
+    message(STATUS "Python version ${PYTHON_VERSION_STRING}")
+  endif()
+  FIND_PACKAGE(PythonLibs)
+  set (BUILD_PYTHON ${PYTHONLIBS_FOUND})
+  if (BUILD_PYTHON)
+    set(PYTHON_DEST "${SIRF_Install_Dir}/python" CACHE PATH "Destination for python modules")
+    message(STATUS "Using PYTHON_LIBRARY=${PYTHON_LIBRARY}")
+    message(STATUS "Using PYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}")
+  endif()
+
   message(STATUS "HDF5_ROOT in External_SIRF: " ${HDF5_ROOT})
   set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${CMAKE_CURRENT_BINARY_DIR}/INSTALL)

@@ -39,8 +54,15 @@
         -DHDF5_ROOT=${HDF5_ROOT}
         -DHDF5_INCLUDE_DIRS=${HDF5_INCLUDE_DIRS}
         -DISMRMRD_DIR=${ISMRMRD_DIR}
+<<<<<<< Updated upstream
         -DSWIG_EXECUTABLE=${SWIG_EXECUTABLE}
     INSTALL_DIR ${SIRF_Install_Dir}
+=======
+	-DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}
+	-DPYTHON_LIBRARY=${PYTHON_LIBRARY}
+	-DPYTHON_DEST=${PYTHON_DEST}
+	INSTALL_DIR ${SIRF_Install_Dir}
+>>>>>>> Stashed changes
     DEPENDS
         ${${proj}_DEPENDENCIES}
   )


Testing: disable dynamic MPI testing because of GH actions issues

--- Testing/script/gh_script.cmake
+++ Testing/script/gh_script.cmake
@@ -241,6 +241,7 @@
 NA_USE_SM:BOOL=${USE_SM}
 NA_USE_OFI:BOOL=ON
 NA_OFI_TESTING_PROTOCOL:STRING=${OFI_PROTOCOLS}
+NA_MPI_TESTING_PROTOCOL:STRING=static

 MERCURY_TESTING_ENABLE_PARALLEL:BOOL=${USE_MPI}
 MERCURY_TESTING_INIT_COMMAND:STRING=killall -9 ${PROC_NAME_OPT} hg_test_server;


BUG: Check when ITK_WRAP_VECTOR_COMPONENTS doesn't include ITK_WRAP_IMAGE_DIMS

Many types based off ITK_WRAP_VECTOR_COMPONENTS require a corresponding
dimension in ITK_WRAP_IMAGE_DIMS. Send a configuration error with
ITK_WRAP_VECTOR_COMPONENTS does not include ITK_WRAP_IMAGE_DIMS.

Change-Id: I15fd15b19398b35f0bbf89627272c390004306f5

--- Wrapping/WrapBasicTypes.cmake
+++ Wrapping/WrapBasicTypes.cmake
@@ -64,6 +64,14 @@
   list(APPEND ITK_WRAP_VECTOR_COMPONENTS_INCREMENTED ${d} ${d_inc})
 endforeach()
 list(REMOVE_DUPLICATES ITK_WRAP_VECTOR_COMPONENTS_INCREMENTED)
+
+INTERSECTION(_vector_dims_intersection "${ITK_WRAP_VECTOR_COMPONENTS}"
+  "${ITK_WRAP_IMAGE_DIMS}")
+list(LENGTH ITK_WRAP_IMAGE_DIMS _num_dims)
+list(LENGTH _vector_dims_intersection _num_vector_dims_intersection)
+if(NOT _num_dims EQUAL _num_vector_dims_intersection)
+  message(FATAL_ERROR "ITK_WRAP_VECTOR_COMPONENTS must include ITK_WRAP_IMAGE_DIMS")
+endif()

 ###############################################################################
 # Create some variable which can be used later


BUG: installation directory for QWT

BUG: installation directory for QWT

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -61,6 +61,7 @@
     -DSlicer_DIR:PATH=${Slicer_DIR}
     -DSlicerExecutionModel_DEFAULT_CLI_RUNTIME_OUTPUT_DIRECTORY:PATH=${SlicerExecutionModel_DEFAULT_CLI_RUNTIME_OUTPUT_DIRECTORY}
     -DSlicerExecutionModel_DEFAULT_CLI_INSTALL_RUNTIME_DESTINATION:PATH=${SlicerExecutionModel_DEFAULT_CLI_INSTALL_RUNTIME_DESTINATION}
+    -DSlicerExecutionModel_DEFAULT_CLI_INSTALL_LIBRARY_DESTINATION:PATH=${SlicerExecutionModel_DEFAULT_CLI_INSTALL_LIBRARY_DESTINATION}
 )


Require python 3+ in CMake

Require python 3+ in CMake

--- CMake/hoomd/HOOMDPythonSetup.cmake
+++ CMake/hoomd/HOOMDPythonSetup.cmake
@@ -14,3 +14,7 @@
 # hoomd's cflags setup script will take care of proper cxx flags settings

 include(pybind11Tools)
+
+if (PYTHON_VERSION_MAJOR LESS 3)
+    message(SEND_ERROR "HOOMD requires Python 3")
+endif()


CMake: FindLLVMClangTidy.cmake: update list of accepted versions.

--- cmake/Modules/FindLLVMClangTidy.cmake
+++ cmake/Modules/FindLLVMClangTidy.cmake
@@ -1,4 +1,4 @@
-find_program(CLANGTIDY_PATH NAMES clang-tidy clang-tidy-5.0 clang-tidy-4.0)
+find_program(CLANGTIDY_PATH NAMES clang-tidy clang-tidy-6.0)

 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(LLVMClangTidy


Remove CMake workaround for LLD PR24476 which is no longer needed

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

--- cmake/modules/HandleLLVMOptions.cmake
+++ cmake/modules/HandleLLVMOptions.cmake
@@ -46,14 +46,6 @@
   endif()
 elseif(LLVM_PARALLEL_LINK_JOBS)
   message(WARNING "Job pooling is only available with Ninja generators.")
-endif()
-
-if (LINKER_IS_LLD_LINK)
-  # Pass /MANIFEST:NO so that CMake doesn't run mt.exe on our binaries.  Adding
-  # manifests with mt.exe breaks LLD's symbol tables and takes as much time as
-  # the link. See PR24476.
-  append("/MANIFEST:NO"
-    CMAKE_EXE_LINKER_FLAGS CMAKE_MODULE_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS)
 endif()

 if( LLVM_ENABLE_ASSERTIONS )


Update

Update

--- modules/asio.cmake
+++ modules/asio.cmake
@@ -1,8 +1,7 @@
 if(NOT TARGET asio)

   # Module library
-  file(GLOB SOURCE_FILES "asio/asio/src/*.cpp")
-  add_library(asio ${SOURCE_FILES})
+  add_library(asio "asio/asio/src/asio.cpp")
   target_compile_definitions(asio PRIVATE ASIO_STANDALONE=1 ASIO_SEPARATE_COMPILATION=1)
   target_include_directories(asio PRIVATE "asio/asio/include" ${OPENSSL_INCLUDE_DIR})
   target_link_libraries(asio)


[cmake] Cache results of find_darwin_sdk_dir

This improves find_darwin_sdk_dir to cache the results of executing xcodebuild to find the SDK. Should significantly reduce the CMake re-configure time.

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

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

--- cmake/Modules/CompilerRTDarwinUtils.cmake
+++ cmake/Modules/CompilerRTDarwinUtils.cmake
@@ -4,6 +4,11 @@
 # set the default Xcode to use. This function finds the SDKs that are present in
 # the current Xcode.
 function(find_darwin_sdk_dir var sdk_name)
+  set(DARWIN_${sdk_name}_CACHED_SYSROOT "" CACHE STRING "Darwin SDK path for SDK ${sdk_name}.")
+  if(DARWIN_${sdk_name}_CACHED_SYSROOT)
+    set(${var} ${DARWIN_${sdk_name}_CACHED_SYSROOT} PARENT_SCOPE)
+    return()
+  endif()
   set(DARWIN_PREFER_PUBLIC_SDK OFF CACHE BOOL "Prefer Darwin public SDK, even when an internal SDK is present.")
   if(NOT DARWIN_PREFER_PUBLIC_SDK)
     # Let's first try the internal SDK, otherwise use the public SDK.
@@ -29,6 +34,7 @@
   if(result_process EQUAL 0)
     set(${var} ${var_internal} PARENT_SCOPE)
   endif()
+  set(DARWIN_${sdk_name}_CACHED_SYSROOT ${var_internal} CACHE STRING "Darwin SDK path for SDK ${sdk_name}." FORCE)
 endfunction()

 # There isn't a clear mapping of what architectures are supported with a given


cmake/modules: opencv: small fixes ...

cmake/modules: opencv: small fixes ...

This lets you use opencv2.2 without fixing your headers...
If you've fixed your headers,
(i.e you are using
#include <opencv2/cv.hpp>
instead of
#include <cv.h>
)

this file won't work...

Not sure how to deal with this ....

--- cmake/qibuild/modules/opencv-config.cmake
+++ cmake/qibuild/modules/opencv-config.cmake
@@ -1,7 +1,17 @@
 ## Copyright (C) 2011 Aldebaran Robotics

 clean(OPENCV)
+# Old API
+# include <cv.h>
+fpath(OPENCV cv.h PATH_SUFFIXES opencv)
+# include <opencv/cv.h>
 fpath(OPENCV opencv/cv.h)
+
+# New API:
+# include <opencv2/cv.hpp>
+# fpath(OPENCV opencv2/cp.hpp PATH_SUFFIXES opencv2)
+
+
 flib(OPENCV OPTIMIZED NAMES cv      cv200       opencv_legacy)
 flib(OPENCV DEBUG     NAMES cv      cv200d      opencv_legacy)
 flib(OPENCV OPTIMIZED NAMES cvaux   cvaux200    opencv_contrib)


FT-691 (CMake fails on case-insensitive FS, such as Mac OS X)

Swap option(USE_ETAGS ... ) and option(USE_CTAGS ... ) in
cmake_modules/TokuBuildTagDatabases.cmake, so that if USE_ETAGS is
processed first and USE_CTAGS then is properly disabled on Mac OS X.

--- cmake_modules/TokuBuildTagDatabases.cmake
+++ cmake_modules/TokuBuildTagDatabases.cmake
@@ -33,6 +33,21 @@
   ${CMAKE_CURRENT_BINARY_DIR}/ft/log_header.h
   )

+option(USE_ETAGS "Build the etags database." ON)
+if (USE_ETAGS)
+  find_program(ETAGS "etags")
+  if (NOT ETAGS MATCHES NOTFOUND)
+    add_custom_command(
+      OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/TAGS"
+      OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/etags-stamp"
+      COMMAND ${ETAGS} -o TAGS ${all_srcs} ${all_hdrs}
+      COMMAND touch "${CMAKE_CURRENT_BINARY_DIR}/etags-stamp"
+      DEPENDS ${all_srcs} ${all_hdrs} install_tdb_h generate_config_h generate_log_code
+      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
+    add_custom_target(build_etags ALL DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/TAGS" etags-stamp)
+  endif ()
+endif ()
+
 option(USE_CTAGS "Build the ctags database." ON)
 if (USE_CTAGS AND
     # Macs by default are not case-sensitive, so tags and TAGS clobber each other.  Do etags and not ctags in that case, because Emacs is superior. :P
@@ -47,21 +62,6 @@
       DEPENDS ${all_srcs} ${all_hdrs} install_tdb_h generate_config_h generate_log_code
       WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
     add_custom_target(build_ctags ALL DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/tags" ctags-stamp)
-  endif ()
-endif ()
-
-option(USE_ETAGS "Build the etags database." ON)
-if (USE_ETAGS)
-  find_program(ETAGS "etags")
-  if (NOT ETAGS MATCHES NOTFOUND)
-    add_custom_command(
-      OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/TAGS"
-      OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/etags-stamp"
-      COMMAND ${ETAGS} -o TAGS ${all_srcs} ${all_hdrs}
-      COMMAND touch "${CMAKE_CURRENT_BINARY_DIR}/etags-stamp"
-      DEPENDS ${all_srcs} ${all_hdrs} install_tdb_h generate_config_h generate_log_code
-      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
-    add_custom_target(build_etags ALL DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/TAGS" etags-stamp)
   endif ()
 endif ()


build: fix git checkout on fs "supports" case insensitive filenames

--- thirdparty/cmake_modules/koreader_thirdparty_git.cmake
+++ thirdparty/cmake_modules/koreader_thirdparty_git.cmake
@@ -77,7 +77,7 @@
     message(FATAL_ERROR \"Failed to fetch update from origin\")
   endif()
   execute_process(
-    COMMAND \"${git_EXECUTABLE}\" checkout ${git_tag}
+    COMMAND \"${git_EXECUTABLE}\" checkout -f ${git_tag}
     WORKING_DIRECTORY \"${work_dir}/${src_name}\"
     RESULT_VARIABLE error_code
   )


need to pass env variable during build

need to pass env variable during build

--- SuperBuild/External_CCPi-RGL.cmake
+++ SuperBuild/External_CCPi-RGL.cmake
@@ -52,7 +52,8 @@
   set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${SUPERBUILD_INSTALL_DIR})
   set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} ${SUPERBUILD_INSTALL_DIR})

-  set(ENV{CIL_VERSION} 0.10.1)
+  set(ENV{CIL_VERSION} 19.02)
+  message(STATUS "1 CIL_VERSION env " $ENV{CIL_VERSION})
   #set(CCPi-RGL_URL https://github.com/vais-ral/CCPi-Regularisation-Toolkit.git)
   #set(CCPi-RGL_TAG origin/windows_fix)
   message("CIL URL " ${${proj}_URL}  )
@@ -79,6 +80,7 @@
       CONDA:      do nothing")
     set_property(CACHE PYTHON_STRATEGY PROPERTY STRINGS PYTHONPATH SETUP_PY CONDA)

+message(STATUS "2 CIL_VERSION env " $ENV{CIL_VERSION})
   ExternalProject_Add(${proj}
     ${${proj}_EP_ARGS}
     GIT_REPOSITORY ${${proj}_URL}
@@ -90,12 +92,20 @@
     STAMP_DIR ${${proj}_STAMP_DIR}
     TMP_DIR ${${proj}_TMP_DIR}
     INSTALL_DIR ${libcilreg_Install_Dir}
-
-    CMAKE_ARGS
-        -DCMAKE_INSTALL_PREFIX=${libcilreg_Install_Dir}
+   # apparently this is the only way to pass environment variables to
+   # external projects
+    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env CIL_VERSION=$ENV{CIL_VERSION}         cmake ${${proj}_SOURCE_DIR}  -DCMAKE_INSTALL_PREFIX=${libcilreg_Install_Dir}
         -DBUILD_PYTHON_WRAPPERS=ON -DCMAKE_BUILD_TYPE=Release
         -DBUILD_CUDA=OFF -DCONDA_BUILD=OFF
         -DPYTHON_DEST=${PYTHON_DEST_DIR}
+    BUILD_COMMAND make
+    INSTALL_COMMAND ""
+
+#    CMAKE_ARGS
+#        -DCMAKE_INSTALL_PREFIX=${libcilreg_Install_Dir}
+#        -DBUILD_PYTHON_WRAPPERS=ON -DCMAKE_BUILD_TYPE=Release
+#        -DBUILD_CUDA=OFF -DCONDA_BUILD=OFF
+#        -DPYTHON_DEST=${PYTHON_DEST_DIR}

     DEPENDS
         ${${proj}_DEPENDENCIES}
@@ -117,7 +127,7 @@

     CONFIGURE_COMMAND ""
     BUILD_COMMAND ""
-    INSTALL_COMMAND ${CMAKE_COMMAND} -E env CIL_VERSION=0.10.0 SRC_DIR=${${proj}_BINARY_DIR} RECIPE_DIR=${${proj}_SOURCE_DIR}/Wrappers/Python/conda-recipe PYTHON=${PYTHON_EXECUTABLE} bash ${${proj}_SOURCE_DIR}/Wrappers/Python/conda-recipe/build.sh
+    INSTALL_COMMAND ${CMAKE_COMMAND} -E env CIL_VERSION=$ENV{CIL_VERSION} SRC_DIR=${${proj}_BINARY_DIR} RECIPE_DIR=${${proj}_SOURCE_DIR}/Wrappers/Python/conda-recipe PYTHON=${PYTHON_EXECUTABLE} bash ${${proj}_SOURCE_DIR}/Wrappers/Python/conda-recipe/build.sh
     CMAKE_ARGS
         -DCMAKE_INSTALL_PREFIX=${libcilreg_Install_Dir}
     DEPENDS


Fix FLANN path to lower case

Fix FLANN path to lower case

Fix FLANN path to lower case.
In default, It is lowercase.

--- cmake/Modules/FindFLANN.cmake
+++ cmake/Modules/FindFLANN.cmake
@@ -27,19 +27,19 @@
 if(NOT FLANN_FOUND)
     find_path(FLANN_INCLUDE_DIR flann/flann.hpp
               HINTS "${FLANN_ROOT}" "$ENV{FLANN_ROOT}"
-              PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann"
+              PATHS "$ENV{PROGRAMFILES}/flann" "$ENV{PROGRAMW6432}/flann"
               PATH_SUFFIXES include)

     find_library(FLANN_LIBRARY
                  NAMES ${FLANN_RELEASE_NAME}
                  HINTS "${FLANN_ROOT}" "$ENV{FLANN_ROOT}"
-                 PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann"
+                 PATHS "$ENV{PROGRAMFILES}/flann" "$ENV{PROGRAMW6432}/flann"
                  PATH_SUFFIXES lib)

     find_library(FLANN_LIBRARY_DEBUG
                  NAMES ${FLANN_DEBUG_NAME} ${FLANN_RELEASE_NAME}
                  HINTS "${FLANN_ROOT}" "$ENV{FLANN_ROOT}"
-                 PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann"
+                 PATHS "$ENV{PROGRAMFILES}/flann" "$ENV{PROGRAMW6432}/flann"
                  PATH_SUFFIXES lib debug/lib)

     if(NOT FLANN_LIBRARY_DEBUG)


Fix FindLog4C.cmake.

Fix FindLog4C.cmake.

--- cmake/Modules/FindLog4C.cmake
+++ cmake/Modules/FindLog4C.cmake
@@ -38,29 +38,18 @@
       /opt/local/lib
       /sw/lib
   )
-  mark_as_advanced(LOG4C_LIBRARY)
-
-  if (LOG4C_LIBRARY)
-    set(LOG4C_FOUND TRUE PARENT_SCOPE)
-  endif (LOG4C_LIBRARY)

   set(LOG4C_INCLUDE_DIRS
     ${LOG4C_INCLUDE_DIR}
   )

-  if (LOG4C_FOUND)
-    set(LOG4C_LIBRARIES
-      ${LOG4C_LIBRARIES}
-      ${LOG4C_LIBRARY}
-    )
-  endif (LOG4C_FOUND)
-
-  if (LOG4C_INCLUDE_DIRS AND LOG4C_LIBRARIES)
-     set(LOG4C_FOUND TRUE)
-  endif (LOG4C_INCLUDE_DIRS AND LOG4C_LIBRARIES)
+  set(LOG4C_LIBRARIES
+    ${LOG4C_LIBRARY}
+  )

   include(FindPackageHandleStandardArgs)
   find_package_handle_standard_args(Log4C DEFAULT_MSG LOG4C_LIBRARIES LOG4C_INCLUDE_DIRS)
+
   # show the LOG4C_INCLUDE_DIRS and LOG4C_LIBRARIES variables only in the advanced view
   mark_as_advanced(LOG4C_INCLUDE_DIRS LOG4C_LIBRARIES)


MAINT: lower CMake version requirements.

Travis CI is still using Ubuntu 12.04... (Grrrr!!!)

--- cmake/UseDOSaraGraphics.cmake
+++ cmake/UseDOSaraGraphics.cmake
@@ -16,8 +16,10 @@
 find_package(OpenGL REQUIRED)

 add_definitions(${Qt5Widgets_DEFINITIONS})
-set(CMAKE_CXX_FLAGS
-  "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+if (UNIX)
+  set(CMAKE_CXX_FLAGS
+      "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+endif ()

 include_directories(
   ${Qt5Widgets_INCLUDE_DIRS}


fixes gh-2753 Fixed error generating second pdf file created from single cmake file.

When TARG is being set by the macro RUN_XSTLPROC it is being set on the global scope for the current cmake file instead of in the local scope of the macro. This is causing an issue where the second call to make a pdf which calls RUN_XSLTPROC sees the variable as set if it was set on the first run.

Signed-off-by: Philip Schwartz <90179e62a462019a8b170b5c04a4f0541ad92702@lexisnexis.com>

--- cmake_modules/docMacros.cmake
+++ cmake_modules/docMacros.cmake
@@ -1,6 +1,7 @@

 MACRO(RUN_XSLTPROC _xsl _file _out _in_dir _out_dir )
 	PARSE_ARGUMENTS(_XSLT "" "" ${ARGN})
+	SET(TARG "")
 	LIST(LENGTH _XSLT_DEFAULT_ARGS _XSLT_LEN)
 	if( _XSLT_LEN )
 		LIST(GET _XSLT_DEFAULT_ARGS 0 TARG)


cmake/FindWaffle: Reformat doc comment to follow CMake standards

The file /usr/share/cmake/Modules/readme.txt discusses standards for
FindXXX.cmake files. This patch cleans up the documentation comments
    - to be parsable by `cmake --help-module`, and
    - to follow more closely the phrasing found in other "find" modules.

Signed-off-by: Chad Versace <a557f7f75bf28dc19ac99107f5cc7cd6b3fbdb1a@linux.intel.com>

--- cmake/Modules/FindWaffle.cmake
+++ cmake/Modules/FindWaffle.cmake
@@ -1,3 +1,11 @@
+# - Locate the Waffle library and headers.
+# This module defines the following variables:
+#     WAFFLE_INCLUDE_DIR     Full path to directory of the main Waffle header, waffle.h.
+#     WAFFLE_LIBRARY         Full path to the Waffle library.
+#     WAFFLE_FOUND           True if Waffle was found.
+#     WAFFLE_VERSION_STRING  Waffle's version in form "Major.Minor.Patch".
+
+#=============================================================================
 # Copyright 2012 Intel Corporation
 #
 # All rights reserved.
@@ -22,17 +30,10 @@
 # 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.
-#
-#
-# Locate the Waffle library.
-#
-#
-# Defines the variables:
-#    WAFFLE_INCLUDE_DIR     Where to look for Waffle headers.
-#    WAFFLE_LIBRARY         Where to look for Waffle library.
-#    WAFFLE_FOUND           If FALSE, don't try to use Waffle.
-#    WAFFLE_VERSION_STRING  Waffle Version: Major.Minor.Patch
-#
+#=============================================================================
+
+# See /usr/share/cmake/Modules/readme.txt for CMake official guidelines for
+# FindXXX.cmake files.

 if(NOT DEFINED WAFFLE_FIND_VERSION_MAJOR)
     set(WAFFLE_FIND_VERSION_MAJOR 1)


CMake: do not install googletest

CMake: do not install googletest

--- cmake/Modules/GoogleTest.cmake
+++ cmake/Modules/GoogleTest.cmake
@@ -48,7 +48,8 @@
 # Add googletest directly to our build. This defines
 # the gtest and gtest_main targets.
 add_subdirectory(${CMAKE_BINARY_DIR}/googletest/googletest-src
-                 ${CMAKE_BINARY_DIR}/googletest/googletest-build)
+                 ${CMAKE_BINARY_DIR}/googletest/googletest-build
+                 EXCLUDE_FROM_ALL)

 set_target_properties(gtest PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:gtest,INTERFACE_INCLUDE_DIRECTORIES>)
 set_target_properties(gtest_main PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:gtest_main,INTERFACE_INCLUDE_DIRECTORIES>)


Findquazip: Look for quazip/quazip.h, not quazip.h.

The usage of PATH_SUFFIXES was wrong here: QUAZIP_INCLUDE_DIR would be set
to something like /usr/include/quazip while the code #include'd
<quazip/quazip.h>.

We need to either #include <quazip.h> directly or look for quazip/quazip.h
in CMake.

CCMAIL: eb3bec3244b5dd5036d8a07a13c66f831613fa96@gentoo.org
(cherry picked from commit 1d031b92bfa71602bdd0ed024bcf7ecd610ec077)

--- cmake/modules/Findquazip.cmake
+++ cmake/modules/Findquazip.cmake
@@ -6,7 +6,7 @@
   set(QUAZIP_FOUND TRUE)
 else(QUAZIP_INCLUDE_DIR AND QUAZIP_LIBRARIES)

-  find_path(QUAZIP_INCLUDE_DIR NAMES quazip.h PATH_SUFFIXES quazip)
+  find_path(QUAZIP_INCLUDE_DIR NAMES quazip/quazip.h)
   find_library(QUAZIP_LIBRARIES NAMES quazip)

   include(FindPackageHandleStandardArgs)


CMake: Tests PERL availability with PERL_EXECUTABLE variable.

On MSVC 64bits, does not put underscore before the symbol name on the
/INCLUDE linker parameter.

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

--- cmake/modules/LLVMConfig.cmake
+++ cmake/modules/LLVMConfig.cmake
@@ -1,3 +1,5 @@
+include(FindPerl)
+
 macro(llvm_config executable)
   # extra args is the list of link components.
   if( MSVC )
@@ -10,16 +12,21 @@

 function(msvc_llvm_config executable)
   set( link_components ${ARGN} )
+  if( CMAKE_CL_64 )
+    set(include_lflag "/INCLUDE:")
+  else( CMAKE_CL_64 )
+    set(include_lflag "/INCLUDE:_")
+  endif()
   foreach(c ${link_components})
     if( c STREQUAL "jit" )
-      set(lfgs "${lfgs} /INCLUDE:_X86TargetMachineModule")
+      set(lfgs "${lfgs} ${include_lflag}X86TargetMachineModule")
     endif( c STREQUAL "jit" )
     list(FIND LLVM_TARGETS_TO_BUILD ${c} idx)
     if( NOT idx LESS 0 )
-      set(lfgs "${lfgs} /INCLUDE:_${c}TargetMachineModule")
+      set(lfgs "${lfgs} ${include_lflag}${c}TargetMachineModule")
       list(FIND LLVM_ASMPRINTERS_FORCE_LINK ${c} idx)
       if( NOT idx LESS 0 )
-	set(lfgs "${lfgs} /INCLUDE:_${c}AsmPrinterForceLink")
+	set(lfgs "${lfgs} ${include_lflag}${c}AsmPrinterForceLink")
       endif()
     endif()
   endforeach(c)
@@ -108,9 +115,9 @@
       "`${LLVM_TOOLS_BINARY_DIR}/llvm-config --libs ${lc}`")
   else( NOT HAVE_LLVM_CONFIG )
     # tbi: Error handling.
-    if( NOT PERL_FOUND )
+    if( NOT PERL_EXECUTABLE )
       message(FATAL_ERROR "Perl required but not found!")
-    endif( NOT PERL_FOUND )
+    endif( NOT PERL_EXECUTABLE )
     execute_process(
       COMMAND sh -c "${PERL_EXECUTABLE} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/llvm-config --libs ${lc}"
       RESULT_VARIABLE rv


CMake uses i686, not x86 for 32bit processors

--- cmake/modules/SetUpLinux.cmake
+++ cmake/modules/SetUpLinux.cmake
@@ -75,7 +75,7 @@
   else()
     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
   endif()
-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES x86)
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES i686)
   message(STATUS "Found a 32bit system")
   set(FP_MATH_FLAGS "-msse -mfpmath=sse")
   if(CMAKE_COMPILER_IS_GNUCXX)
@@ -90,7 +90,7 @@
     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
   endif()
 else()
-  message(FATAL_ERROR "Unknown processor:" ${CMAKE_SYSTEM_PROCESSOR})
+  message(FATAL_ERROR "Unknown processor: ${CMAKE_SYSTEM_PROCESSOR}")
 endif()

 # JIT must be able to resolve symbols from all ROOT binaries.


Filter isystem flags for standard paths (Closes #187)

--- cmakemodules/UtilsMacros.cmake
+++ cmakemodules/UtilsMacros.cmake
@@ -29,27 +29,32 @@
 	ENDIF(NOT "${ARGV}" STREQUAL "")
 ENDMACRO(APPEND_MRPT_LIBS)

+# Add a path to "-isystem", filtering out "/usr/include", without checking for the right compiler:
+MACRO(INTERNAL_ADD_ISYSTEM   DIR)
+	get_filename_component(PATH_DIR "${DIR}" ABSOLUTE)
+	if (NOT "${PATH_DIR}" STREQUAL "/usr/include")
+	    IF($ENV{VERBOSE})
+		    MESSAGE(STATUS "isystem: Path added: ${PATH_DIR}")
+	    ENDIF()
+	    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${PATH_DIR}")
+	endif()
+ENDMACRO()

 # Only if GNU GCC is used, add one "-isystem" flag for each include directory.
 # Useful to discard -pedantic errors in system libraries not prepared to be so... well, pedantic.
 MACRO(ADD_DIRECTORIES_AS_ISYSTEM INCLUDE_DIRS)
-	IF($ENV{VERBOSE})
-		MESSAGE(STATUS "isystem: INCLUDE_DIRS= ${${INCLUDE_DIRS}}")
-	ENDIF($ENV{VERBOSE})
 	IF(CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
 		FOREACH(DIR ${${INCLUDE_DIRS}})
-			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${DIR}")
+			INTERNAL_ADD_ISYSTEM(${DIR})
 		ENDFOREACH(DIR)
 	ENDIF()
 ENDMACRO(ADD_DIRECTORIES_AS_ISYSTEM)

 MACRO(ADD_DIRECTORIES_AS_INCLUDE_AND_ISYSTEM INCLUDE_DIRS)
-	IF($ENV{VERBOSE})
-		MESSAGE(STATUS "isystem: INCLUDE_DIRS= ${${INCLUDE_DIRS}}")
-	ENDIF($ENV{VERBOSE})
 	IF(CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
 		FOREACH(DIR ${${INCLUDE_DIRS}})
-			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I ${DIR} -isystem ${DIR}")
+			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I ${DIR}")
+			INTERNAL_ADD_ISYSTEM(${DIR})
 		ENDFOREACH(DIR)
 	ENDIF()
 ENDMACRO(ADD_DIRECTORIES_AS_INCLUDE_AND_ISYSTEM)


Updated Boost to 1.57.

Updated Boost to 1.57.

--- dependencies/Boost/build.cmake
+++ dependencies/Boost/build.cmake
@@ -72,18 +72,17 @@
 	TestExecMonitorDebugLibraryVariable TestExecMonitorReleaseLibraryVariable
 	UnitTestFrameworkDebugLibraryVariable UnitTestFrameworkReleaseLibraryVariable
 	LocaleDebugLibraryVariable LocaleReleaseLibraryVariable
-	SystemDebugLibraryVariable SystemReleaseLibraryVariable
+	SystemDebugLibraryVariable SystemReleaseLibraryVariable
 	ThreadDebugLibraryVariable ThreadReleaseLibraryVariable
 )
 	set(MajorVersion 1)
+	set(MinorVersion 57)
 	if(WIN32)
-		set(MinorVersion 55)
 		set(Extension zip)
-		set(Md5 8aca361a4713a1f491b0a5e33fee0f1f)
+		set(Md5 5e040e578e3f0ba879da04a1e0cd55ff)
 	else()
-		set(MinorVersion 54)
 		set(Extension tar.gz)
-		set(Md5 efbfbff5a85a9330951f243d0a46e4b9)
+		set(Md5 25f9a8ac28beeb5ab84aa98510305299)
 	endif()

 	set(BuildDirectoryDefault "${BuildsDirectory}/Boost")


[OGRE-230] Include the unordered folder from boost to fix builds in some situations

--HG--
branch : v1-9

--- CMake/InstallDependencies.cmake
+++ CMake/InstallDependencies.cmake
@@ -206,7 +206,6 @@
       PATTERN "timer" EXCLUDE
       PATTERN "tr1" EXCLUDE
       PATTERN "units" EXCLUDE
-      PATTERN "unordered" EXCLUDE
       PATTERN "uuid" EXCLUDE
       PATTERN "variant" EXCLUDE
       PATTERN "wave" EXCLUDE


CMake: Fix list() arguments order

CMake: Fix list() arguments order

According to https://cmake.org/cmake/help/v3.0/command/list.html the operation in list() comes first.

--- CMake/Utils/AndroidMacros.cmake
+++ CMake/Utils/AndroidMacros.cmake
@@ -83,7 +83,7 @@
     endif()

     if(Boost_FOUND)
-       list(OGRE_ANDROID_INCLUDES APPEND ${Boost_INCLUDE_DIRS})
+       list(APPEND OGRE_ANDROID_INCLUDES ${Boost_INCLUDE_DIRS})
 	   add_static_libs_from_paths(${Boost_LIBRARIES})
     endif()


Upgrade C++ REST SDK from version 2.10.16 to 2.10.18

--- CMakeExternals/cpprestsdk.cmake
+++ CMakeExternals/cpprestsdk.cmake
@@ -24,7 +24,7 @@

     ExternalProject_Add(${proj}
       GIT_REPOSITORY https://github.com/microsoft/cpprestsdk.git
-      GIT_TAG v2.10.16
+      GIT_TAG v2.10.18
       SOURCE_SUBDIR Release
       CMAKE_ARGS ${ep_common_args}
       CMAKE_CACHE_ARGS ${cmake_cache_args}


Remove unnecessary quotes

Remove unnecessary quotes

--- cmake/Modules/SampPluginTest.cmake
+++ cmake/Modules/SampPluginTest.cmake
@@ -32,10 +32,10 @@
 		set(ARG_EXEC "${CMAKE_CURRENT_SOURCE_DIR}/${name}.cfg")
 	endif()
 	if(ARG_TIMEOUT)
-		list(APPEND arguments "--timeout" "${ARG_TIMEOUT}")
+		list(APPEND arguments --timeout ${ARG_TIMEOUT})
 	endif()
 	if(EXISTS "${ARG_EXEC}")
-		list(APPEND arguments "--exec" "${ARG_EXEC}")
+		list(APPEND arguments --exec "${ARG_EXEC}")
 	endif()

 	get_target_property(PLUGIN_PATH ${ARG_TARGET} LOCATION)
@@ -44,17 +44,17 @@
 	endif()

 	list(APPEND arguments
-		"--output"
-		"--plugin"   "${PLUGIN_PATH}"
-		"--gamemode" "${ARG_SCRIPT}"
+		--output
+		--plugin   "${PLUGIN_PATH}"
+		--gamemode "${ARG_SCRIPT}"
 	)

 	file(READ "${ARG_OUT_FILE}" out)

 	if(WIN32)
-		add_test(${name} "samp-server-cli.bat" ${arguments})
+		add_test(${name} samp-server-cli.bat ${arguments})
 	else()
-		add_test(${name} "samp-server-cli" ${arguments})
+		add_test(${name} samp-server-cli ${arguments})
 	endif()

 	set_tests_properties(${name} PROPERTIES


Adding ParaSails as a native repo for MCLS build

--- cmake/NativeRepositoriesList.cmake
+++ cmake/NativeRepositoriesList.cmake
@@ -17,6 +17,16 @@
   MESSAGE(STATUS "MCLS repository is not available")
 ENDIF()

+# Search to see if ParaSails exists in the Profugus source tree
+FIND_PATH(ParaSails_EXISTS
+  NAMES ParaSails/PackagesList.cmake
+  PATHS ${CMAKE_CURRENT_SOURCE_DIR})
+IF (ParaSails_EXISTS)
+  SET(NATIVE_REPOS ParaSails ${NATIVE_REPOS})
+ELSE()
+  MESSAGE(STATUS "ParaSails repository is not available")
+ENDIF()
+
 # Assume the user has already symlinked Trilinos into the current dir
 SET(NATIVE_REPOS Trilinos ${NATIVE_REPOS})


Updated for the 5.9.3 release.

Updated for the 5.9.3 release.

svn path=/trunk/; revision=9891

--- 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 "2008-12-14")
+set(RELEASE_DATE "2009-05-03")

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

-set(VERSION 5.9.2)
+set(VERSION 5.9.3)

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

 # PLplot library version information.

@@ -40,7 +40,7 @@
 set(qsastime_VERSION ${qsastime_SOVERSION}.0.1)

 set(plplot_SOVERSION 9)
-set(plplot_VERSION ${plplot_SOVERSION}.6.1)
+set(plplot_VERSION ${plplot_SOVERSION}.6.2)

 set(plplotcxx_SOVERSION 9)
 set(plplotcxx_VERSION ${plplotcxx_SOVERSION}.3.0)


updated build to put the configured version header into the build tree

--- cmake/oskar_compiler_options.cmake
+++ cmake/oskar_compiler_options.cmake
@@ -23,6 +23,7 @@
 # ------------------------------------------------------------------------------
 include_directories(
     ${PROJECT_SOURCE_DIR}
+    ${PROJECT_BINARY_DIR}
     ${PROJECT_SOURCE_DIR}/apps
     ${PROJECT_SOURCE_DIR}/apps/lib
     ${PROJECT_SOURCE_DIR}/apps/log
@@ -93,7 +94,7 @@
 endif()

 configure_file(${PROJECT_SOURCE_DIR}/cmake/oskar_version.h.in
-    ${PROJECT_SOURCE_DIR}/oskar_version.h @ONLY)
+    ${PROJECT_BINARY_DIR}/oskar_version.h @ONLY)

 # Set general compiler flags.
 if (NOT WIN32)


Fixed typo

Fixed typo

--- cmake_modules/FindCuttlebone.cmake
+++ cmake_modules/FindCuttlebone.cmake
@@ -28,7 +28,7 @@
   NAMES CUTTLEBONE
   PATHS ${CUTTLEBONE_PKGCONF_LIBRARY_DIRS}
 	./cuttlebone/build/lib ../cuttlebone/build/lib ../../cuttlebone/build/lib
-	./Cuttlebone/build/lib ../Cuttlebone/build/lib ../..Ccuttlebone/build/lib
+	./Cuttlebone/build/lib ../Cuttlebone/build/lib ../..Cuttlebone/build/lib
 	/usr/lib /usr/local/lib /opt/local/lib /tmp/cuttlebone
 )


Fix: some MacOS don't like --as-needed linker flag
While there lowercase some maco calls

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

--- cmake/pcl_targets.cmake
+++ cmake/pcl_targets.cmake
@@ -82,9 +82,11 @@
     #
     # Only link if needed
     if(WIN32 AND MSVC)
-      SET_TARGET_PROPERTIES(${_name} PROPERTIES LINK_FLAGS_RELEASE /OPT:REF)
+      set_target_properties(${_name} PROPERTIES LINK_FLAGS_RELEASE /OPT:REF)
+    elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+      set_target_properties(${_name} PROPERTIES LINK_FLAGS -Wl)
     else()
-      SET_TARGET_PROPERTIES(${_name} PROPERTIES LINK_FLAGS -Wl,--as-needed)
+      set_target_properties(${_name} PROPERTIES LINK_FLAGS -Wl,--as-needed)
     endif()
     #
     set_target_properties(${_name} PROPERTIES
@@ -111,9 +113,11 @@
     #
     # Only link if needed
     if(WIN32 AND MSVC)
-      SET_TARGET_PROPERTIES(${_name} PROPERTIES LINK_FLAGS_RELEASE /OPT:REF)
+      set_target_properties(${_name} PROPERTIES LINK_FLAGS_RELEASE /OPT:REF)
+    elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+      set_target_properties(${_name} PROPERTIES LINK_FLAGS -Wl)
     else()
-      SET_TARGET_PROPERTIES(${_name} PROPERTIES LINK_FLAGS -Wl,--as-needed)
+      set_target_properties(${_name} PROPERTIES LINK_FLAGS -Wl,--as-needed)
     endif()
     #
     set(PCL_EXECUTABLES ${PCL_EXECUTABLES} ${_name})
@@ -139,12 +143,15 @@
     target_link_libraries(${_exename} ${GTEST_BOTH_LIBRARIES} ${PCL_ADD_TEST_LINK_WITH})
     #
     # Only link if needed
-    if(UNIX)
-      SET_TARGET_PROPERTIES(${_exename} PROPERTIES LINK_FLAGS -Wl,--as-needed)
+    if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+      set_target_properties(${_name} PROPERTIES LINK_FLAGS -Wl)
+      target_link_libraries(${_exename} pthread)
+    elseif(UNIX)
+      set_target_properties(${_exename} PROPERTIES LINK_FLAGS -Wl,--as-needed)
       # GTest >= 1.5 requires pthread and CMake's 2.8.4 FindGTest is broken
       target_link_libraries(${_exename} pthread)
     elseif(WIN32)
-      SET_TARGET_PROPERTIES(${_exename} PROPERTIES LINK_FLAGS_RELEASE /OPT:REF)
+      set_target_properties(${_exename} PROPERTIES LINK_FLAGS_RELEASE /OPT:REF)
     endif()
     #
     PCL_LINK_OPENMP(${_exename})


DOC: added comment block for IGT

DOC: added comment block for IGT

--- Modules/IGT/Testing/files.cmake
+++ Modules/IGT/Testing/files.cmake
@@ -1,4 +1,17 @@
 set(MODULE_TESTS
+   # IMPORTANT: If you plan to deactivate / comment out a test please write a bug number to the commented out line of code.
+   #
+   #     Example: #mitkMyTest #this test is commented out because of bug 12345
+   #
+   # It is important that the bug is open and that the test will be activated again before the bug is closed. This assures that
+   # no test is forgotten after it was commented out. If there is no bug for your current problem, please add a new one and
+   # mark it as critical.
+
+   ################## DISABLED TESTS #################################################
+   #mitkNavigationToolStorageSerializerTest.cpp # deactivated because of bug 17199
+   #mitkNavigationToolStorageSerializerAndDeserializerIntegrationTest.cpp # deactivated because of bug 17199
+
+   ################# RUNNING TESTS ###################################################
    mitkCameraVisualizationTest.cpp
    mitkClaronInterfaceTest.cpp
    mitkClaronToolTest.cpp
@@ -29,14 +42,11 @@
    mitkTrackingDeviceSourceConfiguratorTest.cpp
    mitkNavigationDataEvaluationFilterTest.cpp
    mitkTrackingTypesTest.cpp
-
    # ------------------ Navigation Tool Management Tests -------------------
    mitkNavigationToolStorageTest.cpp
    mitkNavigationToolTest.cpp
    mitkNavigationToolReaderAndWriterTest.cpp
-   #mitkNavigationToolStorageSerializerTest.cpp # deactivated because of bug 17199
    mitkNavigationToolStorageDeserializerTest.cpp
-   #mitkNavigationToolStorageSerializerAndDeserializerIntegrationTest.cpp # deactivated because of bug 17199
    # -----------------------------------------------------------------------
 )


cmake: pass repository path to git when doing git describe

Fixes getting IDF version in out-of-tree builds

--- tools/cmake/third_party/GetGitRevisionDescription.cmake
+++ tools/cmake/third_party/GetGitRevisionDescription.cmake
@@ -109,6 +109,8 @@

 	execute_process(COMMAND
 		"${GIT_EXECUTABLE}"
+		"-C"
+		${_repo_dir}
 		describe
 		${hash}
 		${ARGN}


COMP: use temporary stnava git itk

COMP: use temporary stnava git itk

--- SuperBuild/External_ITKv5.cmake
+++ SuperBuild/External_ITKv5.cmake
@@ -148,7 +148,8 @@

   ### --- End Project specific additions
   set(${proj}_REPOSITORY ${git_protocol}://github.com/InsightSoftwareConsortium/ITK.git)
-  set(${proj}_GIT_TAG 8e821376ee7e19d81c29741acdc32bcda911eafc ) ## jacobian performance
+  set(${proj}_REPOSITORY ${git_protocol}://github.com/stnava/ITK.git)
+  set(${proj}_GIT_TAG f44174c188466da6a9dcfbf3928d52bbd3b05cd2) ## ants fixes for jacobian performance
   set(ITK_VERSION_ID ITK-5.0) ### NOTE: When updating GIT_TAG, also update ITK_VERSION_ID

   ExternalProject_Add(${proj}


BUG:  Missing paren.

BUG:  Missing paren.

--- SuperBuild/External_ITKv5.cmake
+++ SuperBuild/External_ITKv5.cmake
@@ -153,7 +153,7 @@
   set(${proj}_REPOSITORY ${git_protocol}://github.com/InsightSoftwareConsortium/ITK.git)
   # set(${proj}_REPOSITORY ${git_protocol}://github.com/stnava/ITK.git)
   set(${proj}_GIT_TAG e21a56d1227c5433066237060368cb4532b8a9d2)  # Adaptive denoising module 10/2/2020
-  set(ITK_VERSION_ID ITK-5.2 ### NOTE: When updating GIT_TAG, also update ITK_VERSION_ID
+  set(ITK_VERSION_ID ITK-5.2) ### NOTE: When updating GIT_TAG, also update ITK_VERSION_ID

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


GC more left-over libtool defines.

GC more left-over libtool defines.

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

--- include/llvm/Config/config.h.cmake
+++ include/llvm/Config/config.h.cmake
@@ -460,18 +460,8 @@
 /* Define if we link Polly to the tools */
 #cmakedefine LINK_POLLY_INTO_TOOLS

-/* Define if the OS needs help to load dependent libraries for dlopen(). */
-#cmakedefine LTDL_DLOPEN_DEPLIBS ${LTDL_DLOPEN_DEPLIBS}
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LTDL_OBJDIR
-
 /* Define to the extension used for shared libraries, say, ".so". */
 #cmakedefine LTDL_SHLIB_EXT "${LTDL_SHLIB_EXT}"
-
-/* Define to the system default library search path. */
-#cmakedefine LTDL_SYSSEARCHPATH "${LTDL_SYSSEARCHPATH}"

 /* Define if /dev/zero should be used when mapping RWX memory, or undefine if
    its not necessary */


Bugfix

Bugfix

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

--- deal.II/contrib/cmake/configure/configure_boost.cmake
+++ deal.II/contrib/cmake/configure/configure_boost.cmake
@@ -3,7 +3,7 @@
   FIND_PACKAGE (Boost COMPONENTS serialization thread)

   IF(NOT DEAL_II_ALLOW_CONTRIB)
-    IF(NOT Boost_THREAD_FOUND OR NOT Boost_Serialization_FOUND)
+    IF(NOT Boost_THREAD_FOUND OR NOT Boost_SERIALIZATION_FOUND)
       macro_message_not_found("boost" "Boost")
     ENDIF()
   ELSE()


chore(cmake): do not delete coverage.info.cleaned which will be used for coveralls.io

--- src/cmake/Modules/CodeCoverage.cmake
+++ src/cmake/Modules/CodeCoverage.cmake
@@ -94,7 +94,7 @@
                 COMMAND ${LCOV_PATH} --directory . --capture --output-file ${_outputname}.info
                 COMMAND ${LCOV_PATH} --remove ${_outputname}.info 'tests/*' '/usr/*' --output-file ${_outputname}.info.cleaned
                 COMMAND ${GENHTML_PATH} -o ${_outputname} ${_outputname}.info.cleaned
-                COMMAND ${CMAKE_COMMAND} -E remove ${_outputname}.info ${_outputname}.info.cleaned
+                COMMAND ${CMAKE_COMMAND} -E remove ${_outputname}.info

                 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
                 COMMENT "Resetting code coverage counters to zero.\nProcessing code coverage counters and generating report."


brining over fix in master (#4140) for libz import on 64-bit android

(cherry picked from commit 55a9fdf0512a6bd3fd82591f48db0942cbd4fc38)

--- cmake/OpenCVFindLibsGrfmt.cmake
+++ cmake/OpenCVFindLibsGrfmt.cmake
@@ -8,7 +8,8 @@
 else()
   include(FindZLIB)
   if(ZLIB_FOUND AND ANDROID)
-    if(ZLIB_LIBRARY STREQUAL "${ANDROID_SYSROOT}/usr/lib/libz.so")
+    if(ZLIB_LIBRARIES STREQUAL "${ANDROID_SYSROOT}/usr/lib/libz.so" OR
+        ZLIB_LIBRARIES STREQUAL "${ANDROID_SYSROOT}/usr/lib64/libz.so")
       set(ZLIB_LIBRARY z)
       set(ZLIB_LIBRARIES z)
     endif()


Minor change for Houdini branching on OpenVDB ABI selection

Signed-off-by: Nick Avramoussis <4c6772d20f21e1f087b814400acc0120202ec49e@dneg.com>

--- cmake/OpenVDBHoudiniSetup.cmake
+++ cmake/OpenVDBHoudiniSetup.cmake
@@ -313,6 +313,9 @@

 IF ( Houdini_VERSION VERSION_LESS 17 )
   SET ( OPENVDB_HOUDINI_ABI 4 )
+ELSEIF ( Houdini_VERSION VERSION_LESS 18 )
+  SET ( OPENVDB_HOUDINI_ABI 5 )
 ELSE ()
-  SET ( OPENVDB_HOUDINI_ABI 5 )
-ENDIF ()
+  # Anticipated ABI version for H18
+  SET ( OPENVDB_HOUDINI_ABI 6 )
+ENDIF ()


reduce warning level due to libzeug inheritance dominance issue

--- cmake/PlatformWindowsMSVC.cmake
+++ cmake/PlatformWindowsMSVC.cmake
@@ -20,7 +20,7 @@

 set(WIN32_COMPILE_FLAGS
-	"/nologo /Zc:wchar_t /Zc:forScope /GL /GF /GR /GS- /Zi /fp:precise /MP /wd4267 /wd4251 /wd4273 /W3 /WX "
+	"/nologo /Zc:wchar_t /Zc:forScope /GL /GF /GR /GS- /Zi /fp:precise /MP /wd4267 /wd4251 /wd4273 /W3 "
 	# nologo       -> no logo
  	# Zc:wchar_t   -> treat wchar_t as built-in type: yes
  	# Zc:forScope  -> force conformance in for loop scope: Yes


Comment out FILE(COPY) that doesn't work on Cmake 2.6.

--- cmake_modules/ZorbaModule.cmake
+++ cmake_modules/ZorbaModule.cmake
@@ -207,13 +207,14 @@
     ENDFOREACH(ZORBA_STORE_NAME ${ZORBA_STORE_NAMES})

   ENDIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE_NAME}.xq.src/")
-
-  FILE(COPY ${CMAKE_CURRENT_SOURCE_DIR}
-        DESTINATION "${output_dir}/.."
-        FILES_MATCHING
-        PATTERN "*.xsd"
-        PATTERN "*.svn" EXCLUDE
-        PATTERN "*.xq.src" EXCLUDE)
+
+#  QQQ FILE(COPY ...) only exists in Cmake 2.8 :(
+#  FILE(COPY ${CMAKE_CURRENT_SOURCE_DIR}
+#        DESTINATION "${output_dir}/.."
+#        FILES_MATCHING
+#        PATTERN "*.xsd"
+#        PATTERN "*.svn" EXCLUDE
+#        PATTERN "*.xq.src" EXCLUDE)

    STRING(REPLACE "/" "_" ZORBA_OUTPUT_INSTALLED "${output_dir}_installed")


Remove old featureTest function

Remove old featureTest function

--- cmakemodules/FeatureTests.cmake
+++ cmakemodules/FeatureTests.cmake
@@ -32,17 +32,6 @@
 include(CheckFunctionExists)
 include(CheckMPIFunctionExists)
 include(CheckMPISymbolExists)
-
-
-# \brief Helper maco to execute a feature test.
-#
-# \param file Source file (will be searched in cmakemodules/FeatureTests)
-# \param var Variable where the feature test result will be stored in
-#
-macro(featureTest file var)
-  file(READ "${PROJECT_SOURCE_DIR}/cmakemodules/FeatureTests/${file}" SOURCE)
-  check_c_source_compiles("${SOURCE}" ${var})
-endmacro()

 ###Run all feature tests that influence config.h


Do not link to these libraries on apple systems. Actually the check if the libraries are available is already done in the Superbuild.cmake but just for linux systems.

--- CMake/PackageDepends/MITK_DCMTK_Config.cmake
+++ CMake/PackageDepends/MITK_DCMTK_Config.cmake
@@ -14,9 +14,9 @@
   message(SEND_ERROR "DCMTK development files not found.\n Please check variables (e.g. DCMTK_DIR) for include directories and libraries.\nYou may set environment variable DCMTK_DIR before pressing 'configure'")
 endif(NOT DCMTK_FOUND)

-if( NOT WIN32 )
+if( NOT WIN32 AND NOT APPLE )
   set(MISSING_LIBS_REQUIRED_BY_DCMTK wrap tiff z)
-endif( NOT WIN32 )
+endif( NOT WIN32 AND NOT APPLE )

 set(QT_USE_QTSQL 1)


Added missing DESTINATION to file copy

Added missing DESTINATION to file copy

--- BlueBerry/CMake/FunctionCreateBlueBerryApplication.cmake
+++ BlueBerry/CMake/FunctionCreateBlueBerryApplication.cmake
@@ -118,7 +118,7 @@
   set(icon_full_path "${CMAKE_CURRENT_SOURCE_DIR}/icons/${icon_name}")
   if(EXISTS "${icon_full_path}")
     set_target_properties(${_APP_NAME} PROPERTIES MACOSX_BUNDLE_ICON_FILE "${icon_name}")
-    file(COPY ${icon_full_path} "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_APP_NAME}.app/Contents/Resources/")
+    file(COPY ${icon_full_path} DESTINATION "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_APP_NAME}.app/Contents/Resources/")
     INSTALL (FILES ${icon_full_path} DESTINATION "${_APP_NAME}.app/Contents/Resources/")
   endif()
 endif()


STYLE: mark these variables as advanced

Alex

--- CMake/FindMangledMesa.cmake
+++ CMake/FindMangledMesa.cmake
@@ -21,3 +21,6 @@
 IF (NOT MANGLED_OSMESA_LIBRARY)
   FIND_LIBRARY(MANGLED_OSMESA_LIBRARY OSMesa)
 ENDIF (NOT MANGLED_OSMESA_LIBRARY)
+
+MARK_AS_ADVANCED(MANGLED_MESA_INCLUDE_DIR MANGLED_MESA_LIBRARY
+                 MANGLED_OSMESA_INCLUDE_DIR MANGLED_OSMESA_LIBRARY)


add todo to remove workaround of invoking rtigddgen_server twice

--- connext_cmake_module/cmake/Modules/FindConnext.cmake
+++ connext_cmake_module/cmake/Modules/FindConnext.cmake
@@ -327,6 +327,7 @@
 if(Connext_DDSGEN_SERVER)
   # the first invocation with a timeout is necessary since when the script
   # forks the daemon it fails to exit early (default daemon timeout is 20s)
+  # TODO(mikaelarguedas) remove this once rtiddsgen_server detaches the forked daemon and returns early
   execute_process(
     COMMAND "${Connext_DDSGEN_SERVER}" "-version"
     TIMEOUT 1


fix using rtiddsgen_server

fix using rtiddsgen_server

--- connext_cmake_module/cmake/Modules/FindConnext.cmake
+++ connext_cmake_module/cmake/Modules/FindConnext.cmake
@@ -235,7 +235,7 @@
 if(Connext_DDSGEN_SERVER)
   # check that the generator is invocable / finds a Java runtime environment
   execute_process(
-    COMMAND "/usr/bin/rtiddsgen_server"
+    COMMAND "${Connext_DDSGEN_SERVER}"
     RESULT_VARIABLE _retcode
     OUTPUT_QUIET ERROR_QUIET)
   if(NOT _retcode EQUAL 0)


Add configure check for HAVE_UCS4_TCL

Add configure check for HAVE_UCS4_TCL

--- cmake/ConfigureChecks.cmake
+++ cmake/ConfigureChecks.cmake
@@ -1172,6 +1172,21 @@
 #
 #######################################################################

+# Check for UCS-4 tcl
+set(check_src ${PROJECT_BINARY_DIR}/CMakeFiles/have_ucs4_tcl.c)
+file(WRITE ${check_src} "#include <tcl.h>
+#if TCL_UTF_MAX != 6
+# error \"NOT UCS4_TCL\"
+#endif
+int main () { return 0; }
+")
+python_platform_test(
+  HAVE_UCS4_TCL
+  "Checking for UCS-4 tcl"
+  ${check_src}
+  DIRECT
+  )
+
 #ucs2
 set(HAVE_USABLE_WCHAR_T 0)

@@ -2156,7 +2171,6 @@
 endif()

 # todo
-set(HAVE_UCS4_TCL 0)
 set(PTHREAD_SYSTEM_SCHED_SUPPORTED 1)
 set(HAVE_DEVICE_MACROS ${HAVE_MAKEDEV})


[CMake][Lit][unittests] Cleanup in AddLLVM.cmake.

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

--- cmake/modules/AddLLVM.cmake
+++ cmake/modules/AddLLVM.cmake
@@ -155,16 +155,9 @@
   endif()
 endmacro(add_llvm_external_project)

-# Returns directory where unittest should reside.
-function(get_unittest_directory dir)
-  set(result ${CMAKE_CURRENT_BINARY_DIR})
-  set(${dir} ${result} PARENT_SCOPE)
-endfunction()
-
 # Generic support for adding a unittest.
 function(add_unittest test_suite test_name)
-  get_unittest_directory(OUTPUT_DIR)
-  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_DIR})
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
   if( NOT LLVM_BUILD_TESTS )
     set(EXCLUDE_FROM_ALL ON)
   endif()


fix CMake warning regarding policy warning 54

--- rmw/cmake/configure_rmw_library.cmake
+++ rmw/cmake/configure_rmw_library.cmake
@@ -33,7 +33,7 @@
 #
 macro(configure_rmw_library library_target)
   # Set the visibility to hidden by default if possible
-  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+  if("${CMAKE_CXX_COMPILER_ID} " STREQUAL "GNU " OR "${CMAKE_CXX_COMPILER_ID} " STREQUAL "Clang ")
     # Set the visibility of symbols to hidden by default for gcc and clang
     # (this is already the default on Windows)
     set_target_properties(${library_target}


mdev-176 feedback plugin is linked dynamically in bintar

--- cmake/build_configurations/mysql_release.cmake
+++ cmake/build_configurations/mysql_release.cmake
@@ -65,7 +65,8 @@
   IF(num GREATER FEATURE_SET_small)
     SET(WITH_ARCHIVE_STORAGE_ENGINE  ON)
     SET(WITH_BLACKHOLE_STORAGE_ENGINE ON)
-    SET(WITH_FEDERATED_STORAGE_ENGINE ON)
+    SET(WITH_FEDERATEDX_STORAGE_ENGINE ON)
+    SET(WITH_PLUGIN_FEEDBACK ON)
   ENDIF()
   IF(num GREATER FEATURE_SET_classic)
     SET(WITH_INNOBASE_STORAGE_ENGINE ON)
@@ -97,7 +98,7 @@
 SET(WITH_ZLIB bundled CACHE STRING "")

 IF(NOT COMPILATION_COMMENT)
-  SET(COMPILATION_COMMENT "MySQL Community Server (GPL)")
+  SET(COMPILATION_COMMENT "MariaDB Server")
 ENDIF()

 IF(WIN32)


add option to skip the group membership check if installing interfaces (#253)

--- rosidl_cmake/cmake/rosidl_generate_interfaces.cmake
+++ rosidl_cmake/cmake/rosidl_generate_interfaces.cmake
@@ -33,6 +33,9 @@
 # :type LIBRARY_NAME: string
 # :param SKIP_INSTALL: if set skip installing the interface files
 # :type SKIP_INSTALL: option
+# :param SKIP_GROUP_MEMBERSHIP_CHECK: if set, skip enforcing the appartenance
+#   to the rosidl_interface_packages group
+# :type SKIP_GROUP_MEMBERSHIP_CHECK: option
 # :param ADD_LINTER_TESTS: if set lint the interface files using
 #   the ``ament_lint`` package
 # :type ADD_LINTER_TESTS: option
@@ -40,7 +43,10 @@
 # @public
 #
 macro(rosidl_generate_interfaces target)
-  cmake_parse_arguments(_ARG "ADD_LINTER_TESTS;SKIP_INSTALL" "LIBRARY_NAME" "DEPENDENCIES" ${ARGN})
+  cmake_parse_arguments(_ARG
+    "ADD_LINTER_TESTS;SKIP_INSTALL;SKIP_GROUP_MEMBERSHIP_CHECK"
+    "LIBRARY_NAME" "DEPENDENCIES"
+    ${ARGN})
   if(NOT _ARG_UNPARSED_ARGUMENTS)
     message(FATAL_ERROR "rosidl_generate_interfaces() called without any idl "
       "files")
@@ -114,16 +120,18 @@
   )

   if(NOT _ARG_SKIP_INSTALL)
-    set(_interface_packages_group_name "rosidl_interface_packages")
-    if(NOT _AMENT_PACKAGE_NAME)
-      ament_package_xml()
-    endif()
-    if(NOT _interface_packages_group_name IN_LIST ${_AMENT_PACKAGE_NAME}_MEMBER_OF_GROUPS)
-      message(FATAL_ERROR
-        "Packages installing interfaces must include \
-        '<member_of_group>${_interface_packages_group_name}</member_of_group>' \
-        in their package.xml"
-      )
+    if(NOT _ARG_SKIP_GROUP_MEMBERSHIP_CHECK)
+      set(_group_name "rosidl_interface_packages")
+      if(NOT _AMENT_PACKAGE_NAME)
+        ament_package_xml()
+      endif()
+      if(NOT _group_name IN_LIST ${_AMENT_PACKAGE_NAME}_MEMBER_OF_GROUPS)
+        message(FATAL_ERROR
+          "Packages installing interfaces must include \
+          '<member_of_group>${_group_name}</member_of_group>' \
+          in their package.xml"
+        )
+      endif()
     endif()
     # register interfaces with the ament index
     set(_idl_files_lines)


Fix ctkFunctionExtractOptionNameAndValue

Fixes #126

--- CMake/ctkFunctionExtractOptionNameAndValue.cmake
+++ CMake/ctkFunctionExtractOptionNameAndValue.cmake
@@ -12,7 +12,7 @@
   endif()

   # Extract option name and option default value
-  string(REPLACE ":" "\\;" my_opt_list ${my_opt})
+  string(REGEX REPLACE ":(ON|OFF)$" "\\\\;\\1" my_opt_list ${my_opt})
   set(my_opt_list ${my_opt_list})
   list(GET my_opt_list 0 opt_name)
   list(GET my_opt_list 1 opt_value)


fix gcc47 compilation

fix gcc47 compilation

--- cmake/ElektraCompiling.cmake
+++ cmake/ElektraCompiling.cmake
@@ -56,6 +56,9 @@

 		#not supported by icc/clang:
 		set (CXX_EXTRA_FLAGS "${CXX_EXTRA_FLAGS} -Wstrict-null-sentinel")
+
+		# needed by gcc4.7 when compiled with ENABLE_CXX11
+		set (CXX_EXTRA_FLAGS "${CXX_EXTRA_FLAGS} -D_GLIBCXX_USE_NANOSLEEP")

 		message (STATUS "GCC detected")
 	endif(WIN32)


[AddSwift.cmake] Remove leftover use_internal_sdk parameter values

The `use_internal_sdk` flag has been removed from `_add_variant_link_flags` and
`_add_variant_c_compile_flags` in commit
d9bbb6caf09a512f10edc4379194ec6a07aed847

In four instances where previously FALSE was given as the value for that
parameter, this value has not been removed from the call.
This causes the two functions to try to append flags to FALSE instead of the
respective link_flags and c_compile_flags variables.

--- cmake/modules/AddSwift.cmake
+++ cmake/modules/AddSwift.cmake
@@ -1612,14 +1612,12 @@
       "${SWIFTEXE_SINGLE_ARCHITECTURE}"
       "${CMAKE_BUILD_TYPE}"
       "${LLVM_ENABLE_ASSERTIONS}"
-      FALSE
       c_compile_flags)
   _add_variant_link_flags(
       "${SWIFTEXE_SINGLE_SDK}"
       "${SWIFTEXE_SINGLE_ARCHITECTURE}"
       "${CMAKE_BUILD_TYPE}"
       "${LLVM_ENABLE_ASSERTIONS}"
-      FALSE
       link_flags)

   list(APPEND link_flags


A small reminder

A small reminder

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

--- deal.II/contrib/cmake/check/check_for_cxx_features.cmake
+++ deal.II/contrib/cmake/check/check_for_cxx_features.cmake
@@ -29,7 +29,7 @@
 # Checks for various header files:
 #

-CHECK_INCLUDE_FILES("ostream" HAVE_STD_OSTREAM_HEADER)
+CHECK_INCLUDE_FILES("ostream" HAVE_STD_OSTREAM_HEADER) # TODO: remove this...
 CHECK_INCLUDE_FILES("iosfwd" HAVE_STD_IOSFWD_HEADER)
 CHECK_INCLUDE_FILES("stdint.h" HAVE_STDINT_H)
 CHECK_INCLUDE_FILES("stdlib.h" HAVE_STDLIB_H)


build: switch `-Wswitch-enum` to `-Wswitch`

-Wswitch-enum requires all cases be spelt out in a switch, even in the
presence of a `default` case.  This along with
`-Wswitch-covered-default` means that `default` cannot be used in a
switch over an enumerated type and every case must be spelt.  Use
`-Wswitch` instead which allows the use of `default` labels.

--- cmake/modules/DispatchCompilerWarnings.cmake
+++ cmake/modules/DispatchCompilerWarnings.cmake
@@ -38,7 +38,7 @@
     add_compile_options(-Wsign-conversion)
     add_compile_options(-Wstatic-in-inline)
     add_compile_options(-Wsuper-class-method-mismatch)
-    add_compile_options(-Wswitch-enum)
+    add_compile_options(-Wswitch)
     add_compile_options(-Wunguarded-availability)
     add_compile_options(-Wunreachable-code)
     add_compile_options(-Wunused)