updated packaging options, added example simulation directory

--- cmake/oskar_packaging.cmake
+++ cmake/oskar_packaging.cmake
@@ -26,7 +26,7 @@
 SET(CPACK_PACKAGE_VERSION_MAJOR "${OSKAR_VERSION_MAJOR}")
 SET(CPACK_PACKAGE_VERSION_MINOR "${OSKAR_VERSION_MINOR}")
 SET(CPACK_PACKAGE_VERSION_PATCH "${OSKAR_VERSION_PATCH}")
-set(CPACK_PACKAGE_VERSION "${OSKAR_VERSION}-beta1")
+set(CPACK_PACKAGE_VERSION "${OSKAR_VERSION}-beta")

 set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY ON)

@@ -34,12 +34,13 @@
     # http://www.itk.org/Wiki/CMake:Component_Install_With_CPack
     set(CPACK_GENERATOR "NSIS")
 elseif (UNIX)
-    set(CPACK_GENERATOR "DEB;TGZ")
+    #set(CPACK_GENERATOR "DEB;TGZ")
+    set(CPACK_GENERATOR "TGZ")
     set(CPACK_SOURCE_GENERATOR "TGZ")
     set(CPACK_DEBIAN_PACKAGE_MAINTAINER "OSKAR developer team.")
-    set(CPACK_DEBIAN_PACKAGE_VERSION ${OSKAR_VERSION})
+    set(CPACK_DEBIAN_PACKAGE_VERSION "${OSKAR_VERSION}-beta")
     set(CPACK_DEBIAN_PACKAGE_SECTION "Science")
     set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
-    #set(CPACK_DEBIAN_PACKAGE_DEPENDS "libcfitsio3 (>=3.0), libqt4-dev (>=4.5)")
+    #set(CPACK_DEBIAN_PACKAGE_DEPENDS "libcfitsio3 (>=3.0), libqt4-dev (>=4.5) ")
 endif ()
 include(CPack)


added path for Fedora 10

added path for Fedora 10

--- cmake_modules/FindJNI.cmake
+++ cmake_modules/FindJNI.cmake
@@ -25,6 +25,7 @@
   /usr/lib
   /usr/local/lib
   /usr/lib/jvm/java/lib
+  /usr/lib/jvm/java/jre/lib/i386
   /usr/lib/java/jre/lib/i386
   /usr/local/lib/java/jre/lib/i386
   /usr/local/share/java/jre/lib/i386


ManageTranslation: fixed the logic block unmatched

--- Modules/ManageTranslation.cmake
+++ Modules/ManageTranslation.cmake
@@ -195,7 +195,7 @@
 		DEPENDS ${_gmoFile_list}
 		COMMENT "Generate gmo files for translation"
 		)
-	ENDIF(${_gettext_dependency_missing} EQUAL 0)
+	ENDIF(NOT _gettext_dependency_missing)
     ENDFUNCTION(MANAGE_GETTEXT)


CodeGenerator: Disable copy of Gruntfile.js, it is autogenerated

Change-Id: If8f5845612623a3eab7e5ada52e673f2a899c633

--- CMake/CodeGenerator.cmake
+++ CMake/CodeGenerator.cmake
@@ -866,13 +866,6 @@
       message (WARNING "LICENSE file on project root directory is missing")
     endif()

-    if (EXISTS ${PARAM_MODELS}/Gruntfile.js)
-      file (READ ${PARAM_MODELS}/Gruntfile.js GRUNTFILE)
-      file (WRITE ${CMAKE_BINARY_DIR}/js/Gruntfile.js ${GRUNTFILE})
-    else()
-      message (WARNING "Gruntfile.js file on ${PARAM_MODELS} is missing")
-    endif()
-
     if (${Npm_FOUND})
       add_custom_target(js
         COMMAND ${Npm_EXECUTABLE} pack


Fixed WITH_CLIENT_CHANNELS dependencies.

--- cmake/ConfigOptions.cmake
+++ cmake/ConfigOptions.cmake
@@ -62,15 +62,15 @@

 option(WITH_CLIENT_COMMON "Build client common library" ON)
 cmake_dependent_option(WITH_CLIENT "Build client binaries" ON WITH_CLIENT_COMMON ON)
+
 option(WITH_SERVER "Build server binaries" OFF)

 option(STATIC_CHANNELS "Build channels statically" ON)

 option(WITH_CHANNELS "Build virtual channel plugins" ON)

-if(WITH_CLIENT AND WITH_CHANNELS)
-	option(WITH_CLIENT_CHANNELS "Build virtual channel plugins" ON)
-endif()
+cmake_dependent_option(WITH_CLIENT_CHANNELS "Build virtual channel plugins" ON
+	"WITH_CLIENT_COMMON;WITH_CHANNELS" ON)

 if(WITH_SERVER AND WITH_CHANNELS)
 	option(WITH_SERVER_CHANNELS "Build virtual channel plugins" ON)


Change DEFINED ENV{CC} to simple string check

ExternalBoost.cmake broke on my OSX, where the ENV{CC} was DEFINED but it
contained no value.

--- cmake/ExternalBoost.cmake
+++ cmake/ExternalBoost.cmake
@@ -91,11 +91,11 @@
   list( APPEND Boost.Command toolset=msvc-14.0 )
 elseif( XCODE_VERSION )
   list( APPEND Boost.Command toolset=clang )
-elseif( DEFINED ENV{CC} )
+elseif( ENV{CC} )
   # CMake apprarently puts the full path of the compiler into CC
   # The user might specify a non-default gcc compiler through ENV
   message( STATUS "ENV{CC}=$ENV{CC}" )
-  get_filename_component( gccToolset $ENV{CC} NAME )
+  get_filename_component( gccToolset "$ENV{CC}" NAME )

   # see: https://svn.boost.org/trac/boost/ticket/5917
   string( TOLOWER ${gccToolset} gccToolset )


COMP: remove warnings due to the use of deprecated CUDA declarations

Temporay fix for #386

--- cmake/FindCUDA_wrap.cmake
+++ cmake/FindCUDA_wrap.cmake
@@ -52,6 +52,7 @@
 endif()
 set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS}
      -Wno-deprecated-gpu-targets
+     -Wno-deprecated-declarations
      -gencode arch=compute_35,code=sm_35
      -gencode arch=compute_35,code=compute_35
      )


harden check for embedded parent directory references

--- CMake/cotire.cmake
+++ CMake/cotire.cmake
@@ -1068,10 +1068,10 @@
 		set (${_headerIsIgnoredVar} TRUE)
 	elseif (IS_DIRECTORY "${_headerFile}")
 		set (${_headerIsIgnoredVar} TRUE)
-	elseif ("${_headerFile}" MATCHES "\\.\\.|[_-]fixed" AND "${_headerFile}" MATCHES "\\.h$")
-		# heuristic: ignore C headers with embedded parent directory references or "-fixed" or "_fixed" in path
+	elseif ("${_headerFile}" MATCHES "\\.\\.|[_-]fixed")
+		# heuristic: ignore headers with embedded parent directory references or "-fixed" or "_fixed" in path
 		# these often stem from using GCC #include_next tricks, which may break the precompiled header compilation
-		# with the error message "error: no include path in which to search for header.h"
+		# with the error message "error: no include path in which to search for header"
 		set (${_headerIsIgnoredVar} TRUE)
 	else()
 		set (${_headerIsIgnoredVar} FALSE)


use env variable for customization

use env variable for customization

--- CodeCoverage.cmake
+++ CodeCoverage.cmake
@@ -68,10 +68,10 @@
 #

 # Check prereqs
-FIND_PROGRAM( GCOV_PATH NAMES gcov-4.9 gcov-4.8 gcov )
+FIND_PROGRAM( GCOV_PATH NAMES $ENV{GCOV} gcov )
 FIND_PROGRAM( LCOV_PATH lcov )
 FIND_PROGRAM( GENHTML_PATH genhtml )
-FIND_PROGRAM( GCOVR_PATH gcovr PATHS ${CMAKE_SOURCE_DIR}/tests)
+FIND_PROGRAM( GCOVR_PATH NAMES $ENV{GCOVR} gcovr PATHS ${CMAKE_SOURCE_DIR}/tests)

 IF(NOT GCOV_PATH)
 	MESSAGE(FATAL_ERROR "gcov not found! Aborting...")


Incorrect debug invokation of cython

Incorrect debug invokation of cython

--- scripts/PythonModule.cmake
+++ scripts/PythonModule.cmake
@@ -282,7 +282,7 @@
     add_custom_command(
         OUTPUT "${c_source}"
         COMMAND ${arguments}
-            $<$<OR:$<CONFIG:RelWithDebInfo>,$<CONFIG:Debug>>:--dbg>
+            $<$<OR:$<CONFIG:RelWithDebInfo>,$<CONFIG:Debug>>:--gdb>
         WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
         DEPENDS ${DEPENDENCIES}
         COMMENT "Generating c/c++ source ${source} with cython"


Bump TubeTK for fixes

Bump TubeTK for fixes

Add slice intersection for spatial object
Fix ConvertTRE reverse conversion

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


Updating ITK version to a development version of 4.3

This contains a needed patch for the LabelMapContourOverlay image
filter.

--- SuperBuild/External_ITKv4.cmake
+++ SuperBuild/External_ITKv4.cmake
@@ -15,8 +15,8 @@
 set(ITK_REPOSITORY git://itk.org/ITK.git)

 # NOTE: it is very important to update the ITK_DIR path with the
-# current version of ITK
-set(ITK_TAG_COMMAND GIT_TAG v4.2.1 )
+# A version in the ITK 4.3 development which contains a patch for LabelMapContourOverlay
+set(ITK_TAG_COMMAND GIT_TAG c51babdcdacd468f19811225d7a1f91665f1b763 )

 if( ${ITK_WRAPPING} OR ${BUILD_SHARED_LIBS} )
   set( ITK_BUILD_SHARED_LIBS ON )
@@ -71,5 +71,5 @@

 ExternalProject_Get_Property(ITK install_dir)
-set(ITK_DIR "${install_dir}/lib/cmake/ITK-4.2" )
-set(WrapITK_DIR "${install_dir}/lib/cmake/ITK-4.2/WrapITK")
+set(ITK_DIR "${install_dir}/lib/cmake/ITK-4.3" )
+set(WrapITK_DIR "${install_dir}/lib/cmake/ITK-4.3/WrapITK")


add dependency in rosidl_target_interfaces

--- rosidl_cmake/cmake/rosidl_target_interfaces.cmake
+++ rosidl_cmake/cmake/rosidl_target_interfaces.cmake
@@ -15,6 +15,9 @@
 #
 # Add the include directories and libraries from an interface generation target
 # in the current project and a specific type support to another target.
+#
+# It also adds target dependencies to `target` to ensure the interface
+# generation happens before.
 #
 # :param target: the target name
 # :type target: string
@@ -42,6 +45,7 @@
       "double underscores must be a valid target name")
   endif()

+  add_dependencies(${target} ${interface_target})
   get_target_property(include_directories ${typesupport_target} INTERFACE_INCLUDE_DIRECTORIES)
   target_include_directories(${target} PUBLIC ${include_directories})
   target_link_libraries(${target} ${typesupport_target})


protobuf.cmake: Added libraries variable.

--- protobuf.cmake
+++ protobuf.cmake
@@ -36,6 +36,8 @@
     INSTALL_COMMAND   ${BUILDEM_ENV_STRING} make install
 )

+set (protobuf_LIBRARIES ${BUILDEM_LIB_DIR}/libprotobuf.${BUILDEM_PLATFORM_DYLIB_EXTENSION})
+
 ##
 ## Add custom steps for the protobuf python bindings (build, test, install)
 ##


COMP: Decrease the number of parallel jobs on deathstar-linux.

It is using up too much memory on the CLI builds.

Change-Id: I35ae64066dd61d64cff0154595e34bbbd8676fb2

--- Deathstar_Kitware_TubeTK_Nightly.cmake
+++ Deathstar_Kitware_TubeTK_Nightly.cmake
@@ -38,7 +38,7 @@

 set( ENV{DISPLAY} ":0" )

-set( SITE_MAKE_COMMAND "make -j5" )
+set( SITE_MAKE_COMMAND "make -j2" )
 set( SITE_CMAKE_COMMAND "/usr/local/bin/cmake" )
 set( SITE_QMAKE_COMMAND "/home/matt/apps/QtSDK/Desktop/Qt/474/gcc/bin/qmake" )
 set( SITE_CTEST_COMMAND "/usr/local/bin/ctest -j3" )


Ported Eigen to iOS

Ported Eigen to iOS

--- ThirdPartyLibraries.cmake
+++ ThirdPartyLibraries.cmake
@@ -1131,9 +1131,10 @@
   CMAKE_ARGS
       -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
       -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+      -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
       -DCMAKE_BUILD_TYPE=RELEASE
-      -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-      -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+      -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS_WITH_ARCHS}
+      -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS_WITH_ARCHS}
       -DCMAKE_SHARED_LINKER_FLAGS=${CMAKE_SHARED_LINKER_FLAGS}
       -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
       -DCMAKE_OSX_ARCHITECTURES=${ARCHS}


ENH: seet CURL_CA_PATH to none for macOS, to avoid an error in cmake configure if a ca path is automatically found (openssl is not enabled for macos, the native ssl is used instead)

--- SuperBuild/CMake/External_curl.cmake
+++ SuperBuild/CMake/External_curl.cmake
@@ -32,11 +32,15 @@
   list(APPEND CURL_SB_CONFIG
     -DCMAKE_USE_OPENSSL:BOOL=ON
     -DCMAKE_C_FLAGS:STRING=-fPIC)
+# Set CURL_CA_PATH to none because openssl in not enabled and CMake generation will fail if
+# a CA path is found in auto mode.
 elseif(APPLE)
   list(APPEND CURL_SB_CONFIG
     -DCMAKE_USE_DARWINSSL:BOOL=ON
     -DHAVE_LIBNETWORK:STRING=0
-    -DCMAKE_C_FLAGS:STRING=-fPIC)
+    -DCMAKE_C_FLAGS:STRING=-fPIC
+    -DCURL_CA_PATH:STRING=none)
+
 elseif(WIN32)
   list(APPEND CURL_SB_CONFIG
     -DCMAKE_USE_WINSSL:BOOL=ON


SuperBuild: set correct JPEG_LIBRARY installed by turbojpeg

--- SuperBuild/CMake/External_jpeg.cmake
+++ SuperBuild/CMake/External_jpeg.cmake
@@ -65,7 +65,7 @@

   set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
     if(WIN32)
-      set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libjpeg.lib)
+      set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/jpeg.lib)
     elseif(UNIX)
       set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libjpeg${CMAKE_SHARED_LIBRARY_SUFFIX})
     endif()


Move SSH key local lookup, not necessary if connexion test succeeds

--- cmake/CheckEnvironment.cmake
+++ cmake/CheckEnvironment.cmake
@@ -83,14 +83,6 @@
 		file(APPEND ${SSH_KNOWN_HOSTS_PATH} "\n${GITHUB_SIGN}\n")
 	endif()

-	# Test for a SSH key
-	set(SSH_PUB_KEY ${HOME_PATH}/.ssh/id_rsa.pub)
-	if (NOT EXISTS ${SSH_PUB_KEY})
-		message( FATAL_ERROR "Could not find a public SSH key, you need to generate one." )
-	else()
-		message( STATUS "Found the user's public SSH key..." )
-	endif()
-
 	# Make sure the user's key has been upload to GitHub
 	message( STATUS "Testing user's access to GitHub..." )
 	execute_process(COMMAND ${SSH_BIN} -T git@github.com
@@ -101,6 +93,14 @@
 		           )

 	if (SSH_TEST_RESULT EQUAL 255)
+		# Test for a SSH key
+		set(SSH_PUB_KEY ${HOME_PATH}/.ssh/id_rsa.pub)
+		if (NOT EXISTS ${SSH_PUB_KEY})
+			message( FATAL_ERROR "Could not find a public SSH key, you need to generate one." )
+		else()
+			message( STATUS "Found the user's public SSH key..." )
+		endif()
+
 		file(READ ${SSH_PUB_KEY} SSH_PUB_KEY_VALUE)
 		message( FATAL_ERROR "
 Could not connect to GitHub using SSH public key (found here : ${SSH_PUB_KEY})


reduce compiler flags which break OS X builds

The flags stopped gcc under OS X SL.

Discussion:
Hardcoded compiler flags are no good idea. They take much time and
will break from time to platform. What is with ICC, CLANG, MSVC?

--- cmake/ElektraCompiling.cmake
+++ cmake/ElektraCompiling.cmake
@@ -38,7 +38,7 @@

 	#not supported by icc:
 	set (EXTRA_FLAGS "${EXTRA_FLAGS} -Wno-deprecated-declarations")
-	set (EXTRA_FLAGS "${EXTRA_FLAGS} -Wno-ignored-qualifiers")
+	#set (EXTRA_FLAGS "${EXTRA_FLAGS} -Wno-ignored-qualifiers")

 	message (STATUS "Clang detected")
 endif()
@@ -49,7 +49,7 @@
 	else(WIN32)
 		#not supported by icc:
 		set (EXTRA_FLAGS "${EXTRA_FLAGS} -Wno-deprecated-declarations")
-		set (EXTRA_FLAGS "${EXTRA_FLAGS} -Wno-ignored-qualifiers")
+		#set (EXTRA_FLAGS "${EXTRA_FLAGS} -Wno-ignored-qualifiers")

 		#not supported by icc/clang:
 		set (CXX_EXTRA_FLAGS "${CXX_EXTRA_FLAGS} -Wstrict-null-sentinel")
@@ -86,7 +86,7 @@
 set (COMMON_FLAGS "${COMMON_FLAGS} -Wcomments -Wtrigraphs -Wundef")
 set (COMMON_FLAGS "${COMMON_FLAGS} -Wuninitialized")

-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--unresolved-symbols=ignore-in-shared-libs")
+#set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--unresolved-symbols=ignore-in-shared-libs")

 if (ENABLE_COVERAGE)


CMake: Don't enforce the MSVC version

CMake: Don't enforce the MSVC version

--- cmake/Modules/FindMaya.cmake
+++ cmake/Modules/FindMaya.cmake
@@ -26,19 +26,6 @@
 list( FIND _maya_versions ${Maya_FIND_VERSION} _maya_version_index )
 if ( ${_maya_version_index} EQUAL -1 )
     message( FATAL_ERROR "Unknown Maya version. ${Maya_FIND_VERSION}" )
-endif ()
-
-# On Windows, verify that the correct compiler is used.
-if ( ${CMAKE_SYSTEM_NAME} STREQUAL "Windows" )
-    list( APPEND _maya_msvc_versions 1700 )
-    list( APPEND _maya_msvc_versions 1700 )
-    list( APPEND _maya_msvc_versions 1700 )
-    list( APPEND _maya_msvc_versions 1600 )
-    list( GET _maya_msvc_versions ${_maya_version_index} _maya_msvc_version )
-
-    if ( NOT ${MSVC_VERSION} EQUAL ${_maya_msvc_version} )
-        message( FATAL_ERROR "Using MSVC ${MSVC_VERSION}. Maya ${Maya_FIND_VERSION} requires MSVC ${_maya_msvc_version}." )
-    endif ()
 endif ()

 ########################################


Fixed typo in error message in OpenCVDetectCUDA.cmake

There was a minor typo in the FATAL error message when the specified CUDA generation does not match any known generation

--- cmake/OpenCVDetectCUDA.cmake
+++ cmake/OpenCVDetectCUDA.cmake
@@ -102,7 +102,7 @@
   if(CUDA_GENERATION)
     if(NOT ";${_generations};" MATCHES ";${CUDA_GENERATION};")
       string(REPLACE ";" ", " _generations "${_generations}")
-      message(FATAL_ERROR "ERROR: ${_generations} Generations are suppered.")
+      message(FATAL_ERROR "ERROR: ${_generations} Generations are supported.")
     endif()
     unset(CUDA_ARCH_BIN CACHE)
     unset(CUDA_ARCH_PTX CACHE)


[cmake] For now when compiling host swift code into a library, put -gnone to prevent the driver from running dsymutil on static libraries.

Work around for this problem until rdar://78271443 (which tracks the underlying
issue) lands so this no longer happens.

--- cmake/modules/AddSwift.cmake
+++ cmake/modules/AddSwift.cmake
@@ -519,6 +519,12 @@
       target_link_options(${name} PRIVATE
         "LINKER:-current_version,${SWIFT_COMPILER_VERSION}")
     endif()
+
+    # For now turn off in swift targets, debug info if we are compiling a static
+    # library.
+    if (ASHL_STATIC)
+      target_compile_options(${name} PRIVATE $<$<COMPILE_LANGUAGE:Swift>:-gnone>)
+    endif()
   endif()

   add_dependencies(dev ${name})


Avoid stalled file dependency when tablegenning.

Patch by Frits van Bommel!

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

--- cmake/modules/TableGen.cmake
+++ cmake/modules/TableGen.cmake
@@ -12,22 +12,24 @@
     set(LLVM_TARGET_DEFINITIONS_ABSOLUTE
       ${CMAKE_CURRENT_SOURCE_DIR}/${LLVM_TARGET_DEFINITIONS})
   endif()
-  add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ofn}
+  add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ofn}.tmp
     # Generate tablegen output in a temporary file.
     COMMAND ${LLVM_TABLEGEN_EXE} ${ARGN} -I ${CMAKE_CURRENT_SOURCE_DIR}
     -I ${LLVM_MAIN_SRC_DIR}/lib/Target -I ${LLVM_MAIN_INCLUDE_DIR}
     ${LLVM_TARGET_DEFINITIONS_ABSOLUTE}
     -o ${CMAKE_CURRENT_BINARY_DIR}/${ofn}.tmp
+    DEPENDS tblgen ${local_tds} ${global_tds}
+    COMMENT "Building ${ofn}..."
+    )
+  add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ofn}
     # Only update the real output file if there are any differences.
     # This prevents recompilation of all the files depending on it if there
     # aren't any.
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
         ${CMAKE_CURRENT_BINARY_DIR}/${ofn}.tmp
         ${CMAKE_CURRENT_BINARY_DIR}/${ofn}
-    # Either way, we no longer need the temporary file.
-    COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/${ofn}.tmp
-    DEPENDS tblgen ${local_tds} ${global_tds}
-    COMMENT "Building ${ofn}..."
+    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${ofn}.tmp
+    COMMENT ""
     )
   set(TABLEGEN_OUTPUT ${TABLEGEN_OUTPUT} ${CMAKE_CURRENT_BINARY_DIR}/${ofn})
   set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${ofn}


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


Enable multi-threaded compilation for RelWithDebInfo build target on Windows

--- indra/cmake/00-Common.cmake
+++ indra/cmake/00-Common.cmake
@@ -46,7 +46,7 @@
   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd /MP -D_SCL_SECURE_NO_WARNINGS=1"
       CACHE STRING "C++ compiler debug options" FORCE)
   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
-      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /Ob2 /Gm -D_SECURE_STL=0"
+      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP /Ob2 /Gm -D_SECURE_STL=0"
       CACHE STRING "C++ compiler release-with-debug options" FORCE)
   set(CMAKE_CXX_FLAGS_RELEASE
       "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /Ob2 /Oi /Ot /GF /Gy /arch:SSE2 -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"


Small braino

Small braino

--- indra/cmake/Variables.cmake
+++ indra/cmake/Variables.cmake
@@ -63,7 +63,7 @@
     if (ARCH STREQUAL x86_64)
       set(WORD_SIZE 64)
     else (ARCH STREQUAL x86_64)
-      set(WORD_SIZE 64)
+      set(WORD_SIZE 32)
     endif (ARCH STREQUAL x86_64)
   endif (WORD_SIZE EQUAL 32)


iox-#1619 Simplify detailed comment in IceoryxPlatformSettings

Signed-off-by: Christian Eltzschig <b1c1d8736f20db3fb6c1c66bb1455ed43909f0d8@elchris.org>

--- iceoryx_hoofs/platform/cmake/IceoryxPlatformSettings.cmake
+++ iceoryx_hoofs/platform/cmake/IceoryxPlatformSettings.cmake
@@ -14,28 +14,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0

-# In the in-tree build the `iceoryx_platform` is the first project which is built.
-# The platform already includes the `IceoryxPlatformSettings.cmake` from the autodetected platform
-# or from the user provided on (see, CMake argument `-DPLATFORM_PATH`).
-# The other targets (hoofs, posh ...) require a `IceoryxPlatformSettings.cmake` file at a static
-# location (see detailed explanation below) which requires this dummy file.
-#
-# This is a dummy file required for the iceoryx in tree build.
-#   During the out-of-tree build the installed IceoryxPlatformSettings.cmake contains all the
-#   platform specific variables.
-#   In the in-tree build those variables are already globally set by the platform cmake
-#   since it selects the correct platform and includes its corresponding IceoryxPlatformSettings.cmake
-#   file. Something we cannot implement here.
-#
-#   Detailed technical explanation:
-#     In the in-tree build the actual iceoryx_platform target is found and cmake uses the files
-#     provided in cmake, like for instance the IceoryxPlatformSettings.cmake. But in that file we
-#     cannot source the actual CMakeLists.txt of the platform since CMAKE_CURRENT_LIST_DIR points
-#     to iceoryx_hoofs or posh and so on. And in cmake <= 3.16 there is no way to get the path of
-#     the current cmake file so that we can source the platform detection and select the right
-#     settings. With cmake 3.17 a new variable CMAKE_CURRENT_FUNCTION_LIST_DIR was introduced which
-#     would solve the problem, see https://cmake.org/cmake/help/v3.17/release/3.17.html?highlight=cmake_current_function_list_dir#variables
-#
-#     But this is actually not a problem since the iceoryx_platform is the first package which is
-#     sourced in iceoryx_meta and therefore all the correct variables are set up and it suffices
-#     that this file exists.
+# Dummy cmake file for source tree builds. The actual variables are sourced from
+# "IceoryxPlatformSettings.cmake" which resides either in the root path of the autodetected or
+# user provided platorm. The out of tree build uses the installed copy of that file."


Common default build type tweak

Common default build type tweak

--- Common.cmake
+++ Common.cmake
@@ -8,7 +8,11 @@
 endif()

 if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE Debug)
+  if(RELEASE_VERSION)
+    set(CMAKE_BUILD_TYPE Release)
+  else()
+    set(CMAKE_BUILD_TYPE Debug)
+  endif()
 endif(NOT CMAKE_BUILD_TYPE)

 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND NOT MSVC)


Remove old build logic that is no longer works with new Emscripten. [ci skip]

--- CMake/Modules/UrhoCommon.cmake
+++ CMake/Modules/UrhoCommon.cmake
@@ -1065,11 +1065,8 @@
                             get_filename_component (NAME ${FILE} NAME)
                             list (APPEND PAK_NAMES ${NAME})
                         endforeach ()
-                        if (CMAKE_BUILD_TYPE STREQUAL Debug)
-                            set (SEPARATE_METADATA --separate-metadata)
-                        endif ()
                         add_custom_command (OUTPUT ${SHARED_RESOURCE_JS} ${SHARED_RESOURCE_JS}.data
-                            COMMAND ${EMPACKAGER} ${SHARED_RESOURCE_JS}.data --preload ${PAK_NAMES} --js-output=${SHARED_RESOURCE_JS} --use-preload-cache ${SEPARATE_METADATA}
+                            COMMAND ${EMPACKAGER} ${SHARED_RESOURCE_JS}.data --preload ${PAK_NAMES} --js-output=${SHARED_RESOURCE_JS} --use-preload-cache
                             DEPENDS RESOURCE_CHECK ${RESOURCE_PAKS}
                             WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
                             COMMENT "Generating shared data file")


Removed debug message

Removed debug message

git-svn-id: aa838dfc23441284dd616281de4245daec5d2135@14642 16af8721-9629-0410-8352-f15c8da7e697

--- CMakeModules/FindCOLLADA.cmake
+++ CMakeModules/FindCOLLADA.cmake
@@ -292,10 +292,7 @@
             SET(COLLADA_DOM_2_4_OR_LATER FALSE)
         ENDIF()

-        MESSAGE("\n\n COLLADA_DOM_2_4_OR_LATER=" ${COLLADA_DOM_2_4_OR_LATER})
-
-
-    ENDIF()
+        ENDIF()
 ENDIF()


try to fix the cmake configuration on Travis

--- Shared/CMake/modules/GetGitRevisionDescription.cmake
+++ Shared/CMake/modules/GetGitRevisionDescription.cmake
@@ -133,27 +133,28 @@
         message("building on Git rev : " ${GIT_SHA_SHORT})
         message("Git tag : " ${GIT_TAG})
         string(LENGTH GIT_TAG taglen)
-        if (taglen GREATER 0)
-        string(REPLACE "." ";" GIT_TAG_LIST ${GIT_TAG}) # make a list from the tag string
-        list(LENGTH GIT_TAG_LIST len)
-        if (len GREATER 0)
-                list(GET GIT_TAG_LIST 0 GIT_VERSION_MAJ)
-        endif (len GREATER 0)
-        if (len GREATER 1)
-                list(GET GIT_TAG_LIST 1 GIT_VERSION_MIN)
-        endif (len GREATER 1)
-        if (len GREATER 2)
-                list(GET GIT_TAG_LIST 2 GIT_VERSION_SUB)
-        endif (len GREATER 2)
-        if (len GREATER 3)
-                list(GET GIT_TAG_LIST 3 GIT_VERSION_MOD_LONG)
-        endif (len GREATER 3)
-        list(LENGTH GIT_VERSION_MOD_LONG len2)
-        if (len2 GREATER 0)
-                string(REPLACE "-" ";" GIT_VERSION_MOD_LIST ${GIT_VERSION_MOD_LONG})
-                list(GET GIT_VERSION_MOD_LIST 0 GIT_VERSION_MOD)
-        endif (len2 GREATER 0)
-        endif (taglen GREATER 0)
+        message("Git tag length : " ${taglen})
+        if (taglen GREATER 1)
+          string(REPLACE "." ";" GIT_TAG_LIST ${GIT_TAG}) # make a list from the tag string
+          list(LENGTH GIT_TAG_LIST len)
+          if (len GREATER 0)
+                  list(GET GIT_TAG_LIST 0 GIT_VERSION_MAJ)
+          endif (len GREATER 0)
+          if (len GREATER 1)
+                  list(GET GIT_TAG_LIST 1 GIT_VERSION_MIN)
+          endif (len GREATER 1)
+          if (len GREATER 2)
+                  list(GET GIT_TAG_LIST 2 GIT_VERSION_SUB)
+          endif (len GREATER 2)
+          if (len GREATER 3)
+                  list(GET GIT_TAG_LIST 3 GIT_VERSION_MOD_LONG)
+          endif (len GREATER 3)
+          list(LENGTH GIT_VERSION_MOD_LONG len2)
+          if (len2 GREATER 0)
+                  string(REPLACE "-" ";" GIT_VERSION_MOD_LIST ${GIT_VERSION_MOD_LONG})
+                  list(GET GIT_VERSION_MOD_LIST 0 GIT_VERSION_MOD)
+          endif (len2 GREATER 0)
+        endif (taglen GREATER 1)

         SET(GIT_SHA_SHORT "${GIT_SHA_SHORT}" PARENT_SCOPE)
         SET(GIT_VERSION_MAJ "${GIT_VERSION_MAJ}" PARENT_SCOPE)


Fixed comment.

Fixed comment.


replace generate_export_header with our own header template

--- src/osvr/Macros.cmake
+++ src/osvr/Macros.cmake
@@ -1,6 +1,11 @@
 set(LIB_FOLDER "OSVR Libraries")

 set(OSVR_BUILDTREE_TARGETS "" CACHE INTERNAL "" FORCE)
+
+# Get a path to this file
+get_filename_component(_MACROS_DIR
+    "${CMAKE_CURRENT_LIST_FILE}" PATH)
+
 macro(osvr_append_target _targetlist _target)
     list(APPEND OSVR_${_targetlist}_TARGETS "${_target}")
     set(OSVR_${_targetlist}_TARGETS "${OSVR_${_targetlist}_TARGETS}" CACHE INTERNAL "" FORCE)
@@ -34,10 +39,19 @@

     set_target_properties(${LIBNAME_FULL} PROPERTIES
         FOLDER "${LIB_FOLDER}")
-
-    generate_export_header(${LIBNAME_FULL}
-        BASE_NAME ${EXPORT_BASENAME}
-        EXPORT_FILE_NAME Export.h)
+
+    # Are we building or using this library?
+    get_target_property(EXPORT_IMPORT_CONDITION ${LIBNAME_FULL} DEFINE_SYMBOL)
+
+    # If we are building then set export condition
+    if(NOT EXPORT_IMPORT_CONDITION)
+        set(EXPORT_IMPORT_CONDITION ${LIBNAME_FULL}_EXPORTS)
+    endif()
+    string(MAKE_C_IDENTIFIER ${EXPORT_IMPORT_CONDITION} EXPORT_IMPORT_CONDITION)
+
+    configure_file("${_MACROS_DIR}/exportheader.cmake.in"
+        Export.h
+        @ONLY NEWLINE_STYLE LF)

     if(NOT BUILD_SHARED_LIBS)
         target_compile_definitions(${LIBNAME_FULL} PUBLIC ${EXPORT_BASENAME}_STATIC_DEFINE)


Disable iterator debugging on WIN32 platform.

--- adm_local_without_kernel/cmake_files/SalomeSetupPlatform.cmake
+++ adm_local_without_kernel/cmake_files/SalomeSetupPlatform.cmake
@@ -93,10 +93,14 @@

   SET(PLATFORM_LIBS Ws2_32.lib)
   LIST(APPEND PLATFORM_LIBS Userenv.lib)      # At least for GEOM suit
+
+  # Disable iterator debugging on WINDOWS in Debug Mode
+  IF(NOT CMAKE_BUILD_TYPE STREQUAL "RELEASE" AND NOT CMAKE_BUILD_TYPE STREQUAL "Release")
+    ADD_DEFINITIONS(-D_SECURE_SCL=0 -D_SECURE_SCL_THROWS=0)
+    ADD_DEFINITIONS(-D_HAS_ITERATOR_DEBUGGING=0) # To avoid runtime error during checking iterators
+  ENDIF(NOT CMAKE_BUILD_TYPE STREQUAL "RELEASE" AND NOT CMAKE_BUILD_TYPE STREQUAL "Release")

   IF(MACHINE_IS_64)
-    ADD_DEFINITIONS(-D_SECURE_SCL=0 -D_SECURE_SCL_THROWS=0)
-    ADD_DEFINITIONS(-D_HAS_ITERATOR_DEBUGGING=0) # To avoid runtime error during checking iterators
     SET(SIZE_OF_LONG 4)                          # set sizeof(long) to 4 byte
   ELSE()
     SET(SIZE_OF_LONG ${CMAKE_SIZEOF_VOID_P})     # set sizeof(long) the same as size of pointers


Exclude cudnn_version_test from build in tf_stream_executor.cmake

--- tensorflow/contrib/cmake/tf_stream_executor.cmake
+++ tensorflow/contrib/cmake/tf_stream_executor.cmake
@@ -65,6 +65,10 @@
     file(GLOB tf_stream_executor_gpu_srcs
         "${tensorflow_source_dir}/tensorflow/stream_executor/cuda/*.cc"
     )
+    file(GLOB tf_stream_executor_gpu_tests
+        "${tensorflow_source_dir}/tensorflow/stream_executor/cuda/*_test.cc"
+    )
+    list(REMOVE_ITEM tf_stream_executor_gpu_srcs ${tf_stream_executor_gpu_tests})
     list(APPEND tf_stream_executor_srcs ${tf_stream_executor_gpu_srcs})
 endif()


support bianry packages with multiple library folders

--- connext_cmake_module/cmake/Modules/FindConnext.cmake
+++ connext_cmake_module/cmake/Modules/FindConnext.cmake
@@ -34,44 +34,63 @@

   # find library nddscpp
   set(Connext_LIBRARIES "")
-  file(GLOB_RECURSE _lib
+  set(_lib_path "$ENV{NDDSHOME}/lib")
+  file(GLOB_RECURSE _libs
+    RELATIVE "${_lib_path}"
     "$ENV{NDDSHOME}/lib/*/libnddscpp.so")
-  if("${_lib}" STREQUAL "")
-    message(FATAL_ERROR "NNDSHOME set to '$ENV{NDDSHOME} but could not find 'libnddscpp.so'")
+
+  # remove libraries from non-matching platforms
+  set(_i 0)
+  while(TRUE)
+    list(LENGTH _libs _length)
+    if(NOT ${_i} LESS ${_length})
+      break()
+    endif()
+    list(GET _libs ${_i} _lib)
+    set(_match TRUE)
+    # ignore libraries in folders with 'jdk' suffix
+    string(FIND "${_lib}" "jdk/" _found)
+    if(NOT ${_found} EQUAL -1)
+      set(_match FALSE)
+    endif()
+    # ignore libraries in folders containing 'Linux2'
+    string(FIND "${_lib}" "Linux2" _found)
+    if(NOT ${_found} EQUAL -1)
+      set(_match FALSE)
+    endif()
+    if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
+      # on 64 bit platforms ignore libraries in folders containing 'i86'
+      string(FIND "${_lib}" "i86" _found)
+      if(NOT ${_found} EQUAL -1)
+        set(_match FALSE)
+      endif()
+    else()
+      # on 32 bit platforms ignore libraries in folders containing 'x64'
+      string(FIND "${_lib}" "x64" _found)
+      if(NOT ${_found} EQUAL -1)
+        set(_match FALSE)
+      endif()
+    endif()
+    # keep libraries matching this platform
+    if(_match)
+      math(EXPR _i "${_i} + 1")
+    else()
+      list(REMOVE_AT _libs ${_i})
+    endif()
+  endwhile()
+
+  if("${_libs} " STREQUAL " ")
+    message(FATAL_ERROR "NNDSHOME set to '$ENV{NDDSHOME}' but could not find 'libnddscpp.so' under '${_lib_path}'")
   endif()
-  list(LENGTH _lib _length)
   if(_length GREATER 1)
-    message(FATAL_ERROR "NNDSHOME set to '$ENV{NDDSHOME} but found multiple files named 'libnddscpp.so': ${_lib}")
+    message(FATAL_ERROR "NNDSHOME set to '$ENV{NDDSHOME}' but found multiple files named 'libnddscpp.so' under '${_lib_path}': ${_libs}")
   endif()
-  list(APPEND Connext_LIBRARIES ${_lib})

-  # find library nddsc relative to the first one
-  # get_filename_component(_lib_path "${_lib}" DIRECTORY)
-  # file(GLOB_RECURSE _lib
-  #   "${_lib_path}/libnddsc.so")
-  # if("${_lib}" STREQUAL "")
-  #   message(FATAL_ERROR "NNDSHOME set to '$ENV{NDDSHOME} but could not find 'libnddsc.so'")
-  # endif()
-  # list(LENGTH _lib _length)
-  # if(_length GREATER 1)
-  #   message(FATAL_ERROR "NNDSHOME set to '$ENV{NDDSHOME} but found multiple files named 'libnddsc.so': ${_lib}")
-  # endif()
-  # list(APPEND Connext_LIBRARIES ${_lib})
+  list(GET _libs 0 _lib)
+  list(APPEND Connext_LIBRARIES "${_lib_path}/${_lib}")

-  get_filename_component(_lib_path "${_lib}" DIRECTORY)
+  get_filename_component(_lib_path "${Connext_LIBRARIES}" DIRECTORY)
   set(Connext_LIBRARY_DIRS "${_lib_path}")
-
-  # find library nddscore relative to the first one
-  # file(GLOB_RECURSE _lib
-  #   "${_lib_path}/libnddscore.so")
-  # if("${_lib}" STREQUAL "")
-  #   message(FATAL_ERROR "NNDSHOME set to '$ENV{NDDSHOME} but could not find 'libnddscore.so'")
-  # endif()
-  # list(LENGTH _lib _length)
-  # if(_length GREATER 1)
-  #   message(FATAL_ERROR "NNDSHOME set to '$ENV{NDDSHOME} but found multiple files named 'libnddscore.so': ${_lib}")
-  # endif()
-  # list(APPEND Connext_LIBRARIES ${_lib})

   set(Connext_DEFINITIONS "-DRTI_LINUX" "-DRTI_UNIX")
   set(Connext_DDSGEN2 "$ENV{NDDSHOME}/scripts/rtiddsgen2")


SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

--- src/vlc.desktop.cmake
+++ src/vlc.desktop.cmake
@@ -37,6 +37,7 @@
 Name[nb]=VLC
 Name[nds]=VLC
 Name[nl]=VLC
+Name[nn]=VLC
 Name[pa]=VLC
 Name[pl]=VLC
 Name[pt]=VLC
@@ -84,6 +85,7 @@
 Comment[nb]=Phonon VLC-motor
 Comment[nds]=VLC-Hülpprogramm för Phonon
 Comment[nl]=VLC-backend van Phonon
+Comment[nn]=VLC-motor for Phonon
 Comment[pa]=ਫੋਨੋਨ VLC ਬੈਕਐਂਡ
 Comment[pl]=Silnik VLC dla Phonon
 Comment[pt]=Infra-estrutura do VLC para o Phonon


remove unused code, cmake atuo defines it instead

--- src/osvr/Macros.cmake
+++ src/osvr/Macros.cmake
@@ -39,15 +39,6 @@

     set_target_properties(${LIBNAME_FULL} PROPERTIES
         FOLDER "${LIB_FOLDER}")
-
-    # Are we building or using this library?
-    get_target_property(EXPORT_IMPORT_CONDITION ${LIBNAME_FULL} DEFINE_SYMBOL)
-
-    # If we are building then set export condition
-    if(NOT EXPORT_IMPORT_CONDITION)
-        set(EXPORT_IMPORT_CONDITION ${LIBNAME_FULL}_EXPORTS)
-    endif()
-    string(MAKE_C_IDENTIFIER ${EXPORT_IMPORT_CONDITION} EXPORT_IMPORT_CONDITION)

     configure_file("${_MACROS_DIR}/exportheader.cmake.in"
         Export.h


AFAIT, version 0.33 is the minimum version that kitchensync will compile against.

svn path=/trunk/KDE/kdepim/; revision=725980

--- cmake/modules/FindOpensync.cmake
+++ cmake/modules/FindOpensync.cmake
@@ -17,7 +17,7 @@
   IF (NOT WIN32)
     # use pkg-config to get the directories and then use these values
     # in the FIND_PATH() and FIND_LIBRARY() calls
-    PKG_CHECK_MODULES(OPENSYNC opensync-1.0>=0.30)
+    PKG_CHECK_MODULES(OPENSYNC opensync-1.0>=0.33)
   ENDIF(NOT WIN32)

 endif (OPENSYNC_INCLUDEDIR AND OPENSYNC_LIBDIR)
@@ -28,7 +28,7 @@
    else (Opensync_FIND_REQUIRED)
       set (_req FALSE)
    endif (Opensync_FIND_REQUIRED)
-   macro_log_feature(OPENSYNC_FOUND "opensync" "OpenSync Development Libraries" "http://www.opensync.org" ${_req} "0.30 or greater" "Needed to provide syncing functionality in KDE PIM applications. Necessary to compile kitchensync.")
+   macro_log_feature(OPENSYNC_FOUND "opensync" "OpenSync Development Libraries" "http://www.opensync.org" ${_req} "0.33 or greater" "Needed to provide syncing functionality in KDE PIM applications. Necessary to compile kitchensync.")
 else (NOT Opensync_FIND_QUIETLY)
    if (NOT OPENSYNC_FOUND)
       if (Opensync_FIND_REQUIRED)


ManageDependency: var_FOUND should be 1 if nothing not-found

--- Modules/ManageDependency.cmake
+++ Modules/ManageDependency.cmake
@@ -131,6 +131,7 @@
 	    IF(_rpm_ret)
 		## Dependency not found
 		M_MSG(${_verbose} "RPM ${_name} is not installed")
+		SET(_dirty 1)
 	    ENDIF(_rpm_ret)
 	ENDIF(NOT _rpm_missing)
     ENDIF(CMAKE_FEDORA_ENABLE_FEDORA_BUILD)
@@ -150,9 +151,9 @@
 	    --print-variables "${_opt_PKG_CONFIG}"
 	    OUTPUT_VARIABLE _variables
 	    OUTPUT_STRIP_TRAILING_WHITESPACE
-	    RESULT_VARIABLE _ret
+	    RESULT_VARIABLE _pkgconfig_ret
 	    )
-	IF(NOT _ret)
+	IF(NOT _pkgconfig_ret)
 	    STRING_SPLIT(${var}_VARIABLES "\n" "${_variables}")
 	    FOREACH(_v ${${var}_VARIABLES})
 		STRING(TOUPPER "${_v}" _u)
@@ -166,10 +167,13 @@
 		MARK_AS_ADVANCED(${var}_${_u})
 		M_MSG(${M_INFO1} "${var}_${_u}=${${var}_${_u}}")
 	    ENDFOREACH(_v)
-	ENDIF(NOT _ret)
+	ENDIF(NOT _pkgconfig_ret)
     ENDIF(_opt_PKG_CONFIG)

     ## Insert when it's not duplicated
+    IF(NOT _dirty)
+	SET(${var}_FOUND "1" CACHE INTERNAL "Found ${var}")
+    ENDIF(NOT _dirty)
     LIST(FIND ${listVar} "${_newDep}" _index)
     IF(_index EQUAL -1)
 	LIST(APPEND ${listVar} "${_newDep}")


SVN_SILENT made messages (.desktop file)

--- src/vlc.desktop.cmake
+++ src/vlc.desktop.cmake
@@ -11,7 +11,6 @@

 Name=VLC
 Name[bg]=VLC
-Name[bs]=VLC
 Name[ca]=VLC
 Name[ca@valencia]=VLC
 Name[cs]=VLC
@@ -53,7 +52,6 @@

 Comment=Phonon VLC backend
 Comment[bg]=Ядро VLC за Phonon
-Comment[bs]=VLC kao pozadina za Phonon
 Comment[ca]=Dorsal del VLC pel Phonon
 Comment[ca@valencia]=Dorsal del VLC pel Phonon
 Comment[cs]=Podpůrná vrstva VLC


Install libpugixml.a as well (#48)

Install libpugixml.a as well (#48)

--- external/ImportPugiXML.cmake
+++ external/ImportPugiXML.cmake
@@ -26,6 +26,7 @@
   add_library(libpugixml STATIC IMPORTED)
   add_dependencies(libpugixml pugixml_external)
   set_target_properties(libpugixml PROPERTIES IMPORTED_LOCATION ${PUGIXML_LIBRARY})
+  install(FILES ${PUGIXML_LIBRARY} DESTINATION lib)

 else()
   message(STATUS "Found pugixml: ${PUGIXML_INCLUDE_DIR} ${PUGIXML_LIBRARY}")


Fix CMake libusb include path variable

Fix CMake libusb include path variable

pkg_check_module set XXX_INCLUDE_DIRS not XXX_INCLUDEDIR

--- CMake/FindLibUSB.cmake
+++ CMake/FindLibUSB.cmake
@@ -24,7 +24,7 @@
 endif ( PKG_CONFIG_FOUND )

 if ( PKGCONFIG_LIBUSB_FOUND )
-  set ( LibUSB_INCLUDE_DIRS ${PKGCONFIG_LIBUSB_INCLUDEDIR} )
+  set ( LibUSB_INCLUDE_DIRS ${PKGCONFIG_LIBUSB_INCLUDE_DIRS} )
   foreach ( i ${PKGCONFIG_LIBUSB_LIBRARIES} )
     string ( REGEX MATCH "[^-]*" ibase "${i}" )
     find_library ( ${ibase}_LIBRARY


android.toolchain.cmake: Remove +x bit.

android.toolchain.cmake: Remove +x bit.


--- plasma-runner-ktp-contact.desktop.cmake
+++ plasma-runner-ktp-contact.desktop.cmake
@@ -7,6 +7,7 @@
 Name[es]=Mensajería instantánea
 Name[fi]=Pikaviestintä
 Name[fr]=Messagerie instantanée
+Name[ia]=Messageria instantanee
 Name[it]=Messaggistica istantanea
 Name[kk]=Лезде хабарласу
 Name[nb]=Lynmelding
@@ -34,6 +35,7 @@
 Comment[es]=Iniciar una conversación con cualquiera de sus contactos de MI o cambiar su estado de MI
 Comment[fi]=Aloita keskustelu muun pikaviestinkäyttäjän kanssa tai vaihda pikaviestintilaasi
 Comment[fr]=Démarre une discussion avec n'importe lequel de vos contacts de messagerie instantanée ou change l'état de celle-ci
+Comment[ia]=Initia conversation con qualcunque de tu contactos de IM o modifica tu status de IM
 Comment[it]=Avvia una chat con un tuo contatto di MI oppure cambia il tuo stato di MI
 Comment[kk]=Кез-келген лезде хабарласу контактыңызбен чат-әңгімені бастау не күй-жайын өзгерту
 Comment[nb]=Start en prat med en av dine LM-kontakter eller endre din LM-status


More deploy fixes

More deploy fixes

--- qtdeploy.cmake
+++ qtdeploy.cmake
@@ -10,7 +10,7 @@
 get_target_property(_qmake_executable Qt5::qmake IMPORTED_LOCATION)
 get_filename_component(_qt_bin_dir "${_qmake_executable}" DIRECTORY)

-if( WIN32 AND CMAKE_BUILD_TYPE STREQUAL Release AND FUGIO_BUILD_DIST )
+if( WIN32 AND CMAKE_BUILD_TYPE STREQUAL Release )
 	find_program( WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${_qt_bin_dir}" )

 	get_filename_component( ABS_BINARY_DIR "${CMAKE_INSTALL_PREFIX}" REALPATH BASE_DIR "${CMAKE_BINARY_DIR}")
@@ -20,14 +20,11 @@
 	  COMMAND "${WINDEPLOYQT_EXECUTABLE}"
 		--verbose 2
 		--no-compiler-runtime
-		--no-angle
-		--no-opengl-sw
-				--concurrent --opengl --serialport --websockets --network --qml --quick --quickwidgets
-				--qmldir "${CMAKE_SOURCE_DIR}/qml"
-				--dir "${ABS_BINARY_DIR}/${PATH_APP}"
-				--libdir "${ABS_BINARY_DIR}/${PATH_APP}"
-				--plugindir "${ABS_BINARY_DIR}/${PATH_APP}"
-				\"$<TARGET_FILE:${PROJECT_NAME}>\"
+		--serialport --websockets --network
+		--dir "${ABS_BINARY_DIR}/${PATH_APP}"
+		--libdir "${ABS_BINARY_DIR}/${PATH_APP}"
+		--plugindir "${ABS_BINARY_DIR}/${PATH_APP}"
+		\"$<TARGET_FILE:${PROJECT_NAME}>\"
 	)

 	file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_$<CONFIG>_path"
@@ -43,11 +40,8 @@
 			COMMAND \"${WINDEPLOYQT_EXECUTABLE}\"
 					--dry-run
 					--no-compiler-runtime
-					--no-angle
-					--no-opengl-sw
 					--list mapping
-					--concurrent --opengl --serialport --websockets --network --qml --quick --quickwidgets
-					--qmldir \"${CMAKE_SOURCE_DIR}/qml\"
+					--serialport --websockets --network
 					--dir \"${ABS_BINARY_DIR}/${PATH_APP}\"
 					--libdir \"${ABS_BINARY_DIR}/${PATH_APP}\"
 					--plugindir \"${ABS_BINARY_DIR}/${PATH_APP}\"
@@ -94,7 +88,7 @@

 endif()

-if( APPLE AND CMAKE_BUILD_TYPE STREQUAL Release AND FUGIO_BUILD_DIST )
+if( APPLE AND CMAKE_BUILD_TYPE STREQUAL Release )

 	find_program( MACDEPLOYQT_EXECUTABLE macdeployqt HINTS "${_qt_bin_dir}" )


VLC_VERSION = 2.1.2

VLC_VERSION = 2.1.2

--- PluginConfig.cmake
+++ PluginConfig.cmake
@@ -13,7 +13,7 @@
 #if you want embed vlc into FBVLC distribution:
 # 1) place vlc into FBVLC\Win\WiX\vlc-${VLC_VERSION}
 # 2) uncomment following line
-set(VLC_VERSION "2.0.8")
+set(VLC_VERSION "2.1.2")
 # 3) run prepXXXX.cmd from FireBreath

 #unfortunately current implementation does not work :(


use labels for incompressible tests

use labels for incompressible tests

--- phSolver/incompressible/test/testing.cmake
+++ phSolver/incompressible/test/testing.cmake
@@ -1,94 +1,62 @@
+macro(ic_parallel_test name procs dir exe)
+  set(tname incompressible_${name})
+  add_test(
+    NAME ${tname}
+    COMMAND ${MPIRUN} ${MPIRUN_PROCFLAG} ${procs} ${exe} ${ARGN}
+    WORKING_DIRECTORY ${dir} )
+  set_tests_properties(${tname} PROPERTIES LABELS "phsolver_incompressible")
+endmacro(ic_parallel_test)
+
+macro(ic_serial_test name exe)
+  set(tname incompressible_${name})
+  add_test( NAME ${tname} COMMAND ${exe} ${ARGN} )
+  set_tests_properties(${tname} PROPERTIES LABELS "phsolver_incompressible")
+endmacro(ic_serial_test)
+
 set(CDIR ${CASES}/incompressible)
-add_test(copyInpCfg
+ic_serial_test(copyInpCfg
   cp ${PHASTA_SOURCE_DIR}/phSolver/common/input.config ${CDIR})
-add_test(linkProcsDir-sync
+ic_serial_test(linkProcsDir-sync
   ln -snf ${CDIR}/4-procs_case-SyncIO-2 ${CDIR}/4-procs_case)
 if(HAS_VALGRIND)
-  add_test(incompressibleResetNumStartValgrind-sync
+  ic_serial_test(resetNumStartValgrind-sync
     cp ${CDIR}/numstart.dat ${CDIR}/4-procs_case/numstart.dat)
-  set(vgcmd
-    valgrind
-    --leak-check=yes
-    --log-file=icSyncValgrind.%p
-    ${PHASTA_BINARY_DIR}/bin/phastaIC.exe
-  )
-  add_test(
-    NAME incompressibleValgrind-sync
-    COMMAND ${MPIRUN} ${MPIRUN_PROCFLAG} 4 ${vgcmd}
-    WORKING_DIRECTORY ${CDIR}
-  )
+  ic_parallel_test(valgrind-sync 4 ${CDIR}
+    valgrind --leak-check=yes --log-file=icSyncValgrind.%p
+    ${PHASTA_BINARY_DIR}/bin/phastaIC.exe)
 endif(HAS_VALGRIND)
-add_test(incompressibleResetNumStart-sync
+ic_serial_test(resetNumStart-sync
   cp ${CDIR}/numstart.dat ${CDIR}/4-procs_case/numstart.dat)
-add_test(
-  NAME incompressible-sync
-  COMMAND ${MPIRUN} ${MPIRUN_PROCFLAG} 4 ${PHASTA_BINARY_DIR}/bin/phastaIC.exe
-  WORKING_DIRECTORY ${CDIR}
-)
-set(cmd
-  ${PHASTA_BINARY_DIR}/bin/checkphasta
+ic_parallel_test(sync 4 ${CDIR} ${PHASTA_BINARY_DIR}/bin/phastaIC.exe)
+set(compareArgs
   ${CDIR}/4-procs_case-SyncIO-2/
   ${CDIR}/4-procs_case-SyncIO-2_ref/
   2 1e-6)
-add_test(
-  NAME compareIncompressible-sync
-  COMMAND ${MPIRUN} ${MPIRUN_PROCFLAG} 4 ${cmd}
-  WORKING_DIRECTORY ${CDIR}
-)
-add_test(
-  NAME incompressibleRestart-sync
-  COMMAND ${MPIRUN} ${MPIRUN_PROCFLAG} 4 ${PHASTA_BINARY_DIR}/bin/phastaIC.exe
-  WORKING_DIRECTORY ${CDIR}
-)
-add_test(
-  NAME compareIncompressibleRestart-sync
-  COMMAND ${MPIRUN} ${MPIRUN_PROCFLAG} 4 ${cmd}
-  WORKING_DIRECTORY ${CDIR}
-)
+ic_parallel_test(compare-sync 4 ${CDIR}
+  ${PHASTA_BINARY_DIR}/bin/checkphasta ${compareArgs})
+ic_parallel_test(restart-sync 4 ${CDIR} ${PHASTA_BINARY_DIR}/bin/phastaIC.exe)
+ic_parallel_test(compareRestart-sync 4 ${CDIR}
+  ${PHASTA_BINARY_DIR}/bin/checkphasta ${compareArgs})

-add_test(linkProcsDir-posix
+ic_serial_test(linkProcsDir-posix
   ln -snf ${CDIR}/4-procs_case-Posix ${CDIR}/4-procs_case)
 if(HAS_VALGRIND)
-  add_test(incompressibleResetNumStartValgrind-posix
+  ic_serial_test(resetNumStartValgrind-posix
     cp ${CDIR}/numstart.dat ${CDIR}/4-procs_case/numstart.dat)
-  set(vgcmd
-    valgrind
-    --leak-check=yes
-    --log-file=icPosixValgrind.%p
-    ${PHASTA_BINARY_DIR}/bin/phastaIC.exe
-  )
-  add_test(
-    NAME incompressibleValgrind-posix
-    COMMAND ${MPIRUN} ${MPIRUN_PROCFLAG} 4 ${vgcmd}
-    WORKING_DIRECTORY ${CDIR}
-  )
+  ic_parallel_test(valgrind-posix 4 ${CDIR}
+    valgrind --leak-check=yes --log-file=icPosixValgrind.%p
+    ${PHASTA_BINARY_DIR}/bin/phastaIC.exe)
 endif(HAS_VALGRIND)
-add_test(incompressibleResetNumStart-posix
+ic_serial_test(resetNumStart-posix
   cp ${CDIR}/numstart.dat ${CDIR}/4-procs_case/numstart.dat)
-add_test(
-  NAME incompressible-posix
-  COMMAND ${MPIRUN} ${MPIRUN_PROCFLAG} 4 ${PHASTA_BINARY_DIR}/bin/phastaIC.exe
-  WORKING_DIRECTORY ${CDIR}
-)
-set(cmd
-  ${PHASTA_BINARY_DIR}/bin/checkphasta
+ic_parallel_test(posix 4 ${CDIR} ${PHASTA_BINARY_DIR}/bin/phastaIC.exe)
+set(compareArgs
   ${CDIR}/4-procs_case-Posix/
   ${CDIR}/4-procs_case-Posix_ref/
   0 1e-6)
-add_test(
-  NAME compareIncompressible-posix
-  COMMAND ${MPIRUN} ${MPIRUN_PROCFLAG} 4 ${cmd}
-  WORKING_DIRECTORY ${CDIR}
-)
-add_test(
-  NAME incompressibleRestart-posix
-  COMMAND ${MPIRUN} ${MPIRUN_PROCFLAG} 4 ${PHASTA_BINARY_DIR}/bin/phastaIC.exe
-  WORKING_DIRECTORY ${CDIR}
-)
-add_test(
-  NAME compareIncompressibleRestart-posix
-  COMMAND ${MPIRUN} ${MPIRUN_PROCFLAG} 4 ${cmd}
-  WORKING_DIRECTORY ${CDIR}
-)
-add_test(unlinkProcsDir-incompressible
-  rm ${CDIR}/4-procs_case)
+ic_parallel_test(compare-posix 4 ${CDIR}
+  ${PHASTA_BINARY_DIR}/bin/checkphasta ${compareArgs})
+ic_parallel_test(restart-posix 4 ${CDIR} ${PHASTA_BINARY_DIR}/bin/phastaIC.exe)
+ic_parallel_test(compareRestart-posix 4 ${CDIR}
+  ${PHASTA_BINARY_DIR}/bin/checkphasta ${compareArgs})
+ic_serial_test(unlinkProcsDir rm ${CDIR}/4-procs_case)


Use llvm 8 on RHEL 8.

Use llvm 8 on RHEL 8.

--- default_build_settings.cmake
+++ default_build_settings.cmake
@@ -17,7 +17,7 @@

 function(setup_vespa_default_build_settings_rhel_8_1)
   message("-- Setting up default build settings for rhel 8.1")
-  set(DEFAULT_VESPA_LLVM_VERSION "7" PARENT_SCOPE)
+  set(DEFAULT_VESPA_LLVM_VERSION "8" PARENT_SCOPE)
 endfunction()

 function(setup_vespa_default_build_settings_centos_7)


cmake: spelling of messages for root7 compilation

--- cmake/modules/RootBuildOptions.cmake
+++ cmake/modules/RootBuildOptions.cmake
@@ -308,9 +308,9 @@
 if(root7)
   if(NOT CMAKE_CXX_STANDARD)
       set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++14 standard used with root7")
-      message(STATUS "Enable C++14 for compilation of root7 components")
+      message(STATUS "Enabling C++14 for compilation of root7 components")
   elseif(NOT CMAKE_CXX_STANDARD GREATER 11)
-      message(FATAL_ERROR ">>> C++14 standard required with root7")
+      message(FATAL_ERROR ">>> At least C++14 standard required with root7")
    endif()
    if(NOT webui AND NOT webui_disabled)
       set(webui ON CACHE BOOL "(webui built automatically when root7 is enabled)" FORCE)


Cross compile for i686 in x86_64
Issue #10
By zidong.jiang@intel.com

libtuv-DCO-1.0-Signed-off-by: SaeHie Park saehie.park@samsung.com

--- cmake/option/option_i686-linux.cmake
+++ cmake/option/option_i686-linux.cmake
@@ -17,3 +17,9 @@
 include("cmake/option/option_linux_common.cmake")

 # i686 specific
+
+set(FLAGS_COMMON
+      ${FLAGS_COMMON}
+      -march=i686
+      -m32
+      )


Fixes bug caused by missing TO_CANONICAL_URIS.

--- internal/proto_library.cmake
+++ internal/proto_library.cmake
@@ -106,7 +106,7 @@

     # Compute all package dependencies (transitively)
     LIST(APPEND _PACKAGES "SYS://protobuf")
-    COMPUTE_PACKAGE_TRANSITIVE_CLOSURE(${_PACKAGES} missing_package_uris required_package_uris required_libraries required_includes)
+    COMPUTE_PACKAGE_TRANSITIVE_CLOSURE("${_PACKAGES}" missing_package_uris required_package_uris required_libraries required_includes)

     # Warn if a dependency is missing.
     IF(missing_package_uris)
@@ -145,7 +145,7 @@
     STRING(REGEX REPLACE "${CMAKE_SOURCE_DIR}/(.*)" "\\1" dest_dir ${CMAKE_CURRENT_SOURCE_DIR})
     INSTALL(FILES ${TARGET_FILE} DESTINATION ${dest_dir} )

-    SET(requiredPackages ${_PACKAGES})
+    TO_CANONICAL_URIS("${_PACKAGES}" requiredPackages)
     CONFIGURE_FILE("${cmakesnap_DIR}/internal/config.cmake.in"
                    ${CMAKE_CURRENT_BINARY_DIR}/${target}Config.cmake @ONLY IMMEDIATE)
     SET("${target}_DIR" ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH "default path to ${target} lib" FORCE)


correct findmumps cmake

correct findmumps cmake

--- config/cmake/modules/FindMUMPS.cmake
+++ config/cmake/modules/FindMUMPS.cmake
@@ -16,8 +16,8 @@

 include(MfemCmakeUtilities)
 mfem_find_package(MUMPS MUMPS MUMPS_DIR
-  "include" "dmumps_c.h"
-  "lib" "dmumps;mumps_common;pord"
+  "include" dmumps_c.h "lib" dmumps
   "Paths to headers required by MUMPS."
-  "Libraries required by MUMPS.")
-  +  "Libraries required by MUMPS."
+  ADD_COMPONENT mumps_common "include" dmumps_c.h "lib" mumps_common
+  ADD_COMPONENT pord "include" dmumps_c.h "lib" pord)


Add submission to CDash

Add submission to CDash

--- CI/main_ci.cmake
+++ CI/main_ci.cmake
@@ -1,10 +1,10 @@
 # This script is a prototype for the futur CI
+get_filename_component(OTB_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR} DIRECTORY)
 set (ENV{LANG} "C") # Only ascii output
-# Create build directory
-get_filename_component(OTB_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR} DIRECTORY)

 # Build Configuration : Release, Debug..
 set (CTEST_BUILD_CONFIGURATION "Release")
+set (CTEST_SITE "Ubuntu18.04-Release-Experimental-GitLabCI")

 # Directory variable
 set (CTEST_SOURCE_DIRECTORY "${OTB_SOURCE_DIR}")
@@ -18,7 +18,7 @@
 set (CTEST_BUILD_COMMAND "make ${CTEST_BUILD_FLAGS}")

 set (CTEST_CMAKE_GENERATOR "Unix Makefiles")
-set (CTEST_BUILD_NAME "CI_TEST")
+set (CTEST_BUILD_NAME "GitLab_ci_experimentation")

 # Data directory setting
@@ -33,7 +33,7 @@
 # End of configuration

-ctest_start ("Nightly")
+ctest_start (Experimental TRACK Experimental)

 ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}"
     SOURCE "${OTB_SOURCE_DIR}"
@@ -56,4 +56,6 @@
     ${_build_error}")
 endif()

-ctest_test()+ctest_test(PARALLEL_LEVEL 8])
+
+ctest_submit()


ENH: MGHIO is not compiled in ITK with Slicer. If DTIProcess is compiled as a Slicer extension, we do not require this module to be part of ITK.

--- DTIProcess.cmake
+++ DTIProcess.cmake
@@ -48,7 +48,7 @@
 find_package(SlicerExecutionModel REQUIRED)
 include(${SlicerExecutionModel_USE_FILE})

-find_package(ITK COMPONENTS
+set( LIST_ITK_COMPONENTS
   ITKDiffusionTensorImage
   ITKRegistrationCommon
   ITKOptimizersv4
@@ -77,7 +77,6 @@
   ITKIOImageBase
   ITKIOJPEG
   ITKIOLSM
-#  MGHIO
   ITKIOMRC
   ITKIOMesh
   ITKIOMeta
@@ -96,7 +95,16 @@
   ITKIOVTK
   ITKIOXML
   ITKTestKernel
-  REQUIRED)
+)
+
+if( NOT DTIProcess_BUILD_SLICER_EXTENSION )
+  list( APPEND LIST_ITK_COMPONENTS MGHIO )
+endif()
+
+find_package(ITK COMPONENTS
+   ${LIST_ITK_COMPONENTS}
+   REQUIRED
+   )
 include(${ITK_USE_FILE})
 # have to save library list because it gets clobbered by GenerateCLP, which
 # calls find_package(ITK) every time it's invoked.


cmake: esp32: Fix check for environment variable ESP_IDF_PATH

Environment variables should be checked with if(DEFINED
ENV{ESP_IDF_PATH}).

if($ENV{ESP_IDF_PATH}) was not evaluating to true as it should have
when env[ESP_IDF_PATH] was set.

Signed-off-by: Sebastian Bøe <edee888afd63e94916688495334700803eba20a0@nordicsemi.no>

--- boards/common/esp32.board.cmake
+++ boards/common/esp32.board.cmake
@@ -1,7 +1,7 @@
 set(BOARD_FLASH_RUNNER esp32)

 if(NOT DEFINED ESP_IDF_PATH)
-  if($ENV{ESP_IDF_PATH})
+  if(DEFINED ENV{ESP_IDF_PATH})
     message(WARNING "Setting ESP_IDF_PATH in the environment is deprecated. Use cmake -DESP_IDF_PATH=... instead.")
     set(ESP_IDF_PATH $ENV{ESP_IDF_PATH})
   endif()


Removing deleted source files material_editor_dialog_wx.cpp/.h from build.

https://tracker.physiomeproject.org/show_bug.cgi?id=2648

git-svn-id: 4705079bc6b8aadf675e3696f5c015a6aa4916e3@7967 3c1deb5b-d424-0410-962d-aba41a686d42

--- source/cmake/interfaces_source_files.cmake
+++ source/cmake/interfaces_source_files.cmake
@@ -65,10 +65,8 @@

 	IF(  ${GRAPHICS_API} MATCHES OPENGL_GRAPHICS )
 		SET( MATERIAL_INTERFACE_SRCS
-			source/material/material_editor_dialog_wx.cpp
 			source/material/material_editor_wx.cpp )
 		SET( MATERIAL_INTERFACE_HDRS
-			source/material/material_editor_dialog_wx.h
 			source/material/material_editor_wx.h )
 	ENDIF(  ${GRAPHICS_API} MATCHES OPENGL_GRAPHICS )


Fix compiler configuration for Mac.

Fix compiler configuration for Mac.

--- cmake/DOConfigureCompiler.cmake
+++ cmake/DOConfigureCompiler.cmake
@@ -95,5 +95,9 @@
   set(CMAKE_CXX_RELEASE_FLAGS "-03 -ffast-math")
   # Additional flags for Debug builds, which include code coverage.
   set(CMAKE_CXX_FLAGS_DEBUG
-      "-g -O0 -g -DDEBUG -D_DEBUG -fprofile-arcs -ftest-coverage -fno-inline")
+      "${CMAKE_CXX_FLAGS_DEBUG} -g -O0 -g -DDEBUG -D_DEBUG -fno-inline")
+  if (NOT APPLE)
+    set(CMAKE_CXX_FLAGS_DEBUG
+        "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage")
+  endif ()
 endif ()


Increase Windows stack size to 16MB.

Increase Windows stack size to 16MB.

(reverted from commit 8357930b25e5e4914d84eba507b7d94885ff5966)

--- cmake/EthCompilerSettings.cmake
+++ cmake/EthCompilerSettings.cmake
@@ -47,9 +47,10 @@
 	add_compile_options(/MP /EHsc /wd4068 /wd4996 /wd4503 /wd4267 /wd4180 /wd4290 /wd4244 /wd4800 -D_WIN32_WINNT=0x0501 /DNOMINMAX /DMINIUPNP_STATICLIB)
 	# disable empty object file warning
 	set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /ignore:4221")
-	# warning LNK4075: ignoring '/EDITANDCONTINUE' due to '/SAFESEH' specification
+	# warning LNK4075: ignoring '/EDITANDCONTINUE' due to '/SAFESEH' specification
 	# warning LNK4099: pdb was not found with lib
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ignore:4099,4075")
+	# stack size 16MB
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ignore:4099,4075 /STACK:16777216")

 	# windows likes static
 	if (NOT ETH_STATIC)


Updated JKQTPlotter to work with latest MSVC version

--- cmake/ExternalJKQTPlotter.cmake
+++ cmake/ExternalJKQTPlotter.cmake
@@ -7,7 +7,7 @@
         PREFIX ${FAST_EXTERNAL_BUILD_DIR}/jkqtplotter
         BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/jkqtplotter
         GIT_REPOSITORY "https://github.com/jkriege2/JKQtPlotter.git"
-        GIT_TAG "2b942e1e2d64c5fd45f5f70e53153b87299781ab"
+        GIT_TAG "fc7622e901cec7ed68abe6b2d95ea20ce30490ed"
         #UPDATE_COMMAND "" # Hack to avoid rebuild all the time on linux
         CMAKE_ARGS
           -DJKQtPlotter_BUILD_EXAMPLES:BOOL=OFF


Updated the CMCSTL2 package find module to no longer set CMCSTL2_INCLUDE_DIRS as a cache variable.

The cmake-developer documentation states that package find modules should not
set the <package>_INCLUDE_DIRS variable as a cache variable.  This change
results in a normal variable getting set instead of a cache variable.

--- cmake/modules/FindCMCSTL2.cmake
+++ cmake/modules/FindCMCSTL2.cmake
@@ -20,6 +20,12 @@
   PATHS ENV CMCSTL2_INSTALL_PATH
   PATH_SUFFIXES "/include")

+# find_path sets a cached variable, but find modules shouldn't do so according
+# to the cmake-developer documentation.  So, set a normal variable and unset
+# the cache variable.
+set(CMCSTL2_INCLUDE_DIRS ${CMCSTL2_INCLUDE_DIRS})
+unset(CMCSTL2_INCLUDE_DIRS CACHE)
+
 if(CMCSTL2_INCLUDE_DIRS)
   set_property(GLOBAL PROPERTY CMCSTL2_INCLUDE_DIRS ${CMCSTL2_INCLUDE_DIRS})
   set(CMCSTL2_FOUND 1)


swig/python.cmake: keep number of include dirs reasonable

If you had lots of dependencies, you would end up
adding lots and lots of include dirs, causing 'command line too long'
errors

Change-Id: Id3528488e564de88687b962b6c12352da990c54d
Reviewed-on: http://gerrit.aldebaran.lan:8080/894
Reviewed-by: dmerejkowsky <1e4b13000fa8777df4cefd2fd8215187e3deb062@aldebaran-robotics.com>
Tested-by: dmerejkowsky <1e4b13000fa8777df4cefd2fd8215187e3deb062@aldebaran-robotics.com>

--- cmake/qibuild/swig/python.cmake
+++ cmake/qibuild/swig/python.cmake
@@ -36,8 +36,6 @@
   endif()

   include("UseSWIG")
-  #find_package(SWIG REQUIRED)
-  #include(${SWIG_USE_FILE})

   set_source_files_properties(${interface_file} PROPERTIES CPLUSPLUS ON)
   # tell swig that the generated module name is ${module_name}.py
@@ -53,12 +51,20 @@

   ##
   # Deal with dependencies:
+  set(_inc_dirs)
   foreach (_dep ${ARG_DEPENDS})
     find_package(${_dep} NO_MODULE QUIET)
     find_package(${_dep} REQUIRED)
-    include_directories(
-      ${${_dep}_INCLUDE_DIR}
-      ${${_dep}_INCLUDE_DIRS})
+    if(${_dep}_INCLUDE_DIR)
+      _qi_list_append_path(_inc_dirs ${${_dep}_INCLUDE_DIR})
+    endif()
+    if(${_dep}_INCLUDE_DIRS)
+      _qi_list_append_path(_inc_dirs ${${_dep}_INCLUDE_DIRS})
+    endif()
+  endforeach()
+
+  foreach(_inc_dir ${_inc_dirs})
+    include_directories(${_inc_dir})
   endforeach()

   find_package(PYTHON)


--- vlc/vlc.desktop.cmake
+++ vlc/vlc.desktop.cmake
@@ -19,6 +19,7 @@
 Name[hu]=VLC
 Name[nds]=VLC
 Name[nl]=VLC
+Name[pa]=VLC
 Name[pt]=VLC
 Name[pt_BR]=VLC
 Name[sr]=ВЛЦ
@@ -39,6 +40,7 @@
 Comment[hu]=Phonon VLC-backend
 Comment[nds]=VLC-Hülpprogramm för Phonon
 Comment[nl]=VLC-backend van Phonon
+Comment[pa]=ਫੋਨੋਨ VLC ਬੈਕਐਂਡ
 Comment[pt]=Infra-estrutura do VLC para o Phonon
 Comment[pt_BR]=Infraestrutura do VLC para o Phonon
 Comment[sr]=ВЛЦ као позадина Фонона


--- vlc/vlc.desktop.cmake
+++ vlc/vlc.desktop.cmake
@@ -25,6 +25,7 @@
 Name[pa]=VLC
 Name[pt]=VLC
 Name[pt_BR]=VLC
+Name[ro]=VLC
 Name[ru]=VLC
 Name[sr]=ВЛЦ
 Name[sr@ijekavian]=ВЛЦ
@@ -52,6 +53,7 @@
 Comment[pa]=ਫੋਨੋਨ VLC ਬੈਕਐਂਡ
 Comment[pt]=Infra-estrutura do VLC para o Phonon
 Comment[pt_BR]=Infraestrutura do VLC para o Phonon
+Comment[ro]=Suportul VLC pentru Phonon
 Comment[ru]=Механизм VLC для Phonon
 Comment[sr]=ВЛЦ као позадина Фонона
 Comment[sr@ijekavian]=ВЛЦ као позадина Фонона


Fixed check for shared build for profiling option.

--- cmake/DetectOptions.cmake
+++ cmake/DetectOptions.cmake
@@ -188,8 +188,12 @@
   set(ADIOS2_HAVE_SysVShMem OFF)
 endif()

-if(ADIOS2_USE_Profiling STREQUAL AUTO AND SHARED_LIBS_SUPPORTED)
-  set(ADIOS2_HAVE_Profiling ON)
+if(ADIOS2_USE_Profiling STREQUAL AUTO)
+  if(BUILD_SHARED_LIBS)
+    set(ADIOS2_HAVE_Profiling ON)
+  else()
+    set(ADIOS2_HAVE_Profiling OFF)
+  endif()
 elseif(ADIOS2_USE_Profiling)
   set(ADIOS2_HAVE_Profiling ON)
 endif()


Fix nccl cmake files

Fix nccl cmake files

Summary: Closes https://github.com/caffe2/caffe2/pull/1963

Differential Revision: D6994392

Pulled By: bddppq

fbshipit-source-id: 4ab6a8f7dcb4469bdd3e152559ff3474984776fc

--- cmake/External/nccl.cmake
+++ cmake/External/nccl.cmake
@@ -18,17 +18,32 @@
     set(NCCL_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${NCCL_EXTRA_COMPILER_FLAGS})
     set(NCCL_C_FLAGS ${CMAKE_C_FLAGS} ${NCCL_EXTRA_COMPILER_FLAGS})

-    ExternalProject_Add(nccl_external
-      SOURCE_DIR ${nccl_PREFIX}
-      BUILD_IN_SOURCE 1
-      CONFIGURE_COMMAND ""
-      BUILD_COMMAND
-        make
-        "CXX=${CMAKE_CXX_COMPILER}"
-        "CUDA_HOME=${CUDA_TOOLKIT_ROOT_DIR}"
-        "NVCC=${CUDA_NVCC_EXECUTABLE}"
-      INSTALL_COMMAND ""
-      )
+    if(${CMAKE_VERSION} VERSION_LESS "3.2")
+      ExternalProject_Add(nccl_external
+        SOURCE_DIR ${nccl_PREFIX}
+        BUILD_IN_SOURCE 1
+        CONFIGURE_COMMAND ""
+        BUILD_COMMAND
+          make
+          "CXX=${CMAKE_CXX_COMPILER}"
+          "CUDA_HOME=${CUDA_TOOLKIT_ROOT_DIR}"
+          "NVCC=${CUDA_NVCC_EXECUTABLE}"
+        INSTALL_COMMAND ""
+        )
+    else()
+      ExternalProject_Add(nccl_external
+        SOURCE_DIR ${nccl_PREFIX}
+        BUILD_IN_SOURCE 1
+        CONFIGURE_COMMAND ""
+        BUILD_COMMAND
+          make
+          "CXX=${CMAKE_CXX_COMPILER}"
+          "CUDA_HOME=${CUDA_TOOLKIT_ROOT_DIR}"
+          "NVCC=${CUDA_NVCC_EXECUTABLE}"
+        BUILD_BYPRODUCTS "${nccl_PREFIX}/build/lib/libnccl_static.a"
+        INSTALL_COMMAND ""
+        )
+    endif()

     set(NCCL_FOUND TRUE)
     set(NCCL_INCLUDE_DIRS ${nccl_PREFIX}/build/include)


Some changes for Android NDK

Some changes for Android NDK

--- cmake/HalleyProject.cmake
+++ cmake/HalleyProject.cmake
@@ -76,7 +76,7 @@
 	endif()
 	add_definitions(-D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS)
 else()
-	if (NOT EMSCRIPTEN)
+	if ((NOT EMSCRIPTEN) AND (NOT ANDROID_NDK))
 		set(EXTRA_LIBS pthread)
 	endif()
 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
@@ -109,6 +109,13 @@
 if (EMSCRIPTEN)
 	set(USE_SDL2 0)
 	set(USE_ASIO 0)
+endif()
+
+if (ANDROID_NDK)
+	set(USE_SDL2 0)
+	set(USE_ASIO 0)
+	set(USE_OPENGL 0)
+	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_onCreate")
 endif()

 if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
@@ -147,6 +154,7 @@
 endif()

 # Boost
+message("Boost root is ${BOOST_ROOT}")
 find_package(Boost REQUIRED)
 add_definitions(-DBOOST_ALL_NO_LIB -DBOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE)
 if (BOOST_INCLUDE_DIR)
@@ -370,6 +378,9 @@
 	elseif (BUILD_MACOSX_BUNDLE)
 		add_executable(${name} MACOSX_BUNDLE ${proj_sources} ${proj_headers})
 		add_definitions(-DHALLEY_EXECUTABLE)
+	elseif (ANDROID_NDK)
+		add_library(${name} SHARED ${proj_sources} ${proj_headers})
+		add_definitions(-DHALLEY_EXECUTABLE)
 	else()
 		add_executable(${name} WIN32 ${proj_sources} ${proj_headers})
 		add_definitions(-DHALLEY_EXECUTABLE)
@@ -421,6 +432,13 @@
 		add_custom_command(TARGET ${name} POST_BUILD
 			COMMAND "cp" "-R" "${CMAKE_CURRENT_SOURCE_DIR}/assets/" "$<TARGET_FILE_DIR:${name}>/../Resources"
 		)
+	endif ()
+
+	if (ANDROID_NDK)
+		#add_library(native-activity SHARED main.cpp)
+		add_library(native_app_glue STATIC ${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c)
+		target_include_directories(${name} PRIVATE ${ANDROID_NDK}/sources/android/native_app_glue)
+		target_link_libraries(${name} android native_app_glue EGL GLESv1_CM log)
 	endif ()
 endfunction(halleyProject)


miss download part in this file

miss download part in this file

--- cmake/ITKDoxygenTAG.cmake
+++ cmake/ITKDoxygenTAG.cmake
@@ -3,6 +3,7 @@

 add_custom_command( OUTPUT ${ITKDoxygenTAG_DIR}/InsightDoxygen.tag
+  COMMAND ${CMAKE_COMMAND} -DITKDoxygenTAG_TEMP_DIR="${ITKDoxygenTAG_TEMP_DIR}" -P ${ITKv4Doc_SOURCE_DIR}/cmake/DownloadDoxygenTAG.cmake
   COMMAND ${CMAKE_COMMAND} -E chdir "${ITKDoxygenTAG_TEMP_DIR}" ${CMAKE_COMMAND} -E tar xjf "${ITKDoxygenTAG_TEMP_DIR}/InsightDoxygen.tag.tar.bz2"
   COMMAND ${CMAKE_COMMAND} -E rename "${ITKDoxygenTAG_TEMP_DIR}" "${ITKDoxygenTAG_DIR}"
   COMMAND ${CMAKE_COMMAND} -E remove_directory "${ITKDoxygenTAG_TEMP_DIR}"


OpenCVFindMKL: Fix a typo

OpenCVFindMKL: Fix a typo

--- cmake/OpenCVFindMKL.cmake
+++ cmake/OpenCVFindMKL.cmake
@@ -133,7 +133,7 @@
 set(HAVE_MKL ON)
 set(MKL_ROOT_DIR "${MKL_ROOT_DIR}" CACHE PATH "Path to MKL directory")
 set(MKL_INCLUDE_DIRS "${MKL_INCLUDE_DIRS}" CACHE PATH "Path to MKL include directory")
-set(MKL_LIBRARIES "${MKL_LIBRARIES}" CACHE STRING "MKL libarries")
+set(MKL_LIBRARIES "${MKL_LIBRARIES}" CACHE STRING "MKL libraries")
 if(UNIX AND NOT MKL_LIBRARIES_DONT_HACK)
     #it's ugly but helps to avoid cyclic lib problem
     set(MKL_LIBRARIES ${MKL_LIBRARIES} ${MKL_LIBRARIES} ${MKL_LIBRARIES} "-lpthread" "-lm" "-ldl")


Unset the found framework variable so it doesn't pollute the cmake cache

--- cmake/oryol_private.cmake
+++ cmake/oryol_private.cmake
@@ -127,6 +127,7 @@
         unset(found_framework CACHE)
         find_library(found_framework ${fw})
         target_link_libraries(${target} ${found_framework})
+        unset(found_framework CACHE)
     endforeach()
 endmacro()


fix doc indentation (it broke the HTML)

fix doc indentation (it broke the HTML)

Change-Id: I833d2a36962278afd02f6efb409aebcf97e09deb
Reviewed-on: http://gerrit.aldebaran.lan:8080/15772
Tested-by: gerrit
Reviewed-by: dmerejkowsky <1e4b13000fa8777df4cefd2fd8215187e3deb062@aldebaran-robotics.com>
Reviewed-by: sbarthelemy <9c154f64c36738f8e44d945c231ac417d15bd66e@aldebaran-robotics.com>
Tested-by: sbarthelemy <9c154f64c36738f8e44d945c231ac417d15bd66e@aldebaran-robotics.com>

--- cmake/qibuild/stage.cmake
+++ cmake/qibuild/stage.cmake
@@ -213,7 +213,7 @@
 #! Make sure configuration and data files in the
 #  given directory can be found by
 #  ``qi::findData()`` in this project or
-#   any dependency
+#  any dependency
 #
 # For this to work, configuration files should be
 # in ``etc`` and data files in ``share``


qibuild: fix qi_create_gtest : ARGUMENTS set by user was never used ...

--- cmake/qibuild/tests.cmake
+++ cmake/qibuild/tests.cmake
@@ -16,7 +16,7 @@
 # \param:TIMETOUT The timeout of the test
 # \group:ARGUMENTS Arguments to pass to add_test
 function(qi_add_test test_name target_name)
-  cmake_parse_arguments(ARG "" "TIMEOUT;ARGUMENTS" "" ${ARGN})
+  cmake_parse_arguments(ARG "" "TIMEOUT" "ARGUMENTS" ${ARGN})

   if(NOT ARG_TIMEOUT)
     set(ARG_TIMEOUT 20)
@@ -34,6 +34,7 @@

   add_test(${test_name} ${_bin_path} ${ARG_ARGUMENTS})

+  # Be nice with Visual Studio users:
   set_target_properties(${target_name}
     PROPERTIES
       FOLDER "tests")
@@ -83,9 +84,16 @@
     string(REPLACE "/" "\\\\" xml_output ${_xml_output})
   endif()

+
   # Call qi_add_test with correct arguments:
+  # first, --gtest_output:
+  set(_args --gtest_output=xml:${_xml_output})
+
+  # then, arguments coming from the user:
+  list(APPEND _args  ${ARG_ARGUMENTS})
+
   qi_add_test(${name} ${name}
     TIMEOUT ${ARG_TIMEOUT}
-    ARGUMENTS --gtest_output=xml:${_xml_output} ${ARG_ARGUMENTS}
+    ARGUMENTS ${_args}
   )
 endfunction()


Force CMAKE_*_FLAGS to be used

Force CMAKE_*_FLAGS to be used

Cmake doesn't use CMAKE_*_FLAGS normally, so we force it to use them

--- toolchain/Prizm.cmake
+++ toolchain/Prizm.cmake
@@ -16,8 +16,8 @@
 LINK_LIBRARIES(c)

 SET(LINKER_SCRIPT "${BASE_DIR}/toolchain/prizm.x")
-SET(CMAKE_C_FLAGS "-Os -Wall -mb  -mhitachi -nostdlib -ffunction-sections -fdata-sections")
-SET(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS})
+SET(CMAKE_C_FLAGS "-Os -Wall -mb  -mhitachi -nostdlib -ffunction-sections -fdata-sections" CACHE STRING "" FORCE)
+SET(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS} CACHE STRING "" FORCE)
 SET(CMAKE_EXE_LINKER_FLAGS "-L${BASE_DIR}/lib -T${LINKER_SCRIPT} -Wl,-static -Wl,-gc-sections -nostdlib")
 SET(CMAKE_SHARED_LINKER_FLAGS "-L${BASE_DIR}/lib -T${LINKER_SCRIPT} -Wl,-static -Wl,-gc-sections -nostdlib")
 SET(CMAKE_SHARED_LINKER_FLAGS "-L${BASE_DIR}/lib -T${LINKER_SCRIPT} -Wl,-static -Wl,-gc-sections -nostdlib")


Find package component

Find package component

Support COMPONENTS Parameter For find_package(AWSSDK)

--- cmake/AWSSDKConfig.cmake
+++ cmake/AWSSDKConfig.cmake
@@ -274,3 +274,18 @@
     list(APPEND ${OUTPUT_VAR} "core")
     list(REMOVE_DUPLICATES ${OUTPUT_VAR})
 endmacro(AWSSDK_LIB_DEPS)
+
+if (AWSSDK_FIND_COMPONENTS)
+    message(STATUS "Components specified for AWSSDK: ${AWSSDK_FIND_COMPONENTS}")
+    AWSSDK_DETERMINE_LIBS_TO_LINK(AWSSDK_FIND_COMPONENTS AWSSDK_LINK_LIBRARIES)
+    set(AWSSDK_TARGETS ${AWSSDK_LINK_LIBRARIES})
+    # for static sdk, platform dependencies will be included in AWSSDK_LINK_LIBRARIES.
+    list(REMOVE_ITEM AWSSDK_TARGETS ${AWSSDK_PLATFORM_DEPS})
+    list(REVERSE AWSSDK_TARGETS)
+
+    foreach(TARGET IN LISTS AWSSDK_TARGETS)
+        message(STATUS "Try finding ${TARGET}")
+        find_package(${TARGET} REQUIRED)
+        message(STATUS "Found ${TARGET}")
+    endforeach()
+endif()


fix wrong use of var in CodeCoverage cmake

--- cmake/CodeCoverage.cmake
+++ cmake/CodeCoverage.cmake
@@ -220,7 +220,7 @@
     endif() # NOT GENHTML_PATH

     # Set base directory (as absolute path), or default to PROJECT_SOURCE_DIR
-    if(${Coverage_BASE_DIRECTORY})
+    if(Coverage_BASE_DIRECTORY)
         get_filename_component(BASEDIR ${Coverage_BASE_DIRECTORY} ABSOLUTE)
     else()
         set(BASEDIR ${PROJECT_SOURCE_DIR})
@@ -316,7 +316,7 @@
     endif() # NOT GCOVR_PATH

     # Set base directory (as absolute path), or default to PROJECT_SOURCE_DIR
-    if(${Coverage_BASE_DIRECTORY})
+    if(Coverage_BASE_DIRECTORY)
         get_filename_component(BASEDIR ${Coverage_BASE_DIRECTORY} ABSOLUTE)
     else()
         set(BASEDIR ${PROJECT_SOURCE_DIR})
@@ -388,12 +388,12 @@
     endif() # NOT GCOVR_PATH

     # Set base directory (as absolute path), or default to PROJECT_SOURCE_DIR
-    if(${Coverage_BASE_DIRECTORY})
+    if(Coverage_BASE_DIRECTORY)
         get_filename_component(BASEDIR ${Coverage_BASE_DIRECTORY} ABSOLUTE)
     else()
         set(BASEDIR ${PROJECT_SOURCE_DIR})
     endif()
-
+
     # Collect excludes (CMake 3.4+: Also compute absolute paths)
     set(GCOVR_EXCLUDES "")
     foreach(EXCLUDE ${Coverage_EXCLUDE} ${COVERAGE_EXCLUDES} ${COVERAGE_GCOVR_EXCLUDES})


CMake: link with ${HDF5_HL_LIBRARIES}

CMake: link with ${HDF5_HL_LIBRARIES}

Fixes issue #3224.

--- cmake/Dependencies.cmake
+++ cmake/Dependencies.cmake
@@ -26,7 +26,7 @@
 # ---[ HDF5
 find_package(HDF5 COMPONENTS HL REQUIRED)
 include_directories(SYSTEM ${HDF5_INCLUDE_DIRS} ${HDF5_HL_INCLUDE_DIR})
-list(APPEND Caffe_LINKER_LIBS ${HDF5_LIBRARIES})
+list(APPEND Caffe_LINKER_LIBS ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES})

 # ---[ LMDB
 if(USE_LMDB)


improve compiler name and version detection

--- cmake/EigenTesting.cmake
+++ cmake/EigenTesting.cmake
@@ -271,6 +271,9 @@

   set_property(GLOBAL PROPERTY EIGEN_FAILTEST_FAILURE_COUNT "0")
   set_property(GLOBAL PROPERTY EIGEN_FAILTEST_COUNT "0")
+
+  # uncomment anytime you change the ei_get_compilerver_from_cxx_version_string macro
+  # ei_test_get_compilerver_from_cxx_version_string()
 endmacro(ei_init_testing)

 macro(ei_set_sitename)
@@ -303,28 +306,63 @@
     endif()
   else()
     # on all other system we rely on ${CMAKE_CXX_COMPILER}
-    # supporting a "--version" flag
-    exec_program( ${CMAKE_CXX_COMPILER}
-                  ARGS --version
-                  OUTPUT_VARIABLE eigen_cxx_compiler_version_raw
-                )
-    # first extract the compiler name which is the first word
-    string( REGEX REPLACE ".*(llvm\\-g\\+\\+|g\\+\\+|icpc|clang).*" "\\1"
-            eigen_cxx_compiler_name ${eigen_cxx_compiler_version_raw})
-
-    if(eigen_cxx_compiler_name MATCHES ".*g\\+\\+.*")
-      string( REGEX REPLACE ".* ([0-9])\\.([0-9])\\.([0-9]).*" "\\1.\\2.\\3"
-              eigen_cxx_compiler_version ${eigen_cxx_compiler_version_raw})
-    elseif(eigen_cxx_compiler_name MATCHES "icpc|clang")
-      string( REGEX REPLACE ".* ([0-9]+\\.[0-9]+\\.[0-9]+|[0-9]+\\.[0-9]+).*" "\\1"
-              eigen_cxx_compiler_version ${eigen_cxx_compiler_version_raw})
-    else()
-      set(eigen_cxx_compiler_version "_")
-    endif()
-
-    set(${VAR} "${eigen_cxx_compiler_name}-${eigen_cxx_compiler_version}")
+    # supporting a "--version" flag
+    execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version
+                    COMMAND head -n 1
+                    OUTPUT_VARIABLE eigen_cxx_compiler_version_string OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+    ei_get_compilerver_from_cxx_version_string(${eigen_cxx_compiler_version_string} CNAME CVER)
+
+    set(${VAR} "${CNAME}-${CVER}")
   endif()
 endmacro(ei_get_compilerver)
+
+# Extract compiler name and version from a raw version string
+# WARNING: if you edit thid macro, then please test it by  uncommenting
+# the testing macro call in ei_init_testing() of the EigenTesting.cmake file.
+# See also the ei_test_get_compilerver_from_cxx_version_string macro at the end of the file
+macro(ei_get_compilerver_from_cxx_version_string VERSTRING CNAME CVER)
+  # extract possible compiler names
+  string(REGEX MATCH "g\\+\\+"      ei_has_gpp    ${VERSTRING})
+  string(REGEX MATCH "llvm|LLVM"    ei_has_llvm   ${VERSTRING})
+  string(REGEX MATCH "gcc|GCC"      ei_has_gcc    ${VERSTRING})
+  string(REGEX MATCH "icpc|ICC"     ei_has_icpc   ${VERSTRING})
+  string(REGEX MATCH "clang|CLANG"  ei_has_clang  ${VERSTRING})
+
+  # combine them
+  if((ei_has_llvm) AND (ei_has_gpp OR ei_has_gcc))
+    set(${CNAME} "llvm-g++")
+  elseif((ei_has_llvm) AND (ei_has_clang))
+    set(${CNAME} "llvm-clang++")
+  elseif(ei_has_icpc)
+    set(${CNAME} "icpc")
+  elseif(ei_has_gpp OR ei_has_gcc)
+    set(${CNAME} "g++")
+  else()
+    set(${CNAME} "_")
+  endif()
+
+  # extract possible version numbers
+  # first try to extract 3 isolated numbers:
+  string(REGEX MATCH " [0-9]+\\.[0-9]+\\.[0-9]+" eicver ${VERSTRING})
+  if(NOT eicver)
+    # try to extract 2 isolated ones:
+    string(REGEX MATCH " [0-9]+\\.[0-9]+" eicver ${VERSTRING})
+    if(NOT eicver)
+      # try to extract 3:
+      string(REGEX MATCH "[^0-9][0-9]+\\.[0-9]+\\.[0-9]+" eicver ${VERSTRING})
+      if(NOT eicver)
+        # try to extract 2:
+        string(REGEX MATCH "[^0-9][0-9]+\\.[0-9]+" eicver ${VERSTRING})
+      else()
+        set(eicver " _")
+      endif()
+    endif()
+  endif()
+
+  string(REGEX REPLACE ".(.*)" "\\1" ${CVER} ${eicver})
+
+endmacro(ei_get_compilerver_from_cxx_version_string)

 macro(ei_get_cxxflags VAR)
   set(${VAR} "")
@@ -402,3 +440,31 @@
     set(${VAR} 1)
   endif()
 endmacro(ei_is_64bit_env)
+
+
+# helper macro for testing ei_get_compilerver_from_cxx_version_string
+# STR: raw version string
+# REFNAME: expected compiler name
+# REFVER: expected compiler version
+macro(ei_test1_get_compilerver_from_cxx_version_string STR REFNAME REFVER)
+  ei_get_compilerver_from_cxx_version_string(${STR} CNAME CVER)
+  if((NOT ${REFNAME} STREQUAL ${CNAME}) OR (NOT ${REFVER} STREQUAL ${CVER}))
+    message("STATUS ei_get_compilerver_from_cxx_version_string error:")
+    message("Expected \"${REFNAME}-${REFVER}\", got \"${CNAME}-${CVER}\"")
+  endif()
+endmacro(ei_test1_get_compilerver_from_cxx_version_string)
+
+# macro for testing ei_get_compilerver_from_cxx_version_string
+# feel free to add more version strings
+macro(ei_test_get_compilerver_from_cxx_version_string)
+  ei_test1_get_compilerver_from_cxx_version_string("g++ (SUSE Linux) 4.5.3 20110428 [gcc-4_5-branch revision 173117]" "g++" "4.5.3")
+  ei_test1_get_compilerver_from_cxx_version_string("c++ (GCC) 4.5.1 20100924 (Red Hat 4.5.1-4)" "g++" "4.5.1")
+  ei_test1_get_compilerver_from_cxx_version_string("icpc (ICC) 11.0 20081105" "icpc" "11.0")
+  ei_test1_get_compilerver_from_cxx_version_string("g++-3.4 (GCC) 3.4.6" "g++" "3.4.6")
+  ei_test1_get_compilerver_from_cxx_version_string("SUSE Linux clang version 3.0 (branches/release_30 145598) (based on LLVM 3.0)" "llvm-clang++" "3.0")
+  ei_test1_get_compilerver_from_cxx_version_string("icpc (ICC) 12.0.5 20110719" "icpc" "12.0.5")
+  ei_test1_get_compilerver_from_cxx_version_string("Apple clang version 2.1 (tags/Apple/clang-163.7.1) (based on LLVM 3.0svn)" "llvm-clang++" "2.1")
+  ei_test1_get_compilerver_from_cxx_version_string("i686-apple-darwin11-llvm-g++-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)" "llvm-g++" "4.2.1")
+  ei_test1_get_compilerver_from_cxx_version_string("g++-mp-4.4 (GCC) 4.4.6" "g++" "4.4.6")
+  ei_test1_get_compilerver_from_cxx_version_string("g++-mp-4.4 (GCC) 2011" "g++" "4.4")
+endmacro(ei_test_get_compilerver_from_cxx_version_string)


add optional compile flags to enable coverage testing

--- cmake/EigenTesting.cmake
+++ cmake/EigenTesting.cmake
@@ -153,11 +153,17 @@
 endmacro(ei_init_testing)

 if(CMAKE_COMPILER_IS_GNUCXX)
+  option(EIGEN_COVERAGE_TESTING "Enable/disable gcov" OFF)
+  if(EIGEN_COVERAGE_TESTING)
+    set(COVERAGE_FLAGS "-fprofile-arcs -ftest-coverage")
+  else(EIGEN_COVERAGE_TESTING)
+    set(COVERAGE_FLAGS "")
+  endif(EIGEN_ENABLE_COVERAGE_TESTING)
   if(CMAKE_SYSTEM_NAME MATCHES Linux)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g2")
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g2")
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-inline-functions")
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g2")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COVERAGE_FLAGS} -g2")
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COVERAGE_FLAGS} -O2 -g2")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${COVERAGE_FLAGS} -fno-inline-functions")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COVERAGE_FLAGS} -O0 -g2")
   endif(CMAKE_SYSTEM_NAME MATCHES Linux)
   set(EI_OFLAG "-O2")
 elseif(MSVC)


-apply same patch as in kdelibs/cmake/modules/, don't append /lib to CMAKE_INSTALL_PREFIX, since
this is already part of PATH_SUFFIXES

Alex

--- cmake/FindAutomoc4.cmake
+++ cmake/FindAutomoc4.cmake
@@ -32,7 +32,7 @@
              PATH_SUFFIXES automoc4 lib/automoc4 lib64/automoc4
              PATHS ${_env_CMAKE_PREFIX_PATH} ${CMAKE_PREFIX_PATH} ${CMAKE_SYSTEM_PREFIX_PATH}
                    ${_env_CMAKE_LIBRARY_PATH} ${CMAKE_LIBRARY_PATH} ${CMAKE_SYSTEM_LIBRARY_PATH}
-                   ${CMAKE_INSTALL_PREFIX}/lib
+                   ${CMAKE_INSTALL_PREFIX}
              NO_DEFAULT_PATH )
 endif("${KDESupport_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")


Removing unused cmake module

Removing unused cmake module

--- cmake/FindReadline.cmake
+++ cmake/FindReadline.cmake
@@ -1,18 +0,0 @@
-# from http://websvn.kde.org/trunk/KDE/kdeedu/cmake/modules/FindReadline.cmake
-# http://websvn.kde.org/trunk/KDE/kdeedu/cmake/modules/COPYING-CMAKE-SCRIPTS
-# --> BSD licensed
-#
-# GNU Readline library finder
-if(READLINE_INCLUDE_DIR AND READLINE_LIBRARY AND NCURSES_LIBRARY)
-  set(READLINE_FOUND TRUE)
-else(READLINE_INCLUDE_DIR AND READLINE_LIBRARY AND NCURSES_LIBRARY)
-  FIND_PATH(READLINE_INCLUDE_DIR readline/readline.h
-    /usr/include/readline
-  )
-
-  FIND_LIBRARY(READLINE_LIBRARY NAMES readline)
-      include(FindPackageHandleStandardArgs)
-      FIND_PACKAGE_HANDLE_STANDARD_ARGS(Readline DEFAULT_MSG READLINE_INCLUDE_DIR READLINE_LIBRARY )
-
-  MARK_AS_ADVANCED(READLINE_INCLUDE_DIR READLINE_LIBRARY)
-endif(READLINE_INCLUDE_DIR AND READLINE_LIBRARY AND NCURSES_LIBRARY)


Update SourceGroups.cmake

Update SourceGroups.cmake

--- cmake/SourceGroups.cmake
+++ cmake/SourceGroups.cmake
@@ -28,11 +28,9 @@
 source_group("ccstruct"     "${SSRC}/ccstruct/${H_CPP}")
 source_group("ccutil"       "${SSRC}/ccutil/${H_CPP}")
 source_group("classify"     "${SSRC}/classify/${H_CPP}")
-source_group("cube"         "${SSRC}/cube/${H_CPP}")
 source_group("cutil"        "${SSRC}/cutil/${H_CPP}")
 source_group("dict"         "${SSRC}/dict/${H_CPP}")
 source_group("lstm"         "${SSRC}/lstm/${H_CPP}")
-source_group("neural"       "${SSRC}/neural_networks/runtime/${H_CPP}")
 source_group("opencl"       "${SSRC}/opencl/${H_CPP}")
 source_group("textord"      "${SSRC}/textord/${H_CPP}")
 source_group("viewer"       "${SSRC}/viewer/${H_CPP}")


MINIFICPP-1124 - Fix target_wholearchive_library on Windows with older CMake versions

Signed-off-by: Arpad Boda <aboda@apache.org>

This closes #714

--- cmake/WholeArchive.cmake
+++ cmake/WholeArchive.cmake
@@ -22,7 +22,11 @@
         add_dependencies(${TARGET} ${ITEM})
     elseif(WIN32)
         target_link_libraries(${TARGET} ${ITEM})
-        set_property(TARGET ${TARGET} APPEND PROPERTY LINK_OPTIONS "/WHOLEARCHIVE:${ITEM}")
+        if(${CMAKE_VERSION} VERSION_LESS "3.13.0")
+            set_property(TARGET ${TARGET} APPEND_STRING PROPERTY LINK_FLAGS " /WHOLEARCHIVE:${ITEM}")
+        else()
+            target_link_options(${TARGET} PRIVATE "/WHOLEARCHIVE:${ITEM}")
+        endif()
         add_dependencies(${TARGET} ${ITEM})
     else()
         target_link_libraries(${TARGET} -Wl,--whole-archive ${ITEM} -Wl,--no-whole-archive)


ctest update

ctest update

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

--- cmake/ctest_script.cmake
+++ cmake/ctest_script.cmake
@@ -10,11 +10,11 @@
 ##   ctest -S /path/to/ctest_script.cmake
 ##
 ## It is recommended to make a copy of the file (especially using git).
-## For extra information
+## For more verbosity add the flag
 ##
 ##   ctest -S /path/to/ctest_script.cmake -V
 ##
-## or even  -VV
+## or even -VV.
 ##
 ## Set execution options in the Configuration part.
 ## For multiple tests (eg. different compilers) make multiple copies
@@ -33,10 +33,25 @@

 # The Generator for CMake.
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
+#set(CTEST_CMAKE_GENERATOR "Ninja")
+#set(CTEST_CMAKE_GENERATOR "NMake Makefiles")
+#set(CTEST_CMAKE_GENERATOR "NMake Makefiles JOM")
+#set(CTEST_CMAKE_GENERATOR "MinGW Makefiles")
+#set(CTEST_CMAKE_GENERATOR "Visual Studio 12 2013")
+#set(CTEST_CMAKE_GENERATOR "Visual Studio 14 2015")
+#set(CTEST_CMAKE_GENERATOR "Visual Studio 14 2015 Win64")
+#set(CTEST_CMAKE_GENERATOR "Xcode")
+#set(CTEST_CMAKE_GENERATOR "CodeBlocks")
+#set(CTEST_CMAKE_GENERATOR "Sublime Text 2")
+#set(CTEST_CMAKE_GENERATOR "Eclipse CDT4")

-# Set compiler
-#set(CXX g++)
-#set(CC  gcc)
+# Set environment/compiler
+set(ENV{CC}  "gcc")
+set(ENV{CXX} "g++")
+#set(ENV{CC}  "icc")
+#set(ENV{CXX} "icpc")
+#set(ENV{CC}  "clang")
+#set(ENV{CXX} "clang++")

 # Build type
 set(CTEST_BUILD_CONFIGURATION RelWithDebInfo)
@@ -45,16 +60,16 @@
 find_program(UNAME NAMES uname)
 exec_program("${UNAME}" ARGS "-s" OUTPUT_VARIABLE osname)
 exec_program("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "cpu")
-set(CTEST_BUILD_NAME "${osname}-${cpu} ${CTEST_CMAKE_GENERATOR} / ${CTEST_BUILD_CONFIGURATION} ${CXX}")
+set(CTEST_BUILD_NAME "${osname}-${cpu} ${CTEST_CMAKE_GENERATOR}/${CTEST_BUILD_CONFIGURATION} $ENV{CXX}")

 # Test type (Nightly, Continuous, Experimental)
-set(dashboard_model "Experimental")
+set(test_model "Experimental")

 # For continuous builds, number of seconds to stay alive
-set(dashboard_runtime 40000)
+set(test_runtime 40000)

 # Build flags
-set( CTEST_BUILD_FLAGS "-j2")
+set(CTEST_BUILD_FLAGS "-j2")

 # Source folder
 set(CTEST_SOURCE_DIRECTORY ${CTEST_SCRIPT_DIRECTORY}/..)
@@ -63,8 +78,8 @@
 set(CTEST_BINARY_DIRECTORY ${CTEST_SOURCE_DIRECTORY}/build_ctest)

 # Update type (eg. svn or git)
-set( UPDATE_TYPE git)
-set( CTEST_UPDATE_COMMAND "git") #"${CTEST_SOURCE_DIRECTORY}/cmake/svn_github.sh"
+set(UPDATE_TYPE git)
+set(CTEST_UPDATE_COMMAND "git")

 # Timeouts
 set(CTEST_TEST_TIMEOUT 200 CACHE STRING
@@ -86,14 +101,15 @@
 )

 # Coverage analysis
-#set(dashboard_do_coverage TRUE)
+#set(test_coverage TRUE)
 #set(CTEST_COVERAGE_COMMAND "/usr/bin/gcov")
 #set(CTEST_CUSTOM_COVERAGE_EXCLUDE "${CTEST_SOURCE_DIRECTORY}/external/")

 # Memory check with valgrind
-#set(dashboard_do_memcheck true)
+#set(test_memcheck true)
 #set(CTEST_MEMORYCHECK_COMMAND "/usr/bin/valgrind")
-
+#set(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "/path_to/suppression_file.supp")
+#set(CTEST_MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full --show-reachable=yes --track-origins=yes")

 ## #################################################################
@@ -109,44 +125,39 @@
   ctest_test()
   ctest_submit(PARTS Test)

-  if(dashboard_do_coverage)
+  if(test_coverage)
      message("Running coverage..")
      ctest_coverage(BUILD "${CTEST_BINARY_DIRECTORY}" APPEND)
      ctest_submit(PARTS Coverage)
   endif()

-  if(dashboard_do_memcheck)
+  if(test_memcheck)
     message("Running memcheck..")
     ctest_memcheck()
     ctest_submit(PARTS MemCheck)
   endif()
 endmacro(run_ctests)

-#if(NOT EXISTS "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt")
-#  message("Starting fresh configuration...")
-#  write_cache()
-#endif()
-
 file(MAKE_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
 #ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})

-ctest_start(${dashboard_model})
+ctest_start(${test_model})

-if(NOT "${dashboard_model}" STREQUAL "Continuous")
+if(NOT "${test_model}" STREQUAL "Continuous")

 ctest_update()
 run_ctests()

 else() #continuous model

-while(${CTEST_ELAPSED_TIME} LESS ${dashboard_runtime})
+while(${CTEST_ELAPSED_TIME} LESS ${test_runtime})
   set(START_TIME ${CTEST_ELAPSED_TIME})
   ctest_update(RETURN_VALUE count)
   #message(STATUS "Found ${count} changed files.")
   if( ${count} GREATER 0 )
     run_ctests()
   endif()
-  ctest_sleep(${START_TIME} 300    ${CTEST_ELAPSED_TIME})
+  ctest_sleep(${START_TIME} 300 ${CTEST_ELAPSED_TIME})
 endwhile()

-endif(NOT "${dashboard_model}" STREQUAL "Continuous")
+endif(NOT "${test_model}" STREQUAL "Continuous")


Bump version in xcfun.cmake

Bump version in xcfun.cmake

--- cmake/custom/xcfun.cmake
+++ cmake/custom/xcfun.cmake
@@ -23,10 +23,10 @@
   set(XCFUN_MAX_ORDER 6 CACHE STRING "Maximum order of derivatives of the exchange-correlation kernel" FORCE)
 endif()

-set(PROJECT_VERSION 2.0.2)
+set(PROJECT_VERSION 2.1.0)
 set(PROJECT_VERSION_MAJOR 2)
-set(PROJECT_VERSION_MINOR 0)
-set(PROJECT_VERSION_PATCH 2)
+set(PROJECT_VERSION_MINOR 1)
+set(PROJECT_VERSION_PATCH 0)

 set(CMAKECONFIG_INSTALL_DIR share/cmake/${PROJECT_NAME} CACHE PATH "Installation directory for CMake files")


Appveyor: Use last fifechan version from master that is build with SDL2 2.0.7 and SDL2-Image 2.0.2

--- cmake/get-fifechan.cmake
+++ cmake/get-fifechan.cmake
@@ -35,8 +35,8 @@
       PREFIX              ${DEPENDENCY_EXTRACT_DIR}
       DOWNLOAD_DIR        ${DEPENDENCY_DOWNLOAD_DIR}
       #URL                 https://github.com/fifengine/fifechan/releases/tag/${FIFECHAN_VERSION}/fifechan-v${FIFECHAN_VERSION}-VC14.zip
-      URL                 https://ci.appveyor.com/api/buildjobs/p6sl60h2upuyqun4/artifacts/fifechan-shared-VC14-x86.zip
-      URL_MD5             62317f867f13cb37a14c90b59e3f7ede
+      URL                 https://ci.appveyor.com/api/buildjobs/7rqrfkugg204sr0v/artifacts/fifechan-shared-dev-16b1149-VC14-x86.zip
+      URL_MD5             5a6b5a4a97c7cba024d47c17294fc4e9
       CONFIGURE_COMMAND   ""
       BUILD_COMMAND       ""
       INSTALL_COMMAND


re-enables python support.

re-enables python support.

git-svn-id: cf55bc44fb097054a32fc70455a459c940dbbffc@7845 c9849af7-e679-4ec6-a44e-fc146a885bd3

--- cmake/new_lcmtypes.cmake
+++ cmake/new_lcmtypes.cmake
@@ -261,8 +261,38 @@
     add_custom_target(lcmtypes_py ALL
       DEPENDS ${LCMTYPES_PYTHON_FILES})

-    # todo: install python files (but the below will fail because the files don't exist yet!)
-    #pods_install_python_packages(${LCMTYPES_DIR})
+    # install python files (would use pods_install_python_packages(${LCMTYPES_DIR}), but it would fail because the files don't exist yet)
+
+    find_package(PythonInterp REQUIRED)
+
+    # which python version?
+    execute_process(COMMAND
+        ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(sys.version[:3])"
+        OUTPUT_VARIABLE pyversion)
+
+    # where do we install .py files to?
+    set(python_install_dir
+        ${CMAKE_INSTALL_PREFIX}/lib/python${pyversion}/dist-packages)
+
+    foreach(py_file ${LCMTYPES_PYTHON_FILES})
+      get_filename_component(py_src_dir ${py_file} PATH)
+      get_filename_component(py_src_abs_dir ${py_src_dir} ABSOLUTE)
+      file(RELATIVE_PATH __tmp_dir ${LCMTYPES_DIR} ${py_file})
+      get_filename_component(py_module_name ${__tmp_dir} PATH)
+
+      if (py_module_name)  # only install files which specify a package
+        # note: might be adding multiple install rules for a single __init__.py, but cmake should resolve it
+      	install(FILES "${py_src_abs_dir}/__init__.py" DESTINATION "${python_install_dir}/${py_module_name}")
+	get_filename_component(parent_module ${py_module_name} PATH)
+	while (parent_module)
+	  install(FILES "${LCMTYPES_DIR}/${parent_module}/__init__.py" DESTINATION "${python_install_dir}/${parent_module}")
+  	  get_filename_component(parent_module ${parent_module} PATH)
+	endwhile()
+
+	install(FILES ${py_file} DESTINATION "${python_install_dir}/${py_module_name}")
+      endif()
+
+    endforeach()
   endif()

 endmacro()
@@ -276,7 +306,7 @@

   lcmtypes_build_java(${ARGV})

-#  lcmtypes_build_python(${ARGV})
+  lcmtypes_build_python(${ARGV})

 endmacro()


CPackConfig: fixed typo

CPackConfig: fixed typo

--- config/CPackConfig.cmake
+++ config/CPackConfig.cmake
@@ -1,7 +1,7 @@
 # general information
 SET(CPACK_PACKAGE_VENDOR "Heidelberg Collaboratory for Image Processing")
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY
-    "C++ computer vision library with emphasize on customizable algorithms and data structures"
+    "C++ computer vision library with emphasis on customizable algorithms and data structures"
 )

 # package version setup


Pass CMAKE_GENERATOR_PLATFORM to MITK-Configure

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -359,6 +359,7 @@
   LIST_SEPARATOR ${sep}
   DOWNLOAD_COMMAND ""
   CMAKE_GENERATOR ${gen}
+  CMAKE_GENERATOR_PLATFORM ${gen_platform}
   CMAKE_CACHE_ARGS
     # --------------- Build options ----------------
     -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}