Linux: add -Wno-missing-field-initializers, gcc with -Wextra is a false positive for this

--- cmake-toolchains/linux.cmake
+++ cmake-toolchains/linux.cmake
@@ -22,12 +22,12 @@
 set(CMAKE_CONFIGURATION_TYPES Debug Release)

 # C++ flags
-set(CMAKE_CXX_FLAGS "-fPIC -std=c++11 -pthread -fno-strict-aliasing -Wno-expansion-to-defined -Wno-multichar -Wall -Wextra -Wno-unused-parameter -Wno-unknown-pragmas -Wno-ignored-qualifiers")
+set(CMAKE_CXX_FLAGS "-fPIC -std=c++11 -pthread -fno-strict-aliasing -Wno-expansion-to-defined -Wno-multichar -Wall -Wextra -Wno-unused-parameter -Wno-unknown-pragmas -Wno-ignored-qualifiers -Wno-missing-field-initializers")
 set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
 set(CMAKE_CXX_FLAGS_DEBUG "-O0 -D_DEBUG_ -D_DEBUG -DFIPS_DEBUG=1 -ggdb")

 # C flags
-set(CMAKE_C_FLAGS "-fPIC -pthread -fno-strict-aliasing -Wno-multichar -Wall -Wextra -Wno-expansion-to-defined -Wno-unused-parameter -Wno-unknown-pragmas -Wno-ignored-qualifiers")
+set(CMAKE_C_FLAGS "-fPIC -pthread -fno-strict-aliasing -Wno-multichar -Wall -Wextra -Wno-expansion-to-defined -Wno-unused-parameter -Wno-unknown-pragmas -Wno-ignored-qualifiers -Wno-missing-field-initializers")
 set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG")
 set(CMAKE_C_FLAGS_DEBUG "-O0 -D_DEBUG_ -D_DEBUG -DFIPS_DEBUG=1 -ggdb")


dont run linear_ridge_regression if LAPACK is not available

--- cmake/FindMetaExamples.cmake
+++ cmake/FindMetaExamples.cmake
@@ -9,6 +9,10 @@
 	IF(NOT USE_GPL_SHOGUN)
 		LIST(REMOVE_ITEM META_EXAMPLE_LISTINGS ${CMAKE_SOURCE_DIR}/examples/meta/src/gaussian_processes/gaussian_process_regression.sg)
 	ENDIF()
+
+	IF(NOT HAVE_LAPACK)
+		LIST(REMOVE_ITEM META_EXAMPLE_LISTINGS ${CMAKE_SOURCE_DIR}/examples/meta/src/regression/linear_ridge_regression.sg)
+	ENDIF()

 	SET(META_EXAMPLES ${META_EXAMPLE_LISTINGS} PARENT_SCOPE)
 endfunction()


Added check for CUDA toolkit version ( older can't compile Kepler )

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

   message(STATUS "CUDA detected: " ${CUDA_VERSION})

-  if("CUDA_VERSION_STRING" VERSION_GREATER "4.1")
+  if(${CUDA_VERSION_STRING} VERSION_GREATER "4.1")
     set(CUDA_ARCH_BIN "1.1 1.2 1.3 2.0 2.1(2.0) 3.0" CACHE STRING "Specify 'real' GPU architectures to build binaries for, BIN(PTX) format is supported")
   else()
     set(CUDA_ARCH_BIN "1.1 1.2 1.3 2.0 2.1(2.0)" CACHE STRING "Specify 'real' GPU architectures to build binaries for, BIN(PTX) format is supported")


Fix if statement in catkin_libraries (#1050)

--- cmake/catkin_libraries.cmake
+++ cmake/catkin_libraries.cmake
@@ -137,7 +137,7 @@
       get_target_property(${lib}_imported ${lib} IMPORTED)
       if(${${lib}_type} STREQUAL "INTERFACE_LIBRARY")
         get_target_property(${lib}_interface_link_libraries ${lib} INTERFACE_LINK_LIBRARIES)
-        if(${${lib}_interface_link_libraries})
+        if(${lib}_interface_link_libraries)
           catkin_replace_imported_library_targets(${lib}_resolved_libs ${${lib}_interface_link_libraries})
           list(APPEND result ${${lib}_resolved_libs})
         endif()


build: simplify a condition further (NFC)

Cleanup the nested conditions here as per Ross' suggestion.  NFC.

--- cmake/modules/AddSwift.cmake
+++ cmake/modules/AddSwift.cmake
@@ -1669,11 +1669,9 @@

       # Collect architecture agnostic SDK linker flags
       set(swiftlib_link_flags_all ${SWIFTLIB_LINK_FLAGS})
-      if(${sdk} STREQUAL IOS_SIMULATOR)
-        if(${name} STREQUAL swiftMediaPlayer)
-          # message("DISABLING AUTOLINK FOR swiftMediaPlayer")
-          list(APPEND swiftlib_link_flags_all "-Xlinker" "-ignore_auto_link")
-        endif()
+      if(${sdk} STREQUAL IOS_SIMULATOR AND ${name} STREQUAL swiftMediaPlayer)
+        # message("DISABLING AUTOLINK FOR swiftMediaPlayer")
+        list(APPEND swiftlib_link_flags_all "-Xlinker" "-ignore_auto_link")
       endif()

       # We unconditionally removed "-z,defs" from CMAKE_SHARED_LINKER_FLAGS in


avoid using versioned R_HOME

avoid using versioned R_HOME

As it causes warnings when R is launched as a subprocess.

--- cmake/modules/FindLibR.cmake
+++ cmake/modules/FindLibR.cmake
@@ -23,9 +23,7 @@
    find_library(LIBR_LIBRARIES R)

    if(LIBR_LIBRARIES MATCHES ".*\\.framework")
-      set(_LIBR_RESOURCES "${LIBR_LIBRARIES}/Resources")
-      get_filename_component(_LIBR_HOME "${_LIBR_RESOURCES}" REALPATH)
-      set(LIBR_HOME "${_LIBR_HOME}" CACHE PATH "R home directory")
+      set(LIBR_HOME "${LIBR_LIBRARIES}/Resources" CACHE PATH "R home directory")
       set(LIBR_INCLUDE_DIRS "${LIBR_HOME}/include" CACHE PATH "R include directory")
       set(LIBR_DOC_DIR "${LIBR_HOME}/doc" CACHE PATH "R doc directory")
       set(LIBR_EXECUTABLE "${LIBR_HOME}/bin/R" CACHE PATH "R executable")


Update PCRE version to 8.40

Update PCRE version to 8.40

--- SuperBuild/External_PCRE.cmake
+++ SuperBuild/External_PCRE.cmake
@@ -19,8 +19,8 @@
   #  PCRE (Perl Compatible Regular Expressions)
   #

-  set(PCRE_TARGET_VERSION 8.37)
-  set(PCRE_DOWNLOAD_SOURCE_HASH "6e0cc6d1bdac7a4308151f9b3571b86e")
+  set(PCRE_TARGET_VERSION 8.40)
+  set(PCRE_DOWNLOAD_SOURCE_HASH "890c808122bd90f398e6bc40ec862102")
   sitkSourceDownload(PCRE_URL "pcre-${PCRE_TARGET_VERSION}.tar.gz" ${PCRE_DOWNLOAD_SOURCE_HASH})


Update Superbuild SWIG version to 3.0.12

--- SuperBuild/External_Swig.cmake
+++ SuperBuild/External_Swig.cmake
@@ -18,16 +18,18 @@
     mark_as_advanced(USE_SWIG_FROM_GIT)
   endif()

+
+  set(SWIG_TARGET_VERSION "3.0.12" )
+
   if( USE_SWIG_FROM_GIT )
     set(SWIG_GIT_REPOSITORY "${git_protocol}://github.com/swig/swig.git" CACHE STRING "URL of swig git repo")
-    set(SWIG_GIT_TAG "rel-3.0.11" CACHE STRING "Tag in swig git repo")
+    set(SWIG_GIT_TAG "rel-${SWIG_TARGET_VERSION}" CACHE STRING "Tag in swig git repo")
     mark_as_advanced(SWIG_GIT_REPO)
     mark_as_advanced(SWIG_GIT_TAG)
   endif()

-  set(SWIG_TARGET_VERSION "3.0.11" )
-  set(SWIG_DOWNLOAD_SOURCE_HASH "13732eb0f1ab2123d180db8425c1edea")
-  set(SWIGWIN_DOWNLOAD_HASH "5cc57e3658f62b7f648bec7eed91a4f0" )
+  set(SWIG_DOWNLOAD_SOURCE_HASH "82133dfa7bba75ff9ad98a7046be687c")
+  set(SWIGWIN_DOWNLOAD_HASH "a49524dad2c91ae1920974e7062bfc93" )

   if(WIN32)
     # binary SWIG for windows


Add information about new RHEL/Fedora builds

--- doc/www-data.in/download.cmake
+++ doc/www-data.in/download.cmake
@@ -66,9 +66,9 @@
         sudo apt-get install tarantool tarantool-client
         ```

-        ### CentOS 5-6 and RHEL 5-6
+        ### CentOS 5-7 and RHEL 5-7

-        CentOS repository is available at [http://tarantool.org/dist/stable/centos]
+        CentOS and RHEL repository is available at [http://tarantool.org/dist/stable/centos]

         Add the following section to your yum repository list (/etc/yum.repos.d/tarantool.repo)
         to enable it:
@@ -81,7 +81,7 @@
         gpgcheck=0
         ```

-        ### Fedora
+        ### Fedora 19, 20 and Rawhide

         Fedora repository is available at [http://tarantool.org/dist/stable/fedora]


Added -std=c++11 also for clang

Added -std=c++11 also for clang

--- CXX11.cmake
+++ CXX11.cmake
@@ -27,7 +27,7 @@
        (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 3.1))
         set(${_VAR} 1)
         message(STATUS "Checking for C++11 compiler - available")
-	if(CMAKE_COMPILER_IS_GNUCXX)
+	if(CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang"))
 	  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 	endif()
     else()


Move some check

Move some check

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

--- config-kopete.h.cmake
+++ config-kopete.h.cmake
@@ -23,4 +23,15 @@
 /* Define to 1 if you want IDN support. */
 #define LIBIDN 1

+/* Speex codec is enabled */
+#define HAVE_SPEEX 1

+/* Define to 1 if you have the <speex.h> header file. */
+#cmakedefine HAVE_SPEEX_H 1
+
+/* Define to 1 if you have the <speex/speex.h> header file. */
+#cmakedefine HAVE_SPEEX_SPEEX_H 1
+
+/* Defines the executable of xmllint */
+#define XMLLINT "/usr/bin/xmllint"
+


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 10)

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


minor fixes

minor fixes

--- SM/SM.cmake
+++ SM/SM.cmake
@@ -24,13 +24,13 @@
 	set(SEARCH_PARAMS ${SEARCH_PARAMS} GridTrackerFlow RKLT)
 endif(WITH_GRID_TRACKERS)
 if(WITH_FEAT)
-	if(NOT "${OPENCV_VERSION}" STREQUAL "3")̀
+	if(NOT "${OpenCV_VERSION}" STREQUAL "3")̀
 	# message(STATUS "OpenCV_LIBRARIES: ${OpenCV_LIBRARIES}")
 		findSubPart("${OpenCV_LIBRARIES}" "opencv_nonfree" CV_NONFREE_FOUND)
 	else()
 		findSubPart("${OpenCV_LIBRARIES}" "opencv_xfeatures2d" CV_NONFREE_FOUND)
 	endif()
-	# message(STATUS "CV_NONFREE_FOUND: ${CV_NONFREE_FOUND}")
+	message(STATUS "OpenCV_VERSION: ${OpenCV_VERSION}")
 	if(CV_NONFREE_FOUND)
 		message(STATUS "Feature based grid tracker is enabled")
 		set(COMPOSITE_SEARCH_METHODS ${COMPOSITE_SEARCH_METHODS} FeatureTracker)


boards: nucleo_h723zg: Use openocd as default flash interface

Since this board is fully supported on openocd,
let's use openocd to comply with other boards and
remove the dependency on stm32cubeprogrammer.

Signed-off-by: Erwan Gouriou <de4d967452b83bb0e37525652734e7d9163b6a4c@linaro.org>

--- boards/arm/nucleo_h723zg/board.cmake
+++ boards/arm/nucleo_h723zg/board.cmake
@@ -4,6 +4,6 @@
 board_runner_args(jlink "--device=STM32H723ZG" "--speed=4000")
 board_runner_args(stm32cubeprogrammer "--port=swd" "--reset=hw")

-include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)


Fix infinite loop.

Fix infinite loop.

	* build-aux/cmake/modules/Search.cmake (_cache_list_append): Here.

--- build-aux/cmake/modules/Search.cmake
+++ build-aux/cmake/modules/Search.cmake
@@ -41,14 +41,14 @@
 # time it is accessed by this macro: it is a cache value, so it is savec in
 # the cache... and we don't want that.
 macro(_cache_list_append VAR VALUE)
-  if(${VAR} AND _cache_list_append_FIRST)
+  if(${VAR} AND _cache_list_append_${VAR}_FIRST)
     # Append value to the already existing list
     set(${VAR} "${${VAR}};${VALUE}" CACHE STRING "" FORCE)
   else(${VAR} AND _cache_list_append_FIRST)
     # Init list
-    set(_cache_list_append_FIRST 1)
+    set(_cache_list_append_${VAR}_FIRST 1)
     set(${VAR} "${VALUE}" CACHE STRING "" FORCE)
-  endif(${VAR} AND _cache_list_append_FIRST)
+  endif(${VAR} AND _cache_list_append_${VAR}_FIRST)
 endmacro(_cache_list_append)


Fix SVN detection for Windows

Fix SVN detection for Windows

--- CMakeModules/FindSvnClient.cmake
+++ CMakeModules/FindSvnClient.cmake
@@ -22,7 +22,7 @@
     message(STATUS "apr-1-config not found, implement manual search for APR")
 endif(HAVE_APR_CONFIG)

-if(HAVE_APR_CONFIG)
+if(HAVE_APR_CONFIG OR MSVC)
 	find_path(LIBSVN_INCLUDE_DIR svn_client.h
 	  HINTS
 	  $ENV{LIBSVN_DIR}
@@ -33,9 +33,15 @@
 	  /opt
 	)

-	check_library_exists(svn_client-1 svn_client_checkout "" HAVE_LIB_SVNCLIENT)
-	check_library_exists(svn_subr-1 svn_cmdline_init "" HAVE_LIB_SVNSUBR)
-	check_library_exists(svn_ra-1 svn_ra_initialize "" HAVE_LIB_SVNRA)
+	if (MSVC)
+		check_library_exists(libsvn_client-1 svn_client_checkout "${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib" HAVE_LIB_SVNCLIENT)
+		check_library_exists(libsvn_subr-1 svn_cmdline_init "${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib" HAVE_LIB_SVNSUBR)
+		check_library_exists(libsvn_ra-1 svn_ra_initialize "${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib" HAVE_LIB_SVNRA)
+	else (MSVC)
+		check_library_exists(svn_client-1 svn_client_checkout "" HAVE_LIB_SVNCLIENT)
+		check_library_exists(svn_subr-1 svn_cmdline_init "" HAVE_LIB_SVNSUBR)
+		check_library_exists(svn_ra-1 svn_ra_initialize "" HAVE_LIB_SVNRA)
+	endif (MSVC)

 	include(FindPackageHandleStandardArgs)
 	FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBSVN DEFAULT_MSG
@@ -47,5 +53,5 @@
 	if(LIBSVN_FOUND)
 		set(LIBSVN_LIBRARIES "svn_client-1" "svn_subr-1" "svn_ra-1" ${APR_LIBS})
 	endif(LIBSVN_FOUND)
-endif(HAVE_APR_CONFIG)
+endif(HAVE_APR_CONFIG OR MSVC)


cmake: add quotes to string split.

cmake: add quotes to string split.

--- CMakeModules/FindSvnClient.cmake
+++ CMakeModules/FindSvnClient.cmake
@@ -16,7 +16,7 @@
         OUTPUT_STRIP_TRAILING_WHITESPACE)

 # clean up some vars, or other CMake pieces complain
-	string(STRIP ${RAW_APR_LIBS} APR_LIBS)
+	string(STRIP "${RAW_APR_LIBS}" APR_LIBS)

 else(HAVE_APR_CONFIG)
     message(STATUS "apr-1-config not found, implement manual search for APR")


ENH: Modified to expose abstract classes in the vtk module just like in earlier versions of VTK.

--- CMake/vtkWrapPython.cmake
+++ CMake/vtkWrapPython.cmake
@@ -42,10 +42,11 @@
           SET(TMP_CONCRETE 0)
         ELSE (TMP_ABSTRACT)
           SET(TMP_CONCRETE 1)
-          # add the info to the init file
-          SET(VTK_WRAPPER_INIT_DATA
-            "${VTK_WRAPPER_INIT_DATA}\n${TMP_FILENAME}")
         ENDIF (TMP_ABSTRACT)
+
+        # add the info to the init file
+        SET(VTK_WRAPPER_INIT_DATA
+          "${VTK_WRAPPER_INIT_DATA}\n${TMP_FILENAME}")

         # new source file is namePython.cxx, add to resulting list
         SET(${SRC_LIST_NAME} ${${SRC_LIST_NAME}}


Disable original labelstatistics module

Disable original labelstatistics module

This will prevent any confusion between the bender statistics module and
slicer's module.

--- CMake/Superbuild/External_Slicer.cmake
+++ CMake/Superbuild/External_Slicer.cmake
@@ -112,7 +112,7 @@
       -DSlicer_USE_QtTesting:BOOL=OFF
       -DSlicer_USE_PYTHONQT:BOOL=ON
       -DSlicer_QTLOADABLEMODULES_DISABLED:STRING=SlicerWelcome
-      -DSlicer_QTSCRIPTEDMODULES_DISABLED:STRING=Endoscopy.py^^SelfTests.py
+      -DSlicer_QTSCRIPTEDMODULES_DISABLED:STRING=Endoscopy.py^^SelfTests.py^^LabelStatistics.py
       -DSlicer_BUILD_ChangeTrackerPy:BOOL=OFF
       -DSlicer_BUILD_MultiVolumeExplorer:BOOL=OFF
       -DSlicer_BUILD_MultiVolumeImporter:BOOL=OFF


more cross-compiler friendliness

more cross-compiler friendliness

git-svn-id: dea4c50957f75874cf9791776be29d2e34106c50@151 ef0d8562-5c19-0410-972e-841db63a069c

--- CMakeModules/CMakeASMInformation.cmake
+++ CMakeModules/CMakeASMInformation.cmake
@@ -4,7 +4,9 @@
     SET(CMAKE_ASM_COMPILER_ARG1 "-f elf")

     IF(CMAKE_UNAME)
-      EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE CMAKE_SYSTEM_MACHINE)
+#FIXME: Check for defined CMAKE_SYSTEM_MACHINE
+#FIXME: cross-compilation?
+#EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE CMAKE_SYSTEM_MACHINE)
       IF(CMAKE_SYSTEM_MACHINE MATCHES "x86_64")
         SET(CMAKE_ASM_COMPILER_ARG1 "-f elf64")
       ENDIF(CMAKE_SYSTEM_MACHINE MATCHES "x86_64")


Special treatment of RPATH for MacOSX

Special treatment of RPATH for MacOSX

--- cmake/modules/RootBuildOptions.cmake
+++ cmake/modules/RootBuildOptions.cmake
@@ -229,6 +229,11 @@
 if(rpath OR gnuinstall)
   set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) # install LIBDIR
   set(CMAKE_SKIP_INSTALL_RPATH FALSE)          # don't skip the full RPATH for the install tree
+elseif(APPLE)
+  set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+  set(CMAKE_INSTALL_NAME_DIR "@rpath")
+  set(CMAKE_INSTALL_RPATH "@loader_path/../lib")    # self relative LIBDIR
+  set(CMAKE_SKIP_INSTALL_RPATH FALSE)          # don't skip the full RPATH for the install tree
 else()
   set(CMAKE_SKIP_INSTALL_RPATH TRUE)           # skip the full RPATH for the install tree
 endif()


zephyr: Bring no_libgcc back to v2.7

zephyr: Bring no_libgcc back to v2.7

no_libgcc support was removed in upstream Zephyr OS, and we still
depend on it to make coreboot-sdk work, as well as to add EC software
panic handling for divide by zero.

This hack emulates how no_libgcc used to function by removing -lgcc
from the linker flags if no_libgcc is set.

BUG=b:198824039
BRANCH=none
TEST=compile volteer with v2.7_rc2

Signed-off-by: Jack Rosenthal <d3f605bef1867f59845d4ce6e4f83b8dc9e4e0ae@chromium.org>
Change-Id: I9e67277dd9f1f1b0dc36687b5255a99f82117a3b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3179311
Commit-Queue: Denis Brockus <6b21e8190fb5e373363fb95271367073a16474ef@chromium.org>
Reviewed-by: Denis Brockus <6b21e8190fb5e373363fb95271367073a16474ef@chromium.org>

--- zephyr/cmake/compiler/gcc/target.cmake
+++ zephyr/cmake/compiler/gcc/target.cmake
@@ -5,3 +5,10 @@
 # Zephyr cmake system looks into ${TOOLCHAIN_ROOT}, but we just send
 # this out to the copy in ${ZEPHYR_BASE}.
 include("${ZEPHYR_BASE}/cmake/compiler/gcc/target.cmake")
+
+# no_libgcc support has been removed in upstream zephyr, but we still
+# depend on it.  This ugly hack emulates what it used to do by undoing
+# what some of target.cmake does.
+if(no_libgcc)
+  list(REMOVE_ITEM TOOLCHAIN_LIBS gcc)
+endif()


Add the EXTERNAL_DATA argument to client tests

--- tests/JavascriptTests.cmake
+++ tests/JavascriptTests.cmake
@@ -146,6 +146,15 @@
     set(test_module "tests.web_client_test")
   endif()

+  if(fn_EXTERNAL_DATA)
+    set(_data_files "")
+    foreach(_data_file ${fn_EXTERNAL_DATA})
+      list(APPEND _data_files "DATA{${GIRDER_EXTERNAL_DATA_BUILD_PATH}/${_data_file}}")
+    endforeach()
+    girder_ExternalData_expand_arguments("${testname}_data" _tmp ${_data_files})
+    girder_ExternalData_add_target("${testname}_data")
+  endif()
+
   add_test(
       NAME ${testname}
       WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
@@ -171,6 +180,7 @@
     "GIRDER_TEST_ASSETSTORE=${testname}"
     "GIRDER_PORT=${web_client_port}"
     "MONGOD_EXECUTABLE=${MONGOD_EXECUTABLE}"
+    "GIRDER_TEST_DATA_PREFIX=${GIRDER_EXTERNAL_DATA_ROOT}"
     "${fn_ENVIRONMENT}"
   )
   math(EXPR next_web_client_port "${web_client_port} + 1")


[cxxmodules][cmake] Switch off the pch option when building with runtime_cxxmodules=On.

--- cmake/modules/RootBuildOptions.cmake
+++ cmake/modules/RootBuildOptions.cmake
@@ -188,6 +188,10 @@
 option(rootbench "Include rootbench, if rootbench exists in root or if it is a sibling directory." OFF)
 option(clingtest "Include cling tests. NOTE that this makes llvm/clang symbols visible in libCling." OFF)

+if (runtime_cxxmodules)
+  set(pch_defvalue OFF)
+endif(runtime_cxxmodules)
+
 #--- Compression algorithms in ROOT-------------------------------------------------------------
 if(NOT compression_default MATCHES "zlib|lz4|lzma")
   message(STATUS "Not supported compression algorithm, ROOT compression algorithms are zlib, lzma and lz4.


Remove odbc option from list of deprecated options

--- cmake/modules/RootBuildOptions.cmake
+++ cmake/modules/RootBuildOptions.cmake
@@ -360,7 +360,7 @@
 endforeach()

 #---Deprecated options---------------------------------------------------------
-foreach(opt memstat odbc)
+foreach(opt memstat)
   if(${opt})
     message(DEPRECATION ">>> Option '${opt}' is deprecated and will be removed in ROOT v6.18. Please inform rootdev@cern.ch should you still need it.")
   endif()


Add note + Reformated LTO script

Add note + Reformated LTO script

--- cmake/LTO.cmake
+++ cmake/LTO.cmake
@@ -20,7 +20,10 @@
 #
 #       target_enable_lto(mytarget optimized)
 #
-# WARNING for cmake versions older than 3.9 :
+# Note : For CMake versions < 3.9, target_link_library is used in it's non plain version.
+#        You will need to specify PUBLIC/PRIVATE/INTERFACE to all your other target_link_library calls for the target
+#
+# WARNING for cmake versions older than 3.9 :
 # This module will override CMAKE_AR CMAKE_RANLIB and CMAKE_NM by the gcc versions if found when building with gcc

@@ -55,7 +58,7 @@

 macro(find_lto lang)
     if(ENABLE_LTO AND NOT LTO_${lang}_CHECKED)
-
+
       #LTO support was added for clang/gcc in 3.9
       if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_LESS 3.9)
           message(STATUS "Checking for LTO Compatibility")
@@ -184,66 +187,66 @@
       endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_LESS 3.9)
     endif(ENABLE_LTO AND NOT LTO_${lang}_CHECKED)

-
-	if(ENABLE_LTO)
-	  #Special case for cmake older than 3.9, using a library for gcc/clang, but could setup the flags directly.
-	  #Taking advantage of the [debug,optimized] parameter of target_link_libraries
+
+    if(ENABLE_LTO)
+      #Special case for cmake older than 3.9, using a library for gcc/clang, but could setup the flags directly.
+      #Taking advantage of the [debug,optimized] parameter of target_link_libraries
       if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_LESS 3.9)
         if(LTO_${lang}_SUPPORT)
-			if(NOT TARGET __enable_lto_tgt)
-				add_library(__enable_lto_tgt INTERFACE)
-			endif()
+            if(NOT TARGET __enable_lto_tgt)
+                add_library(__enable_lto_tgt INTERFACE)
+            endif()
             target_compile_options(__enable_lto_tgt INTERFACE ${LTO_COMPILE_FLAGS})
             #this might not work for all platforms... in which case we'll have to set the link flags on the target directly
-			target_link_libraries(__enable_lto_tgt INTERFACE ${LTO_LINK_FLAGS} )
-			macro(target_enable_lto _target _build_configuration)
-				if(${_build_configuration} STREQUAL "optimized" OR ${_build_configuration} STREQUAL "debug" )
-					target_link_libraries(${_target} PRIVATE ${_build_configuration} __enable_lto_tgt)
-				else()
-					target_link_libraries(${_target} PRIVATE __enable_lto_tgt)
-				endif()
-			endmacro()
-		else()
-			#In old cmake versions, we can set INTERPROCEDURAL_OPTIMIZATION even if not supported by the compiler
-			#So if we didn't detect it, let cmake give it a try
-			set(__IPO_SUPPORTED TRUE)
+            target_link_libraries(__enable_lto_tgt INTERFACE ${LTO_LINK_FLAGS} )
+            macro(target_enable_lto _target _build_configuration)
+                if(${_build_configuration} STREQUAL "optimized" OR ${_build_configuration} STREQUAL "debug" )
+                    target_link_libraries(${_target} PRIVATE ${_build_configuration} __enable_lto_tgt)
+                else()
+                    target_link_libraries(${_target} PRIVATE __enable_lto_tgt)
+                endif()
+            endmacro()
+        else()
+            #In old cmake versions, we can set INTERPROCEDURAL_OPTIMIZATION even if not supported by the compiler
+            #So if we didn't detect it, let cmake give it a try
+            set(__IPO_SUPPORTED TRUE)
         endif()
-	  else()
+      else()
           cmake_policy(SET CMP0069 NEW)
           include(CheckIPOSupported)
           # Optional IPO. Do not use IPO if it's not supported by compiler.
           check_ipo_supported(RESULT __IPO_SUPPORTED OUTPUT output)
-		  if(NOT __IPO_SUPPORTED)
-			message(WARNING "IPO is not supported: ${output}")
+          if(NOT __IPO_SUPPORTED)
+            message(WARNING "IPO is not supported: ${output}")
           else()
             message(STATUS "IPO is supported !")
-		  endif()
-      endif()
-	  if(__IPO_SUPPORTED)
-		macro(target_enable_lto _target _build_configuration)
-			if(NOT ${_build_configuration} STREQUAL "debug" )
-				#enable for all configurations
-				set_target_properties(${_target} PROPERTIES INTERPROCEDURAL_OPTIMIZATION TRUE)
-			endif()
-			if(${_build_configuration} STREQUAL "optimized" )
-				#blacklist debug configurations
-				set(__enable_debug_lto FALSE)
-			else()
-				#enable only for debug configurations
-				set(__enable_debug_lto TRUE)
-			endif()
-			get_property(DEBUG_CONFIGURATIONS GLOBAL PROPERTY DEBUG_CONFIGURATIONS)
-			if(NOT DEBUG_CONFIGURATIONS)
-				set(DEBUG_CONFIGURATIONS DEBUG) # This is what is done by CMAKE internally... since DEBUG_CONFIGURATIONS is empty by default
-			endif()
-			foreach(config IN LISTS DEBUG_CONFIGURATIONS)
-				set_target_properties(${_target} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_${config} ${__enable_debug_lto})
-			endforeach()
-		endmacro()
-	  endif()
-	endif()
-	if(NOT COMMAND target_enable_lto)
-		macro(target_enable_lto _target _build_configuration)
-		endmacro()
-	endif()
+          endif()
+      endif()
+      if(__IPO_SUPPORTED)
+        macro(target_enable_lto _target _build_configuration)
+            if(NOT ${_build_configuration} STREQUAL "debug" )
+                #enable for all configurations
+                set_target_properties(${_target} PROPERTIES INTERPROCEDURAL_OPTIMIZATION TRUE)
+            endif()
+            if(${_build_configuration} STREQUAL "optimized" )
+                #blacklist debug configurations
+                set(__enable_debug_lto FALSE)
+            else()
+                #enable only for debug configurations
+                set(__enable_debug_lto TRUE)
+            endif()
+            get_property(DEBUG_CONFIGURATIONS GLOBAL PROPERTY DEBUG_CONFIGURATIONS)
+            if(NOT DEBUG_CONFIGURATIONS)
+                set(DEBUG_CONFIGURATIONS DEBUG) # This is what is done by CMAKE internally... since DEBUG_CONFIGURATIONS is empty by default
+            endif()
+            foreach(config IN LISTS DEBUG_CONFIGURATIONS)
+                set_target_properties(${_target} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_${config} ${__enable_debug_lto})
+            endforeach()
+        endmacro()
+      endif()
+    endif()
+    if(NOT COMMAND target_enable_lto)
+        macro(target_enable_lto _target _build_configuration)
+        endmacro()
+    endif()
 endmacro()


ENH: Update to KWStyle conformant version

SkullStrip is now KWStyle conformant.

Change-Id: Ic125b6f1aacdc1fabf550cec0a43d1ac2ecb05fd

--- Modules/Remote/SkullStrip.remote.cmake
+++ Modules/Remote/SkullStrip.remote.cmake
@@ -1,5 +1,6 @@
 itk_fetch_module(SkullStrip
   "A class to perform automatic skull-stripping for neuroimage analysis."
   GIT_REPOSITORY https://github.com/lorensen/skullStrip.git
-  GIT_TAG master
+  # April 7, 2015 Fixed KWStyle issues
+  GIT_TAG 2c4ded1afd24607de921e37cf56693cc5fa05570
   )


CMake: Fix using check on Debian Buster

CMake: Fix using check on Debian Buster

--- tools/cmake/FindCheck.cmake
+++ tools/cmake/FindCheck.cmake
@@ -28,14 +28,22 @@
 		MESSAGE ( STATUS "Using override CHECK_INSTALL_DIR to find check" )
 		SET ( CHECK_INCLUDE_DIR  "${CHECK_INSTALL_DIR}/include" )
 		FIND_LIBRARY( CHECK_LIBRARY NAMES check PATHS "${CHECK_INSTALL_DIR}/lib" )
-		FIND_LIBRARY( COMPAT_LIBRARY NAMES compat PATHS "${CHECK_INSTALL_DIR}/lib" )
+        IF (WIN32)
+		    FIND_LIBRARY( COMPAT_LIBRARY NAMES compat PATHS "${CHECK_INSTALL_DIR}/lib" )
+        ENDIF (WIN32)
 	ELSE ( CHECK_INSTALL_DIR )
 		FIND_PATH( CHECK_INCLUDE_DIR check.h )
 		FIND_LIBRARY( CHECK_LIBRARY NAMES check )
-		FIND_LIBRARY( COMPAT_LIBRARY NAMES compat )
+        IF (WIN32)
+		    FIND_LIBRARY( COMPAT_LIBRARY NAMES compat )
+        ENDIF (WIN32)
 	ENDIF ( CHECK_INSTALL_DIR )

-    SET ( CHECK_LIBRARIES "${CHECK_LIBRARY}" "${COMPAT_LIBRARY}" )
+    IF (WIN32)
+        SET ( CHECK_LIBRARIES "${CHECK_LIBRARY}" "${COMPAT_LIBRARY}" )
+    ELSE ( WIN32)
+        SET ( CHECK_LIBRARIES "${CHECK_LIBRARY}" )
+    ENDIF (WIN32)

 	IF ( CHECK_INCLUDE_DIR AND CHECK_LIBRARIES )
 		SET( CHECK_FOUND 1 )
@@ -54,4 +62,7 @@
 ENDIF( NOT CHECK_FOUND )

 # Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( CHECK_INCLUDE_DIR CHECK_LIBRARIES CHECK_LIBRARY COMPAT_LIBRARY)+MARK_AS_ADVANCED( CHECK_INCLUDE_DIR CHECK_LIBRARIES CHECK_LIBRARY)
+IF( WIN32 )
+    MARK_AS_ADVANCED( COMPAT_LIBRARY)
+ENDIF()


Doxygen: Added ext as INCLUDE_PATH and slightly modification to exlude patterns to remove doxygen warnings related to warn/push and pop

--- tools/doxygen/doxygen.cmake
+++ tools/doxygen/doxygen.cmake
@@ -123,6 +123,8 @@

 IMAGE_PATH             = ${image_paths}

+INCLUDE_PATH           = ${IVW_ROOT_DIR}/ext
+
 EXTENSION_MAPPING      = no_extension=C++ frag=C++ vert=C++ geom=C++ glsl=C++

 FILE_PATTERNS          = *.c \\
@@ -140,7 +142,7 @@
 EXCLUDE                =
 EXCLUDE_PATTERNS       = */moc_* \\
                          */qrc_* \\
-                         */ext/* \\
+                         */modules/*/ext/* \\
                          */clogs/* \\
                          *-test.cpp \\
                          *sqlite3* \\


ENH: add wrapping backward compatibility macros

Change-Id: I2403a9699329f5c594fda291b170733246fc4a33

--- Wrapping/TypedefMacros.cmake
+++ Wrapping/TypedefMacros.cmake
@@ -116,11 +116,6 @@

 endmacro(itk_wrap_module)

-macro(BEGIN_WRAPPER_LIBRARY library_name)
-  message("Deprecation warning: BEGIN_WRAPPER_LIBRARY is replaced by itk_wrap_module.")
-  itk_wrap_module("${library_name}")
-endmacro(BEGIN_WRAPPER_LIBRARY)
-

 macro(itk_end_wrap_module)
   if("${WRAPPER_LIBRARY_itk_wrap_modules_STATUS}" STREQUAL "EXECUTED_IN_itk_wrap_module")
@@ -129,11 +124,6 @@

   itk_end_wrap_module_all_generators()
 endmacro(itk_end_wrap_module)
-
-macro(WRAPPER_LIBRARY_CREATE_LIBRARY)
-  message("Deprecation warning: WRAPPER_LIBRARY_CREATE_LIBRARY is replaced by itk_end_wrap_module.")
-  itk_end_wrap_module()
-endmacro(WRAPPER_LIBRARY_CREATE_LIBRARY)

 macro(INCLUDE_LIBRARY library)

@@ -234,11 +224,6 @@

 endmacro(itk_auto_load_submodules)

-macro(WRAPPER_LIBRARY_CREATE_WRAP_FILES)
-  message("Deprecation warning: WRAPPER_LIBRARY_CREATE_WRAP_FILES is replaced by itk_auto_load_submodules.")
-  itk_auto_load_submodules()
-endmacro(WRAPPER_LIBRARY_CREATE_WRAP_FILES)
-

 macro(itk_load_submodule module)
   # include a cmake module file and generate the associated wrap_*.cxx file.
@@ -310,11 +295,6 @@

 endmacro(itk_end_wrap_submodule)

-
-macro(INCLUDE_WRAP_CMAKE module)
-  message("Deprecation warning: INCLUDE_WRAP_CMAKE is replaced by itk_load_submodule.")
-  itk_load_submodule("${module}")
-endmacro(INCLUDE_WRAP_CMAKE module)

 ################################################################################
@@ -817,3 +797,182 @@
     INTERSECTION(${var_name} "${dimension_condition}" "${ITK_WRAP_DIMS}")
   endif("${dimension_condition}" MATCHES "^[0-9]+\\+$")
 endmacro(itk_wrap_filter_dims)
+
+
+# deprecated macros
+macro(WRAP_LIBRARIES)
+  message("Deprecation warning: WRAP_LIBRARIES is replaced by itk_wrap_modules.")
+  itk_wrap_modules()
+endmacro(WRAP_LIBRARIES)
+
+macro(END_WRAP_LIBRARIES)
+  message("Deprecation warning: END_WRAP_LIBRARIES is replaced by itk_end_wrap_modules.")
+  itk_end_wrap_modules()
+endmacro(END_WRAP_LIBRARIES)
+
+macro(WRAP_LIBRARY library_name)
+  message("Deprecation warning: WRAP_LIBRARY is replaced by itk_wrap_module.")
+  itk_wrap_module("${library_name}")
+endmacro(WRAP_LIBRARY)
+
+macro(END_WRAP_LIBRARY )
+  message("Deprecation warning: END_WRAP_LIBRARY is replaced by itk_end_wrap_module.")
+  itk_end_wrap_module("${library_name}")
+endmacro(END_WRAP_LIBRARY)
+
+macro(AUTO_INCLUDE_MODULES)
+  message("Deprecation warning: AUTO_INCLUDE_MODULES is replaced by itk_auto_load_submodules.")
+  itk_auto_load_submodules()
+endmacro(AUTO_INCLUDE_MODULES)
+
+macro(WRAP_MODULE module)
+  message("Deprecation warning: WRAP_MODULE is replaced by itk_wrap_submodule.")
+  itk_wrap_submodule("${module}")
+endmacro(WRAP_MODULE)
+
+macro(END_WRAP_MODULE)
+  message("Deprecation warning: END_WRAP_MODULE is replaced by itk_end_wrap_submodule.")
+  itk_end_wrap_submodule()
+endmacro(END_WRAP_MODULE)
+
+macro(WRAP_CLASS class)
+  message("Deprecation warning: WRAP_CLASS is replaced by itk_wrap_class.")
+  itk_wrap_class("${class}" "${ARGN}")
+endmacro(WRAP_CLASS)
+
+macro(WRAP_NAMED_CLASS class swig_name)
+  message("Deprecation warning: WRAP_NAMED_CLASS is replaced by itk_wrap_named_class.")
+  itk_wrap_named_class("${class}" "${swig_name}" "${ARGN}")
+endmacro(WRAP_NAMED_CLASS)
+
+macro(WRAP_NON_TEMPLATE_CLASS class)
+  message("Deprecation warning: WRAP_NON_TEMPLATE_CLASS is replaced by itk_wrap_simple_class.")
+  itk_wrap_simple_class("${class}" "${ARGN}")
+endmacro(WRAP_NON_TEMPLATE_CLASS)
+
+macro(WRAP_NAMED_NON_TEMPLATE_CLASS class swig_name)
+  message("Deprecation warning: WRAP_NAMED_NON_TEMPLATE_CLASS is replaced by itk_wrap_named_simple_class.")
+  itk_wrap_named_simple_class("${class}" "${swig_name}" "${ARGN}")
+endmacro(WRAP_NAMED_NON_TEMPLATE_CLASS)
+
+macro(WRAP_INCLUDE include_file)
+  message("Deprecation warning: WRAP_INCLUDE is replaced by itk_wrap_include.")
+  itk_wrap_include("${include_file}")
+endmacro(WRAP_INCLUDE)
+
+macro(END_WRAP_CLASS)
+  message("Deprecation warning: END_WRAP_CLASS is replaced by itk_end_wrap_class.")
+  itk_end_wrap_class()
+endmacro(END_WRAP_CLASS)
+
+macro(ADD_ONE_TYPEDEF wrap_method wrap_class swig_name)
+  message("Deprecation warning: ADD_ONE_TYPEDEF is replaced by itk_wrap_one_type.")
+  itk_wrap_one_type("${wrap_method}" "${wrap_class}" "${swig_name}")
+endmacro(ADD_ONE_TYPEDEF)
+
+macro(WRAP_TEMPLATE name type)
+  message("Deprecation warning: WRAP_TEMPLATE is replaced by itk_wrap_template.")
+  itk_wrap_template("${name}" "${type}")
+endmacro(WRAP_TEMPLATE)
+
+macro(WRAP_IMAGE_FILTER param_type param_count)
+  message("Deprecation warning: WRAP_IMAGE_FILTER is replaced by itk_wrap_template.")
+  itk_wrap_image_filter("${param_type}" ${param_count} "${ARGN}")
+endmacro(WRAP_IMAGE_FILTER)
+
+macro(WRAP_IMAGE_FILTER_ALL_TYPES param_count)
+  message("Deprecation warning: WRAP_IMAGE_FILTER_ALL_TYPES() is replaced by itk_wrap_template(\"\${WRAP_ITK_ALL_TYPES}\").")
+  itk_wrap_image_filter("${WRAP_ITK_ALL_TYPES}" ${param_count} "${ARGN}")
+endmacro(WRAP_IMAGE_FILTER_ALL_TYPES)
+
+macro(WRAP_IMAGE_FILTER_SCALAR param_count)
+  message("Deprecation warning: WRAP_IMAGE_FILTER_SCALAR() is replaced by itk_wrap_template(\"\${WRAP_ITK_SCALAR}\").")
+  itk_wrap_image_filter("${WRAP_ITK_SCALAR}" ${param_count} "${ARGN}")
+endmacro(WRAP_IMAGE_FILTER_SCALAR)
+
+macro(WRAP_IMAGE_FILTER_VECTOR param_count)
+  message("Deprecation warning: WRAP_IMAGE_FILTER_VECTOR() is replaced by itk_wrap_template(\"\${WRAP_ITK_VECTOR}\").")
+  itk_wrap_image_filter("${WRAP_ITK_VECTOR}" ${param_count} "${ARGN}")
+endmacro(WRAP_IMAGE_FILTER_VECTOR)
+
+macro(WRAP_IMAGE_FILTER_USIGN_INT param_count)
+  message("Deprecation warning: WRAP_IMAGE_FILTER_USIGN_INT() is replaced by itk_wrap_template(\"\${WRAP_ITK_USIGN_INT}\").")
+  itk_wrap_image_filter("${WRAP_ITK_USIGN_INT}" ${param_count} "${ARGN}")
+endmacro(WRAP_IMAGE_FILTER_USIGN_INT)
+
+macro(WRAP_IMAGE_FILTER_SIGN_INT param_count)
+  message("Deprecation warning: WRAP_IMAGE_FILTER_SIGN_INT() is replaced by itk_wrap_template(\"\${WRAP_ITK_SIGN_INT}\").")
+  itk_wrap_image_filter("${WRAP_ITK_SIGN_INT}" ${param_count} "${ARGN}")
+endmacro(WRAP_IMAGE_FILTER_SIGN_INT)
+
+macro(WRAP_IMAGE_FILTER_INT param_count)
+  message("Deprecation warning: WRAP_IMAGE_FILTER_INT() is replaced by itk_wrap_template(\"\${WRAP_ITK_INT}\").")
+  itk_wrap_image_filter("${WRAP_ITK_INT}" ${param_count} "${ARGN}")
+endmacro(WRAP_IMAGE_FILTER_INT)
+
+macro(WRAP_IMAGE_FILTER_REAL param_count)
+  message("Deprecation warning: WRAP_IMAGE_FILTER_REAL() is replaced by itk_wrap_template(\"\${WRAP_ITK_REAL}\").")
+  itk_wrap_image_filter("${WRAP_ITK_REAL}" ${param_count} "${ARGN}")
+endmacro(WRAP_IMAGE_FILTER_REAL)
+
+macro(WRAP_IMAGE_FILTER_RGB param_count)
+  message("Deprecation warning: WRAP_IMAGE_FILTER_RGB() is replaced by itk_wrap_template(\"\${WRAP_ITK_RGB}\").")
+  itk_wrap_image_filter("${WRAP_ITK_RGB}" ${param_count} "${ARGN}")
+endmacro(WRAP_IMAGE_FILTER_RGB)
+
+macro(WRAP_IMAGE_FILTER_RGBA param_count)
+  message("Deprecation warning: WRAP_IMAGE_FILTER_RGBA() is replaced by itk_wrap_template(\"\${WRAP_ITK_RGBA}\").")
+  itk_wrap_image_filter("${WRAP_ITK_RGBA}" ${param_count} "${ARGN}")
+endmacro(WRAP_IMAGE_FILTER_RGBA)
+
+macro(WRAP_IMAGE_FILTER_VECTOR_REAL param_count)
+  message("Deprecation warning: WRAP_IMAGE_FILTER_VECTOR_REAL() is replaced by itk_wrap_template(\"\${WRAP_ITK_VECTOR_REAL}\").")
+  itk_wrap_image_filter("${WRAP_ITK_VECTOR_REAL}" ${param_count} "${ARGN}")
+endmacro(WRAP_IMAGE_FILTER_VECTOR_REAL)
+
+macro(WRAP_IMAGE_FILTER_COV_VECTOR_REAL param_count)
+  message("Deprecation warning: WRAP_IMAGE_FILTER_COV_VECTOR_REAL() is replaced by itk_wrap_template(\"\${WRAP_ITK_COV_VECTOR_REAL}\").")
+  itk_wrap_image_filter("${WRAP_ITK_COV_VECTOR_REAL}" ${param_count} "${ARGN}")
+endmacro(WRAP_IMAGE_FILTER_COV_VECTOR_REAL)
+
+macro(WRAP_IMAGE_FILTER_COMPLEX_REAL param_count)
+  message("Deprecation warning: WRAP_IMAGE_FILTER_COMPLEX_REAL() is replaced by itk_wrap_template(\"\${WRAP_ITK_COMPLEX_REAL}\").")
+  itk_wrap_image_filter("${WRAP_ITK_COMPLEX_REAL}" ${param_count} "${ARGN}")
+endmacro(WRAP_IMAGE_FILTER_COMPLEX_REAL)
+
+macro(WRAP_IMAGE_FILTER_COMBINATIONS)
+  message("Deprecation warning: WRAP_IMAGE_FILTER_COMBINATIONS is replaced by itk_wrap_image_filter_combinations.")
+  itk_wrap_image_filter_combinations("${ARGN}")
+endmacro(WRAP_IMAGE_FILTER_COMBINATIONS)
+
+macro(WRAP_IMAGE_FILTER_TYPES)
+  message("Deprecation warning: WRAP_IMAGE_FILTER_TYPES is replaced by itk_wrap_image_filter_types.")
+  itk_wrap_image_filter_types("${ARGN}")
+endmacro(WRAP_IMAGE_FILTER_TYPES)
+
+macro(FILTER_DIMS)
+  message("Deprecation warning: FILTER_DIMS is replaced by itk_wrap_filter_dims.")
+  itk_wrap_filter_dims("${ARGN}")
+endmacro(FILTER_DIMS)
+
+macro(BEGIN_WRAPPER_LIBRARY library_name)
+  message("Deprecation warning: BEGIN_WRAPPER_LIBRARY is replaced by itk_wrap_module.")
+  itk_wrap_module("${library_name}")
+endmacro(BEGIN_WRAPPER_LIBRARY)
+
+macro(WRAPPER_LIBRARY_CREATE_LIBRARY)
+  message("Deprecation warning: WRAPPER_LIBRARY_CREATE_LIBRARY is replaced by itk_end_wrap_module.")
+  itk_end_wrap_module()
+endmacro(WRAPPER_LIBRARY_CREATE_LIBRARY)
+
+macro(WRAPPER_LIBRARY_CREATE_WRAP_FILES)
+  message("Deprecation warning: WRAPPER_LIBRARY_CREATE_WRAP_FILES is replaced by itk_auto_load_submodules.")
+  itk_auto_load_submodules()
+endmacro(WRAPPER_LIBRARY_CREATE_WRAP_FILES)
+
+macro(INCLUDE_WRAP_CMAKE module)
+  message("Deprecation warning: INCLUDE_WRAP_CMAKE is replaced by itk_load_submodule.")
+  itk_load_submodule("${module}")
+endmacro(INCLUDE_WRAP_CMAKE module)
+
+set(WRAP_ITK_DIMS "${ITK_WRAP_DIMS}" CACHE INTERNAL "deprecated - do not use" FORCE)


SuperBuild: libsvm: change output so name. liblibsvm -> libsvm

--- SuperBuild/CMake/External_libsvm.cmake
+++ SuperBuild/CMake/External_libsvm.cmake
@@ -11,7 +11,7 @@
 else()
   SETUP_SUPERBUILD(PROJECT ${proj})
   message(STATUS "  Using LibSVM SuperBuild version")
-
+
   ExternalProject_Add(${proj}
     PREFIX ${proj}
     URL "http://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-3.20.tar.gz"
@@ -26,17 +26,17 @@
       ${LIBSVM_FLAGS}
     CMAKE_COMMAND ${SB_CMAKE_COMMAND}
     DEPENDS ${${proj}_DEPENDENCIES}
-    PATCH_COMMAND ${CMAKE_COMMAND} -E copy
-      ${CMAKE_SOURCE_DIR}/patches/${proj}/CMakeLists.txt
+    PATCH_COMMAND ${CMAKE_COMMAND} -E copy
+      ${CMAKE_SOURCE_DIR}/patches/${proj}/CMakeLists.txt
       ${LIBSVM_SB_SRC}
-    )
-
+      )
+
  set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
   if(WIN32)
-    set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libsvm.lib)
+    set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/svm.lib)
   elseif(UNIX)
-    set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/liblibsvm${CMAKE_SHARED_LIBRARY_SUFFIX})
+    set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libsvm${CMAKE_SHARED_LIBRARY_SUFFIX})
   endif()
-
+
 endif()
 endif()


Updated dashboard script template.

Updated dashboard script template.

--- CMake/MITKDashboardScript.TEMPLATE.cmake
+++ CMake/MITKDashboardScript.TEMPLATE.cmake
@@ -7,13 +7,13 @@
 # Note: The specific version and processor type of this machine should be reported in the
 # header above. Indeed, this file will be send to the dashboard as a NOTE file.

-cmake_minimum_required(VERSION 2.8.8)
+cmake_minimum_required(VERSION 3.1)

 #
 # Dashboard properties
 #

-set(MY_COMPILER "gcc-4.4.5")
+set(MY_COMPILER "gcc-4.8.x")
 # For Windows, e.g.
 #set(MY_COMPILER "VC9.0")

@@ -22,13 +22,13 @@
 set(CTEST_DASHBOARD_ROOT "/opt/dartclients")
 # For Windows, e.g.
 #set(CTEST_CMAKE_COMMAND "cmake")
-#set(CTEST_CMAKE_GENERATOR "Visual Studio 9 2008 Win64")
+#set(CTEST_CMAKE_GENERATOR "Visual Studio 12 2013 Win64")
 #set(CTEST_DASHBOARD_ROOT "C:/dartclients")

 # The directory containing the Qt binaries
-set(QT_BINARY_DIR "/usr/bin/")
+set(QT_BINARY_DIR "/home/user/Qt/5.4/gcc_64/bin")
 # For Windows, e.g.
-#set(QT_BINARY_DIR "V:/windows/x64/QT-4.7.0_VC9.0_Bin/bin")
+#set(QT_BINARY_DIR "C:/Qt/5.4/msvc2013_64_opengl/bin")

 #
 # Dashboard options
@@ -92,6 +92,8 @@
 # Use the MITK_INITIAL_CACHE the pass variables to the MITK-Build.
 # add entries like this
 #MITK_USE_OpenCV:BOOL=OFF
+CMAKE_PREFIX_PATH:PATH=/home/user/Qt/5.4/gcc_64
+DESIRED_QT_VERSION:STRING=5
 ")

 # List of test that should be explicitly disabled on this machine


fixed the pkg_config_variable macro which I thought worked but I was wrong...

--- cmake/Modules/PkgConfigVariable.cmake
+++ cmake/Modules/PkgConfigVariable.cmake
@@ -5,7 +5,7 @@

 	execute_process(
 		COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=${VARIABLE} ${MODULE}
-		OUTPUT_VARIABLE ${_output}
+		OUTPUT_VARIABLE _output
 		OUTPUT_STRIP_TRAILING_WHITESPACE
 	)


Revert "[CMake] Move the -Xclang option before -fmodules-cache-path"

This reverts commit 3db82f646a0890eb7664d0351b5a3c79622e8bef.

Vassil already fixed this and I mechanically undid his fix without looking
too close at what I'm actually doing. Need more coffee.

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

--- cmake/modules/HandleLLVMOptions.cmake
+++ cmake/modules/HandleLLVMOptions.cmake
@@ -465,13 +465,13 @@
   endif()
   if (LLVM_ENABLE_MODULES)
     set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
-    set(module_flags "-fmodules -Xclang -fmodules-cache-path=module.cache")
+    set(module_flags "-fmodules -fmodules-cache-path=module.cache")
     if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
       # On Darwin -fmodules does not imply -fcxx-modules.
       set(module_flags "${module_flags} -fcxx-modules")
     endif()
     if (LLVM_ENABLE_LOCAL_SUBMODULE_VISIBILITY)
-      set(module_flags "${module_flags} -fmodules-local-submodule-visibility")
+      set(module_flags "${module_flags} -Xclang -fmodules-local-submodule-visibility")
     endif()
     set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${module_flags}")


some MSVC optimization flags cleanup

some MSVC optimization flags cleanup

--- cmake-toolchains/windows.cmake
+++ cmake-toolchains/windows.cmake
@@ -29,34 +29,6 @@
 set(CMAKE_C_STANDARD_LIBRARIES "kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib dbghelp.lib wsock32.lib ws2_32.lib rpcrt4.lib wininet.lib")

 # define compiler and linker flags
-
-# GENERIC compiler flags:
-#   /WX treat warnings as errors
-#   /GF eliminate duplicate strings
-#   /TP treat files as C++ source
-#   /TC treat files as C source
-#   /fp:fast create fast (not precise) floating point code
-#   /Gm: enable minimal rebuild
-#   /EHsc: slim exception model
-#   /EHa: fat exception model
-#   /MP: use multiple cores
-#
-# DEBUG compiler flags:
-#   /Zi create debugging information PDB file
-#   /Od disable optimizations
-#   /Oy- do not suppress frame pointers (recommended for debugging)
-#   /MTd use statically linked, thread-safe, debug CRT libs
-#
-# RELEASE compiler/linker flags:
-#   /Ox full optimization
-#   /MT use statically linked, thread-safe CRT libs
-#   /GS- no Buffer Security Check
-#   /GL whole-program-optimization
-#   /LTCG use link-time code generation
-#   /INCREMENTAL:NO don't use incremental linking
-#   /OPT:REF dead-code-elimination
-#   /OPT:ICF identical COMDAT folding
-#
 if (FIPS_EXCEPTIONS)
     set(FIPS_VS_EXCEPTION_FLAGS "/EHa")
 else()
@@ -70,14 +42,14 @@
 endif()

 set(CMAKE_CXX_FLAGS "${FIPS_VS_EXCEPTION_FLAGS} /MP /WX /TP /DWIN32")
-set(CMAKE_CXX_FLAGS_DEBUG "/Zi /Od /Oy- /D_DEBUG /DFIPS_DEBUG=1")
-set(CMAKE_CXX_FLAGS_RELEASE "/Ox /DNDEBUG")
+set(CMAKE_CXX_FLAGS_DEBUG "/Zi /Od /D_DEBUG /DFIPS_DEBUG=1")
+set(CMAKE_CXX_FLAGS_RELEASE "/O2 /DNDEBUG")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${FIPS_VS_CRT_FLAGS}d")
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${FIPS_VS_CRT_FLAGS}")

 set(CMAKE_C_FLAGS "/MP /WX /TC /errorReport:queue /DWIN32")
-set(CMAKE_C_FLAGS_DEBUG "/Zi /Od /Oy- /D_DEBUG /DFIPS_DEBUG=1")
-set(CMAKE_C_FLAGS_RELEASE "/Ox /DNDEBUG ")
+set(CMAKE_C_FLAGS_DEBUG "/Zi /Od /D_DEBUG /DFIPS_DEBUG=1")
+set(CMAKE_C_FLAGS_RELEASE "/O2 /DNDEBUG ")
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${FIPS_VS_CRT_FLAGS}d")
 set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${FIPS_VS_CRT_FLAGS}")


fixup imported target copy

fixup imported target copy

--- cmake/CopyImportedTarget.cmake
+++ cmake/CopyImportedTarget.cmake
@@ -29,4 +29,4 @@

 function(install_imported_target _dep)
     install(FILES $<TARGET_FILE:${_dep}> ${ARGN})
-endfunction()+endfunction()


modules: Improved the GCrypt module.

modules: Improved the GCrypt module.

--- cmake/Modules/FindGCrypt.cmake
+++ cmake/Modules/FindGCrypt.cmake
@@ -6,62 +6,65 @@
 #  GCRYPT_LIBRARIES - Link these to use GCrypt
 #  GCRYPT_DEFINITIONS - Compiler switches required for using GCrypt
 #
-#  Copyright (c) 2009-2010 Andreas Schneider <mail@cynapses.org>
+#=============================================================================
+#  Copyright (c) 2009-2011 Andreas Schneider <asn@cryptomilk.org>
 #
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#  Distributed under the OSI-approved BSD License (the "License");
+#  see accompanying file Copyright.txt for details.
+#
+#  This software is distributed WITHOUT ANY WARRANTY; without even the
+#  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#  See the License for more information.
+#=============================================================================
 #

-
 if (GCRYPT_LIBRARIES AND GCRYPT_INCLUDE_DIRS)
-  # in cache already
-  set(GCRYPT_FOUND TRUE)
+    # in cache already
+    # set(GCRYPT_FOUND TRUE)
 else (GCRYPT_LIBRARIES AND GCRYPT_INCLUDE_DIRS)

-  find_path(GCRYPT_INCLUDE_DIR
-    NAMES
-      gcrypt.h
-    PATHS
-      ${_GCRYPT_DIR}/include
-      /usr/include
-      /usr/local/include
-      /opt/local/include
-      /sw/include
-      /usr/lib/sfw/include
-      $ENV{PROGRAMFILES}/GnuWin32/include
-  )
+    set(_GCRYPT_ROOT_PATHS
+        "$ENV{PROGRAMFILES}/libgcrypt"
+    )

-  find_library(GCRYPT_LIBRARY
-    NAMES
-      gcrypt
-    PATHS
-      ${_GCRYPT_DIR}/lib
-      /usr/lib
-      /usr/local/lib
-      /opt/local/lib
-      /sw/lib
-      /usr/sfw/lib/64
-      /usr/sfw/lib
-      $ENV{PROGRAMFILES}/GnuWin32/lib
-  )
+    find_path(GCRYPT_ROOT_DIR
+        NAMES
+            include/gcrypt.h
+        PATHS
+            ${_GCRYPT_ROOT_PATHS}
+    )
+    mark_as_advanced(ZLIB_ROOT_DIR)

-  set(GCRYPT_INCLUDE_DIRS
-    ${GCRYPT_INCLUDE_DIR}
-  )
+    find_path(GCRYPT_INCLUDE_DIR
+        NAMES
+            gcrypt.h
+        PATHS
+            /usr/local/include
+            /opt/local/include
+            /sw/include
+            /usr/lib/sfw/include
+            ${GCRYPT_ROOT_DIR}/include
+    )
+    set(GCRYPT_INCLUDE_DIRS ${GCRYPT_INCLUDE_DIR})

-  if (GCRYPT_LIBRARY)
-    set(GCRYPT_LIBRARIES
-        ${GCRYPT_LIBRARIES}
-        ${GCRYPT_LIBRARY}
+    find_library(GCRYPT_LIBRARY
+        NAMES
+            gcrypt
+            gcrypt11
+            libgcrypt-11
+        PATHS
+            /opt/local/lib
+            /sw/lib
+            /usr/sfw/lib/64
+            /usr/sfw/lib
+            ${GCRYPT_ROOT_DIR}/lib
     )
-  endif (GCRYPT_LIBRARY)
+    set(GCRYPT_LIBRARIES ${GCRYPT_LIBRARY})

-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(GCrypt DEFAULT_MSG GCRYPT_LIBRARIES GCRYPT_INCLUDE_DIRS)
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(GCrypt DEFAULT_MSG GCRYPT_LIBRARIES GCRYPT_INCLUDE_DIRS)

-  # show the GCRYPT_INCLUDE_DIRS and GCRYPT_LIBRARIES variables only in the advanced view
-  mark_as_advanced(GCRYPT_INCLUDE_DIRS GCRYPT_LIBRARIES)
+    # show the GCRYPT_INCLUDE_DIRS and GCRYPT_LIBRARIES variables only in the advanced view
+    mark_as_advanced(GCRYPT_INCLUDE_DIRS GCRYPT_LIBRARIES)

 endif (GCRYPT_LIBRARIES AND GCRYPT_INCLUDE_DIRS)
-


cmake: SampPlugin: Define either LINUX or WIN32

--- cmake/Modules/SampPlugin.cmake
+++ cmake/Modules/SampPlugin.cmake
@@ -54,6 +54,13 @@
 	endif()
 endif()

+if(UNIX)
+	add_definitions(-DLINUX)
+endif()
+if(WIN32)
+	add_definitions(-DWIN32)
+endif()
+
 if(CMAKE_COMPILER_IS_GNUCXX)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
 endif()


Don't use PYTHON_VERSION_STRING when searching for Python libraries

It may be an arbitrary string, and, for example, in Ubuntu 13.10
it's set to "2.7.5+", which breaks the find script.

--- cmake/OpenCVDetectPython.cmake
+++ cmake/OpenCVDetectPython.cmake
@@ -24,7 +24,8 @@

   if(NOT ANDROID AND NOT IOS)
     ocv_check_environment_variables(PYTHON_LIBRARY PYTHON_INCLUDE_DIR)
-    find_host_package(PythonLibs "${PYTHON_VERSION_STRING}" EXACT)
+    # not using PYTHON_VERSION_STRING here, because it might not conform to the CMake version format
+    find_host_package(PythonLibs "${PYTHON_VERSION_MAJOR_MINOR}.${PYTHON_VERSION_PATCH}" EXACT)
   endif()

   if(NOT ANDROID AND NOT IOS)


[cmake] added -fPIc, this should probably not be unconditional

--- cmake/DuneUtils.cmake
+++ cmake/DuneUtils.cmake
@@ -199,10 +199,10 @@

 SET( CMAKE_CXX_FLAGS_RELEASE
-	"-DDNDEBUG -funroll-loops -m64 -mfpmath=sse -falign-loops -mtune=native -march=native -O3 -pipe -fomit-frame-pointer " )
+	"-DDNDEBUG -funroll-loops -m64 -mfpmath=sse -falign-loops -mtune=native -march=native -O3 -pipe -fomit-frame-pointer -fPIC " )

 SET( CMAKE_CXX_FLAGS_DEBUG
-	"-O0 -DDNDEBUG -g3 -ggdb -Wall -Wextra -Wc++0x-compat -Wparentheses -pedantic -Wredundant-decls -Wshadow -Wunused-variable -Winline -fno-strict-aliasing -Wundef -Wnon-virtual-dtor " )
+	"-O0 -DDNDEBUG -g3 -ggdb -Wall -Wextra -Wc++0x-compat -Wparentheses -pedantic -Wredundant-decls -Wshadow -Wunused-variable -Winline -fno-strict-aliasing -Wundef -Wnon-virtual-dtor -fPIC " )

 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 	set( CMAKE_CXX_FLAGS_DEBUG


Case fix for windows.

Case fix for windows.

svn path=/trunk/playground/base/strigi/; revision=557507

--- cmake/FindBZip2.cmake
+++ cmake/FindBZip2.cmake
@@ -1,7 +1,7 @@
 # - Try to find BZip2
 # Once done this will define
 #
-#  BZIP2_FOUND - system has BZip2
+#  BZip2_FOUND - system has BZip2
 #  BZIP2_INCLUDE_DIR - the BZip2 include directory
 #  BZIP2_LIBRARY - Link these to use OpenGL and GLU
 #  BZIP2_DEFINITIONS - Compiler switches required for using BZip2
@@ -21,18 +21,18 @@
 )

 IF(BZIP2_INCLUDE_DIR AND BZIP2_LIBRARY)
-   SET(BZIP2_FOUND TRUE)
+   SET(BZip2_FOUND TRUE)
    INCLUDE(CheckLibraryExists)
    check_library_exists(${BZIP2_LIBRARY} BZ2_bzCompressInit "" BZIP2_NEED_PREFIX)
 ENDIF(BZIP2_INCLUDE_DIR AND BZIP2_LIBRARY)

-IF(BZIP2_FOUND)
+IF(BZip2_FOUND)
   IF(NOT BZip2_FIND_QUIETLY)
     MESSAGE(STATUS "Found BZip2: ${BZIP2_LIBRARY}")
   ENDIF(NOT BZip2_FIND_QUIETLY)
-ELSE(BZIP2_FOUND)
+ELSE(BZip2_FOUND)
   IF(BZip2_FIND_REQUIRED)
     MESSAGE(FATAL_ERROR "Could not find BZip2")
   ENDIF(BZip2_FIND_REQUIRED)
-ENDIF(BZIP2_FOUND)
+ENDIF(BZip2_FOUND)


FindIPOPT: Port YCM changes

FindIPOPT: Port YCM changes

Port changes from https://github.com/robotology/ycm/pull/365

--- cmake/FindIPOPT.cmake
+++ cmake/FindIPOPT.cmake
@@ -129,11 +129,12 @@
   set(IPOPT_DIR $ENV{IPOPT_DIR} CACHE PATH "Path to IPOPT build directory")

   find_path(IPOPT_INCLUDE_DIRS NAMES IpIpoptApplication.hpp PATH_SUFFIXES coin coin-or PATHS ${IPOPT_DIR}/include/coin)
-
-  find_library(IPOPT_IPOPT_LIBRARY_RELEASE libipopt ${IPOPT_DIR}/lib
-                                                    ${IPOPT_DIR}/lib/coin)
-  find_library(IPOPT_IPOPT_LIBRARY_DEBUG   libipoptD ${IPOPT_DIR}/lib
-                                                     ${IPOPT_DIR}/lib/coin)
+
+  # See https://github.com/coin-or/Ipopt/blob/releases/3.13.3/src/Interfaces/Ipopt.java#L167 for a possible library names
+  find_library(IPOPT_IPOPT_LIBRARY_RELEASE NAMES libipopt ipopt ipopt-3 ipopt-0 libipopt-3 libipopt-0
+                                           HINTS ${IPOPT_DIR}/lib ${IPOPT_DIR}/lib/coin)
+  find_library(IPOPT_IPOPT_LIBRARY_DEBUG NAMES libipoptD ipoptD ipoptD-3 ipoptD-0 libipoptD-3 libipoptD-0
+                                         HINTS ${IPOPT_DIR}/lib ${IPOPT_DIR}/lib/coin)

   select_library_configurations(IPOPT_IPOPT)
   set(IPOPT_LIBRARIES ${IPOPT_IPOPT_LIBRARY})


Updated FindKaldi.cmake to not search default paths/

--- cmake/FindKaldi.cmake
+++ cmake/FindKaldi.cmake
@@ -11,8 +11,10 @@
   set(KALDI_FOUND TRUE)
 else (KALDI_SRC_DIR AND KALDI_TOOLS_DIR AND KALDI_LIBRARIES)

-  find_path(KALDI_SRC_DIR base/kaldi-common.h ${KALDI_ROOT}/src)
-  find_path(KALDI_TOOLS_DIR install_portaudio.sh ${KALDI_ROOT}/tools)
+  find_path(KALDI_SRC_DIR NAMES base/kaldi-common.h
+            PATHS ${KALDI_ROOT}/src NO_DEFAULT_PATH)
+  find_path(KALDI_TOOLS_DIR NAMES install_portaudio.sh
+            PATHS ${KALDI_ROOT}/tools NO_DEFAULT_PATH)

   if (KALDI_SRC_DIR AND KALDI_TOOLS_DIR)
     if (NOT Kaldi_FIND_QUIETLY)
@@ -33,17 +35,28 @@

   if (KALDI_SRC_DIR)

-    find_library(KALDI_BASE_LIBRARY base/kaldi-base.a ${KALDI_SRC_DIR})
-    find_library(KALDI_DECODER_LIBRARY decoder/kaldi-decoder.a ${KALDI_SRC_DIR})
-    find_library(KALDI_FEAT_LIBRARY feat/kaldi-feat.a ${KALDI_SRC_DIR})
-    find_library(KALDI_GMM_LIBRARY gmm/kaldi-gmm.a ${KALDI_SRC_DIR})
-    find_library(KALDI_HMM_LIBRARY hmm/kaldi-hmm.a ${KALDI_SRC_DIR})
-    find_library(KALDI_LAT_LIBRARY lat/kaldi-lat.a ${KALDI_SRC_DIR})
-    find_library(KALDI_MATRIX_LIBRARY matrix/kaldi-matrix.a ${KALDI_SRC_DIR})
-    find_library(KALDI_ONLINE_LIBRARY online/kaldi-online.a ${KALDI_SRC_DIR})
-    find_library(KALDI_TRANSFORM_LIBRARY transform/kaldi-transform.a ${KALDI_SRC_DIR})
-    find_library(KALDI_TREE_LIBRARY tree/kaldi-tree.a ${KALDI_SRC_DIR})
-    find_library(KALDI_UTIL_LIBRARY util/kaldi-util.a ${KALDI_SRC_DIR})
+    find_library(KALDI_BASE_LIBRARY      NAMES base/kaldi-base.a
+                 PATHS ${KALDI_SRC_DIR} NO_DEFAULT_PATH)
+    find_library(KALDI_DECODER_LIBRARY   NAMES decoder/kaldi-decoder.a
+                 PATHS ${KALDI_SRC_DIR} NO_DEFAULT_PATH)
+    find_library(KALDI_FEAT_LIBRARY      NAMES feat/kaldi-feat.a
+                 PATHS ${KALDI_SRC_DIR} NO_DEFAULT_PATH)
+    find_library(KALDI_GMM_LIBRARY       NAMES gmm/kaldi-gmm.a
+                 PATHS ${KALDI_SRC_DIR} NO_DEFAULT_PATH)
+    find_library(KALDI_HMM_LIBRARY       NAMES hmm/kaldi-hmm.a
+                 PATHS ${KALDI_SRC_DIR} NO_DEFAULT_PATH)
+    find_library(KALDI_LAT_LIBRARY       NAMES lat/kaldi-lat.a
+                 PATHS ${KALDI_SRC_DIR} NO_DEFAULT_PATH)
+    find_library(KALDI_MATRIX_LIBRARY    NAMES matrix/kaldi-matrix.a
+                 PATHS ${KALDI_SRC_DIR} NO_DEFAULT_PATH)
+    find_library(KALDI_ONLINE_LIBRARY    NAMES online/kaldi-online.a
+                 PATHS ${KALDI_SRC_DIR} NO_DEFAULT_PATH)
+    find_library(KALDI_TRANSFORM_LIBRARY NAMES transform/kaldi-transform.a
+                 PATHS ${KALDI_SRC_DIR} NO_DEFAULT_PATH)
+    find_library(KALDI_TREE_LIBRARY      NAMES tree/kaldi-tree.a
+                 PATHS ${KALDI_SRC_DIR} NO_DEFAULT_PATH)
+    find_library(KALDI_UTIL_LIBRARY      NAMES util/kaldi-util.a
+                 PATHS ${KALDI_SRC_DIR} NO_DEFAULT_PATH)

     foreach(LIBNAME KALDI_BASE_LIBRARY KALDI_DECODER_LIBRARY KALDI_FEAT_LIBRARY KALDI_GMM_LIBRARY KALDI_HMM_LIBRARY KALDI_LAT_LIBRARY KALDI_MATRIX_LIBRARY KALDI_ONLINE_LIBRARY KALDI_TRANSFORM_LIBRARY KALDI_TREE_LIBRARY KALDI_UTIL_LIBRARY)
       if(${LIBNAME})
@@ -64,7 +77,8 @@

   if (KALDI_TOOLS_DIR)

-    find_path(OPENFST_INCLUDE_DIR fst/fstlib.h ${KALDI_TOOLS_DIR}/openfst/include)
+    find_path(OPENFST_INCLUDE_DIR NAMES fst/fstlib.h
+              PATHS ${KALDI_TOOLS_DIR}/openfst/include NO_DEFAULT_PATH)
     if (OPENFST_INCLUDE_DIR)
       if (NOT Kaldi_FIND_QUIETLY)
         message(STATUS "OpenFst include: ${OPENFST_INCLUDE_DIR}")
@@ -73,7 +87,8 @@
       message ("Openfst header files not found at ${KALDI_TOOLS_DIR}/openfst/include")
     endif (OPENFST_INCLUDE_DIR)

-    find_library(OPENFST_LIBRARY NAMES libfst.a PATHS ${KALDI_TOOLS_DIR}/openfst/lib)
+    find_library(OPENFST_LIBRARY NAMES libfst.a
+                 PATHS ${KALDI_TOOLS_DIR}/openfst/lib NO_DEFAULT_PATH)
     if (OPENFST_LIBRARY)
       if (NOT Kaldi_FIND_QUIETLY)
         message(STATUS "OpenFst library: ${OPENFST_LIBRARY}")
@@ -82,7 +97,8 @@
       message ("Openfst library not found at ${KALDI_TOOLS_DIR}/openfst/lib")
     endif (OPENFST_LIBRARY)

-    find_path(PORTAUDIO_INCLUDE_DIR portaudio.h ${KALDI_TOOLS_DIR}/portaudio/install/include)
+    find_path(PORTAUDIO_INCLUDE_DIR NAMES portaudio.h PATHS
+              ${KALDI_TOOLS_DIR}/portaudio/install/include NO_DEFAULT_PATH)
     if (PORTAUDIO_INCLUDE_DIR)
       if (NOT Kaldi_FIND_QUIETLY)
         message(STATUS "PortAudio include: ${PORTAUDIO_INCLUDE_DIR}")
@@ -91,7 +107,8 @@
       message ("Portaudio header files not found at ${KALDI_TOOLS_DIR}/portaudio/install/include")
     endif (PORTAUDIO_INCLUDE_DIR)

-    find_library(PORTAUDIO_LIBRARY NAMES libportaudio.a PATHS ${KALDI_TOOLS_DIR}/portaudio/install/lib)
+    find_library(PORTAUDIO_LIBRARY NAMES libportaudio.a PATHS
+                 ${KALDI_TOOLS_DIR}/portaudio/install/lib NO_DEFAULT_PATH)
     if (PORTAUDIO_LIBRARY)
       if (NOT Kaldi_FIND_QUIETLY)
         message(STATUS "PortAudio library: ${PORTAUDIO_LIBRARY}")
@@ -100,7 +117,8 @@
       message ("PortAudio library not found at ${KALDI_TOOLS_DIR}/portaudio/install/lib")
     endif (PORTAUDIO_LIBRARY)

-    find_file(PORTAUDIO_LIBTOOL_FILE NAMES libportaudio.la PATHS ${KALDI_TOOLS_DIR}/portaudio/install/lib)
+    find_file(PORTAUDIO_LIBTOOL_FILE NAMES libportaudio.la PATHS
+              ${KALDI_TOOLS_DIR}/portaudio/install/lib NO_DEFAULT_PATH)
     if (PORTAUDIO_LIBTOOL_FILE)
       if (NOT Kaldi_FIND_QUIETLY)
         message(STATUS "PortAudio libtool file: ${PORTAUDIO_LIBTOOL_FILE}")


[cmake] fix MUMPS detection for fedora

[cmake] fix MUMPS detection for fedora

--- cmake/FindMUMPS.cmake
+++ cmake/FindMUMPS.cmake
@@ -50,6 +50,7 @@
     HINTS
     ${MUMPS_LIBRARY_DIR_DIR}/include
     $ENV{MPI_INCLUDE}
+    PATH_SUFFIXES MUMPS
     )
 ENDIF()


Fix the NDEBUG, RELEASE define bug.

Fix the NDEBUG, RELEASE define bug.

--- cmake/TbagFlags.cmake
+++ cmake/TbagFlags.cmake
@@ -56,9 +56,13 @@
 #/// Assign default debug definition.
 macro (tbag_flags__set_debug_define)
     # Build type: Debug, Release, RelWithDebInfo, MinSizeRel
-    if (CMAKE_BUILD_TYPE MATCHES "Debug")
+    if (CMAKE_BUILD_TYPE STREQUAL "Debug")
         add_definitions (-DDEBUG)
-    else ()
+    elseif (CMAKE_BUILD_TYPE STREQUAL "Release")
+        add_definitions (-DNDEBUG -DRELEASE)
+    elseif (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+        add_definitions (-DNDEBUG -DRELEASE)
+    elseif (CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
         add_definitions (-DNDEBUG -DRELEASE)
     endif ()
 endmacro ()


Don't search for third party libraries while using MSan

On the average user's system, those libraries will not be compiled with
MSan. Prior to this change, the LLVM test suite was full of false
positives from calls from third party libraries to MSan interceptors
like strlen.

We can remove this check if MSan ever grows a suppression mechanism
similar to TSan's.

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

--- cmake/config-ix.cmake
+++ cmake/config-ix.cmake
@@ -105,6 +105,12 @@
   endif()
   check_library_exists(dl dlopen "" HAVE_LIBDL)
   check_library_exists(rt clock_gettime "" HAVE_LIBRT)
+endif()
+
+# Don't look for these libraries on Windows. Also don't look for them if we're
+# using MSan, since uninstrmented third party code may call MSan interceptors
+# like strlen, leading to false positives.
+if( NOT PURE_WINDOWS AND NOT LLVM_USE_SANITIZER MATCHES "Memory.*")
   if (LLVM_ENABLE_ZLIB)
     check_library_exists(z compress2 "" HAVE_LIBZ)
   else()


Update configure.

Update configure.

--- cmake/configure.cmake
+++ cmake/configure.cmake
@@ -2,7 +2,6 @@
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/msvc)
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/msvc/build)
 message("Generating project files...")
-# Note: Any change to CMAKE_SYSTEM_VERSION must also be reflected in the workflow yaml files [build-and-test, release].yml
 execute_process(COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} -T v142,version=14.29.16.11 -A Win32 -DCMAKE_SYSTEM_VERSION=10.0.20348.0
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/msvc/build
   RESULT_VARIABLE success


Add -D PADDLE_WITH_CUDA in cmake/configure.cmake

--- cmake/configure.cmake
+++ cmake/configure.cmake
@@ -49,11 +49,16 @@
 endif(NOT WITH_GOLANG)

 if(NOT WITH_GPU)
+    # Will gradually remove uses of PADDLE_ONLY_CPU in source files,
+    # so could we remove -DPADDLE_ONLY_CPU.
+    # c.f. https://github.com/PaddlePaddle/Paddle/issues/4588
     add_definitions(-DPADDLE_ONLY_CPU)
     add_definitions(-DHPPL_STUB_FUNC)

     list(APPEND CMAKE_CXX_SOURCE_FILE_EXTENSIONS cu)
 else()
+    add_definitions(-DPADDLE_WITH_CUDA)
+
     FIND_PACKAGE(CUDA REQUIRED)

     if(${CUDA_VERSION_MAJOR} VERSION_LESS 7)


Fixed error in definition of SHEAVES_STD_HEADERS. Builds and installs.

--- sheaves/component_definitions.cmake
+++ sheaves/component_definitions.cmake
@@ -152,7 +152,7 @@

       string(REGEX REPLACE ".in$" ""  std_h ${input_file})
       message(STATUS "Creating ${CMAKE_BINARY_DIR}/include/${std_h} from std/${input_file}")
-      list(APPEND std_incs ${CMAKE_BINARY_DIR}/include/${std_h})
+      list(APPEND std_incs ${SHEAFSYSTEM_HEADER_DIR}/${std_h})

       # Configure the .h files

@@ -610,7 +610,6 @@
    dbc_require(SHEAFSYSTEM_BUILD_BINDINGS)

    include(${SHEAFSYSTEM_CMAKE_MODULE_PATH}/UseSWIG.cmake)
-#   include(UseSWIG)

    SheafSystem_add_sheaves_java_bindings_targets()

@@ -627,140 +626,6 @@
 endfunction(SheafSystem_add_sheaves_bindings_targets)

-#function(SheafSystem_add_sheaves_install_target)
-#
-#   # message("Entering sheaves/component_defintions::add_install_target")
-#
-#   if(SHEAFSYSTEM_LINUX)
-#
-#      install(TARGETS ${SHEAVES_SHARED_LIB} ${SHEAVES_STATIC_LIB}
-#         EXPORT ${SHEAFSYSTEM_EXPORT_NAME}
-#         ARCHIVE DESTINATION ${CMAKE_BUILD_TYPE}/lib
-#         LIBRARY DESTINATION ${CMAKE_BUILD_TYPE}/lib)
-#
-#      if(SHEAFSYSTEM_BUILD_BINDINGS)
-#
-#         install(TARGETS ${SHEAVES_JAVA_BINDING_LIB}
-#            EXPORT ${SHEAFSYSTEM_EXPORT_NAME}
-#            LIBRARY DESTINATION ${CMAKE_BUILD_TYPE}/lib)
-#
-#         install(FILES ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/${SHEAVES_JAVA_BINDING_JAR}
-#            DESTINATION ${CMAKE_BUILD_TYPE}/lib)
-#
-#         install(TARGETS ${SHEAVES_PYTHON_BINDING_LIB}
-#            EXPORT ${SHEAFSYSTEM_EXPORT_NAME}
-#            LIBRARY DESTINATION ${CMAKE_BUILD_TYPE}/lib)
-#
-#         install(TARGETS ${SHEAVES_CSHARP_BINDING_LIB}
-#            EXPORT ${SHEAFSYSTEM_EXPORT_NAME}
-#            LIBRARY DESTINATION ${CMAKE_BUILD_TYPE}/lib)
-#
-#         install(FILES ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${SHEAVES_CSHARP_BINDING_ASSY}
-#            DESTINATION ${CMAKE_BUILD_TYPE}/lib)
-#
-#      endif()
-#
-#   elseif(SHEAFSYSTEM_WINDOWS)
-#
-#      # Install the sheaves libs.
-#
-#      install(TARGETS ${SHEAVES_IMPORT_LIB}
-#         EXPORT ${SHEAFSYSTEM_EXPORT_NAME}
-#         ARCHIVE
-#         DESTINATION lib/$<CONFIG>)
-#
-#      # The dynmaic library is not directly referred to by clients,
-#      # so it is not an exported target.
-#
-#      install(TARGETS ${SHEAVES_DYNAMIC_LIB}
-#         RUNTIME
-#         DESTINATION bin/$<CONFIG>)
-#
-#      install(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>/${SHEAVES_DYNAMIC_LIB}_d.pdb
-#         DESTINATION bin/$<CONFIG>
-#         OPTIONAL)
-#
-#      install(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>/${SHEAVES_DYNAMIC_LIB}.pdb
-#         DESTINATION bin/$<CONFIG>
-#         OPTIONAL)
-#
-#      if(SHEAFSYSTEM_BUILD_BINDINGS)
-#
-#         # Install the sheaves java bindings libs.
-#
-#         install(TARGETS ${SHEAVES_JAVA_BINDING_LIB}
-#            EXPORT ${SHEAFSYSTEM_EXPORT_NAME}
-#            ARCHIVE
-#            DESTINATION lib/$<CONFIG>)
-#
-#         install(TARGETS ${SHEAVES_JAVA_BINDING_LIB}
-#            RUNTIME
-#            DESTINATION bin/$<CONFIG>)
-#
-#         install(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>/${SHEAVES_JAVA_BINDING_LIB}_d.pdb
-#            DESTINATION bin/$<CONFIG>
-#            OPTIONAL)
-#
-#         install(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>/${SHEAVES_JAVA_BINDING_LIB}.pdb
-#            DESTINATION bin/$<CONFIG>
-#            OPTIONAL)
-#
-#         install(FILES ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/$<CONFIG>/${SHEAVES_JAVA_BINDING_JAR}
-#            DESTINATION lib/$<CONFIG>)
-#
-#         # Install the sheaves csharp bindings libs
-#
-#         install(TARGETS ${SHEAVES_CSHARP_BINDING_LIB}
-#            EXPORT ${SHEAFSYSTEM_EXPORT_NAME}
-#            ARCHIVE
-#            DESTINATION lib/$<CONFIG>)
-#
-#         install(TARGETS ${SHEAVES_CSHARP_BINDING_LIB}
-#            RUNTIME
-#            DESTINATION bin/$<CONFIG>)
-#
-#         install(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>/${SHEAVES_CSHARP_BINDING_LIB}_d.pdb
-#            DESTINATION bin/$<CONFIG>
-#            OPTIONAL)
-#
-#         install(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>/${SHEAVES_CSHARP_BINDING_LIB}.pdb
-#            DESTINATION bin/$<CONFIG>
-#            OPTIONAL)
-#
-#         install(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>/${SHEAVES_CSHARP_BINDING_ASSY}
-#            DESTINATION bin/$<CONFIG>)
-#
-#         # Install sheaves python bindings libs.
-#
-#         install(TARGETS ${SHEAVES_PYTHON_BINDING_LIB}
-#            EXPORT ${SHEAFSYSTEM_EXPORT_NAME}
-#            ARCHIVE
-#            DESTINATION lib/$<CONFIG>)
-#
-#         install(TARGETS ${SHEAVES_PYTHON_BINDING_LIB}
-#            RUNTIME
-#            DESTINATION bin/$<CONFIG>)
-#
-#         install(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>/${SHEAVES_PYTHON_BINDING_LIB}_d.pdb
-#            DESTINATION bin/$<CONFIG>
-#            OPTIONAL)
-#
-#         install(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>/${SHEAVES_PYTHON_BINDING_LIB}.pdb
-#            DESTINATION bin/$<CONFIG>
-#            OPTIONAL)
-#
-#      endif()
-#   endif()
-#
-#   install(FILES ${SHEAVES_INCS} DESTINATION include)
-#
-#   install(FILES ${SHEAVES_STD_HEADERS} DESTINATION include)
-#
-#   # message("Leaving sheaves/component_defintions::add_install_target")
-#
-#endfunction(SheafSystem_add_sheaves_install_target)
-#
-
 function(SheafSystem_add_sheaves_install_target)

    SheafSystem_add_component_install_target(sheaves)


fix warning

fix warning

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

--- cmake/gsVersion.cmake
+++ cmake/gsVersion.cmake
@@ -29,7 +29,7 @@
 set(${PROJECT_NAME}_VERSION_TYPE  "alpha")

 # Constuct version info
-if( "${PROJECT_NAME}_BUILD_VERSION" STREQUAL "0")
+if( "${{PROJECT_NAME}_BUILD_VERSION}" STREQUAL "0")
     set(${PROJECT_NAME}_VERSION
         "${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION}${${PROJECT_NAME}_VERSION_TYPE}"
         CACHE INTERNAL "${PROJECT_NAME} version number")


Adding image/python to cmake build

Adding image/python to cmake build

--- tensorflow/contrib/cmake/tf_python.cmake
+++ tensorflow/contrib/cmake/tf_python.cmake
@@ -264,6 +264,7 @@
 add_python_module("tensorflow/contrib/grid_rnn/python/kernel_tests")
 add_python_module("tensorflow/contrib/grid_rnn/python/ops")
 add_python_module("tensorflow/contrib/image")
+add_python_module("tensorflow/contrib/image/python")
 add_python_module("tensorflow/contrib/input_pipeline")
 add_python_module("tensorflow/contrib/input_pipeline/python")
 add_python_module("tensorflow/contrib/input_pipeline/python/ops")


Fix Cleaver build by compiling with fPIC

--- CMake/Superbuild/External_Cleaver.cmake
+++ CMake/Superbuild/External_Cleaver.cmake
@@ -56,6 +56,12 @@
       -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
       -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET})
   endif()
+  set(CMAKE_FLAGS_EXTERNAL_PROJECT_ARGS)
+  if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
+    list(APPEND CMAKE_FLAGS_EXTERNAL_PROJECT_ARGS
+      -DCMAKE_CXX_FLAGS_RELEASE:STRING="-fPIC"
+      -DCMAKE_CXX_FLAGS_DEBUG:STRING="-fPIC")
+  endif()

   set(${proj}_DIR ${CMAKE_BINARY_DIR}/${proj}-build)
   ExternalProject_Add(${proj}
@@ -70,6 +76,8 @@
       -DBUILD_CLEAVER_APP:BOOL=OFF
       -DBUILD_SHARED_LIBS:BOOL=OFF
       -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+      ${CMAKE_OSX_EXTERNAL_PROJECT_ARGS}
+      ${CMAKE_FLAGS_EXTERNAL_PROJECT_ARGS}
     DEPENDS
       ${${proj}_DEPENDENCIES}
     )


Fix android toolchain error

Fix android toolchain error

--- CMake/toolchain/android.toolchain.cmake
+++ CMake/toolchain/android.toolchain.cmake
@@ -521,7 +521,7 @@
 #verify that target ABI is supported
 list( FIND ANDROID_SUPPORTED_ABIS "${ANDROID_ABI}" __androidAbiIdx )
 if( __androidAbiIdx EQUAL -1 )
- string( REPLACE ";" "\", \"", PRINTABLE_ANDROID_SUPPORTED_ABIS  "${ANDROID_SUPPORTED_ABIS}" )
+ string( REPLACE ";" "\", \"" PRINTABLE_ANDROID_SUPPORTED_ABIS  "${ANDROID_SUPPORTED_ABIS}" )
  message( FATAL_ERROR "Specified ANDROID_ABI = \"${ANDROID_ABI}\" is not supported by this cmake toolchain or your NDK/toolchain.
    Supported values are: \"${PRINTABLE_ANDROID_SUPPORTED_ABIS}\"
    " )


CMake: Fix FindP4EST.cmake, see issue 102

git-svn-id: 31d9d2f6432a47c86a3640814024c107794ea77c@30454 0785d39b-7218-0410-832d-ea1e28bc413d

--- deal.II/cmake/modules/FindP4EST.cmake
+++ deal.II/cmake/modules/FindP4EST.cmake
@@ -120,9 +120,11 @@

 IF(P4EST_FOUND)

-  IF( "${P4EST_LIBRARY_OPTIMIZED}" STREQUAL "${P4EST_LIBRARY_DEBUG}"
-      AND
-      "${SC_LIBRARY_OPTIMIZED}" STREQUAL "${SC_LIBRARY_DEBUG}" )
+  IF( ( "${P4EST_LIBRARY_OPTIMIZED}" STREQUAL "${P4EST_LIBRARY_DEBUG}"
+        AND
+        "${SC_LIBRARY_OPTIMIZED}" STREQUAL "${SC_LIBRARY_DEBUG}" )
+      OR P4EST_LIBRARY_DEBUG MATCHES "-NOTFOUND"
+      OR SC_LIBRARY_DEBUG MATCHES "-NOTFOUND" )
     SET(P4EST_LIBRARIES
       ${P4EST_LIBRARY_OPTIMIZED}
       ${SC_LIBRARY_OPTIMIZED}


Bugfix

Bugfix

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

--- deal.II/cmake/modules/FindPETSC.cmake
+++ deal.II/cmake/modules/FindPETSC.cmake
@@ -58,7 +58,8 @@
   # We found petsc and we used PETSC_DIR and PETSC_ARCH for finding it.
   # So, we assume a source tree layout:
   #
-  IF(PETSC_INCLUDE_DIRS MATCHES "-NOTFOUND")
+  IF( PETSC_INCLUDE_DIRS MATCHES "-NOTFOUND" OR
+      "${PETSC_INCLUDE_DIRS}" STREQUAL "" )
     SET(PETSC_INCLUDE_DIRS "${PETSC_INCLUDE_DIR_ARCH};${PETSC_DIR}/include"
       CACHE STRING "Include paths for petsc"
       FORCE


BUG: Add ${VTK_BINARY_DIR}/Common directory since it contains configured headers that some clients need...

--- vtkIncludeDirectories.cmake
+++ vtkIncludeDirectories.cmake
@@ -69,6 +69,7 @@
 # Include directories from the build tree.
 SET(VTK_INCLUDE_DIRS_BUILD_TREE
   ${VTK_BINARY_DIR}
+  ${VTK_BINARY_DIR}/Common
   ${VTK_BINARY_DIR}/Utilities
   )


BUG: Don't use old OSMESA_INCLUDE_PATH anymore.

--- vtkIncludeDirectories.cmake
+++ vtkIncludeDirectories.cmake
@@ -38,8 +38,10 @@
   ELSE(VTK_USE_MANGLED_MESA)
     # Off-Screen Mesa include directory.
     IF(VTK_OPENGL_HAS_OSMESA)
-      SET(VTK_INCLUDE_DIRS_SYSTEM ${VTK_INCLUDE_DIRS_SYSTEM}
-          ${OSMESA_INCLUDE_PATH} ${OSMESA_INCLUDE_DIR})
+      IF(OSMESA_INCLUDE_DIR)
+        SET(VTK_INCLUDE_DIRS_SYSTEM ${VTK_INCLUDE_DIRS_SYSTEM}
+            ${OSMESA_INCLUDE_DIR})
+      ENDIF(OSMESA_INCLUDE_DIR)
     ENDIF(VTK_OPENGL_HAS_OSMESA)
   ENDIF(VTK_USE_MANGLED_MESA)
 ENDIF(VTK_USE_RENDERING)


Improve the CMake _bailout function.

Improve the CMake _bailout function.

--- cmake/checks/check_01_cxx_features.cmake
+++ cmake/checks/check_01_cxx_features.cmake
@@ -299,7 +299,7 @@
 # DEAL_II_WITH_CXX14) but support is not available due to above tests
 #

-MACRO(_bailout _version)
+MACRO(_bailout _version _symbolic)
   IF(DEAL_II_WITH_CXX${_version} AND NOT DEAL_II_HAVE_CXX${_version})
     MESSAGE(FATAL_ERROR "\n"
       "C++${_version} support was requested (DEAL_II_WITH_CXX${_version}=${DEAL_II_WITH_CXX${_version}}) but is not "
@@ -307,14 +307,14 @@
       "Please disable C++${_version} support, i.e. configure with\n"
       "    -DDEAL_II_WITH_CXX${_version}=FALSE,\n"
       "or use a different compiler, instead. (If the compiler flag for C++${_version} "
-      "support differs from \"-std=c++0x\" or \"-std=c++${_version}\", a suitable "
-      "compiler flag has to be specified manually via\n"
+      "support differs from \"-std=c++${_symbolic}\" or \"-std=c++${_version}\", "
+      "a suitable compiler flag has to be specified manually via\n"
       "    -DDEAL_II_CXX_VERSION_FLAG=\"...\"\n\n"
       )
   ENDIF()
 ENDMACRO()

-_bailout("14")
+_bailout("14" "1y")

 #
 # Some compilers (notably GCC6 and up) default to C++14 (more exactly, GNU++14,


hunter_gate_settings: check HUNTER_GATE_DONE is YES

--- cmake/modules/hunter_gate_settings.cmake
+++ cmake/modules/hunter_gate_settings.cmake
@@ -1,5 +1,7 @@
 # Copyright (c) 2015, Ruslan Baratov
 # All rights reserved.
+
+include(hunter_internal_error)

 function(hunter_gate_settings varname)
   set(settings "")
@@ -10,9 +12,18 @@
       HUNTER_CONFIG_SHA1
       HUNTER_VERSION
       HUNTER_TOOLCHAIN_SHA1
+      HUNTER_STATUS_DEBUG
   )
     list(APPEND settings "-D${hunter_var}=${${hunter_var}}")
   endforeach()
+
+  if(NOT HUNTER_GATE_DONE)
+    get_property(_hunter_gate_done GLOBAL PROPERTY HUNTER_GATE_DONE SET)
+    if(NOT _hunter_gate_done)
+      hunter_internal_error("HUNTER_GATE_DONE is OFF")
+    endif()
+  endif()
+
   list(APPEND settings "-DHUNTER_GATE_DONE=YES")
   set("${varname}" "${settings}" PARENT_SCOPE)
 endfunction()


cmake: select appropriate Zephyr SDK compiler for CONFIG_X86_LONGMODE

We need to use the new x86_64 chain provided by the SDK in long mode.

Signed-off-by: Charles E. Youse <5bc2c6f24e92b68873229a004438f1d6a77a3862@intel.com>

--- cmake/toolchain/zephyr/0.10/target.cmake
+++ cmake/toolchain/zephyr/0.10/target.cmake
@@ -7,7 +7,12 @@
 set(CROSS_COMPILE_TARGET_xtensa   xtensa-zephyr-elf)
 set(CROSS_COMPILE_TARGET_arc         arc-zephyr-elf)
 set(CROSS_COMPILE_TARGET_x86_64   x86_64-zephyr-elf)
-set(CROSS_COMPILE_TARGET_x86        i586-zephyr-elf)
+
+if(CONFIG_X86_LONGMODE)
+  set(CROSS_COMPILE_TARGET_x86 x86_64-zephyr-elf)
+else()
+  set(CROSS_COMPILE_TARGET_x86 i586-zephyr-elf)
+endif()

 set(CROSS_COMPILE_TARGET ${CROSS_COMPILE_TARGET_${ARCH}})
 set(SYSROOT_TARGET       ${CROSS_COMPILE_TARGET})


Bump GAPID version to v0.9.6

Bump GAPID version to v0.9.6

--- version.cmake
+++ version.cmake
@@ -16,7 +16,7 @@
 # Increment these numbers immediately after releasing a new version.
 set(GAPID_VERSION_MAJOR 0)
 set(GAPID_VERSION_MINOR 9)
-set(GAPID_VERSION_POINT 5)
+set(GAPID_VERSION_POINT 6)

 if (NOT DEFINED GAPID_BUILD_NUMBER)
     set(GAPID_BUILD_NUMBER 0)


Split off 7.12.76

Split off 7.12.76

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

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


Bump version to 0.2

Bump version to 0.2

--- version.cmake
+++ version.cmake
@@ -3,5 +3,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 set(HAKA_VERSION_MAJOR 0)
-set(HAKA_VERSION_MINOR 1)
-set(HAKA_VERSION_PATCH 0)+set(HAKA_VERSION_MINOR 2)
+set(HAKA_VERSION_PATCH 0)


Bump version to 2.2.0

Bump version to 2.2.0

--- version.cmake
+++ version.cmake
@@ -5,8 +5,8 @@

 # set project version
 set(ALVAR_VERSION_MAJOR 2)
-set(ALVAR_VERSION_MINOR 1)
-set(ALVAR_VERSION_PATCH 2)
+set(ALVAR_VERSION_MINOR 2)
+set(ALVAR_VERSION_PATCH 0)

 # denote special version tag
 # examples: a1, a2, a3, b1, b2, b3, rc1, rc2, rc3


Split off 8.8.24

Split off 8.8.24

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

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


Porting from deprecated CMAKE_FORCE_C_COMPILER to supported cross-compiling script

--- cross-toolchain.cmake
+++ cross-toolchain.cmake
@@ -1,11 +1,11 @@
-INCLUDE(CMakeForceCompiler)
-
-# this one is important
 SET(CMAKE_SYSTEM_NAME Generic)

 # specify the cross compiler
-CMAKE_FORCE_C_COMPILER(/usr/local/cross/bin/arm-elf-eabi-gcc GNU)
-CMAKE_FORCE_CXX_COMPILER(/usr/local/cross/bin/arm-elf-eabi-g++ GNU)
+SET(CMAKE_C_COMPILER arm-elf-eabi-gcc)
+SET(CMAKE_CXX_COMPILER arm-elf-eabi-g++)
+
+# use this if CMAKE complains about '-rdynamic'
+SET(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)

 # search for programs in the build host directories
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)


CI: syntax error

CI: syntax error

--- CI/main_ci.cmake
+++ CI/main_ci.cmake
@@ -29,7 +29,7 @@
 set (CTEST_BUILD_NAME "$ENV{CI_COMMIT_SHORT_SHA}")
 if("$ENV{CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" AND "$ENV{CI_MERGE_REQUEST_TARGET_BRANCH_NAME}")
   set (CTEST_BUILD_NAME "${CTEST_BUILD_NAME} ($ENV{CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} to $ENV{CI_MERGE_REQUEST_TARGET_BRANCH_NAME})")
-elseif(("$ENV{CI_COMMIT_REF_NAME}")
+elseif("$ENV{CI_COMMIT_REF_NAME}")
   set (CTEST_BUILD_NAME "${CTEST_BUILD_NAME} ($ENV{CI_COMMIT_SHORT_SHA})")
 endif()
 set (CTEST_SITE "${IMAGE_NAME}")


Fix Emscripten version check for enabling the separate metadata option.

--- CMake/Modules/Urho3D-CMake-common.cmake
+++ CMake/Modules/Urho3D-CMake-common.cmake
@@ -1117,7 +1117,7 @@
             get_filename_component (NAME ${FILE} NAME)
             list (APPEND PAK_NAMES ${NAME})
         endforeach ()
-        if (CMAKE_BUILD_TYPE STREQUAL Debug AND NOT EMCC_VERSION VERSION_LESS 1.31.4)
+        if (CMAKE_BUILD_TYPE STREQUAL Debug AND EMCC_VERSION VERSION_GREATER 1.32.2)
             set (SEPARATE_METADATA --separate-metadata)
         endif ()
         add_custom_command (OUTPUT ${SHARED_RESOURCE_JS}.data


Build tests by default when backward is a top level project

--- BackwardConfig.cmake
+++ BackwardConfig.cmake
@@ -41,8 +41,12 @@
 set(STACK_DETAILS_DWARF FALSE CACHE BOOL
 	"Use libdwarf/libelf to read debug info")

-set(BACKWARD_TESTS FALSE CACHE BOOL "Enable tests")
-
+if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND NOT DEFINED BACKWARD_TESTS)
+	# If this is a top level CMake project, we most lixely want the tests
+	set(BACKWARD_TESTS ON CACHE BOOL "Enable tests")
+else()
+	set(BACKWARD_TESTS OFF CACHE BOOL "Enable tests")
+endif()
 ###############################################################################
 # CONFIGS
 ###############################################################################


cmake: Disable in source builds the cmake way

Signed-off-by: Andreas Schneider <5be00ddc76278cf6077f5047ca3384a88460c671@cryptomilk.org>

--- cmake/Modules/DefineCMakeDefaults.cmake
+++ cmake/Modules/DefineCMakeDefaults.cmake
@@ -19,3 +19,7 @@

 # Always build with -fPIC
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+# Avoid source tree pollution
+set(CMAKE_DISABLE_SOURCE_CHANGES ON)
+set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)


Qt 5.9 Windows: Link 'Qt5FontDatabaseSupport.lib'

--- cmake/Qt5Widgets_HunterPlugin_5_9.cmake
+++ cmake/Qt5Widgets_HunterPlugin_5_9.cmake
@@ -297,6 +297,13 @@

   # defined: ' __imp__OpenThemeData'
   _qt_cmake_extra_helpers_add_interface(Qt5::Widgets UxTheme)
+
+  # defined: 'QWindowsFontDatabase::QWindowsFontDatabase(void)'
+  _qt_cmake_extra_helpers_add_interface_release_debug(
+      Qt5::Widgets
+      "${_qt_install_prefix}/lib/Qt5FontDatabaseSupport.lib"
+      "${_qt_install_prefix}/lib/Qt5FontDatabaseSupportd.lib"
+  )
 elseif(MINGW)
   _qt_cmake_extra_helpers_add_source(
       Qt5::Widgets


CMake support

CMake support

--- cmake/dev/generate_msvc_libraries.cmake
+++ cmake/dev/generate_msvc_libraries.cmake
@@ -38,7 +38,7 @@
         FILES_MATCHING
         PATTERN "*${PROJECT_NAME}*-${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}*"
         )
-    install(DIRECTORY ${PROJECT_BINARY_DIR}/cmake/config/
+    install(DIRECTORY ${PROJECT_BINARY_DIR}/../${platform}/cmake/config/
         DESTINATION lib/${platform}
         COMPONENT cmake
         FILES_MATCHING


Remove debug messages from CMake

Remove debug messages from CMake

--- CMake/FindSDL2.cmake
+++ CMake/FindSDL2.cmake
@@ -52,8 +52,8 @@

     set(SDL2_FOUND true)
     message(STATUS "Looking for SDL2 - found")
-    message(STATUS "SDL2 include dir: ${SDL2_INCLUDE_DIRS}")
-    message(STATUS "SDL2 libraries: ${SDL2_LIBRARIES}")
+    #message(STATUS "SDL2 include dir: ${SDL2_INCLUDE_DIRS}")
+    #message(STATUS "SDL2 libraries: ${SDL2_LIBRARIES}")
 else()
     #set(SDL2_FOUND FALSE)
     message(STATUS "Looking for SDL2 - not found")


Fix spelling error in CMake file.

Fix spelling error in CMake file.

--HG--
branch : vanilla
extra : source : 9ffbf78478335c65aae7d474c518cbaf64d45ec6


[GL3+] Mark GL3+ as experimental in the feature summary.

--HG--
branch : v1-9

--- CMake/FeatureSummary.cmake
+++ CMake/FeatureSummary.cmake
@@ -79,7 +79,7 @@
 	set(_rendersystems "${_rendersystems}  + OpenGL\n")
 endif ()
 if (OGRE_BUILD_RENDERSYSTEM_GL3PLUS)
-	set(_rendersystems "${_rendersystems}  + OpenGL 3+\n")
+	set(_rendersystems "${_rendersystems}  + OpenGL 3+ (EXPERIMENTAL)\n")
 endif ()
 if (OGRE_BUILD_RENDERSYSTEM_GLES)
 	set(_rendersystems "${_rendersystems}  + OpenGL ES 1.x\n")


Fix missing quotes

Fix missing quotes

--- CMake/mitkSetupCPack.cmake
+++ CMake/mitkSetupCPack.cmake
@@ -93,7 +93,7 @@
 set(CPACK_RESOURCE_FILE_LICENSE "${MITK_SOURCE_DIR}/LICENSE")

 set(CPACK_PACKAGE_VERSION_MAJOR ${MITK_REVISION_DESC})
-string(REPLACE " [local changes]" "-local_changes" CPACK_PACKAGE_VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR})
+string(REPLACE " [local changes]" "-local_changes" CPACK_PACKAGE_VERSION_MAJOR "${CPACK_PACKAGE_VERSION_MAJOR}")

 # tell cpack to strip all debug symbols from all files
 set(CPACK_STRIP_FILES ON)


Use try_compiles COMPILE_DEFINITIONS argument over CMAKE_FLAGS

--- CMake/sitkCheckCXX11.cmake
+++ CMake/sitkCheckCXX11.cmake
@@ -35,12 +35,10 @@

   if(NOT DEFINED ${VARIABLE})
     message(STATUS "Performing Test ${VARIABLE}")
-    set(requred_definitions "${CMAKE_REQUIRED_DEFINITIONS} -D${VARIABLE}")
     try_compile(${VARIABLE}
       "${PROJECT_BINARY_DIR}/CMakeTmp"
       "${CMAKE_CURRENT_LIST_DIR}/sitk_check_cxx11.cxx"
-      CMAKE_FLAGS
-      -DCOMPILE_DEFINITIONS:STRING=${requred_definitions}
+      COMPILE_DEFINITIONS "-D${VARIABLE}" ${CMAKE_REQUIRED_DEFINITIONS}
       OUTPUT_VARIABLE output)

     set(${cache_var} ${${VARIABLE}} CACHE INTERNAL "hashed flags with  try_compile results")


Simplify check for Visual Studio version

--- CMakeExternals/Boost.cmake
+++ CMakeExternals/Boost.cmake
@@ -51,9 +51,9 @@

       # Work around due to BOOST toolset limitations
       # Remove if task T24222 is fixed
-      if(${VISUAL_STUDIO_VERSION_MAJOR} EQUAL "14" AND ${VISUAL_STUDIO_VERSION_MINOR} GREATER "0")
-        set(VISUAL_STUDIO_VERSION_MINOR "1")
-      endif(${VISUAL_STUDIO_VERSION_MAJOR} EQUAL "14" AND ${VISUAL_STUDIO_VERSION_MINOR} GREATER "0")
+      if(VISUAL_STUDIO_VERSION_MAJOR EQUAL 14 AND VISUAL_STUDIO_VERSION_MINOR GREATER 0)
+        set(VISUAL_STUDIO_VERSION_MINOR 1)
+      endif()
       # End Work around

       set(_boost_with_toolset "vc${VISUAL_STUDIO_VERSION_MAJOR}")


Add newer version of LibOVR into FindOVR cmake file

--- CMakeModules/FindOVR.cmake
+++ CMakeModules/FindOVR.cmake
@@ -5,9 +5,13 @@
 set(CMAKE_INCLUDE_PATH "/home/campus11/kuhl/public-cs4611/ovr_sdk_linux_0.4.4/LibOVR/Include" ${CMAKE_INCLUDE_PATH})
 set(CMAKE_INCLUDE_PATH "/home/campus11/kuhl/public-cs4611/ovr_sdk_linux_0.4.4/LibOVR/Src" ${CMAKE_INCLUDE_PATH})
 # Installed in this directory's parent directory
+set(CMAKE_LIBRARY_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ovr_sdk_linux_0.5.0.1/LibOVR/Lib/Linux/x86_64/Debug" ${CMAKE_LIBRARY_PATH})
+set(CMAKE_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ovr_sdk_linux_0.5.0.1/LibOVR/Include" ${CMAKE_INCLUDE_PATH})
+set(CMAKE_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ovr_sdk_linux_0.5.0.1/LibOVR/Src" ${CMAKE_INCLUDE_PATH})
 set(CMAKE_LIBRARY_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ovr_sdk_linux_0.4.4/LibOVR/Lib/Linux/Release/x86_64" ${CMAKE_LIBRARY_PATH})
 set(CMAKE_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ovr_sdk_linux_0.4.4/LibOVR/Include" ${CMAKE_INCLUDE_PATH})
 set(CMAKE_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ovr_sdk_linux_0.4.4/LibOVR/Src" ${CMAKE_INCLUDE_PATH})
+
 # An alternative directory name that OVR could be installed in (same style as: https://github.com/jherico/OculusSDK )
 set(CMAKE_LIBRARY_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../OculusSDK/LibOVR/Lib/Linux/Release/x86_64" ${CMAKE_LIBRARY_PATH})
 set(CMAKE_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../OculusSDK/LibOVR/Include" ${CMAKE_INCLUDE_PATH})


- double target can now be conditionally enabled/disabled because not everything in tsimd comiles with doubles

--- components/ospcommon/cmake/macros.cmake
+++ components/ospcommon/cmake/macros.cmake
@@ -58,6 +58,9 @@
   ENDIF()
 ENDMACRO()

+OPTION(OSPRAY_SUPPORT_DOUBLES
+  "Include support for building 'real is double' libraries" OFF)
+
 ## Macro configure ISA targets for ispc ##
 MACRO(OSPRAY_CONFIGURE_ISPC_ISA)

@@ -322,13 +325,20 @@
     SET(OSPRAY_CXXFLAGS_AVX512SKX   -mavx512f -mavx512dq -mavx512cd -mavx512bw -mavx512vl -mf16c -mavx2 -mfma -mlzcnt -mbmi -mbmi2 -DOSPRAY_SIMD_SKX=2)
     SET(OSPRAY_CXXFLAGS_AVX512KNL  -mavx512f -mavx512pf -mavx512er -mavx512cd -mf16c -mavx2 -mfma -mlzcnt -mbmi -mbmi2 -DOSPRAY_SIMD_KNX=1)
   ELSEIF (OSPRAY_COMPILER_CLANG)
-    # get rid of "XXX is not defined, will evaluate to 0" warning - that's what we _want_
+    # get rid of "XXX is not defined, will evaluate to 0" warning -
+    # that's what we _want_
     SET(OSPRAY_CXXFLAGS_COMMON ${OSPRAY_CXXFLAGS_COMMON} -Wno-undef)
+
+    # get rid of the tsimd 'annymous types' and 'anonymous structs'
+    # warnings - shuld get fixed in tsimd
+    SET(OSPRAY_CXXFLAGS_COMMON ${OSPRAY_CXXFLAGS_COMMON} -Wno-gnu-anonymous-struct -Wno-source-uses-openmp -Wno-nested-anon-types)
+
     # at least temporarily, ignore un-used parameters (should
     # eventually turn back on, but not while we have lots of dummy api
     # functions...)
     SET(OSPRAY_CXXFLAGS_COMMON ${OSPRAY_CXXFLAGS_COMMON} -Wno-unused-parameter)

+    SET(OSPRAY_CXXFLAGS_COMMON ${OSPRAY_CXXFLAGS_COMMON} -openmp)
     # define isa-specific flags
     SET(OSPRAY_CXXFLAGS_SCALAR -DOSPRAY_SIMD_NONE=1 -DOSPRAY_SCALAR=1)
     SET(OSPRAY_CXXFLAGS_NATIVE -march=native -DOSPRAY_SIMD_NATIVE=1 )
@@ -373,20 +383,22 @@
     ENDIF()

     # ----------- double -----------
-    SET(LIBRARY_NAME ${LIBRARY_BASE_NAME}_${OSPRAY_SIMD_LIBNAME_${ISA}})
-    OSPRAY_ADD_LIBRARY(${LIBRARY_NAME}_double SHARED ${LIBRARY_SOURCES})
-    TARGET_COMPILE_OPTIONS(${LIBRARY_NAME}_double PRIVATE ${OSPRAY_CXXFLAGS_COMMON} ${OSPRAY_CXXFLAGS_${ISA}} -DOSPRAY_USE_DOUBLES=1)
-    TARGET_LINK_LIBRARIES(${LIBRARY_NAME}_double ${LIBRARY_LIBS})
-    OSPRAY_SET_LIBRARY_VERSION(${LIBRARY_NAME}_double)
-    IF(${LIBRARY_EXCLUDE_FROM_ALL})
-      SET_TARGET_PROPERTIES(${LIBRARY_NAME}_double PROPERTIES EXCLUDE_FROM_ALL TRUE)
-    ELSE()
-      OSPRAY_INSTALL_LIBRARY(${LIBRARY_NAME}_double ${LIBRARY_COMPONENT})
-    ENDIF()
-
-    # end of hack: restore original ispc target list for multi-target libraries
-    SET(OSPRAY_ISPC_TARGET_LIST ${SAVED_OSPRAY_ISPC_TARGET_LIST})
-    SET(OSPRAY_ISPC_TARGET_NAME "")
+    IF (OSPRAY_SUPPORT_DOUBLES)
+      SET(LIBRARY_NAME ${LIBRARY_BASE_NAME}_${OSPRAY_SIMD_LIBNAME_${ISA}})
+      OSPRAY_ADD_LIBRARY(${LIBRARY_NAME}_double SHARED ${LIBRARY_SOURCES})
+      TARGET_COMPILE_OPTIONS(${LIBRARY_NAME}_double PRIVATE ${OSPRAY_CXXFLAGS_COMMON} ${OSPRAY_CXXFLAGS_${ISA}} -DOSPRAY_USE_DOUBLES=1)
+      TARGET_LINK_LIBRARIES(${LIBRARY_NAME}_double ${LIBRARY_LIBS})
+      OSPRAY_SET_LIBRARY_VERSION(${LIBRARY_NAME}_double)
+      IF(${LIBRARY_EXCLUDE_FROM_ALL})
+	SET_TARGET_PROPERTIES(${LIBRARY_NAME}_double PROPERTIES EXCLUDE_FROM_ALL TRUE)
+      ELSE()
+	OSPRAY_INSTALL_LIBRARY(${LIBRARY_NAME}_double ${LIBRARY_COMPONENT})
+      ENDIF()
+
+      # end of hack: restore original ispc target list for multi-target libraries
+      SET(OSPRAY_ISPC_TARGET_LIST ${SAVED_OSPRAY_ISPC_TARGET_LIST})
+      SET(OSPRAY_ISPC_TARGET_NAME "")
+    ENDIF()
   ENDFOREACH()

   # end of hack: restore original ispc target list for multi-target libraries


Remove incorrect UNIX_AMD64_ABI define

Remove incorrect UNIX_AMD64_ABI define

--- clrdefinitions.cmake
+++ clrdefinitions.cmake
@@ -204,7 +204,6 @@
 endif (CLR_CMAKE_PLATFORM_ARCH_AMD64)
 if(CLR_CMAKE_PLATFORM_UNIX_AMD64)
   add_definitions(-DFEATURE_MULTIREG_RETURN)
-  add_definitions(-DUNIX_AMD64_ABI)
 endif (CLR_CMAKE_PLATFORM_UNIX_AMD64)
 if(CLR_CMAKE_PLATFORM_UNIX AND CLR_CMAKE_TARGET_ARCH_AMD64)
   add_definitions(-DUNIX_AMD64_ABI)


message change

message change

--- cmake/FindOgre.cmake
+++ cmake/FindOgre.cmake
@@ -181,7 +181,7 @@
         endif()
     endif()

-    # look for required Ogre dependencies in case of static build and/or threading
+    # look for required Ogre dependencies in case of static build
     if (OGRE_STATIC)
         set(OGRE_DEPS_FOUND TRUE)
         find_package(FreeImage QUIET)


message change

message change


removed old dir

removed old dir

--- cmake/FindZZIP.cmake
+++ cmake/FindZZIP.cmake
@@ -1,41 +0,0 @@
-################################################################################
-# Custom cmake module for CEGUI to find zzip
-################################################################################
-include(FindPackageHandleStandardArgs)
-
-find_path(ZZIP_H_PATH NAMES zzip.h)
-find_library(ZZIP_LIB NAMES zzip libzzip zzip libzzip PATH_SUFFIXES dynamic)
-find_library(ZZIP_LIB_DBG NAMES zzipd libzzipd zzip_d libzzip_d PATH_SUFFIXES dynamic)
-mark_as_advanced(ZZIP_H_PATH ZZIP_LIB ZZIP_LIB_DBG)
-
-if (WIN32 OR APPLE)
-    find_library(ZZIP_LIB_STATIC NAMES zzip libzzip zzip libzzip PATH_SUFFIXES static)
-    find_library(ZZIP_LIB_STATIC_DBG NAMES zzipd libzzipd zzip_d libzzip_d PATH_SUFFIXES static)
-    set( ZZIP_DEFINITIONS_STATIC "ZZIP_LIB" CACHE STRING "preprocessor definitions" )
-    mark_as_advanced(ZZIP_DEFINITIONS_STATIC ZZIP_LIB_STATIC ZZIP_LIB_STATIC_DBG)
-endif()
-
-cegui_find_package_handle_standard_args(ZZIP ZZIP_LIB ZZIP_H_PATH)
-
-
-# set up output vars
-if (ZZIP_FOUND)
-    set (ZZIP_INCLUDE_DIR ${ZZIP_H_PATH})
-    set (ZZIP_LIBRARIES ${ZZIP_LIB})
-    if (ZZIP_LIB_DBG)
-        set (ZZIP_LIBRARIES_DBG ${ZZIP_LIB_DBG})
-    endif()
-    if (ZZIP_LIB_STATIC)
-        set (ZZIP_LIBRARIES_STATIC ${ZZIP_LIB_STATIC})
-    endif()
-    if (ZZIP_LIB_STATIC_DBG)
-        set (ZZIP_LIBRARIES_STATIC_DBG ${ZZIP_LIB_STATIC_DBG})
-    endif()
-else()
-    set (ZZIP_INCLUDE_DIR)
-    set (ZZIP_LIBRARIES)
-    set (ZZIP_LIBRARIES_DBG)
-    set (ZZIP_LIBRARIES_STATIC)
-    set (ZZIP_LIBRARIES_STATIC_DBG)
-endif()
-


Workaround ABI issue with GCC 5.

Workaround ABI issue with GCC 5.

GCC 5 introduced the -fabi-compat-version switch and defaults it to 2 if
-fabi-version is 0. But in that case the bug -fabi-version=0 is supposed
to fix resurfaces. For now just make sure that it compiles and links.

Bug report to GCC bugzilla is still pending.

Fixes gh-36

Signed-off-by: Matthias Kretz <372ea4eca737a13cd010ee806d4ce7b98ee71550@kde.org>

--- cmake/VcMacros.cmake
+++ cmake/VcMacros.cmake
@@ -254,6 +254,10 @@
       endif()
       vc_add_compiler_flag(Vc_COMPILE_FLAGS "-Wabi")
       vc_add_compiler_flag(Vc_COMPILE_FLAGS "-fabi-version=0") # ABI version 4 is required to make __m128 and __m256 appear as different types. 0 should give us the latest version.
+      vc_add_compiler_flag(Vc_COMPILE_FLAGS "-fabi-compat-version=0") # GCC 5 introduced this switch
+      # and defaults it to 2 if -fabi-version is 0. But in that case the bug -fabi-version=0 is
+      # supposed to fix resurfaces. For now just make sure that it compiles and links.
+      # Bug report pending.

       if(_add_buildtype_flags)
          vc_set_gnu_buildtype_flags()


ups typo: -Wno-parentheses

ups typo: -Wno-parentheses

--- cmake/VcMacros.cmake
+++ cmake/VcMacros.cmake
@@ -232,7 +232,7 @@
          message(WARNING "GCC 4.4.x shows false positives for -Wparentheses, thus we rather disable the warning.")
          string(REPLACE " -Wparentheses " " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
          string(REPLACE " -Wparentheses " " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-         set(Vc_DEFINITIONS "${Vc_DEFINITIONS} -Wno-parenthesis")
+         set(Vc_DEFINITIONS "${Vc_DEFINITIONS} -Wno-parentheses")
       elseif(Vc_GCC_VERSION VERSION_EQUAL 4.7.0)
          message(WARNING "GCC 4.7.0 miscompiles at -O3, adding -fno-predictive-commoning to the compiler flags as workaround")
          set(Vc_DEFINITIONS "${Vc_DEFINITIONS} -fno-predictive-commoning")


require Fortran 2008 when using ifort

require Fortran 2008 when using ifort

--- cmake/compiler.cmake
+++ cmake/compiler.cmake
@@ -2,4 +2,6 @@

 if(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
   set(CMAKE_Fortran_FLAGS_INIT "-fopenmp -Wall -Wextra -Wconversion -std=f2008 -pedantic")
+elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
+  set(CMAKE_Fortran_FLAGS_INIT "-stand f08")
 endif()


testing: Use vtk-example as a fallback for prefix

Change-Id: I627bdd7ae131a3eff1b2e08a9b709760af178c28

--- CMake/vtkTestingMacros.cmake
+++ CMake/vtkTestingMacros.cmake
@@ -191,7 +191,11 @@
   _vtk_test_set_options("${cxx_options}" "" ${options})

   if(VTK_BASELINE_DIR)
-    set(prefix ${vtk-module})
+    if(vtk-module)
+      set(prefix ${vtk-module})
+    elseif(vtk-example)
+      set(prefix ${vtk-example})
+    endif()
     set(baseline_dir ${VTK_BASELINE_DIR})
   elseif(vtk-module)
     set(prefix ${vtk-module})


fix whitespace

fix whitespace

--- CommonCompilerConfig.cmake
+++ CommonCompilerConfig.cmake
@@ -202,7 +202,7 @@
     set(optimization_flags_cc "${optimization_flags_cc} -fuse-ld=gold")
     # NOTE -flto must go together in both cc and ld flags; also, it's presently incompatible
     # with the -g option in at least some GNU compilers (saw in `man gcc` on Ubuntu)
-    set(optimization_flags_cc "${optimization_flags_cc} -fuse-linker-plugin -flto-report -flto")#TODO fix LTO for clang
+    set(optimization_flags_cc "${optimization_flags_cc} -fuse-linker-plugin -flto-report -flto") #TODO fix LTO for clang
     set(optimization_flags_lt "${optimization_flags_lt} -flto") #TODO LTO for clang too
   endif()
 endif()


Fixed default build configuration error

Fixed default build configuration error

--- Configurations.cmake
+++ Configurations.cmake
@@ -96,7 +96,7 @@
 		set(CMAKE_CXX_FLAGS "${COMMON_PARAMETERS} -O2 --llvm-lto 1")
 	else()
 		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast")
-		set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s EXPORTED_RUNTIME_METHODS=\"['UTF8ToString', 'HEAPF32', '_free', '_malloc', 'HEAPU8']\" -s EXPORTED_FUNCTIONS=\"['UTF8ToString', 'HEAPF32', '_free', '_malloc', 'HEAPU8']\" ")
+		set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os")
 		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g3")
 		set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -Ofast -g3")
 		set(CMAKE_CXX_FLAGS "${COMMON_PARAMETERS}")


ENH: Bump the latest version of the `ITKThickness3D` remote.

Bump the latest version of the `ITKThickness3D` remote module.

--- Modules/Remote/Thickness3D.remote.cmake
+++ Modules/Remote/Thickness3D.remote.cmake
@@ -2,5 +2,5 @@
 itk_fetch_module(Thickness3D
   "Tools for 3D thickness measurement"
   GIT_REPOSITORY ${git_protocol}://github.com/InsightSoftwareConsortium/ITKThickness3D.git
-  GIT_TAG 7b2de28581369586595fdd5e3b9bec2606a2d516
+  GIT_TAG ed537630b3cf5f9f38c53d26ff18e93bf9ea62f6
 )


ctest: shorten the OS and compiler strings even more

Signed-off-by: Matthias Kretz <372ea4eca737a13cd010ee806d4ce7b98ee71550@kde.org>

--- test.cmake
+++ test.cmake
@@ -84,9 +84,11 @@
    string(REPLACE "Scientific Linux SL" "SL" os_ident "${os_ident}")
    string(REPLACE " release" "" os_ident "${os_ident}")
    string(REPLACE " GNU_Linux" "" os_ident "${os_ident}")
+   string(REPLACE "openSUSE" "Suse" os_ident "${os_ident}")
    string(STRIP "${os_ident}" os_ident)
 else()
    set(os_ident "${arch}")
+   string(REPLACE "Windows" "Win" os_ident "${os_ident}")
 endif()

 # Determine the processor count (number_of_processors)
@@ -134,8 +136,10 @@
    string(REPLACE "gxx" "GCC" COMPILER_VERSION "${COMPILER_VERSION}")
    string(REPLACE "g++" "GCC" COMPILER_VERSION "${COMPILER_VERSION}")
    string(REPLACE ".exe" "" COMPILER_VERSION "${COMPILER_VERSION}")
+   string(REPLACE " version" "" COMPILER_VERSION "${COMPILER_VERSION}")
    string(REGEX REPLACE " \\(.*\\)" "" COMPILER_VERSION "${COMPILER_VERSION}")
    string(REGEX REPLACE " \\[.*\\]" "" COMPILER_VERSION "${COMPILER_VERSION}")
+   string(REGEX REPLACE "GCC-[0-9](\\.[0-9])?" "GCC" COMPILER_VERSION "${COMPILER_VERSION}")
    string(STRIP "${COMPILER_VERSION}" COMPILER_VERSION)
    if(COMPILER_VERSION_COMPLETE MATCHES "Free Software Foundation, Inc." AND NOT COMPILER_VERSION MATCHES "GCC")
       # it's GCC but without "GCC" in the COMPILER_VERSION string - fix it up


CMake: Cleanup: Well, this is now obsolete

git-svn-id: 31d9d2f6432a47c86a3640814024c107794ea77c@32906 0785d39b-7218-0410-832d-ea1e28bc413d

--- deal.II/cmake/modules/FindTRILINOS.cmake
+++ deal.II/cmake/modules/FindTRILINOS.cmake
@@ -49,14 +49,6 @@
     lib${LIB_SUFFIX}/cmake/Trilinos
   NO_SYSTEM_ENVIRONMENT_PATH
   )
-
-IF( DEFINED TRILINOS_CONFIG_DIR_SAVED AND
-    NOT "${TRILINOS_CONFIG_DIR}" STREQUAL "${TRILINOS_CONFIG_DIR_SAVED}" )
-  SET(_backup ${TRILINOS_CONFIG_DIR})
-  PURGE_FEATURE(TRILINOS)
-  SET(TRILINOS_CONFIG_DIR ${_backup} CACHE INTERNAL "")
-ENDIF()
-SET(TRILINOS_CONFIG_DIR_SAVED "${TRILINOS_CONFIG_DIR}" CACHE INTERNAL "" FORCE)

 IF(DEFINED Trilinos_VERSION)