Cosmetics: indentation

Cosmetics: indentation

git-svn-id: 5398946ba177a3e438c2dae55e2cdfc2fb96c905@2768 a9d63959-f2ad-4865-b262-bf0e56cfafb6

--- cmake/pcl_targets.cmake
+++ cmake/pcl_targets.cmake
@@ -517,15 +517,15 @@
         string(REGEX REPLACE "set.*SUBSYS_NAME" "" name "${name}")
         string(REPLACE ")" "" name "${name}")
         string(STRIP "${name}" name)
-#				message(STATUS "setting ${subdir} component name to ${name}")
-				set(${names} ${${names}} ${name})
+#       message(STATUS "setting ${subdir} component name to ${name}")
+        set(${names} ${${names}} ${name})
         file(STRINGS ${dirname}/${subdir}/CMakeLists.txt DEPENDENCIES REGEX "set.*SUBSYS_DEPS .*\\)")
         string(REGEX REPLACE "set.*SUBSYS_DEPS" "" DEPENDENCIES "${DEPENDENCIES}")
         string(REPLACE ")" "" DEPENDENCIES "${DEPENDENCIES}")
         string(STRIP "${DEPENDENCIES}" DEPENDENCIES)
         string(REPLACE " " ";" DEPENDENCIES "${DEPENDENCIES}")
         if(NOT("${DEPENDENCIES}" STREQUAL ""))
-					  list(REMOVE_ITEM DEPENDENCIES "#")
+            list(REMOVE_ITEM DEPENDENCIES "#")
             string(TOUPPER "PCL_${name}_DEPENDS" SUBSYS_DEPENDS)
             set(${SUBSYS_DEPENDS} ${DEPENDENCIES})
             foreach(dependee ${DEPENDENCIES})


fix cryptopp lib building bug in gcc8 (#24945)

--- cmake/external/cryptopp.cmake
+++ cmake/external/cryptopp.cmake
@@ -50,6 +50,8 @@
                         -DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
                         -DCMAKE_CXX_FLAGS=${CRYPTOPP_CMAKE_CXX_FLAGS}
                         -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
+                        -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+                        -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
 )

 INCLUDE_DIRECTORIES(${CRYPTOPP_INCLUDE_DIR})


cmake/modules/FindVIGRA.cmake: For older versions of CMake, GET_FILENAME_COMPONENT does not have the component DIRECTORY, but uses PATH instead.

--- cmake/modules/FindVIGRA.cmake
+++ cmake/modules/FindVIGRA.cmake
@@ -32,7 +32,7 @@
                             OUTPUT_STRIP_TRAILING_WHITESPACE)

 IF(NOT VIGRA_VIGRANUMPYCORE_LIBRARY_NOT_FOUND)
-    GET_FILENAME_COMPONENT(VIGRANUMPY_SITEPACKAGE_DIR ${VIGRA_VIGRANUMPYCORE_LIBRARY} DIRECTORY)
+    GET_FILENAME_COMPONENT(VIGRANUMPY_SITEPACKAGE_DIR ${VIGRA_VIGRANUMPYCORE_LIBRARY} PATH)

     MESSAGE(STATUS "Found VIGRA")
     MESSAGE(STATUS "  > includes:                 ${VIGRA_INCLUDE_DIR}")


Use lowercase 'root' in the root_vX.XX.XX tar file name

--- cmake/modules/RootCPack.cmake
+++ cmake/modules/RootCPack.cmake
@@ -62,9 +62,9 @@
 set(CPACK_PACKAGE_RELOCATABLE True)
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "root_v${ROOT_VERSION}")
 if(CMAKE_BUILD_TYPE STREQUAL Release)
-  set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_v${ROOT_VERSION}.${ROOT_ARCHITECTURE}${COMPILER_NAME_VERSION}")
+  set(CPACK_PACKAGE_FILE_NAME "root_v${ROOT_VERSION}.${ROOT_ARCHITECTURE}${COMPILER_NAME_VERSION}")
 else()
-  set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_v${ROOT_VERSION}.${ROOT_ARCHITECTURE}${COMPILER_NAME_VERSION}.${CMAKE_BUILD_TYPE}")
+  set(CPACK_PACKAGE_FILE_NAME "root_v${ROOT_VERSION}.${ROOT_ARCHITECTURE}${COMPILER_NAME_VERSION}.${CMAKE_BUILD_TYPE}")
 endif()
 set(CPACK_PACKAGE_EXECUTABLES "root" "ROOT")


[CMAKE] Fix Linux64 toolchain name

[CMAKE] Fix Linux64 toolchain name

Summary:
The toolchain is named with an extra `-pc` in its name (just like the 32
bits version) but it should not.
Using this mistaken name as the depends name will still work when the
host is a 64 bits linux as it will default to the good system.

Test Plan:
  cd depends
  make build-linux64
  mkdir ../buildcmake && cd ../buildcmake
  cmake -GNinja .. \
  -DCMAKE_TOOLCHAIN_FILE=../cmake/platforms/Linux64.cmake
  ninja

Reviewers: #bitcoin_abc, deadalnix

Reviewed By: #bitcoin_abc, deadalnix

Differential Revision: https://reviews.bitcoinabc.org/D4038

--- cmake/platforms/Linux64.cmake
+++ cmake/platforms/Linux64.cmake
@@ -1,7 +1,7 @@
 # Copyright (c) 2019 The Bitcoin developers

 set(CMAKE_SYSTEM_NAME Linux)
-set(TOOLCHAIN_PREFIX x86_64-pc-linux-gnu)
+set(TOOLCHAIN_PREFIX x86_64-linux-gnu)

 # Cross compilers to use for C and C++
 set(CMAKE_C_COMPILER gcc)


[cmake] on Darwin, UNIX is defined

[cmake] on Darwin, UNIX is defined

--- cmake/swig_python_tools.cmake
+++ cmake/swig_python_tools.cmake
@@ -116,12 +116,12 @@
   # Check dependencies and then link ...
   add_dependencies(${SWIG_MODULE_${_name}_REAL_NAME} ${COMPONENT})

-  IF(UNIX)
+  IF(UNIX AND NOT APPLE)
     # do not link against the Python library on unix, it is useless
     swig_link_libraries(${_name} ${${COMPONENT}_LINK_LIBRARIES} ${COMPONENT})
-  ELSE(UNIX)
+  ELSE(UNIX AND NOT APPLE)
     swig_link_libraries(${_name} ${PYTHON_LIBRARIES} ${${COMPONENT}_LINK_LIBRARIES} ${COMPONENT})
-  ENDIF(UNIX)
+  ENDIF(UNIX AND NOT APPLE)

   # set dep between docstrings and python bindings
   add_dependencies(${SWIG_MODULE_${_name}_REAL_NAME} ${COMPONENT}_docstrings)


Updated Boost (latest compatible version).

--- cmake/third_party/boost.cmake
+++ cmake/third_party/boost.cmake
@@ -1,5 +1,5 @@
-set(BOOST_URL "https://boostorg.jfrog.io/artifactory/main/release/1.71.0/source/boost_1_71_0.tar.bz2" CACHE STRING "Boost download URL")
-set(BOOST_URL_SHA256 "d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee" CACHE STRING "Boost download URL SHA256 checksum")
+set(BOOST_URL "https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.tar.bz2" CACHE STRING "Boost download URL")
+set(BOOST_URL_SHA256 "fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854" CACHE STRING "Boost download URL SHA256 checksum")

 include(FetchContent)
 FetchContent_Declare(


Fix for CMake 2.6

Fix for CMake 2.6

No named arguments for add_test in CMake 2.6.

--- CMakeModules/BoostTestTargets.cmake
+++ CMakeModules/BoostTestTargets.cmake
@@ -41,7 +41,7 @@
 endif()
 set(__add_boost_test YES)

-set(BOOST_TEST_TARGET_PREFIX "boosttest")
+set(BOOST_TEST_TARGET_PREFIX "test")

 if(NOT Boost_FOUND)
 	find_package(Boost 1.34.0 QUIET)
@@ -93,20 +93,6 @@
 	if(NOT BUILD_TESTING)
 		return()
 	endif()
-# TODO check if 2.6 is enough
-#	if("${CMAKE_VERSION}" VERSION_LESS "2.8.0")
-#		if(NOT "${_boost_test_cmakever_pestered}x" EQUAL "${CMAKE_VERSION}x")
-#			message(STATUS
-#				"Not adding boost::test targets - CMake 2.8.0 or newer required, using ${CMAKE_VERSION}")
-#			set(_boost_test_cmakever_pestered
-#				"${CMAKE_VERSION}"
-#				CACHE
-#				INTERNAL
-#				""
-#				FORCE)
-#		endif()
-#		return()
-#	endif()

 	# parse arguments
 	set(_nowhere)
@@ -239,12 +225,10 @@

 		if(TESTS AND ( "${Boost_VERSION}" VERSION_GREATER "103799" ))
 			foreach(_test ${TESTS})
-				add_test(NAME
+				add_test(
 					${_name}-${_test}
-					COMMAND
-					${_test_command}
-					--run_test=${_test}
-					${Boost_TEST_FLAGS})
+					${_test_command} --run_test=${_test} ${Boost_TEST_FLAGS}
+				)
 				if(FAIL_REGULAR_EXPRESSION)
 					set_tests_properties(${_name}-${_test}
 						PROPERTIES
@@ -253,13 +237,12 @@
 				endif()
 			endforeach()
 		else()
-			add_test(NAME
+			add_test(
 				${_name}-boost_test
-				COMMAND
-				${_test_command}
-				${Boost_TEST_FLAGS})
+				${_test_command} ${Boost_TEST_FLAGS}
+			)
 			if(FAIL_REGULAR_EXPRESSION)
-				set_tests_properties(${_name}-${_test}
+				set_tests_properties(${_name}-boost_test
 					PROPERTIES
 					FAIL_REGULAR_EXPRESSION
 					"${FAIL_REGULAR_EXPRESSION}")


[Fix] Correct path for each build configuration

Used the cmake generator expression to determine the full path to the target file.
Link: https://cmake.org/cmake/help/v3.0/manual/cmake-generator-expressions.7.html#informational-expressions

--- cmake/Dependencies.cmake
+++ cmake/Dependencies.cmake
@@ -173,10 +173,8 @@
 endmacro()

 macro(DeployWindows TARGET)
-	# TODO Find out what build type it is
-	set(TARGET_FILE ${CMAKE_BINARY_DIR}/bin/Release/${TARGET}.exe)
-
 	if(EXISTS ${TARGET_FILE})
+		message(STATUS "Collecting Dependencies for target file: ${TARGET_FILE}")
 		find_package(Qt5Core REQUIRED)

 		# Find the windeployqt binaries
@@ -277,7 +275,7 @@
 		# Run CMake after target was built
 		add_custom_command(
 			TARGET ${TARGET} POST_BUILD
-			COMMAND ${CMAKE_COMMAND}
+			COMMAND "${CMAKE_COMMAND}" "-DTARGET_FILE=$<TARGET_FILE:${TARGET}>"
 			ARGS ${CMAKE_SOURCE_DIR}
 			WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 			VERBATIM


CMake: hopefully last gcov tuning...

CMake: hopefully last gcov tuning...

--- cmake/Modules/GCOV.cmake
+++ cmake/Modules/GCOV.cmake
@@ -17,7 +17,11 @@

 add_custom_target(
   gcov
+  COMMAND "${CMAKE_COMMAND}" -E remove_directory "${GCOV_REPORT_PATH}"
+  COMMAND "${CMAKE_COMMAND}" -E make_directory "${GCOV_REPORT_PATH}"
+  COMMAND find "${CMAKE_SOURCE_DIR}" -type f -name '*.gcov' -exec rm {} + > /dev/null
   COMMAND find "${CMAKE_SOURCE_DIR}" -type f -name '*.gcno' -exec "${GCOV_PATH}" -abflpu  {} + > /dev/null
+  COMMAND find "${CMAKE_SOURCE_DIR}" -type f -name '*.gcov' -exec mv -t "${GCOV_REPORT_PATH}" {} + > /dev/null
   WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
   COMMENT "Running gcov tool on all the *.gcno files"
 )


Fix "make test", there are no .shell wrappers in here so don't try to execute them. However 4 tests fail. Extract: FAIL!  : MethodTest::checkMediaObjectMethods(currentSourceChanged(const MediaSource&)) 'meta->indexOfSignal(QMetaObject::normalizedSignature(signature.constData())) != -1' returned FALSE. ()    Loc: [/d/kde/src/t/kdesupport/phonon/phonon/tests/methodtest.cpp(181)] CCMAIL: kretz@kde.org

Fix "make test", there are no .shell wrappers in here so don't try to execute them.
However 4 tests fail. Extract:
FAIL!  : MethodTest::checkMediaObjectMethods(currentSourceChanged(const MediaSource&)) 'meta->indexOfSignal(QMetaObject::normalizedSignature(signature.constData())) != -1' returned FALSE. ()
   Loc: [/d/kde/src/t/kdesupport/phonon/phonon/tests/methodtest.cpp(181)]
CCMAIL: 372ea4eca737a13cd010ee806d4ce7b98ee71550@kde.org

--- cmake/PhononMacros.cmake
+++ cmake/PhononMacros.cmake
@@ -58,9 +58,9 @@
       set(_executable ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME}.app/Contents/MacOS/${_test_NAME})
    else (Q_WS_MAC AND NOT _nogui)
       # Use .shell wrapper where available, to use uninstalled libs.
-      if (UNIX)
-         set(_executable ${_executable}.shell)
-      endif (UNIX)
+      #if (UNIX)
+      #   set(_executable ${_executable}.shell)
+      #endif (UNIX)
    endif (Q_WS_MAC AND NOT _nogui)

    if (using_qtest AND PHONON_TEST_OUTPUT STREQUAL "xml")


restrict OpenCL support for single precision scalar type

--- cmake/dependencies.cmake
+++ cmake/dependencies.cmake
@@ -21,6 +21,9 @@

 # OpenCL
 if(NANO_WITH_OPENCL)
+        if(NOT NANO_WITH_FLOAT_SCALAR)
+                message(FATAL_ERROR "++ OpenCL support is available only for float scalar!")
+        endif()
         find_package(OpenCL REQUIRED)
         include_directories(SYSTEM ${OpenCL_INCLUDE_DIRS})
         add_definitions(-DNANO_WITH_OPENCL)


Only set SSE optimization when compiling an optimized build.

Needed for Debian and Gentoo packaging.

git-svn-id: 5398946ba177a3e438c2dae55e2cdfc2fb96c905@4582 a9d63959-f2ad-4865-b262-bf0e56cfafb6

--- cmake/pcl_find_sse.cmake
+++ cmake/pcl_find_sse.cmake
@@ -128,6 +128,7 @@
         endif(HAVE_SSE2_EXTENSIONS)
     endif (NOT APPLE AND NOT MSVC)

-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SSE_FLAGS}")
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${SSE_FLAGS}")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${SSE_FLAGS}")

 endmacro(PCL_CHECK_FOR_SSE)


Remove verbose_sweep from vpr base args

Remove verbose_sweep from vpr base args

Signed-off-by: Tomasz Michalak <a2fdaa543b4cc5e3d6cd8672ec412c0eb393b86e@antmicro.com>

--- make/devices.cmake
+++ make/devices.cmake
@@ -565,7 +565,6 @@

 set(VPR_BASE_ARGS
     --min_route_chan_width_hint 100
-    --verbose_sweep on
     --max_criticality 0.0
     --max_router_iterations 500
     --routing_failure_predictor off


remove clang-tidy use script

remove clang-tidy use script

should have been removed previously
commit https://github.com/smanders/externpro/commit/2ad1f1fdac5df2320d4161cfee875d7eaaceff61
issue https://github.com/smanders/externpro/issues/311

--- projects/use/usexp-clangtidy-config.cmake
+++ projects/use/usexp-clangtidy-config.cmake
@@ -1,13 +0,0 @@
-# CLANGTIDY_FOUND - clang-tidy was found
-# CLANGTIDY_VER - clang-tidy version
-# CLANGTIDY_EXE - the clang-tidy executable
-# this file (-config) installed to share/cmake
-get_filename_component(XP_ROOTDIR ${CMAKE_CURRENT_LIST_DIR}/../.. ABSOLUTE)
-get_filename_component(XP_ROOTDIR ${XP_ROOTDIR} ABSOLUTE) # remove relative parts
-set(CLANGTIDY_VER "@VER@ [@PROJECT_NAME@]")
-set(CLANGTIDY_EXE ${XP_ROOTDIR}/bin/clang-tidy${CMAKE_EXECUTABLE_SUFFIX})
-set(reqVars CLANGTIDY_VER CLANGTIDY_EXE)
-include(FindPackageHandleStandardArgs)
-set(FPHSA_NAME_MISMATCHED TRUE) # find_package_handle_standard_args NAME_MISMATCHED (prefix usexp-)
-find_package_handle_standard_args(clangtidy REQUIRED_VARS ${reqVars})
-mark_as_advanced(${reqVars})


BUG: Add EXCLUDE_FROM_DEFAULT.

BUG: Add EXCLUDE_FROM_DEFAULT.

As a Remote Module, EXCLUDE_FROM_DEFAULT needs to be added from the module
being inadvertently turned on in a fresh build after it was downloaded in a
previous build.

--- itk-module.cmake
+++ itk-module.cmake
@@ -10,4 +10,5 @@
     ITKQuadEdgeMesh
   DESCRIPTION
     "${DOCUMENTATION}"
+  EXCLUDE_FROM_DEFAULT
 )


shifted Gadgetron tag to e7eb430..

shifted Gadgetron tag to e7eb430..

--- version_config.cmake
+++ version_config.cmake
@@ -96,7 +96,8 @@
   set(DEFAULT_Gadgetron_URL https://github.com/gadgetron/gadgetron )
   #https://github.com/CCPPETMR/gadgetron)

-  set(DEFAULT_Gadgetron_TAG 00b96376568278a595e78879026bb3b0d5fbb98d )
+  set(DEFAULT_Gadgetron_TAG e7eb430673eb3272e8a821b51750c0a2a96dafed )
+  #set(DEFAULT_Gadgetron_TAG 00b96376568278a595e78879026bb3b0d5fbb98d )

   ## ISMRMRD
   set(DEFAULT_ISMRMRD_URL https://github.com/CCPPETMR/ismrmrd )


Check & log conan commands execution (#309)


Bugfix

Bugfix

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

--- deal.II/contrib/cmake/setup_compiler_flags.cmake
+++ deal.II/contrib/cmake/setup_compiler_flags.cmake
@@ -97,10 +97,14 @@
 SET(CMAKE_C_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})

 #
-# Strip some -W* flags and all CXX-only flags.
-# This is mainly to silence the build of contrib UMFPACK.
+# Strip flags not supported by a C target:
 #
-STRIP_FLAG(CMAKE_C_FLAGS "-Wall")
 STRIP_FLAG(CMAKE_C_FLAGS "-Wsynth")
+STRIP_FLAG(CMAKE_C_FLAGS_RELEASE "-felide-constructors")
+
+#
+# Disable some warnings:
+#
+STRIP_FLAG(CMAKE_C_FLAGS "-Wall") # There is no other way to disable -Wunknown-pragma atm...
 STRIP_FLAG(CMAKE_C_FLAGS "-Wsign-compare")
-STRIP_FLAG(CMAKE_C_FLAGS_RELEASE "-felide-constructors")
+STRIP_FLAG(CMAKE_C_FLAGS "-Wwrite-strings")


CMake: URHO3D_FILEWATCHER option, required by resource reloader.


Update to latest Matchpoint version

Update to latest Matchpoint version

Test Plan: manual

Reviewers: kislinsk, O1 MITK Core

Reviewed By: kislinsk, O1 MITK Core

Maniphest Tasks: T26270

Differential Revision: https://phabricator.mitk.org/D199

--- CMakeExternals/MatchPoint.cmake
+++ CMakeExternals/MatchPoint.cmake
@@ -26,8 +26,8 @@
       set(download_step SOURCE_DIR ${MatchPoint_SOURCE_DIR})
     else()
       set(download_step
-          URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/MatchPoint_rev_24ef6072.tar.gz
-          URL_MD5 b0a0d7d63da5071db8e73dd6e6b4db7c
+          URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/MatchPoint_rev_f2a64255.tar.gz
+          URL_MD5 4407836f85e6382e65c9d3a4bd79c370
          )
     endif()


disable AVX2 on iOS simulator

disable AVX2 on iOS simulator

--- nnpack.cmake
+++ nnpack.cmake
@@ -101,5 +101,6 @@
     XCODE_ATTRIBUTE_OTHER_CFLAGS[arch=armv7] "$(OTHER_CFLAGS) -mfpu=neon-fp16"
     XCODE_ATTRIBUTE_OTHER_CFLAGS[arch=armv7s] "$(OTHER_CFLAGS) -mfpu=neon-fp16"
     XCODE_ATTRIBUTE_EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] "${neon_source_files}" # those sources fail to build for simulator
+    XCODE_ATTRIBUTE_GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*] "NNP_BACKEND_PSIMD" # don't use AVX2 on iOS simulator
   )
 endif()


COMP: External find_package was not working with VTK6.

--- SuperBuild/External_VTK.cmake
+++ SuperBuild/External_VTK.cmake
@@ -25,8 +25,6 @@
 set(proj        VTK) #This local name

-#Setting VTK_VERSION_MAJOR to its default value if it has not been set before
-set(VTK_VERSION_MAJOR 5 CACHE STRING "Choose the expected VTK major version to build Slicer (5 or 6).")
 # Set the possible values of VTK major version for cmake-gui
 set_property(CACHE VTK_VERSION_MAJOR PROPERTY STRINGS "5" "6")
 if(NOT "${VTK_VERSION_MAJOR}" STREQUAL "5" AND NOT "${VTK_VERSION_MAJOR}" STREQUAL "6")
@@ -34,11 +32,16 @@
   message(WARNING "Setting VTK_VERSION_MAJOR to '5' as an valid value was specified.")
 endif()

-set(USE_VTKv5 ON)
-set(USE_VTKv6 OFF)
 if(${VTK_VERSION_MAJOR} STREQUAL "6")
+  #Setting VTK_VERSION_MAJOR to its default value if it has not been set before
+  set(VTK_VERSION_MAJOR 6 CACHE STRING "Choose the expected VTK major version to build Slicer (5 or 6).")
   set(USE_VTKv5 OFF)
   set(USE_VTKv6 ON)
+else()
+   set(USE_VTKv5 ON)
+   set(USE_VTKv6 OFF)
+   #Setting VTK_VERSION_MAJOR to its default value if it has not been set before
+   set(VTK_VERSION_MAJOR 5 CACHE STRING "Choose the expected VTK major version to build Slicer (5 or 6).")
 endif()

 if(USE_VTKv6)
@@ -238,8 +241,8 @@

 else()
   if(${USE_SYSTEM_${extProjName}})
-    find_package(${extProjName} ${${extProjName}_REQUIRED_VERSION} REQUIRED)
-    message("USING the system ${extProjName}, set ${extProjName}_DIR=${${extProjName}_DIR}")
+    message("USING the system ${extProjName}, set ${extProjName}_DIR=${${extProjName}_DIR}, USE_VTKv6=${USE_VTKv6}, VTK_VERSION_MAJOR=${VTK_VERSION_MAJOR}")
+    find_package(${extProjName} REQUIRED)
   endif()
   # The project is provided using ${extProjName}_DIR, nevertheless since other
   # project may depend on ${extProjName}, let's add an 'empty' one


Temporarily disable valgrind suppression file for jenkins

--- Testing/jenkins_mercury.cmake
+++ Testing/jenkins_mercury.cmake
@@ -71,7 +71,7 @@
   message("Enabling Memcheck")
   set(CTEST_MEMORYCHECK_COMMAND "/usr/bin/valgrind")
   set(CTEST_MEMORYCHECK_COMMAND_OPTIONS "--gen-suppressions=all --trace-children=yes -q --leak-check=yes --show-reachable=yes --num-callers=50 -v")
-  set(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE ${CTEST_SCRIPT_DIRECTORY}/MercuryValgrindSuppressions.supp)
+  #set(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE ${CTEST_SCRIPT_DIRECTORY}/MercuryValgrindSuppressions.supp)

   # needed by mercury_common.cmake
   set(dashboard_do_memcheck TRUE)


Change to safer logic.  Check that QT_LIBRARIES is non-empty (which assures
that at least one of QT_LIBRARIES_optimized, QT_LIBRARIES_debug, or
QT_LIBRARIES_general is non-empty). If CMAKE_BUILD_TYPE is Release and
QT_LIBRARIES_optimized is non-empty use that for QT_LIBRARIES.  Otherwise,
use QT_LIBRARIES_debug if that is non-empty or QT_LIBRARIES_general if that
is non-empty.

svn path=/trunk/; revision=9948

--- cmake/modules/qt.cmake
+++ cmake/modules/qt.cmake
@@ -45,6 +45,8 @@
       set(QT_USE_QTSVG 1)
     endif(PLD_svgqt AND ${QT_VERSION_MINOR} GREATER 2)
     include(${QT_USE_FILE})
+  endif(QT4_FOUND)
+  if(QT4_FOUND AND QT_LIBRARIES)
     set(qt_COMPILE_FLAGS)
     foreach(DIR ${QT_INCLUDES})
       set(qt_COMPILE_FLAGS "${qt_COMPILE_FLAGS} -I${DIR}")
@@ -63,26 +65,34 @@
     # example with gcc, the C options are Debug=-g, Release=-O3,
     # RelWithDebInfo = -g -O2, and MinSizeRes=-Os.  For that compiler, some of
     # the options are clearly debug (Debug), some of the options are clearly
-    # optimized (Release), but the rest are ambiguous.  This decision may
-    # be changed in the future, but for now choose the debug or optimized
-    # Qt4 libraries only for the cases which are clearly justified, and
-    # otherwise just use the general Qt4 libraries.
-    message(STATUS "QT_LIBRARIES (mixed for all CMAKE_BUILD_TYPES) = ${QT_LIBRARIES}")
-    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    # optimized (Release), but the rest are ambiguous.  For now we will assign
+    # the ambiguous ones to debug, but we may change that interpretation
+    # in the future.  It is also clear from analysis of FindQt4.cmake that any
+    # of QT_LIBRARIES_general, QT_LIBRARIES_debug, or QT_LIBRARIES_optimized
+    # could be empty depending on the Qt install and whether CMAKE_BUILD_TYPE
+    # is specified or not.  Therefore, specifically deal with the empty cases.
+    message(STATUS "QT_LIBRARIES = ${QT_LIBRARIES}")
+    if(CMAKE_BUILD_TYPE STREQUAL "Release" AND QT_LIBRARIES_optimized)
+      set(QT_LIBRARIES ${QT_LIBRARIES_optimized})
+    elseif(QT_LIBRARIES_debug)
       set(QT_LIBRARIES ${QT_LIBRARIES_debug})
-    elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
-      set(QT_LIBRARIES ${QT_LIBRARIES_optimized})
-    else(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    elseif(QT_LIBRARIES_general)
       set(QT_LIBRARIES ${QT_LIBRARIES_general})
-    endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    message(STATUS "specific QT_LIBRARIES results used for this CMAKE_BUILD_TYPE = ${QT_LIBRARIES}")
+    else(CMAKE_BUILD_TYPE STREQUAL "Release" AND QT_LIBRARIES_optimized)
+      # This should be impossible because of the above check on QT_LIBRARIES
+      # being true (i.e., non-empty).
+      message(FATAL_ERROR "qt.cmake QT_LIBRARIES logic error")
+    endif(CMAKE_BUILD_TYPE STREQUAL "Release" AND QT_LIBRARIES_optimized)
+    message(STATUS "revised QT_LIBRARIES (based on keyword interpretation for
+the CMAKE_BUILD_TYPE that is specified) = ${QT_LIBRARIES}")

     set(qt_LINK_FLAGS ${QT_LIBRARIES})
     #message("qt_LINK_FLAGS = ${qt_LINK_FLAGS}")
     set(qt_RPATH ${QT_LIBRARY_DIR})
     #message("qt_LIBRARY_DIR = ${qt_LIBRARY_DIR}")
     set(DRIVERS_LINK_FLAGS ${DRIVERS_LINK_FLAGS} ${qt_LINK_FLAGS})
-  else(QT4_FOUND)
+  else(QT4_FOUND AND QT_LIBRARIES)
+    message(STATUS "QT_LIBRARIES not found so disabling all qt devices")
     set(PLD_bmpqt OFF CACHE BOOL "Enable Qt Windows bmp device" FORCE)
     set(PLD_jpgqt OFF CACHE BOOL "Enable Qt jpg device" FORCE)
     set(PLD_pngqt OFF CACHE BOOL "Enable Qt png device" FORCE)
@@ -93,7 +103,7 @@
     set(PLD_qtwidget OFF CACHE BOOL "Enable Qt interactive device" FORCE)
     set(PLD_svgqt OFF CACHE BOOL "Enable Qt SVG device" FORCE)
     set(PLD_extqt OFF CACHE BOOL "Enable Qt ext device" FORCE)
-  endif(QT4_FOUND)
+  endif(QT4_FOUND AND QT_LIBRARIES)
 endif(PLD_bmpqt OR PLD_jpgqt OR PLD_pngqt OR PLD_ppmqt OR PLD_tiffqt OR PLD_epsqt OR PLD_pdfqt OR PLD_qtwidget OR PLD_svgqt OR PLD_extqt)

 if(PLD_extqt)


Fix indentation

Fix indentation

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

--- cmake/pcl_openmp.cmake
+++ cmake/pcl_openmp.cmake
@@ -29,7 +29,7 @@
             if(OPENMP_FLAGS_${_flag})
                 set(OPENMP_FLAGS ${_flag})
                 message(STATUS "Found OpenMP flags: ${OPENMP_FLAGS}")
-								set(OPENMP_FLAGS_FOUND true)
+                set(OPENMP_FLAGS_FOUND true)
             endif(OPENMP_FLAGS_${_flag})
         endif(NOT OPENMP_FLAGS_FOUND)
     endforeach(_flag)


bump SIRF_TAG (#588)

bump SIRF_TAG (#588)

--- version_config.cmake
+++ version_config.cmake
@@ -190,7 +190,7 @@
   set(DEFAULT_CCPi-Regularisation-Toolkit_TAG origin/master)

 else()
-  set(DEFAULT_SIRF_TAG 58961137baddb2054405e9c7de647adc62ade7fe)
+  set(DEFAULT_SIRF_TAG c8f808acf5324b4ed56360362f369a1dd693f33d)
 #  set(DEFAULT_SIRF_TAG v3.0.0)

   ## STIR


updated armadillo version to 9.800.2

updated armadillo version to 9.800.2

--- version_config.cmake
+++ version_config.cmake
@@ -42,7 +42,7 @@
 endif()

 ## Armadillo
-set(Armadillo_URL   https://downloads.sourceforge.net/project/arma/armadillo-7.800.2.tar.xz)
+set(Armadillo_URL   https://downloads.sourceforge.net/project/arma/armadillo-9.800.2.tar.xz)
 set(Armadillo_MD5 c601f3a5ec6d50666aa3a539fa20e6ca )

 ## FFTW3


cmake: dts: rename dts fixup file related variables

Rename the variables related to DTS fixup to be clear what they are used
for.  This also lets us introduce a SOC level DTS fixup in the future
that is distinct from the board one.

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

--- dts/dts.cmake
+++ dts/dts.cmake
@@ -85,14 +85,14 @@

   # Run extract_dts_includes.py for the header file
   # generated_dts_board.h
-  set(FIXUP_FILE ${PROJECT_SOURCE_DIR}/dts/${ARCH}/${BOARD_FAMILY}.fixup)
-  if(EXISTS ${FIXUP_FILE})
-    set(FIXUP -f ${FIXUP_FILE})
+  set(DTS_BOARD_FIXUP_FILE ${PROJECT_SOURCE_DIR}/dts/${ARCH}/${BOARD_FAMILY}.fixup)
+  if(EXISTS ${DTS_BOARD_FIXUP_FILE})
+    set(DTS_BOARD_FIXUP -f ${DTS_BOARD_FIXUP_FILE})
   endif()
   set(CMD_EXTRACT_DTS_INCLUDES ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/scripts/dts/extract_dts_includes.py
     --dts ${BOARD_FAMILY}.dts_compiled
     --yaml ${PROJECT_SOURCE_DIR}/dts/bindings
-    ${FIXUP}
+    ${DTS_BOARD_FIXUP}
     )
   execute_process(
     COMMAND ${CMD_EXTRACT_DTS_INCLUDES}


Remplacement par la nouvelle version d'OSSIM

--- otbIncludeDirectories.cmake
+++ otbIncludeDirectories.cmake
@@ -23,14 +23,13 @@
   ${OTB_SOURCE_DIR}/Utilities/BGL
   ${OTB_SOURCE_DIR}/Utilities/BGL/boost
   ${OTB_SOURCE_DIR}/Utilities/otbsvm
-  ${OTB_SOURCE_DIR}/Utilities/OSSIM
-  ${OTB_SOURCE_DIR}/Utilities/OSSIM/ossim_core
+  ${OTB_SOURCE_DIR}/Utilities/OSSIM/include
 )

 #-----------------------------------------------------------------------------
 # Include directories from the ossim build tree
 SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
-${OTB_BINARY_DIR}/Utilities/OSSIM
+${OTB_BINARY_DIR}/Utilities/OSSIM/include
 )


Cleanup build script

Cleanup build script

--- build/cmake/ConsoleApplication.cmake
+++ build/cmake/ConsoleApplication.cmake
@@ -1,11 +1,4 @@
 function(add_console_application BINARY_NAME ${SRC_LIST} ${HDR_LIST} ${INL_LIST} ${RES_LIST} ${LIB_LIST})
-
-find_package(Subversion)
-if(SUBVERSION_FOUND AND EXISTS "${SOURCE_DIR}/.svn")
-  Subversion_WC_INFO(${PROJECT_SOURCE_DIR} APP_VCS)
-  set(APP_VERSION_REVISION ${APP_VCS_WC_REVISION})
-endif()
-

 if(APP_VERSION_MAJOR)
   set(PREPROCESSOR_DEFINITIONS "${PREPROCESSOR_DEFINITIONS} -DSE_APP_VERSION_MAJOR=${APP_VERSION_MAJOR}")
@@ -16,10 +9,6 @@
 if(APP_VERSION_MAINTENANCE)
   set(PREPROCESSOR_DEFINITIONS "${PREPROCESSOR_DEFINITIONS} -DSE_APP_VERSION_MAINTENANCE=${APP_VERSION_MAINTENANCE}")
 endif()
-if(APP_VERSION_REVISION)
-  set(PREPROCESSOR_DEFINITIONS "${PREPROCESSOR_DEFINITIONS} -DSE_APP_VERSION_REVISION=${APP_VERSION_REVISION}")
-endif()
-

 add_definitions(${PREPROCESSOR_DEFINITIONS})
 source_group("Source Files" FILES ${SRC_LIST} ${INL_LIST})


folly: remove problematic -Wnon-virtual-dtor error from cmake build

Summary:
This causes problems with the cmake build because boost
triggers this warning, and we're promoting this to an error.

It is possible to use `-isystem` to tell the compiler that the
the boost headers are system headers, but introducing that for
boost headers is a mess.

We can safely live without this warning in the open source build
as our buck based builds have this enabled correctly.

Reviewed By: yfeldblum

Differential Revision: D14631786

fbshipit-source-id: cf30d0921ce592f410c2ad4bfddba1bddef01ed7

--- CMake/FollyCompilerUnix.cmake
+++ CMake/FollyCompilerUnix.cmake
@@ -42,7 +42,6 @@
       -Wno-unused
       -Wunused-label
       -Wunused-result
-      -Wnon-virtual-dtor
       ${FOLLY_CXX_FLAGS}
   )
 endfunction()


Chanded revision tag of MITK-Data.

Chanded revision tag of MITK-Data.

--- CMakeExternals/MITKData.cmake
+++ CMakeExternals/MITKData.cmake
@@ -13,7 +13,7 @@

 if(BUILD_TESTING)

-  set(revision_tag 452cf3a4)
+  set(revision_tag dc06cc67)

   ExternalProject_Add(${proj}
     URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/MITK-Data_${revision_tag}.tar.gz


Updated FindAravis.cmake

Updated FindAravis.cmake

--- CMakeModules/FindAravis.cmake
+++ CMakeModules/FindAravis.cmake
@@ -2,12 +2,12 @@

 FIND_PATH(ARAVIS_INCLUDE_PATH arv.h
   "$ENV{ARAVIS_INCLUDE_PATH}"
-  /usr/include/aravis-0.2
+  /usr/local/include/aravis-0.4
 )

-FIND_LIBRARY(ARAVIS_LIBRARY aravis-0.2
+FIND_LIBRARY(ARAVIS_LIBRARY aravis-0.4
   "$ENV{ARAVIS_LIBRARY}"
-  /usr/lib
+  /usr/local/lib
 )

 FIND_PACKAGE_HANDLE_STANDARD_ARGS(ARAVIS DEFAULT_MSG


update ios.toolchain.cmake

update ios.toolchain.cmake


COMP: missing dependency to OTBBoostAdapters

--- Modules/Learning/Markov/otb-module.cmake
+++ Modules/Learning/Markov/otb-module.cmake
@@ -5,7 +5,7 @@

 otb_module(OTBMarkov
   DEPENDS
-    OTBBoost
+    OTBBoostAdapters
     OTBCommon
     OTBITK


More robust versioning in CMake, plus comments

--- src/version.cmake
+++ src/version.cmake
@@ -1,30 +1,79 @@
+# Copyright (c) 2014, The Monero Project
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this list of
+#    conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice, this list
+#    of conditions and the following disclaimer in the documentation and/or other
+#    materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its contributors may be
+#    used to endorse or promote products derived from this software without specific
+#    prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+# THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
+
+# Check what commit we're on
 execute_process(COMMAND "${GIT}" rev-parse --short HEAD RESULT_VARIABLE RET OUTPUT_VARIABLE COMMIT OUTPUT_STRIP_TRAILING_WHITESPACE)

 if(RET)
+	# Something went wrong, set the version tag to -unknown
+
     message(WARNING "Cannot determine current commit. Make sure that you are building either from a Git working tree or from a source archive.")
     set(VERSIONTAG "unknown")
     configure_file("src/version.h.in" "${TO}")
 else()
 	message(STATUS "You are currently on commit ${COMMIT}")
+
+	# Get all the tags
 	execute_process(COMMAND "${GIT}" show-ref --tags -d --abbrev RESULT_VARIABLE RET OUTPUT_VARIABLE TAGGEDCOMMITOUT OUTPUT_STRIP_TRAILING_WHITESPACE)

-	string(REPLACE " refs/" "\n" TAGGEDCOMMITOUT2 ${TAGGEDCOMMITOUT})
-	string(REPLACE "\n" ";" TAGGEDCOMMITLIST ${TAGGEDCOMMITOUT2})
-	list(GET TAGGEDCOMMITLIST -2 TAGGEDCOMMIT)
+	# Make sure we actually got some tags
+	string(LENGTH ${TAGGEDCOMMITOUT} TLEN)

-	if(RET OR NOT TAGGEDCOMMIT)
+	if(RET OR TLEN LESS 5)
 	    message(WARNING "Cannot determine most recent tag. Make sure that you are building either from a Git working tree or from a source archive.")
-	    set(VERSIONTAG "${COMMIT}")
+	    set(VERSIONTAG "${COMMIT}")
 	else()
-		message(STATUS "The most recent tag was at ${TAGGEDCOMMIT}")
-		if(${COMMIT} MATCHES ${TAGGEDCOMMIT})
-			message(STATUS "You are building a tagged release")
-		    set(VERSIONTAG "release")
+		# Replace a bunch of things so we end up with a semi-colon separated list
+		string(REPLACE " refs/" "\n" TAGGEDCOMMITOUT2 ${TAGGEDCOMMITOUT})
+		string(REPLACE "\n" ";" TAGGEDCOMMITLIST ${TAGGEDCOMMITOUT2})
+
+		# Grab the second-last item in the list, as that will be the hash of our most recent commit
+		list(GET TAGGEDCOMMITLIST -2 TAGGEDCOMMIT)
+
+		if(NOT TAGGEDCOMMIT)
+			message(WARNING "Cannot determine most recent tag. Make sure that you are building either from a Git working tree or from a source archive.")
+			set(VERSIONTAG "${COMMIT}")
 		else()
-			message(STATUS "You are ahead or behind of a tagged release")
-		    set(VERSIONTAG "${COMMIT}")
-		endif()
-	endif()
+			message(STATUS "The most recent tag was at ${TAGGEDCOMMIT}")
+
+			# Check if we're building that tagged commit or a different one
+			if(${COMMIT} MATCHES ${TAGGEDCOMMIT})
+				message(STATUS "You are building a tagged release")
+				set(VERSIONTAG "release")
+			else()
+				message(STATUS "You are ahead or behind of a tagged release")
+				set(VERSIONTAG "${COMMIT}")
+			endif()
+		endif()
+
+	endif()

     configure_file("src/version.h.in" "${TO}")
 endif()


Clean the native directory when using the clean target

Summary: As per title. The native directory is defintively a build byproduct.

Test Plan:
  ninja clean

Check that the native folder is gone.

Reviewers: #bitcoin_abc, Fabien

Reviewed By: #bitcoin_abc, Fabien

Subscribers: Fabien

Differential Revision: https://reviews.bitcoinabc.org/D5613

--- cmake/modules/NativeExecutable.cmake
+++ cmake/modules/NativeExecutable.cmake
@@ -105,4 +105,7 @@
 	)

 	add_custom_target(native-cmake-build DEPENDS "${NATIVE_BUILD_DIR}/CMakeCache.txt")
+
+	# Add the native directory to the list of file to cleanup.
+	set_property(DIRECTORY "${CMAKE_SOURCE_DIR}" APPEND PROPERTY ADDITIONAL_CLEAN_FILES "${NATIVE_BUILD_DIR}")
 endif()


libjansson fix

libjansson fix

--- libjansson.cmake
+++ libjansson.cmake
@@ -10,9 +10,10 @@
 include (ExternalSource)
 include (BuildSupport)

-external_git_repo (libjansson
-  HEAD
-  http://github.com/akheron/jansson.git
+external_source(libjansson
+  2.4
+  jansson-2.4.tar.gz
+  http://www.digip.org/jansson/releases
   )

 message ("Installing ${libjansson_NAME} into FlyEM build area: ${BUILDEM_DIR} ...")


rmw include directories were missing from typesupport library

--- rosidl_typesupport_connext_cpp/cmake/rosidl_typesupport_connext_cpp_generate_interfaces.cmake
+++ rosidl_typesupport_connext_cpp/cmake/rosidl_typesupport_connext_cpp_generate_interfaces.cmake
@@ -166,6 +166,7 @@
 link_directories(${Connext_LIBRARY_DIRS})
 add_library(${rosidl_generate_interfaces_TARGET}${_target_suffix} SHARED
   ${_generated_msg_files} ${_generated_external_msg_files} ${_generated_srv_files})
+ament_target_dependencies(${rosidl_generate_interfaces_TARGET}${_target_suffix} "rmw")
 if(WIN32)
   target_compile_definitions(${rosidl_generate_interfaces_TARGET}${_target_suffix}
     PRIVATE "ROSIDL_BUILDING_DLL")


Add Test: Add option to specify required plugins

--- cmake/Modules/LibAddTest.cmake
+++ cmake/Modules/LibAddTest.cmake
@@ -102,8 +102,14 @@
 #
 # PLUGIN: This argument specifies the name of the plugin for which this function creates a MSR test.
 #
+# REQUIRED_PLUGINS:
+#	This optional variable specifies a list of plugins required to run the MSR test.
+#
 # ENVIRONMENT:
 # 	This optional argument specifies environment variables defined while CTest executes the MSR test.
 function (add_plugin_shell_test PLUGIN)
-	add_s_test (${PLUGIN} "${CMAKE_SOURCE_DIR}/src/plugins/${PLUGIN}/README.md" ${ARGN} REQUIRED_PLUGINS ${PLUGIN})
+	set (multiValueArgs REQUIRED_PLUGINS)
+	cmake_parse_arguments (ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+	list (APPEND ARG_REQUIRED_PLUGINS ${PLUGIN})
+	add_s_test (${PLUGIN} "${CMAKE_SOURCE_DIR}/src/plugins/${PLUGIN}/README.md" ${ARGN} REQUIRED_PLUGINS ${ARG_REQUIRED_PLUGINS})
 endfunction ()


Fix ninja build error on windows

Fix ninja build error on windows

--- cmake/modules/BuildGTest.cmake
+++ cmake/modules/BuildGTest.cmake
@@ -15,6 +15,24 @@
 endif()

 if(WIN32)
+  set(_byproducts)
+  if(NOT MSBUILD)
+    if(${BUILD_SHARED_LIBS})
+      set(_byproducts
+        ${GTEST_INSTALL_DIR}/lib/gtestd.lib
+        ${GTEST_INSTALL_DIR}/lib/gmockd.lib
+
+        ${GTEST_INSTALL_DIR}/bin/gtestd.dll
+        ${GTEST_INSTALL_DIR}/bin/gmockd.dll
+      )
+    else()
+      set(_byproducts
+        ${GTEST_INSTALL_DIR}/lib/gtest.lib
+        ${GTEST_INSTALL_DIR}/lib/gmock.lib
+      )
+    endif()
+  endif()
+
   ExternalProject_Add(
     gtest
     GIT_REPOSITORY https://github.com/google/googletest.git
@@ -22,6 +40,7 @@

     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${GTEST_INSTALL_DIR} -DCMAKE_CXX_FLAGS=${GTEST_ADD_CXX_FLAGS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DBUILD_GMOCK=${BUILD_GMOCK} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -Dgmock_build_tests=OFF -Dgtest_force_shared_crt=ON
     INSTALL_DIR ${GTEST_INSTALL_DIR}
+    BUILD_BYPRODUCTS ${_byproducts}
   )
 else()
   # This is a workaround for Ninja not allowing us to build if these libs weren't built before
@@ -57,10 +76,10 @@

 if(WIN32)
   set(GTEST_LIBRARIES "$<$<CONFIG:Release>:${install_dir}/lib/gtest.lib>$<$<CONFIG:Debug>:${install_dir}/lib/gtestd.lib>")
-  set(GTEST_INSTALL_LIBS "${install_dir}/lib/gtest.dll")
+  set(GTEST_INSTALL_LIBS "${install_dir}/bin/gtest.dll")
   if(BUILD_GMOCK)
     set(GTEST_LIBRARIES "$<$<CONFIG:Release>:${install_dir}/lib/gmock.lib>$<$<CONFIG:Debug>:${install_dir}/lib/gmockd.lib>;${GTEST_LIBRARIES}")
-    set(GTEST_INSTALL_LIBS "${install_dir}/lib/gmock.dll;${GTEST_INSTALL_LIBS}")
+    set(GTEST_INSTALL_LIBS "${install_dir}/bin/gmock.dll;${GTEST_INSTALL_LIBS}")
   endif()
 else()
   if(${BUILD_SHARED_LIBS})


USE HINTS instead of PATHS to find OpenCL libs.

--- cmake/modules/FindOpenCL.cmake
+++ cmake/modules/FindOpenCL.cmake
@@ -29,14 +29,16 @@
 ELSE(APPLE)
     # Unix style platforms
     FIND_LIBRARY(OPENCL_LIBRARY_DIR OpenCL
-        PATHS ${OPENCL_LIB_PATH} $ENV{LD_LIBRARY_PATH}
+        HINTS ${OPENCL_LIB_PATH}
     )
+MESSAGE(${OPENCL_LIB_PATH})
+MESSAGE(${OPENCL_LIBRARY_DIR})
     GET_FILENAME_COMPONENT(OPENCL_LIBRARY_DIR ${OPENCL_LIBRARY_DIR} PATH)

     FIND_PATH(OPENCL_INCLUDE_DIR CL/cl.h
-        PATHS ${OPENCL_INC_PATH})
+        HINTS ${OPENCL_INC_PATH})
     FIND_PATH(_OPENCL_CPP_INCLUDE_DIR CL/cl.hpp
-        PATHS ${OPENCL_INC_PATH})
+        HINTS ${OPENCL_INC_PATH})
     SET(OPENCL_CFLAGS "-I${OPENCL_INCLUDE_DIR}")
     SET(OPENCL_LFLAGS "-L${OPENCL_LIBRARY_DIR} -lOpenCL")
 ENDIF(APPLE)


Use -O3 for release. (Accelerates clang by factor 3.6!)

--- cmake/modules/SetUpLinux.cmake
+++ cmake/modules/SetUpLinux.cmake
@@ -122,14 +122,14 @@
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")

   # Select flags.
-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG")
-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG")
+  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG")
+  set(CMAKE_CXX_FLAGS_RELEASE        "-O3 -DNDEBUG")
   set(CMAKE_CXX_FLAGS_OPTIMIZED      "-Ofast -DNDEBUG")
   set(CMAKE_CXX_FLAGS_DEBUG          "-g")
   set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3")
   set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -ftest-coverage -fprofile-arcs")
-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g -DNDEBUG")
-  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG")
+  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O3 -g -DNDEBUG")
+  set(CMAKE_C_FLAGS_RELEASE          "-O3 -DNDEBUG")
   set(CMAKE_C_FLAGS_OPTIMIZED        "-Ofast -DNDEBUG")
   set(CMAKE_C_FLAGS_DEBUG            "-g")
   set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline")


Disable ParaView web components

Disable ParaView web components

They are not used by tomviz.

--- projects/paraview.cmake
+++ projects/paraview.cmake
@@ -7,6 +7,7 @@
     -DVTK_RENDERING_BACKEND:STRING=OpenGL2
     -DPARAVIEW_BUILD_QT_GUI:BOOL=ON
     -DPARAVIEW_ENABLE_PYTHON:BOOL=ON
+    -DPARAVIEW_ENABLE_WEB:BOOL=OFF
     -DPARAVIEW_BUILD_PLUGIN_AdiosReader:BOOL=FALSE
     -DPARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO:BOOL=FALSE
     -DPARAVIEW_BUILD_PLUGIN_ArrowGlyph:BOOL=FALSE


build: adjust the flags addition for the standard library

The standard library cannot be built with MSVC's compiler.  However, if
it is built with the toolchain which uses MSVC, it would fail to add
this flag.  With recent VS2022 toolsets, this is a problem as we would
fail to be able to use the `offsetof` macro.  Unconditionally apply the
definition when building the standard library.

--- stdlib/cmake/modules/AddSwiftStdlib.cmake
+++ stdlib/cmake/modules/AddSwiftStdlib.cmake
@@ -215,9 +215,7 @@
     list(APPEND result "-DLLVM_ON_WIN32")
     list(APPEND result "-D_CRT_SECURE_NO_WARNINGS")
     list(APPEND result "-D_CRT_NONSTDC_NO_WARNINGS")
-    if(NOT "${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
-      list(APPEND result "-D_CRT_USE_BUILTIN_OFFSETOF")
-    endif()
+    list(APPEND result "-D_CRT_USE_BUILTIN_OFFSETOF")
     # TODO(compnerd) permit building for different families
     list(APPEND result "-D_CRT_USE_WINAPI_FAMILY_DESKTOP_APP")
     if("${CFLAGS_ARCH}" MATCHES arm)


ilastik.cmake: Message for cplex location.

--- ilastik.cmake
+++ ilastik.cmake
@@ -64,6 +64,7 @@
 if (NOT "${CMAKE_CPLEX_ROOT_DIR}" STREQUAL "")
     # Tracking depends on pgmlink, which depends on CPLEX.
     # Most people don't have CPLEX installed on their system.
+    message ("Building ilastik with CPLEX located in ${CMAKE_CPLEX_ROOT_DIR}")
     set (ilastik_dependencies ${ilastik_dependencies}  ${pgmlink_NAME})
 endif()


Added link flags for gnu when building with coverage reports

--- cmake/platform/unix/compiler/GNU.cmake
+++ cmake/platform/unix/compiler/GNU.cmake
@@ -21,6 +21,7 @@

 if (WITH_COVERAGE_REPORTS)
   add_compile_options(--coverage)
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lgcov --coverage")
 endif()

 set(GCC TRUE)


[Build] The CMake framework now takes into account the CXXFLAGS environment variable.

--- config/project_config_embeddable.cmake
+++ config/project_config_embeddable.cmake
@@ -129,6 +129,10 @@
 	"Where to install ${PROJECT_NAME}" FORCE)
   set (CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
 	"Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE)
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" CACHE STRING
+	"C++ compilation flags" FORCE)
+  set (COMPILE_FLAGS "${COMPILE_FLAGS}" CACHE STRING
+	"Supplementary C++ compilation flags" FORCE)
   set (CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" CACHE PATH
 	"Path to custom CMake Modules" FORCE)
   set (INSTALL_DOC "${INSTALL_DOC}" CACHE BOOL
@@ -535,11 +539,20 @@
 macro (init_build)
   ##
   # Compilation
-  # Note: the debug flag (-g) is set (or not) by giving the
-  # corresponding option when calling cmake:
-  # cmake -DCMAKE_BUILD_TYPE:STRING={Debug,Release,MinSizeRel,RelWithDebInfo}
-  #set (CMAKE_CXX_FLAGS "-Wall -Wextra -pedantic -Werror")
-  set (CMAKE_CXX_FLAGS "-Wall -Werror")
+  # Note:
+  #  * The debug flag (-g) is set (or not) by giving the corresponding option
+  #    when calling cmake:
+  #    cmake -DCMAKE_BUILD_TYPE:STRING={Debug,Release,MinSizeRel,RelWithDebInfo}
+  #  * The CMAKE_CXX_FLAGS is set by CMake to be equal to the CXXFLAGS
+  #    environment variable. Hence:
+  #    CXXFLAGS="-O2"; export CXXFLAGS; cmake ..
+  #    will set CMAKE_CXX_FLAGS as being equal to -O2.
+  if (NOT CMAKE_CXX_FLAGS)
+	#set (CMAKE_CXX_FLAGS "-Wall -Wextra -pedantic -Werror")
+	set (CMAKE_CXX_FLAGS "-Wall -Werror")
+  endif (NOT CMAKE_CXX_FLAGS)
+
+  #
   include_directories (BEFORE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})

   ##
@@ -1256,6 +1269,10 @@
   message (STATUS)
   message (STATUS "BUILD_SHARED_LIBS .............. : ${BUILD_SHARED_LIBS}")
   message (STATUS "CMAKE_BUILD_TYPE ............... : ${CMAKE_BUILD_TYPE}")
+  message (STATUS " * CMAKE_C_FLAGS ............... : ${CMAKE_C_FLAGS}")
+  message (STATUS " * CMAKE_CXX_FLAGS ............. : ${CMAKE_CXX_FLAGS}")
+  message (STATUS " * BUILD_FLAGS ................. : ${BUILD_FLAGS}")
+  message (STATUS " * COMPILE_FLAGS ............... : ${COMPILE_FLAGS}")
   message (STATUS "CMAKE_MODULE_PATH .............. : ${CMAKE_MODULE_PATH}")
   message (STATUS "CMAKE_INSTALL_PREFIX ........... : ${CMAKE_INSTALL_PREFIX}")
   display_doxygen ()


[Build] Generalised the module_python_add CMake macro to any type of scripts (Shell, Python, Perl, Ruby, etc).

--- config/project_config_embeddable.cmake
+++ config/project_config_embeddable.cmake
@@ -1483,8 +1483,15 @@
 endmacro (module_binary_add)

 ##
-# Add a Python script to be installed
-macro (module_python_add _script_file)
+# Add a (Shell, Python, Perl, Ruby, etc) script to be installed.
+#
+# The parameter is the relative file path of the (template) script to
+# be installed. That template file must end with the '.in' suffix.
+# Indeed, the project variables (wrapped by @@ signs) of the template file
+# are evaluated and expanded thanks to the configure command.
+# The '.in' extension of the script is dropped once installed.
+#
+macro (module_script_add _script_file)
   #
   set (_full_script_src_path ${CMAKE_CURRENT_SOURCE_DIR}/${_script_file}.in)
   set (_full_script_path ${CMAKE_CURRENT_BINARY_DIR}/${_script_file})
@@ -1492,11 +1499,14 @@
 	#
     configure_file (${_full_script_src_path} ${_full_script_path} @ONLY)

-    # Add the 'scripts_${MODULE_NAME}' target, depending on the
-    # converted (Python) scripts
-    add_custom_target (scripts_${MODULE_NAME} ALL DEPENDS ${_full_script_path})
-
-    # Install the (Python) script file
+	# Extract the file name (only) from the full file path
+	get_filename_component (_script_alone ${_script_file} NAME)
+
+	# Add the 'scripts_${MODULE_NAME}' target, depending on the
+    # converted (Shell, Python, Perl, Ruby, etc) scripts
+    add_custom_target (${_script_alone}_script ALL DEPENDS ${_full_script_path})
+
+    # Install the (Shell, Python, Perl, Ruby, etc) script file
     install (PROGRAMS ${_full_script_path} DESTINATION bin COMPONENT devel)

   else (EXISTS ${_full_script_src_path})
@@ -1505,7 +1515,6 @@
   endif (EXISTS ${_full_script_src_path})

   # Register the binary target in the project (for reporting purpose)
-  get_filename_component (_script_alone ${_script_file} NAME)
   list (APPEND PROJ_ALL_BIN_TARGETS ${_script_alone})
   set (PROJ_ALL_BIN_TARGETS ${PROJ_ALL_BIN_TARGETS} PARENT_SCOPE)

@@ -1514,7 +1523,7 @@
   list (APPEND ${MODULE_NAME}_ALL_EXECS ${_script_alone})
   set (${MODULE_NAME}_ALL_EXECS ${${MODULE_NAME}_ALL_EXECS} PARENT_SCOPE)

-endmacro (module_python_add)
+endmacro (module_script_add)

 ##
 # Installation of the CMake import helper, so that third party projects


ENH: update download location for libpng SuperBuild

--- SuperBuild/CMake/External_png.cmake
+++ SuperBuild/CMake/External_png.cmake
@@ -23,7 +23,7 @@

     ExternalProject_Add(${proj}
       PREFIX ${proj}
-      URL "http://sourceforge.net/projects/libpng/files/libpng16/1.6.16/lpng1616.zip/download"
+      URL "http://sourceforge.net/projects/libpng/files/libpng16/older-releases/1.6.16/lpng1616.zip/download"
       URL_MD5 c90c9587c9a5c735327fb3f6900f6b03
       BINARY_DIR ${PNG_SB_BUILD_DIR}
       INSTALL_DIR ${SB_INSTALL_PREFIX}


Update DownloadLibrary.cmake

Update DownloadLibrary.cmake

--- cmake-modules/DownloadLibrary.cmake
+++ cmake-modules/DownloadLibrary.cmake
@@ -19,7 +19,7 @@
 			set(TARBELL_NAME ${name}.tgz)
 		endif()

-		execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf TARBELL_NAME WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+		execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf ${TARBELL_NAME} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
 	endif()

 	message(STATUS "Found ${name} in source directory")


Added dupicate lib list for opencv libs in FindOpenCV.cmake

--- cmake/CMakeModules/FindOpenCV.cmake
+++ cmake/CMakeModules/FindOpenCV.cmake
@@ -120,6 +120,8 @@
    message( "Could not find optional OpenCV Image Codecs Library" )
 endif()

+set(OPENCV_LIBRARIES ${OPENCV_LIBRARIES} ${OPENCV_LIBRARIES} )
+
 if(OPENCV_FOUND)
    message( STATUS "OPENCV_INCLUDE_DIR = ${OPENCV_INCLUDE_DIR}" )
    message( STATUS "OPENCV_LIBRARIES   = ${OPENCV_LIBRARIES}" )


Disable invalid cross-compiling variables for cmake of higher version.

--- cmake/cross_compiling/android.cmake
+++ cmake/cross_compiling/android.cmake
@@ -108,6 +108,7 @@
         ENDIF()
         IF(ANDROID_ABI STREQUAL "arm64-v8a")
             SET(ANDROID_TOOLCHAIN_NAME aarch64-linux-android)
+            SET(CMAKE_SYSTEM_PROCESSOR aarch64)
         ENDIF()
         SET(ANDROID_TOOLCHAIN_PREFIX "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_NAME}-")
     ENDIF()
@@ -166,7 +167,7 @@
     ENDIF()

     IF(ANDROID_ABI STREQUAL "arm64-v8a")
-      LIST(APPEND ANDROID_COMPILER_FLAGS -march=armv8-a)
+        LIST(APPEND ANDROID_COMPILER_FLAGS -march=armv8-a)
     ENDIF()

     STRING(REPLACE ";" " " ANDROID_COMPILER_FLAGS "${ANDROID_COMPILER_FLAGS}")
@@ -193,6 +194,10 @@
         SET(CMAKE_ANDROID_STANDALONE_TOOLCHAIN ${ANDROID_STANDALONE_TOOLCHAIN})
     ENDIF()
     SET(CMAKE_ANDROID_ARCH_ABI ${ANDROID_ABI})
-    SET(CMAKE_ANDROID_ARM_MODE ${ANDROID_ARM_MODE})
-    SET(CMAKE_ANDROID_ARM_NEON ${ANDROID_ARM_NEON})
-ENDIF()
+    IF(ANDROID_ABI MATCHES "^armeabi(-v7a)?$")
+        SET(CMAKE_ANDROID_ARM_MODE ${ANDROID_ARM_MODE})
+        IF(ANDROID_ABI STREQUAL "armeabi-v7a")
+            SET(CMAKE_ANDROID_ARM_NEON ${ANDROID_ARM_NEON})
+        ENDIF()
+    ENDIF()
+ENDIF()


Detect VS2015

Detect VS2015

--- cmake/dev/check_configuration.cmake
+++ cmake/dev/check_configuration.cmake
@@ -54,5 +54,11 @@
         else()
             set(MSVC_ARCH "i86Win32VS2013")
         endif()
+    elseif(MSVC) # Expect VS2015
+        if(CMAKE_CL_64)
+            set(MSVC_ARCH "x64Win64VS2015")
+        else()
+            set(MSVC_ARCH "i86Win32VS2015")
+        endif()
     endif()
 endmacro()


[gardening] Invert an if condition to reduce indentation.

--- cmake/modules/SwiftComponents.cmake
+++ cmake/modules/SwiftComponents.cmake
@@ -119,9 +119,11 @@
   precondition(component MESSAGE "Component name is required")

   swift_is_installing_component("${component}" is_installing)
-  if(is_installing)
-    install(${ARGN})
+  if(NOT is_installing)
+    return()
   endif()
+
+  install(${ARGN})
 endfunction()

 function(swift_install_symlink_component component)


Forward HUNTER_STATUS_DEBUG

Forward HUNTER_STATUS_DEBUG

--- cmake/modules/hunter_download.cmake
+++ cmake/modules/hunter_download.cmake
@@ -34,7 +34,8 @@

   set(ver ${HUNTER_${h_name}_VERSION})
   if(NOT ver AND ${h_root_name})
-    # custom location
+    # function `hunter_add_version` will skip set if root already
+    # defined by custom location => ver is empty
     return()
   endif()

@@ -134,11 +135,14 @@
     set(h_generator)
   endif()

+  hunter_status_debug("Run generate")
+
   # Configure and build download project
   execute_process(
       COMMAND
       ${CMAKE_COMMAND}
       "-DCMAKE_TOOLCHAIN_FILE=${toolchain_wrapper}"
+      "-DHUNTER_STATUS_DEBUG=${HUNTER_STATUS_DEBUG}"
       ${h_generator}
       ${verbose_makefile}
       "./"
@@ -151,6 +155,8 @@
   if(NOT ${h_generate_result} EQUAL 0)
     hunter_fatal_error("generate step failed")
   endif()
+
+  hunter_status_debug("Run build")

   execute_process(
       COMMAND


hunter_download: add stubs hunter_load_from_cache and hunter_save_to_cache

--- cmake/modules/hunter_download.cmake
+++ cmake/modules/hunter_download.cmake
@@ -7,8 +7,10 @@
 include(hunter_find_stamps)
 include(hunter_internal_error)
 include(hunter_jobs_number)
+include(hunter_load_from_cache)
 include(hunter_print_cmd)
 include(hunter_register_dependency)
+include(hunter_save_to_cache)
 include(hunter_status_debug)
 include(hunter_status_print)
 include(hunter_test_string_not_empty)
@@ -125,6 +127,15 @@
   endif()
   set(HUNTER_PACKAGE_SOURCE_DIR "${HUNTER_PACKAGE_HOME_DIR}/Source")

+  if(HUNTER_PACKAGE_CACHEABLE)
+    if(NOT HUNTER_DOWNLOAD_SCHEME_INSTALL)
+      hunter_internal_error("Unpack-only packages is cacheable by default")
+    endif()
+    set(HUNTER_PACKAGE_INSTALL_PREFIX "${HUNTER_PACKAGE_HOME_DIR}/Install")
+  else()
+    set(HUNTER_PACKAGE_INSTALL_PREFIX "${HUNTER_INSTALL_PREFIX}")
+  endif()
+
   if(HUNTER_DOWNLOAD_SCHEME_INSTALL)
     set(${root_name} "${HUNTER_INSTALL_PREFIX}")
     hunter_status_debug("Install to: ${HUNTER_INSTALL_PREFIX}")
@@ -157,6 +168,9 @@
   )

   foreach(deps ${HUNTER_PACKAGE_DEPENDS_ON})
+    if(HUNTER_DOWNLOAD_SCHEME_INSTALL)
+      hunter_internal_error("Unpack-only scheme can't depends on anything")
+    endif()
     # Register explicit dependency
     hunter_register_dependency(
         PACKAGE "${HUNTER_PACKAGE_NAME};${HUNTER_PACKAGE_COMPONENT}"
@@ -187,6 +201,17 @@
   # While locking other instance can finish package building
   if(EXISTS "${HUNTER_PACKAGE_DONE_STAMP}")
     hunter_status_debug("Package already installed: ${HUNTER_PACKAGE_NAME}")
+    if(hunter_has_component)
+      hunter_status_debug("Component: ${HUNTER_PACKAGE_COMPONENT}")
+    endif()
+    return()
+  endif()
+
+  # Check if package can be loaded from cache
+  hunter_load_from_cache()
+
+  if(EXISTS "${HUNTER_PACKAGE_DONE_STAMP}")
+    hunter_status_debug("Package installed from cache: ${HUNTER_PACKAGE_NAME}")
     if(hunter_has_component)
       hunter_status_debug("Component: ${HUNTER_PACKAGE_COMPONENT}")
     endif()
@@ -339,6 +364,8 @@

   hunter_find_stamps("${HUNTER_PACKAGE_BUILD_DIR}")

+  hunter_save_to_cache()
+
   file(REMOVE_RECURSE "${HUNTER_PACKAGE_BUILD_DIR}")
   if(HUNTER_DOWNLOAD_SCHEME_INSTALL)
     # Unpacked directory not needed (save some disk space)
@@ -349,5 +376,9 @@
   file(REMOVE "${HUNTER_DOWNLOAD_TOOLCHAIN}")
   file(REMOVE "${HUNTER_ARGS_FILE}")

+  if(HUNTER_PACKAGE_CACHEABLE)
+    file(REMOVE_RECURSE "${HUNTER_PACKAGE_INSTALL_PREFIX}")
+  endif()
+
   file(WRITE "${HUNTER_PACKAGE_DONE_STAMP}" "")
 endfunction()


ilastik.cmake: Updated git stamp

ilastik.cmake: Updated git stamp

--- ilastik.cmake
+++ ilastik.cmake
@@ -36,13 +36,12 @@
 include (futures)

 # select the desired ilastik commit
-set(DEFAULT_ILASTIK_VERSION 18026ae2efb9e9e04046598cd5fccca3a42bcdaa) # 2014-06-11
+set(DEFAULT_ILASTIK_VERSION eb3940aea782c301ce470f6342c457c94a8bfece) # 2014-07-29
 IF(NOT DEFINED ILASTIK_VERSION)
     SET(ILASTIK_VERSION "${DEFAULT_ILASTIK_VERSION}")
 ENDIF()
 SET(ILASTIK_VERSION ${ILASTIK_VERSION}
-    CACHE STRING "Specify ilastik branch/tag/commit to be used (default: ${DEFAULT_ILASTIK_VERSION})"
-    FORCE)
+    CACHE STRING "Specify ilastik branch/tag/commit to be used (default: ${DEFAULT_ILASTIK_VERSION})")

 external_git_repo (ilastik
     ${ILASTIK_VERSION}


set CMAKE_CROSSCOMPILING to true for android toolchain

--- toolchains/android-studio.toolchain.cmake
+++ toolchains/android-studio.toolchain.cmake
@@ -19,6 +19,8 @@
 add_definitions( -D__ANDROID__ )

 set( TNUN_os_suffix Android )
+
+set( CMAKE_CROSSCOMPILING true )

 if("${ANDROID_TOOLCHAIN}" STREQUAL "clang")
     include( "${CMAKE_CURRENT_LIST_DIR}/clang.cmake" )


[cmake] adds find tbb for buildbot

[cmake] adds find tbb for buildbot

--- cmake/modules/DuneGridMultiscaleMacros.cmake
+++ cmake/modules/DuneGridMultiscaleMacros.cmake
@@ -0,0 +1,2 @@
+include(FindTBB)
+find_package(TBB)


COMP: add include for external projects

COMP: add include for external projects

--- otbIncludeDirectories.cmake
+++ otbIncludeDirectories.cmake
@@ -52,6 +52,7 @@
 #   ${OTB_SOURCE_DIR}/Utilities/otbossim/include/ossim/projection
 # Add otbossimplugins/ossim/otb into the include directories path
   ${OTB_SOURCE_DIR}/Utilities/otbossimplugins/ossim
+  ${OTB_SOURCE_DIR}/Utilities/otbossimplugins/ossim/otb
   ${OTB_SOURCE_DIR}/Utilities/dxflib
   ${OTB_SOURCE_DIR}/Utilities/InsightJournal
   ${OTB_SOURCE_DIR}/Utilities/otb6S


Libprocess: cleaned up definition order in CMake config.

--- 3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
+++ 3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
@@ -142,10 +142,15 @@
   MESOS_CONTAINERIZER mesos-containerizer
   CACHE STRING "Target for containerizer")

+# Define target for docker executor.
+set(
+  MESOS_DOCKER_EXECUTOR mesos-docker-executor
+  CACHE STRING "Target for docker executor")
+
 # Define target for command executor.
 set(
   MESOS_EXECUTOR mesos-executor
-  CACHE STRING "Target for executor")
+  CACHE STRING "Target for command executor")

 # Define target for fetcher.
 set(
@@ -161,8 +166,3 @@
 set(
   MESOS_USAGE mesos-usage
   CACHE STRING "Target for usage")
-
-# Define target for docker executor.
-set(
-  MESOS_DOCKER_EXECUTOR mesos-docker-executor
-  CACHE STRING "Target for docker executor")


cmake-modules:
 * FindThirdPartyPython.cmake : removed the line searching for Python versions other than 2.7

git-svn-id: ed1ce8e5c168003d808aec37bc6fda77b178f7bb@3307 c330d7e9-fc0c-0410-a5b3-fd85c6f5aa8f

--- trunk/cmake-modules/FindThirdPartyPython.cmake
+++ trunk/cmake-modules/FindThirdPartyPython.cmake
@@ -5,13 +5,8 @@
 # ---------------------------------

 IF(WIN32)
-FIND_PATH(PATH_PYTHON include/Python.h PATHS
-		"c:\python27" $ENV{OpenViBE_dependencies}
-		[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
-		[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
-		[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
-		[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
-		[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath])
+	FIND_PATH(PATH_PYTHON include/Python.h PATHS "c:\python27" $ENV{OpenViBE_dependencies}	[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath])
+
 	IF(PATH_PYTHON)
 		MESSAGE(STATUS "  Found Python...")
 		INCLUDE_DIRECTORIES(${PATH_PYTHON}/include)


COMP: Make MITK compatible to CMake 3.5

COMP: Make MITK compatible to CMake 3.5

--- Modules/CppMicroServices/cmake/CMakeParseArguments.cmake
+++ Modules/CppMicroServices/cmake/CMakeParseArguments.cmake
@@ -1,186 +0,0 @@
-# CMAKE_PARSE_ARGUMENTS(<prefix> <options> <one_value_keywords> <multi_value_keywords> args...)
-#
-# CMAKE_PARSE_ARGUMENTS() is intended to be used in macros or functions for
-# parsing the arguments given to that macro or function.
-# It processes the arguments and defines a set of variables which hold the
-# values of the respective options.
-#
-# The <options> argument contains all options for the respective macro,
-# i.e. keywords which can be used when calling the macro without any value
-# following, like e.g. the OPTIONAL keyword of the install() command.
-#
-# The <one_value_keywords> argument contains all keywords for this macro
-# which are followed by one value, like e.g. DESTINATION keyword of the
-# install() command.
-#
-# The <multi_value_keywords> argument contains all keywords for this macro
-# which can be followed by more than one value, like e.g. the TARGETS or
-# FILES keywords of the install() command.
-#
-# When done, CMAKE_PARSE_ARGUMENTS() will have defined for each of the
-# keywords listed in <options>, <one_value_keywords> and
-# <multi_value_keywords> a variable composed of the given <prefix>
-# followed by "_" and the name of the respective keyword.
-# These variables will then hold the respective value from the argument list.
-# For the <options> keywords this will be TRUE or FALSE.
-#
-# All remaining arguments are collected in a variable
-# <prefix>_UNPARSED_ARGUMENTS, this can be checked afterwards to see whether
-# your macro was called with unrecognized parameters.
-#
-# As an example here a my_install() macro, which takes similar arguments as the
-# real install() command:
-#
-#   function(MY_INSTALL)
-#     set(options OPTIONAL FAST)
-#     set(oneValueArgs DESTINATION RENAME)
-#     set(multiValueArgs TARGETS CONFIGURATIONS)
-#     cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
-#     ...
-#
-# Assume my_install() has been called like this:
-#   my_install(TARGETS foo bar DESTINATION bin OPTIONAL blub)
-#
-# After the cmake_parse_arguments() call the macro will have set the following
-# variables:
-#   MY_INSTALL_OPTIONAL = TRUE
-#   MY_INSTALL_FAST = FALSE (this option was not used when calling my_install()
-#   MY_INSTALL_DESTINATION = "bin"
-#   MY_INSTALL_RENAME = "" (was not used)
-#   MY_INSTALL_TARGETS = "foo;bar"
-#   MY_INSTALL_CONFIGURATIONS = "" (was not used)
-#   MY_INSTALL_UNPARSED_ARGUMENTS = "blub" (no value expected after "OPTIONAL"
-#
-# You can then continue and process these variables.
-#
-# Keywords terminate lists of values, e.g. if directly after a one_value_keyword
-# another recognized keyword follows, this is interpreted as the beginning of
-# the new option.
-# E.g. my_install(TARGETS foo DESTINATION OPTIONAL) would result in
-# MY_INSTALL_DESTINATION set to "OPTIONAL", but MY_INSTALL_DESTINATION would
-# be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefor.
-
-#=============================================================================
-# Copyright 2010 Alexander Neundorf <neundorf@kde.org>
-#
-# CMake - Cross Platform Makefile Generator
-# Copyright 2000-2011 Kitware, Inc., Insight Software Consortium
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-#   notice, this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in the
-#   documentation and/or other materials provided with the distribution.
-#
-# * Neither the names of Kitware, Inc., the Insight Software Consortium,
-#  nor the names of their contributors may be used to endorse or promote
-#  products derived from this software without specific prior written
-#  permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# ------------------------------------------------------------------------------
-#
-# The above copyright and license notice applies to distributions of
-# CMake in source and binary form.  Some source files contain additional
-# notices of original copyright by their contributors; see each source
-# for details.  Third-party software packages supplied with CMake under
-# compatible licenses provide their own copyright notices documented in
-# corresponding subdirectories.
-#
-#------------------------------------------------------------------------------
-#
-# CMake was initially developed by Kitware with the following sponsorship:
-#
-#  * National Library of Medicine at the National Institutes of Health
-#    as part of the Insight Segmentation and Registration Toolkit (ITK).
-#
-#  * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel
-#    Visualization Initiative.
-#
-#  * National Alliance for Medical Image Computing (NAMIC) is funded by the
-#    National Institutes of Health through the NIH Roadmap for Medical Research,
-#    Grant U54 EB005149.
-#
-#  * Kitware, Inc.
-#=============================================================================
-
-
-if(__CMAKE_PARSE_ARGUMENTS_INCLUDED)
-  return()
-endif()
-set(__CMAKE_PARSE_ARGUMENTS_INCLUDED TRUE)
-
-
-function(CMAKE_PARSE_ARGUMENTS prefix _optionNames _singleArgNames _multiArgNames)
-  # first set all result variables to empty/FALSE
-  foreach(arg_name ${_singleArgNames} ${_multiArgNames})
-    set(${prefix}_${arg_name})
-  endforeach()
-
-  foreach(option ${_optionNames})
-    set(${prefix}_${option} FALSE)
-  endforeach()
-
-  set(${prefix}_UNPARSED_ARGUMENTS)
-
-  set(insideValues FALSE)
-  set(currentArgName)
-
-  # now iterate over all arguments and fill the result variables
-  foreach(currentArg ${ARGN})
-    list(FIND _optionNames "${currentArg}" optionIndex)  # ... then this marks the end of the arguments belonging to this keyword
-    list(FIND _singleArgNames "${currentArg}" singleArgIndex)  # ... then this marks the end of the arguments belonging to this keyword
-    list(FIND _multiArgNames "${currentArg}" multiArgIndex)  # ... then this marks the end of the arguments belonging to this keyword
-
-    if(${optionIndex} EQUAL -1  AND  ${singleArgIndex} EQUAL -1  AND  ${multiArgIndex} EQUAL -1)
-      if(insideValues)
-        if("${insideValues}" STREQUAL "SINGLE")
-          set(${prefix}_${currentArgName} ${currentArg})
-          set(insideValues FALSE)
-        elseif("${insideValues}" STREQUAL "MULTI")
-          list(APPEND ${prefix}_${currentArgName} ${currentArg})
-        endif()
-      else()
-        list(APPEND ${prefix}_UNPARSED_ARGUMENTS ${currentArg})
-      endif()
-    else()
-      if(NOT ${optionIndex} EQUAL -1)
-        set(${prefix}_${currentArg} TRUE)
-        set(insideValues FALSE)
-      elseif(NOT ${singleArgIndex} EQUAL -1)
-        set(currentArgName ${currentArg})
-        set(${prefix}_${currentArgName})
-        set(insideValues "SINGLE")
-      elseif(NOT ${multiArgIndex} EQUAL -1)
-        set(currentArgName ${currentArg})
-        set(${prefix}_${currentArgName})
-        set(insideValues "MULTI")
-      endif()
-    endif()
-
-  endforeach()
-
-  # propagate the result variables to the caller:
-  foreach(arg_name ${_singleArgNames} ${_multiArgNames} ${_optionNames})
-    set(${prefix}_${arg_name}  ${${prefix}_${arg_name}} PARENT_SCOPE)
-  endforeach()
-  set(${prefix}_UNPARSED_ARGUMENTS ${${prefix}_UNPARSED_ARGUMENTS} PARENT_SCOPE)
-
-endfunction()


Disable USE_TRANSFER_FUNCTION_CHARTS by default ctkVTKScalarsToColorsView requires a special API not yet in VTK

--- Libs/Visualization/VTK/Widgets/ctk_library_options.cmake
+++ Libs/Visualization/VTK/Widgets/ctk_library_options.cmake
@@ -6,5 +6,5 @@
 #

 set(ctk_library_options
-  USE_TRANSFER_FUNCTION_CHARTS:ON
+  USE_TRANSFER_FUNCTION_CHARTS:OFF
   )


Fix build of newlib on aarch64

Fix build of newlib on aarch64

newlib on aarch64 uses a few nonstandard features that require special
build flags:

- Instruction formats not supported by LLVM's assembler, requiring
  `-no-integrated-as` to force use of binutils as

- Inline assembly via `asm()` instead of `__asm__()`, not available in
  clang with `-std=c99` unless `-fasm` is given.

Signed-off-by: Chris Pavlina <adf771424372a9b38c575eeb6ecbe07ad50f7fe7@ainfosec.com>

--- scripts/cmake/depends/newlib.cmake
+++ scripts/cmake/depends/newlib.cmake
@@ -30,6 +30,8 @@
         list(APPEND NEWLIB_C_FLAGS
             "-O3"
             "-DNDEBUG"
+            "-no-integrated-as"
+            "-fasm"
         )
     endif()


Turn off PGO unprofiled warning on Linux (#17262)

This warning will break the build when new files are added to the build that do not have PGO data, meaning that release builds will be broken until a new PGO collection can be run. We should not break the build if there are not counts for new files.

--- pgosupport.cmake
+++ pgosupport.cmake
@@ -36,7 +36,7 @@
                 if(UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELEASE OR UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELWITHDEBINFO)
                     if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.6)
                         if(HAVE_LTO)
-                            target_compile_options(${TargetName} PRIVATE -flto -fprofile-instr-use=${ProfilePath} -Wno-profile-instr-out-of-date)
+                            target_compile_options(${TargetName} PRIVATE -flto -fprofile-instr-use=${ProfilePath} -Wno-profile-instr-out-of-date -Wno-profile-instr-unprofiled)
                             set_property(TARGET ${TargetName} APPEND_STRING PROPERTY LINK_FLAGS " -flto -fuse-ld=gold -fprofile-instr-use=${ProfilePath}")
                         else(HAVE_LTO)
                             message(WARNING "LTO is not supported, skipping profile guided optimizations")


Buildroot.cmake: Ensure OUTPUT parameter was passed

This avoids weird breakages.

--- Buildroot.cmake
+++ Buildroot.cmake
@@ -171,6 +171,10 @@
     ensure_all_arguments_parsed(buildroot_target "${BR_UNPARSED_ARGUMENTS}")

     default_value(BR_CONFIG ${CMAKE_CURRENT_SOURCE_DIR}/config)
+
+    if(NOT ${BUILDROOT_OUTPUT})
+        message(FATAL_ERROR "buildroot_target(${name}): the OUTPUT paramater is required")
+    endif()

     # Sets build_dir, config_commands
     _buildroot_common_setup(${name})


[cmake] serach for boost log

[cmake] serach for boost log

--- cmake/siconos_find_common_dep.cmake
+++ cmake/siconos_find_common_dep.cmake
@@ -71,6 +71,11 @@
 # --- Boost ---
 compile_with(Boost 1.47 REQUIRED)

+SET(WITH_BOOST_LOG TRUE)
+IF(WITH_BOOST_LOG)
+  compile_with(Boost 1.47 COMPONENTS log  REQUIRED)
+  APPEND_CXX_FLAGS("-DBOOST_LOG_DYN_LINK")
+ENDIF()
 # --- Bullet ---
 IF(WITH_BULLET)
   COMPILE_WITH(Bullet REQUIRED)


Making RuntimeGeneratorTests parallelizable

--- cmake_modules/GenZorbaRuntime.cmake
+++ cmake_modules/GenZorbaRuntime.cmake
@@ -64,7 +64,9 @@

 # If we are testing the generation, overwrite gen_file with a dummy location.
 IF(test_only)
-  SET(gen_file "${binary_dir}/gen_test.tmp")
+  STRING(REGEX REPLACE "[/\\]" "_" gen_file "${gen_relfilename}")
+  SET(gen_file "${binary_dir}/gen_test.tmp.${gen_file}")
+  MESSAGE("  dobbbling: ${gen_file}")
 ENDIF(test_only)


Update set of elements output as CDATA.

Update set of elements output as CDATA.

--- test/fots/ImportFOTS.cmake
+++ test/fots/ImportFOTS.cmake
@@ -21,6 +21,9 @@
 # Change this to publish updated FOTS archives
 SET (FOTS_ARCHIVE "FOTS_191212.tgz")

+# Change this to modify which elements in FOTS driver results are output
+# as CDATA
+SET (FOTS_CDATA_ELEMENTS "fots:query test assert-xml")

 # Download and unpack pre-created archive
 SET (_outdir "${BUILDDIR}/test/fots")
@@ -70,7 +73,7 @@
     "-e mode:=run-test-sets -e testSetPrefixes:=${_testset} "
     "-e expectedFailuresPath:=${BUILDDIR}/FOTSExpectedFailures.xml "
     "--disable-http-resolution --indent "
-    "-z cdata-section-elements=\"fots:query result\")\n"
+    "-z \"cdata-section-elements=${FOTS_CDATA_ELEMENTS}\")\n"
     "ZORBA_SET_TEST_PROPERTY (FOTS/${_testset} "
     "FAIL_REGULAR_EXPRESSION \"result=\\\"fail\\\"\")\n")

@@ -96,7 +99,7 @@
       "-e testSetName:=${_testset} -e testCaseName:=${_testcase} "
       "-e expectedFailuresPath:=${BUILDDIR}/FOTSExpectedFailures.xml "
       "--disable-http-resolution --indent "
-      "-z cdata-section-elements=\"fots:query result\")\n"
+      "-z \"cdata-section-elements=${FOTS_CDATA_ELEMENTS}\")\n"
       "ZORBA_SET_TEST_PROPERTY (FOTS/${_testset}/${_testcase} "
       "PASS_REGULAR_EXPRESSION \"name=\\\"${_testcase}\\\" result=\\\"pass\\\"\")\n")
   ENDFOREACH (_testcase)


cmake: fix build with CMake 3.9.0

cmake: fix build with CMake 3.9.0

--- cmake/OpenCVPCHSupport.cmake
+++ cmake/OpenCVPCHSupport.cmake
@@ -323,10 +323,7 @@

         get_target_property(_sources ${_targetName} SOURCES)
         foreach(src ${_sources})
-          if(NOT "${src}" MATCHES "\\.mm$"
-               AND NOT "${src}" MATCHES "\\.h$" AND NOT "${src}" MATCHES "\\.hpp$" # header files
-               AND NOT "${src}" MATCHES "^\$" # CMake generator expressions
-          )
+          if("${src}" MATCHES "\\.c(pp|xx)?$")
             get_source_file_property(oldProps "${src}" COMPILE_FLAGS)
             get_source_file_property(oldProps2 "${src}" COMPILE_DEFINITIONS)
             if(NOT oldProps AND NOT oldProps2)


Minor cleanup of uneeded code

Minor cleanup of uneeded code

--- cmake/Platform/Arduino.cmake
+++ cmake/Platform/Arduino.cmake
@@ -647,17 +647,13 @@
 #=============================================================================#
 function(setup_arduino_target TARGET_NAME BOARD_ID ALL_SRCS ALL_LIBS COMPILE_FLAGS LINK_FLAGS)

-    foreach(LIB_DEP ${ALL_LIBS})
-        set(LIB_DEP_INCLUDES "${LIB_DEP_INCLUDES} -I${LIB_DEP}")
-    endforeach()
-
     add_executable(${TARGET_NAME} ${ALL_SRCS})
     set_target_properties(${TARGET_NAME} PROPERTIES SUFFIX ".elf")

     get_arduino_flags(ARDUINO_COMPILE_FLAGS ARDUINO_LINK_FLAGS  ${BOARD_ID})

     set_target_properties(${TARGET_NAME} PROPERTIES
-                COMPILE_FLAGS "${ARDUINO_COMPILE_FLAGS} ${COMPILE_FLAGS} ${LIB_DEP_INCLUDES}"
+                COMPILE_FLAGS "${ARDUINO_COMPILE_FLAGS} ${COMPILE_FLAGS}"
                 LINK_FLAGS "${ARDUINO_LINK_FLAGS} ${LINK_FLAGS}")
     target_link_libraries(${TARGET_NAME} ${ALL_LIBS} "-lc -lm")


Adjust warnings for both gcc and clang

Adjust warnings for both gcc and clang

--- cmake/PlatformLinuxGCC.cmake
+++ cmake/PlatformLinuxGCC.cmake
@@ -35,7 +35,7 @@
     set(EXCEPTION_FLAG "-fno-exceptions")
 endif()

-set(LINUX_COMPILE_FLAGS "-pthread -pipe -fPIC -Wreturn-type -Wall -Wextra -Wcast-align -Wno-unused-parameter -Wno-unused-variable -Wno-overloaded-virtual -Wno-reinterpret-base-class ${EXCEPTION_FLAG}")
+set(LINUX_COMPILE_FLAGS "-pthread -pipe -fPIC -Wreturn-type -Wall -Wextra -Wcast-align -Wno-unused-parameter -Wno-unused-variable ${EXCEPTION_FLAG}")
 # pthread       -> use pthread library
 # no-rtti       -> disable c++ rtti
 # no-exceptions -> disable exception handling
@@ -43,6 +43,14 @@
 # fPIC          -> use position independent code
 # -Wreturn-type -Werror=return-type -> missing returns in functions and methods are handled as errors which stops the compilation
 # -Wshadow -> e.g. when a parameter is named like a member, too many warnings, disabled for now
+
+if(CMAKE_COMPILER_IS_GNUCXX)
+    # gcc
+    set(LINUX_COMPILE_FLAGS "${LINUX_COMPILE_FLAGS} -Wno-unused-but-set-variable")
+elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    # clang
+    set(LINUX_COMPILE_FLAGS "${LINUX_COMPILE_FLAGS} -Wno-reinterpret-base-class -Wno-overloaded-virtual")
+endif()

 set(LINUX_LINKER_FLAGS "-pthread")


cmake: Fix detection of pthread_setname_np() with 3 args

--- cmake/ThreadNameDetect.cmake
+++ cmake/ThreadNameDetect.cmake
@@ -71,7 +71,7 @@
                      ${PTHREAD_HEADERS}

                      int main () {
-                        pthread_setname_np ((pthread_t) 0, \"thread_name\");
+                        pthread_setname_np ((pthread_t) 0, \"thread_name\", 0);
                         return 0;
                      }"
                     PLIBSYS_HAS_POSIX_SETNAME_NP_3


disable libxsmm by default

disable libxsmm by default

--- cmake/external/libxsmm.cmake
+++ cmake/external/libxsmm.cmake
@@ -13,19 +13,20 @@
 # limitations under the License.
 #

-# NOTE: libxsmm is enabled with with_mkl, add new option if necessary
-IF(NOT WITH_MKL)
+OPTION(WITH_LIBXSMM "Compile with libxsmm" OFF)
+
+IF(NOT WITH_LIBXSMM)
     return()
 ENDIF()

-IF(WIN32 OR APPLE)
-    MESSAGE(WARNING "Windows or Mac is not supported with libxsmm in Paddle yet.")
+IF(WIN32 OR APPLE OR ANDROID OR IOS)
+    MESSAGE(WARNING "Windows, Mac or Mobile are not supported with libxsmm in Paddle yet.")
+    SET(WITH_LIBXSMM OFF CACHE STRING "Disable LIBXSMM" FORCE)
     return()
 ENDIF()

 INCLUDE (ExternalProject)

-SET(WITH_LIBXSMM ON)
 SET(LIBXSMM_SOURCES_DIR ${THIRD_PARTY_PATH}/libxsmm)
 SET(LIBXSMM_INSTALL_DIR ${THIRD_PARTY_PATH}/install/libxsmm)
 SET(LIBXSMM_INCLUDE_DIR "${LIBXSMM_INSTALL_DIR}/include" CACHE PATH "LIBXSMM include directory." FORCE)


add_swift_host_library: make a trivial wrapper around add_llvm_library

--- cmake/modules/AddSwift.cmake
+++ cmake/modules/AddSwift.cmake
@@ -1319,49 +1319,12 @@
 #
 # Usage:
 #   add_swift_host_library(name
-#     [SHARED]
-#     [STATIC]
-#     [DEPENDS dep1 ...]
-#     [LINK_LIBS lib1 ...]
-#     [SWIFT_MODULE_DEPENDS dep1 ...]
-#     [LINK_COMPONENTS comp1 ...]
-#     [INSTALL]
-#     INSTALL_IN_COMPONENT comp
-#     source1 [source2 source3 ...])
-#
-# name
-#   Name of the library (e.g., swiftParse).
-#
-# SHARED
-#   Build a shared library.
-#
-# STATIC
-#   Build a static library.
-#
-# DEPENDS
-#   Targets that this library depends on.
-#
-# LINK_LIBS
-#   Libraries this library depends on.
-#
-# LINK_COMPONENTS
-#   LLVM components this library depends on.
-#
-# INSTALL_IN_COMPONENT comp
-#   The Swift installation component that this library belongs to.
-#
-# source1 ...
-#   Sources to add into this library.
+#     [FORCE_BUILD_OPTIMIZED]
+#     [...]
 function(add_swift_host_library name)
-  set(options
-        FORCE_BUILD_OPTIMIZED
-        SHARED
-        STATIC)
+  set(options FORCE_BUILD_OPTIMIZED)
   set(single_parameter_options)
-  set(multiple_parameter_options
-        DEPENDS
-        LINK_LIBS
-        LINK_COMPONENTS)
+  set(multiple_parameter_options)

   cmake_parse_arguments(ASHL
                         "${options}"
@@ -1370,25 +1333,10 @@
                         ${ARGN})
   set(ASHL_SOURCES ${ASHL_UNPARSED_ARGUMENTS})

-  translate_flags(ASHL "${options}")
-
-  if(NOT ASHL_SHARED AND NOT ASHL_STATIC)
-    message(FATAL_ERROR "Either SHARED or STATIC must be specified")
-  endif()
-
-  _add_swift_library_single(
-    ${name}
-    ${name}
-    ${ASHL_SHARED_keyword}
-    ${ASHL_STATIC_keyword}
-    ${ASHL_SOURCES}
-    SDK ${SWIFT_HOST_VARIANT_SDK}
-    ARCHITECTURE ${SWIFT_HOST_VARIANT_ARCH}
-    DEPENDS ${ASHL_DEPENDS}
-    LINK_LIBRARIES ${ASHL_LINK_LIBS}
-    LLVM_COMPONENT_DEPENDS ${ASHL_LINK_COMPONENTS}
-    INSTALL_IN_COMPONENT "dev"
-    )
+  llvm_add_library(${name} ${ASHL_UNPARSED_ARGUMENTS})
+  if(ASHL_FORCE_BUILD_OPTIMIZED)
+    target_compile_options(${name} PRIVATE "-O2")
+  endif()

   swift_install_in_component(dev
     TARGETS ${name}


Commented NO_DEFAULT_PATH in cmake search [ci skip]

--- cmake/FindgenericLogger.cmake
+++ cmake/FindgenericLogger.cmake
@@ -71,7 +71,8 @@
     PATHS ${GENERICLOGGER_ROOT_DIR}
     PATH_SUFFIXES ${_GENERICLOGGER_POSSIBLE_INCLUDE_SUFFIXES}
     DOC "genericLogger include directory"
-    NO_DEFAULT_PATH)
+    # NO_DEFAULT_PATH
+    )
 ELSE (GENERICLOGGER_ROOT_DIR)
   # Use default path search
   FIND_PATH (GENERICLOGGER_INCLUDE_DIR
@@ -103,11 +104,13 @@
       FIND_LIBRARY (${_GENERICLOGGER_LIBRARY_BASE}_DEBUG
 	NAMES ${_GENERICLOGGER_COMPONENT_POSSIBLE_DEBUG_NAMES}
 	PATHS ${GENERICLOGGER_ROOT_DIR} PATH_SUFFIXES ${_GENERICLOGGER_POSSIBLE_LIB_SUFFIXES}
-	NO_DEFAULT_PATH)
+	# NO_DEFAULT_PATH
+	)
       FIND_LIBRARY (${_GENERICLOGGER_STATIC_LIBRARY_BASE}_DEBUG
 	NAMES ${_GENERICLOGGER_STATIC_COMPONENT_POSSIBLE_DEBUG_NAMES}
 	PATHS ${GENERICLOGGER_ROOT_DIR} PATH_SUFFIXES ${_GENERICLOGGER_POSSIBLE_LIB_SUFFIXES}
-	NO_DEFAULT_PATH)
+	# NO_DEFAULT_PATH
+	)
     ELSE (GENERICLOGGER_ROOT_DIR)
       FIND_LIBRARY (${_GENERICLOGGER_LIBRARY_BASE}_DEBUG
 	NAMES ${_GENERICLOGGER_COMPONENT_POSSIBLE_DEBUG_NAMES}
@@ -123,11 +126,13 @@
       FIND_LIBRARY (${_GENERICLOGGER_LIBRARY_BASE}_RELEASE
 	NAMES ${_GENERICLOGGER_COMPONENT_POSSIBLE_RELEASE_NAMES}
 	PATHS ${GENERICLOGGER_ROOT_DIR} PATH_SUFFIXES ${_GENERICLOGGER_POSSIBLE_LIB_SUFFIXES}
-	NO_DEFAULT_PATH)
+	# NO_DEFAULT_PATH
+	)
       FIND_LIBRARY (${_GENERICLOGGER_STATIC_LIBRARY_BASE}_RELEASE
 	NAMES ${_GENERICLOGGER_STATIC_COMPONENT_POSSIBLE_RELEASE_NAMES}
 	PATHS ${GENERICLOGGER_ROOT_DIR} PATH_SUFFIXES ${_GENERICLOGGER_POSSIBLE_LIB_SUFFIXES}
-	NO_DEFAULT_PATH)
+	# NO_DEFAULT_PATH
+	)
     ELSE (ICU_ROOT_DIR)
       FIND_LIBRARY (${_GENERICLOGGER_LIBRARY_BASE}_RELEASE
 	NAMES ${_GENERICLOGGER_COMPONENT_POSSIBLE_RELEASE_NAMES}


Add ${EIGEN_VERSION} to FindEigen.cmake

Add ${EIGEN_VERSION} to FindEigen.cmake

--- cmake/Modules/FindEigen.cmake
+++ cmake/Modules/FindEigen.cmake
@@ -5,6 +5,7 @@
 # EIGEN_FOUND - True if Eigen was found.
 # EIGEN_INCLUDE_DIRS - Directories containing the Eigen include files.
 # EIGEN_DEFINITIONS - Compiler flags for Eigen.
+# EIGEN_VERSION - Package version

 find_package(PkgConfig QUIET)
 pkg_check_modules(PC_EIGEN eigen3)
@@ -20,6 +21,16 @@
           "$ENV{PROGRAMFILES}/Eigen 3.0.0" "$ENV{PROGRAMW6432}/Eigen 3.0.0"
     PATH_SUFFIXES eigen3 include/eigen3 include)

+if(EIGEN_INCLUDE_DIR)
+  file(READ "${EIGEN_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen_version_header)
+  string(REGEX MATCH "define[ \t]+EIGEN_WORLD_VERSION[ \t]+([0-9]+)" _eigen_world_version_match "${_eigen_version_header}")
+  set(EIGEN_WORLD_VERSION "${CMAKE_MATCH_1}")
+  string(REGEX MATCH "define[ \t]+EIGEN_MAJOR_VERSION[ \t]+([0-9]+)" _eigen_major_version_match "${_eigen_version_header}")
+  set(EIGEN_MAJOR_VERSION "${CMAKE_MATCH_1}")
+  string(REGEX MATCH "define[ \t]+EIGEN_MINOR_VERSION[ \t]+([0-9]+)" _eigen_minor_version_match "${_eigen_version_header}")
+  set(EIGEN_MINOR_VERSION "${CMAKE_MATCH_1}")
+  set(EIGEN_VERSION ${EIGEN_WORLD_VERSION}.${EIGEN_MAJOR_VERSION}.${EIGEN_MINOR_VERSION})
+endif(EIGEN_INCLUDE_DIR)

 set(EIGEN_INCLUDE_DIRS ${EIGEN_INCLUDE_DIR})

@@ -29,6 +40,6 @@
 mark_as_advanced(EIGEN_INCLUDE_DIR)

 if(EIGEN_FOUND)
-  message(STATUS "Eigen found (include: ${EIGEN_INCLUDE_DIRS})")
+  message(STATUS "Eigen found (include: ${EIGEN_INCLUDE_DIRS}, version: ${EIGEN_VERSION})")
 endif(EIGEN_FOUND)


Don't search iconv in /opt/local

Don't search iconv in /opt/local

Since OpenSSL isn't used any more on OS X, there is no dependency
on any MacPorts library under /opt/local and there is no danger of
conflicts between MacPorts and system iconv. For this reason the
system iconv can always be used now.

--- cmake/Modules/FindIconv.cmake
+++ cmake/Modules/FindIconv.cmake
@@ -11,10 +11,7 @@
 	SET(ICONV_FIND_QUIETLY TRUE)
 ENDIF()

-FIND_PATH(ICONV_INCLUDE_DIR iconv.h PATHS /opt/local/include NO_DEFAULT_PATH)
 FIND_PATH(ICONV_INCLUDE_DIR iconv.h)
-
-FIND_LIBRARY(iconv_lib NAMES iconv libiconv libiconv-2 c NO_DEFAULT_PATH PATHS /opt/local/lib)
 FIND_LIBRARY(iconv_lib NAMES iconv libiconv libiconv-2 c)

 IF(ICONV_INCLUDE_DIR AND iconv_lib)


Make sure LGPL2_1.txt is copied, too. (And update "vendor".)

(cherry picked from commit ba4a8f2189bead363cbc1ad97fdb8130b7bdb169)

--- cmake/modules/RootCPack.cmake
+++ cmake/modules/RootCPack.cmake
@@ -13,7 +13,7 @@
 #
 set(CPACK_PACKAGE_DESCRIPTION "ROOT project")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ROOT project")
-set(CPACK_PACKAGE_VENDOR "HEPSoft")
+set(CPACK_PACKAGE_VENDOR "ROOT project")
 set(CPACK_PACKAGE_VERSION ${ROOT_VERSION})
 set(CPACK_PACKAGE_VERSION_MAJOR ${ROOT_MAJOR_VERSION})
 set(CPACK_PACKAGE_VERSION_MINOR ${ROOT_MINOR_VERSION})
@@ -25,6 +25,7 @@
 #---Resource Files-----------------------------------------------------------------------------------
 configure_file(README/README README.txt COPYONLY)
 configure_file(LICENSE LICENSE.txt COPYONLY)
+configure_file(LGPL2_1.txt LGPL2_1.txt COPYONLY)
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_BINARY_DIR}/README.txt")
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_BINARY_DIR}/LICENSE.txt")
 set(CPACK_RESOURCE_FILE_README "${CMAKE_BINARY_DIR}/README.txt")


libcvd: respect Debug build

libcvd: respect Debug build

--- cmakemodules/script_cvd.cmake
+++ cmakemodules/script_cvd.cmake
@@ -5,6 +5,7 @@
 	CMAKE_ARGS
 		-DCMAKE_POSITION_INDEPENDENT_CODE=ON
 		-DCVD_SSE2=${CMAKE_MRPT_HAS_SSE2}
+		-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 		-DCVD_TESTS=OFF
 		-DCVD_PROGS=OFF
 		-DCVD_EXAMPLES=OFF
@@ -19,5 +20,5 @@
 if(MSVC)
 	set(CVD_LIB "${CVD_BIN_DIR}/$<CONFIG>/CVD$<$<CONFIG:Debug>:_debug>.lib")
 else()
-	set(CVD_LIB "${CVD_BIN_DIR}/libCVD.a")
+	set(CVD_LIB "${CVD_BIN_DIR}/libCVD$<$<CONFIG:Debug>:_debug>.a")
 endif()


Add zlib as dependency to python or else zlib module is missing

--- python.cmake
+++ python.cmake
@@ -13,6 +13,8 @@
 include (ExternalSource)
 include (BuildSupport)

+include (zlib)
+
 external_source (python
     2.7.3
     Python-2.7.3.tgz
@@ -21,6 +23,7 @@

 message ("Installing ${python_NAME} into FlyEM build area: ${FLYEM_BUILD_DIR} ...")
 ExternalProject_Add(${python_NAME}
+    DEPENDS             ${zlib_NAME}
     PREFIX              ${FLYEM_BUILD_DIR}
     URL                 ${python_URL}
     URL_MD5             ${python_MD5}
@@ -37,4 +40,4 @@
 set (PYTHON_INCLUDE_PATH ${FLYEM_BUILD_DIR}/include/python2.7)
 set (PYTHON_EXE ${FLYEM_BUILD_DIR}/bin/python2.7)

-endif (NOT python_NAME)+endif (NOT python_NAME)


dummy commit for testing continuous testing

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -4,4 +4,3 @@
 SET (CTEST_DROP_SITE "http://fifthelement.inf.ethz.ch:8082")
 SET (CTEST_DROP_LOCATION "zorba")
 SET (CTEST_COMPRESS_SUBMISSION ON)
-


Put PROJECT_NAME first in test rule

Put PROJECT_NAME first in test rule

--- CommonCTest.cmake
+++ CommonCTest.cmake
@@ -7,9 +7,9 @@
 if(COVERAGE)
   coverage_report(run_cpp_tests)
   # workaround: 'make test' does not build tests beforehand
-  add_custom_target(tests_${PROJECT_NAME} DEPENDS lcov-html)
+  add_custom_target(${PROJECT_NAME}_tests DEPENDS lcov-html)
 else()
-  add_custom_target(tests_${PROJECT_NAME} DEPENDS run_cpp_tests)
+  add_custom_target(${PROJECT_NAME}_tests DEPENDS run_cpp_tests)
 endif()

-set_target_properties(tests_${PROJECT_NAME} PROPERTIES FOLDER "Tests")
+set_target_properties(${PROJECT_NAME}_tests PROPERTIES FOLDER "Tests")


fixed: switch back to OpenEXR package search, Linux is case sensitive

git-svn-id: 6c7e10cdde2c115f53707ba8ec4efe535f92d362@2096 4683daeb-ad0f-0410-a623-93161e962ae5

--- CMake/ConfigurePackages.cmake
+++ CMake/ConfigurePackages.cmake
@@ -202,7 +202,7 @@
 MACRO(OSG_CONFIGURE_OPENEXR)

     IF(NOT OSG_USE_OSGSUPPORT_LIBS)
-        OSG_FIND_PACKAGE(OPENEXR)
+        OSG_FIND_PACKAGE(OpenEXR)

         IF(OPENEXR_FOUND)
           OSG_ADD_IMPORT_LIB(OSG_OPENEXR_TARGETS OPENEXR_LIBRARY_IMF)


fixed: use global includes in py build

fixed: use global includes in py build

--- CMake/OSGBuildFunctions.cmake
+++ CMake/OSGBuildFunctions.cmake
@@ -2105,7 +2105,13 @@
     ENDFOREACH()

     INCLUDE_DIRECTORIES(${${PROJECT_NAME}_INC})
-    INCLUDE_DIRECTORIES(${OSG_BOOST_INCDIRS})
+#    INCLUDE_DIRECTORIES(${OSG_BOOST_INCDIRS})
+
+    # dependencies global
+    FOREACH(INCDIR ${OSG_GLOBAL_DEP_INCDIR})
+        OSG_MSG("  (global) - include dir ${INCDIR} = ${${INCDIR}}")
+        INCLUDE_DIRECTORIES(${${INCDIR}})
+    ENDFOREACH(INCDIR)

     TARGET_LINK_LIBRARIES(${PROJECT_NAME}Py ${PROJECT_NAME})
     TARGET_LINK_LIBRARIES(${PROJECT_NAME}Py ${OSG_BOOST_PYTHON_LIBS})


COMP: mitkFiberfoxAddArtifactsToDwiTest used wrong data because of MITK-Data update.

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

 if(BUILD_TESTING)
-  set(revision_tag b6bd6f82)
+  set(revision_tag 4259856b)
 #                  ^^^^^^^^  these are just to check correct length of hash part

   ExternalProject_Add(${proj}


added numpy dependency for pgmlink

added numpy dependency for pgmlink

--- pgmlink.cmake
+++ pgmlink.cmake
@@ -31,6 +31,7 @@
     include (opengm)
     include (dlib)
     include (mlpack)
+    include (numpy)

     include (cplex-shared)
@@ -41,7 +42,7 @@

     message ("Installing ${pgmlink_NAME} into FlyEM build aread: ${BUILDEM_DIR} ...")
     ExternalProject_Add(${pgmlink_NAME}
-        DEPENDS             ${ann_NAME} ${lemon_NAME} ${vigra_NAME} ${boost_NAME} ${opengm_NAME}
+        DEPENDS             ${ann_NAME} ${lemon_NAME} ${vigra_NAME} ${boost_NAME} ${opengm_NAME} ${numpy_NAME}
                             ${cplex-shared} ${ilocplex-shared} ${concert-shared}
                             ${dlib_NAME} ${mlpack_NAME}
         PREFIX              ${BUILDEM_DIR}
@@ -58,6 +59,7 @@
             -DWITH_CHECKED_STL=OFF
             -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_PATH}
             -DPYTHON_LIBRARY=${PYTHON_LIBRARY_FILE}
+            -DVigranumpy_DIR="${BUILDEM_DIR}/lib/vigranumpy"
             ${CMAKE_CPLEX_ROOT_DIR}

         BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE)


brought pods.cmake fix from libbot over to resolve compile error

git-svn-id: 3bdc50f1ba932488e36d0c1d1e7fc079467b8f9b@7338 c7283977-0100-402a-a91a-fa70b306dbfe

--- software/perception/world_model/affordance/cmake/pods.cmake
+++ software/perception/world_model/affordance/cmake/pods.cmake
@@ -26,7 +26,7 @@
 #
 # ----
 # File: pods.cmake
-# Distributed with pods version: 12.01.11
+# Distributed with pods version: 12.09.21

 # pods_install_headers(<header1.h> ... DESTINATION <subdir_name>)
 #
@@ -88,7 +88,7 @@
 function(pods_install_pkg_config_file)
     list(GET ARGV 0 pc_name)
     # TODO error check
-
+
     set(pc_version 0.0.1)
     set(pc_description ${pc_name})
     set(pc_requires "")
@@ -305,19 +305,20 @@
         ${PKG_CONFIG_EXECUTABLE} --libs ${ARGN}
         OUTPUT_VARIABLE _pods_pkg_ldflags)
     string(STRIP ${_pods_pkg_ldflags} _pods_pkg_ldflags)
-    #    message("ldflags: ${_pods_pkg_ldflags}")
+    # message("ldflags: ${_pods_pkg_ldflags}")
     include_directories(${_pods_pkg_include_flags})
-    target_link_libraries(${target} ${_pods_pkg_ldflags})
+    string(REPLACE " " ";" TMP ${_pods_pkg_ldflags}) #covert to a list
+    target_link_libraries(${target} ${TMP})

     # make the target depend on libraries that are cmake targets
     if (_pods_pkg_ldflags)
         string(REPLACE " " ";" _split_ldflags ${_pods_pkg_ldflags})
-        foreach(lib ${_split_ldflags})
-                string(REGEX REPLACE "^-l" "" libname ${lib})
-                get_target_property(IS_TARGET ${libname} LOCATION)
+        foreach(__ldflag ${_split_ldflags})
+                string(REGEX REPLACE "^-l" "" __depend_target_name ${__ldflag})
+                get_target_property(IS_TARGET ${__depend_target_name} LOCATION)
                 if (NOT IS_TARGET STREQUAL "IS_TARGET-NOTFOUND")
-                    #message("---- ${target} depends on  ${libname}")
-                    add_dependencies(${target} ${libname})
+                    #message("---- ${target} depends on  ${__depend_target_name}")
+                    add_dependencies(${target} ${__depend_target_name})
                 endif()
         endforeach()
     endif()
@@ -374,7 +375,9 @@

         # hack to force cmake always create install and clean targets
         install(FILES DESTINATION)
-        add_custom_target(tmp)
+        string(RANDOM LENGTH 32 __rand_target__name__)
+        add_custom_target(${__rand_target__name__})
+        unset(__rand_target__name__)

         set(__pods_setup true)
     endif(NOT DEFINED __pods_setup)


Delete cmake_install.cmake

Delete cmake_install.cmake

--- examples/myCodes/test/test_cell_finder/cmake_install.cmake
+++ examples/myCodes/test/test_cell_finder/cmake_install.cmake
@@ -1,39 +0,0 @@
-# Install script for directory: /Users/lisa/Desktop/dealii/examples/myCodes/test/test_cell_finder
-
-# Set the install prefix
-if(NOT DEFINED CMAKE_INSTALL_PREFIX)
-  set(CMAKE_INSTALL_PREFIX "/usr/local")
-endif()
-string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
-
-# Set the install configuration name.
-if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME)
-  if(BUILD_TYPE)
-    string(REGEX REPLACE "^[^A-Za-z0-9_]+" ""
-           CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}")
-  else()
-    set(CMAKE_INSTALL_CONFIG_NAME "Debug")
-  endif()
-  message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"")
-endif()
-
-# Set the component getting installed.
-if(NOT CMAKE_INSTALL_COMPONENT)
-  if(COMPONENT)
-    message(STATUS "Install component: \"${COMPONENT}\"")
-    set(CMAKE_INSTALL_COMPONENT "${COMPONENT}")
-  else()
-    set(CMAKE_INSTALL_COMPONENT)
-  endif()
-endif()
-
-if(CMAKE_INSTALL_COMPONENT)
-  set(CMAKE_INSTALL_MANIFEST "install_manifest_${CMAKE_INSTALL_COMPONENT}.txt")
-else()
-  set(CMAKE_INSTALL_MANIFEST "install_manifest.txt")
-endif()
-
-string(REPLACE ";" "\n" CMAKE_INSTALL_MANIFEST_CONTENT
-       "${CMAKE_INSTALL_MANIFEST_FILES}")
-file(WRITE "/Users/lisa/Desktop/dealii/examples/myCodes/test/test_cell_finder/${CMAKE_INSTALL_MANIFEST}"
-     "${CMAKE_INSTALL_MANIFEST_CONTENT}")


cmake: Change version to 1.0.0rc2

cmake: Change version to 1.0.0rc2

--- BasisProject.cmake
+++ BasisProject.cmake
@@ -44,7 +44,7 @@
   # meta-data
   NAME        "VolumetricMapping"
   PACKAGE     "MIRTK"
-  VERSION     "1.0.0rc1" # External module version
+  VERSION     "1.0.0rc2" # External module version
   SOVERSION   "0"        # API yet unstable
   AUTHORS     "Andreas Schuh"
   DESCRIPTION "Volumetric Mapping library of the Medical Image Registration ToolKit."


Add a warning header to the temporary generated file

--- stm32/generic_code/stm32f1/cmake/stm32f10x.cmake
+++ stm32/generic_code/stm32f1/cmake/stm32f10x.cmake
@@ -46,7 +46,7 @@
 /****************************************************************************
 ** Hal file for ${hal_type}
 **
-** This file was genereted by the toolchain
+** This file was generated by the toolchain
 **
 ** The original file is located here : \"${HAL_IMPLEMENTED_NATIVE_PATH}\"
 **


Adding the stdlib parameter to openexr's LDFLAGS again

--- openexr.cmake
+++ openexr.cmake
@@ -50,7 +50,7 @@
         --prefix=${BUILDEM_DIR}
         --disable-ilmbasetest
         PKG_CONFIG_PATH=${BUILDEM_PKGCONFIG_DIR}
-        "LDFLAGS=${BUILDEM_LDFLAGS}"
+        "LDFLAGS=${BUILDEM_LDFLAGS} ${BUILDEM_ADDITIONAL_CXX_FLAGS}"
         "CPPFLAGS=-I${BUILDEM_DIR}/include ${BUILDEM_ADDITIONAL_CXX_FLAGS}"
     BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE)
     INSTALL_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE) install


Add my path to findlcl

Add my path to findlcl

--- juci/cmake/Modules/FindTestlcl.cmake
+++ juci/cmake/Modules/FindTestlcl.cmake
@@ -18,6 +18,7 @@
 find_library(LCL_LIBRARY NAMES testlcl
   HINTS "/home/gm/bachelor/lib/lib/"
   "/home/forgie/code/libclangpp/lib/"
+  "/home/zalox/bachelor/libclang++/lib/"
   )

 set(LCL_LIBRARIES ${LCL_LIBRARY} )


Change search order for yaml-cpp library

Buf reported in issue 305

--- cmake/FindYAMLCPP.cmake
+++ cmake/FindYAMLCPP.cmake
@@ -18,7 +18,7 @@
   PATH_SUFFIXES include)

 find_library(YAML_LIBRARIES
-  NAMES libyaml-cpp.a yaml-cpp
+  NAMES yaml-cpp libyaml-cpp.a
   HINTS ${YAML_ROOT} ${CMAKE_INSTALL_PREFIX}
   PATH_SUFFIXES lib)


Fixed cmake script

Fixed cmake script

--- CTestJenkins.cmake
+++ CTestJenkins.cmake
@@ -8,7 +8,7 @@
 set(CTEST_BUILD_OPTIONS "${JENKINS_BUILD_OPTIONS}")
 set(CTEST_BUILD_CONFIGURATION "${JENKINS_BUILD_CONFIGURATION}")

-set(CTEST_MEMORYCHECK_COMMAND_OPTIONS "${CTEST_MEMORYCHECK_COMMAND_OPTIONS} -q --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=50 --xml=yes --xml-file=test_%p_memcheck.xml --suppressions='${CTEST_SOURCE_DIRECTORY}/valgrind.supp'")
+set(CTEST_MEMORYCHECK_COMMAND_OPTIONS "${CTEST_MEMORYCHECK_COMMAND_OPTIONS} -q --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=50 --xml=yes --xml-file=test_%p_memcheck.xml \"--suppressions=${CTEST_SOURCE_DIRECTORY}/valgrind.supp\"")

 set(CTEST_COVERAGE_CXX_FLAGS "-DCMAKE_CXX_FLAGS:STRING=-fprofile-arcs -ftest-coverage")
 set(CTEST_COVERAGE_EXE_LD_FLAGS "-DCMAKE_EXE_LINKER_FLAGS:STRING=-fprofile-arcs -ftest-coverage")


demo: also look for debug versions of the Poco libs

If you build Poco from source, and with debug only, then the demo
fails to build because it doesn't look for Poco libraries ending in
'd'. This logic is the same as in the top-level directory.

Signed-off-by: Andrew McDermott <6c6c2766133de5328a68ea38e42dc5bfcce63d27@frobware.com>

--- demo/poco-websockets/FindPOCO.cmake
+++ demo/poco-websockets/FindPOCO.cmake
@@ -13,8 +13,8 @@
 # limitations under the License.

 find_path(POCO_INCLUDE_DIR NAMES Poco/Poco.h)
-find_library(POCO_LIBRARY NAMES PocoFoundation)
-find_library(POCO_NET_LIBRARY NAMES PocoNet)
+find_library(POCO_LIBRARY NAMES PocoFoundation PocoFoundationd)
+find_library(POCO_NET_LIBRARY NAMES PocoNet PocoNetd)

 include(FindPackageHandleStandardArgs)


quote additional opensplice libraries

quote additional opensplice libraries

--- opensplice_cmake_module/cmake/Modules/FindOpenSplice.cmake
+++ opensplice_cmake_module/cmake/Modules/FindOpenSplice.cmake
@@ -66,7 +66,7 @@
     "dcpsisocpp"
     "dcpssacpp")
   if(NOT WIN32)
-    list(APPEND OpenSplice_LIBRARIES pthread dl)
+    list(APPEND OpenSplice_LIBRARIES "pthread" "dl")
   endif()
   set(OpenSplice_LIBRARY_DIRS "${_ospl_home}/lib")
   set(OpenSplice_DEFINITIONS "")


Fix ctest version detection logic, seem that CMake 2.4 don't have CMAKE_VERSION.

--- flies-selenium/src/test/steer.cmake
+++ flies-selenium/src/test/steer.cmake
@@ -4,9 +4,16 @@
 ####################################################################
 SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
 MESSAGE("CMake version=${CMAKE_VERSION}")
-IF (CMAKE_VERSION VERSION_LESS 2.6)
+
+IF(CMAKE_VERSION)
+    IF(CMAKE_VERSION VERSION_LESS 2.6)
+        MESSAGE("SET CMAKE_BACKWARDS_COMPATIBILITY ${CMAKE_VERSION}")
+        SET(CMAKE_BACKWARDS_COMPATIBILITY ${CMAKE_VERSION})
+    ENDIF()
+ELSE()
+    # CMAKE_VERSION may not available in 2.4
     MESSAGE("SET CMAKE_BACKWARDS_COMPATIBILITY ${CMAKE_VERSION}")
-    SET(CMAKE_BACKWARDS_COMPATIBILITY ${CMAKE_VERSION})
+    SET(CMAKE_BACKWARDS_COMPATIBILITY 2.4)
 ENDIF()

 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR})