[CMake] look into include/PythonQt5

[CMake] look into include/PythonQt5

as this is where the libpythonqt-qt5-common-dev package on 18.04 put its
includes.

--- cmake-module/FindPythonQt.cmake
+++ cmake-module/FindPythonQt.cmake
@@ -4,7 +4,7 @@
 #

 IF(NOT EXISTS "${PYTHONQT_INSTALL_DIR}")
-  FIND_PATH(PYTHONQT_INSTALL_DIR include/PythonQt/PythonQt.h
+  FIND_PATH(PYTHONQT_INSTALL_DIR NAMES include/PythonQt/PythonQt.h include/PythonQt5/PythonQt.h
     DOC "Directory where PythonQt was installed.")
 ENDIF()
 # XXX Since PythonQt 3.0 is not yet cmakeified, depending
@@ -13,10 +13,10 @@
 #     is added as an option. See [1] for more details.
 #     [1] https://github.com/commontk/CTK/pull/538#issuecomment-86106367
 FIND_PATH(PYTHONQT_INCLUDE_DIR PythonQt.h
-  PATHS "${PYTHONQT_INSTALL_DIR}/include/PythonQt"
+  PATHS "${PYTHONQT_INSTALL_DIR}/include/PythonQt" "${PYTHONQT_INSTALL_DIR}/include/PythonQt5"
   DOC "Path to the PythonQt include directory")
 FIND_PATH(PYTHONQT_QTALL_INCLUDE_DIR PythonQt_QtAll.h
-  PATHS "${PYTHONQT_INSTALL_DIR}/include/PythonQt"
+  PATHS "${PYTHONQT_INSTALL_DIR}/include/PythonQt" "${PYTHONQT_INSTALL_DIR}/include/PythonQt5"
   PATH_SUFFIXES "extensions/PythonQt_QtAll"
   DOC "Path to the PythonQt QtAll extension include directory")


Formatting correction in FindLIBMESH module.

--- cmake/Modules/FindLIBMESH.cmake
+++ cmake/Modules/FindLIBMESH.cmake
@@ -1,7 +1,7 @@
 # Finds the libMesh installation using CMake's PkgConfig
 # module and creates a libmesh imported target

-if (${CMAKE_VERSION} VERSION_LESS 3.12.0)
+if(${CMAKE_VERSION} VERSION_LESS 3.12.0)
     message(FATAL_ERROR "OpenMC builds with libMesh support require CMake version 3.12.0 or greater.")
 endif()


Find Xerces-C: Reformat CMake code

Find Xerces-C: Reformat CMake code

--- cmake/Modules/FindXercesC.cmake
+++ cmake/Modules/FindXercesC.cmake
@@ -1,4 +1,5 @@
-#.rst:
+# ~~~
+# .rst:
 # FindXercesC
 # -----------
 #
@@ -35,10 +36,10 @@
 #   the directory containing the Xerces headers
 # ``XercesC_LIBRARY``
 #   the Xerces library
-
+#
 # Written by Roger Leigh <rleigh@codelibre.net>
-
-#=============================================================================
+#
+# =============================================================================
 # Copyright 2014-2015 University of Dundee
 #
 # Distributed under the OSI-approved BSD License (the "License");
@@ -47,92 +48,90 @@
 # This software is distributed WITHOUT ANY WARRANTY; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 # See the License for more information.
-#=============================================================================
+# =============================================================================
+# ~~~

-function(_XercesC_GET_VERSION  version_hdr)
-    file(STRINGS ${version_hdr} _contents REGEX "^[ \t]*#define XERCES_VERSION_.*")
-    if(_contents)
-        string(REGEX REPLACE ".*#define XERCES_VERSION_MAJOR[ \t]+([0-9]+).*" "\\1" XercesC_MAJOR "${_contents}")
-        string(REGEX REPLACE ".*#define XERCES_VERSION_MINOR[ \t]+([0-9]+).*" "\\1" XercesC_MINOR "${_contents}")
-        string(REGEX REPLACE ".*#define XERCES_VERSION_REVISION[ \t]+([0-9]+).*" "\\1" XercesC_PATCH "${_contents}")
+function (_XercesC_GET_VERSION version_hdr)
+	file (STRINGS ${version_hdr} _contents REGEX "^[ \t]*#define XERCES_VERSION_.*")
+	if (_contents)
+		string (REGEX REPLACE ".*#define XERCES_VERSION_MAJOR[ \t]+([0-9]+).*" "\\1" XercesC_MAJOR "${_contents}")
+		string (REGEX REPLACE ".*#define XERCES_VERSION_MINOR[ \t]+([0-9]+).*" "\\1" XercesC_MINOR "${_contents}")
+		string (REGEX REPLACE ".*#define XERCES_VERSION_REVISION[ \t]+([0-9]+).*" "\\1" XercesC_PATCH "${_contents}")

-        if(NOT XercesC_MAJOR MATCHES "^[0-9]+$")
-            message(FATAL_ERROR "Version parsing failed for XERCES_VERSION_MAJOR!")
-        endif()
-        if(NOT XercesC_MINOR MATCHES "^[0-9]+$")
-            message(FATAL_ERROR "Version parsing failed for XERCES_VERSION_MINOR!")
-        endif()
-        if(NOT XercesC_PATCH MATCHES "^[0-9]+$")
-            message(FATAL_ERROR "Version parsing failed for XERCES_VERSION_REVISION!")
-        endif()
+		if (NOT XercesC_MAJOR MATCHES "^[0-9]+$")
+			message (FATAL_ERROR "Version parsing failed for XERCES_VERSION_MAJOR!")
+		endif ()
+		if (NOT XercesC_MINOR MATCHES "^[0-9]+$")
+			message (FATAL_ERROR "Version parsing failed for XERCES_VERSION_MINOR!")
+		endif ()
+		if (NOT XercesC_PATCH MATCHES "^[0-9]+$")
+			message (FATAL_ERROR "Version parsing failed for XERCES_VERSION_REVISION!")
+		endif ()

-        set(XercesC_VERSION "${XercesC_MAJOR}.${XercesC_MINOR}.${XercesC_PATCH}" PARENT_SCOPE)
-    else()
-        message(FATAL_ERROR "Include file ${version_hdr} does not exist or does not contain expected version information")
-    endif()
-endfunction()
+		set (XercesC_VERSION "${XercesC_MAJOR}.${XercesC_MINOR}.${XercesC_PATCH}" PARENT_SCOPE)
+	else ()
+		message (FATAL_ERROR "Include file ${version_hdr} does not exist or does not contain expected version information")
+	endif ()
+endfunction ()

 # Find include directory
-find_path(XercesC_INCLUDE_DIR
-          NAMES "xercesc/util/PlatformUtils.hpp"
-          DOC "Xerces-C++ include directory")
-mark_as_advanced(XercesC_INCLUDE_DIR)
+find_path (XercesC_INCLUDE_DIR NAMES "xercesc/util/PlatformUtils.hpp" DOC "Xerces-C++ include directory")
+mark_as_advanced (XercesC_INCLUDE_DIR)

-if(NOT XercesC_LIBRARY)
-  # Find all XercesC libraries
-  find_library(XercesC_LIBRARY_RELEASE
-               NAMES "xerces-c" "xerces-c_3"
-               DOC "Xerces-C++ libraries (release)")
-  find_library(XercesC_LIBRARY_DEBUG
-               NAMES "xerces-cd" "xerces-c_3D" "xerces-c_3_1D"
-               DOC "Xerces-C++ libraries (debug)")
-  include(SelectLibraryConfigurations)
-  select_library_configurations(XercesC)
-  mark_as_advanced(XercesC_LIBRARY_RELEASE XercesC_LIBRARY_DEBUG)
-endif()
+if (NOT XercesC_LIBRARY) # Find all XercesC libraries
+	find_library (XercesC_LIBRARY_RELEASE NAMES "xerces-c" "xerces-c_3" DOC "Xerces-C++ libraries (release)")
+	find_library (XercesC_LIBRARY_DEBUG NAMES "xerces-cd" "xerces-c_3D" "xerces-c_3_1D" DOC "Xerces-C++ libraries (debug)")
+	include (SelectLibraryConfigurations)
+	select_library_configurations (XercesC)
+	mark_as_advanced (XercesC_LIBRARY_RELEASE XercesC_LIBRARY_DEBUG)
+endif ()

-if(XercesC_INCLUDE_DIR)
-  _XercesC_GET_VERSION("${XercesC_INCLUDE_DIR}/xercesc/util/XercesVersion.hpp")
-endif()
+if (XercesC_INCLUDE_DIR)
+	_xercesc_get_version ("${XercesC_INCLUDE_DIR}/xercesc/util/XercesVersion.hpp")
+endif ()

-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(XercesC
-                                  FOUND_VAR XercesC_FOUND
-                                  REQUIRED_VARS XercesC_LIBRARY
-                                                XercesC_INCLUDE_DIR
-                                                XercesC_VERSION
-                                  VERSION_VAR XercesC_VERSION
-                                  FAIL_MESSAGE "Failed to find XercesC")
+include (FindPackageHandleStandardArgs)
+find_package_handle_standard_args (XercesC
+				   FOUND_VAR
+				   XercesC_FOUND
+				   REQUIRED_VARS
+				   XercesC_LIBRARY
+				   XercesC_INCLUDE_DIR
+				   XercesC_VERSION
+				   VERSION_VAR
+				   XercesC_VERSION
+				   FAIL_MESSAGE
+				   "Failed to find XercesC")

-if(XercesC_FOUND)
-  set(XercesC_INCLUDE_DIRS "${XercesC_INCLUDE_DIR}")
-  set(XercesC_LIBRARIES "${XercesC_LIBRARY}")
+if (XercesC_FOUND)
+	set (XercesC_INCLUDE_DIRS "${XercesC_INCLUDE_DIR}")
+	set (XercesC_LIBRARIES "${XercesC_LIBRARY}")

-  # For header-only libraries
-  if(NOT TARGET XercesC::XercesC)
-    add_library(XercesC::XercesC UNKNOWN IMPORTED)
-    if(XercesC_INCLUDE_DIRS)
-      set_target_properties(XercesC::XercesC PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES "${XercesC_INCLUDE_DIRS}")
-    endif()
-    if(EXISTS "${XercesC_LIBRARY}")
-      set_target_properties(XercesC::XercesC PROPERTIES
-        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-        IMPORTED_LOCATION "${XercesC_LIBRARY}")
-    endif()
-    if(EXISTS "${XercesC_LIBRARY_DEBUG}")
-      set_property(TARGET XercesC::XercesC APPEND PROPERTY
-        IMPORTED_CONFIGURATIONS DEBUG)
-      set_target_properties(XercesC::XercesC PROPERTIES
-        IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX"
-        IMPORTED_LOCATION_DEBUG "${XercesC_LIBRARY_DEBUG}")
-    endif()
-    if(EXISTS "${XercesC_LIBRARY_RELEASE}")
-      set_property(TARGET XercesC::XercesC APPEND PROPERTY
-        IMPORTED_CONFIGURATIONS RELEASE)
-      set_target_properties(XercesC::XercesC PROPERTIES
-        IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
-        IMPORTED_LOCATION_RELEASE "${XercesC_LIBRARY_RELEASE}")
-    endif()
-  endif()
-endif()
+	# For header-only libraries
+	if (NOT TARGET XercesC::XercesC)
+		add_library (XercesC::XercesC UNKNOWN IMPORTED)
+		if (XercesC_INCLUDE_DIRS)
+			set_target_properties (XercesC::XercesC PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${XercesC_INCLUDE_DIRS}")
+		endif ()
+		if (EXISTS "${XercesC_LIBRARY}")
+			set_target_properties (
+				XercesC::XercesC PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES "CXX" IMPORTED_LOCATION "${XercesC_LIBRARY}")
+		endif ()
+		if (EXISTS "${XercesC_LIBRARY_DEBUG}")
+			set_property (TARGET XercesC::XercesC APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+			set_target_properties (XercesC::XercesC
+					       PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG
+							  "CXX"
+							  IMPORTED_LOCATION_DEBUG
+							  "${XercesC_LIBRARY_DEBUG}")
+		endif ()
+		if (EXISTS "${XercesC_LIBRARY_RELEASE}")
+			set_property (TARGET XercesC::XercesC APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+			set_target_properties (XercesC::XercesC
+					       PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE
+							  "CXX"
+							  IMPORTED_LOCATION_RELEASE
+							  "${XercesC_LIBRARY_RELEASE}")
+		endif ()
+	endif ()
+endif ()


 * Check for right oRTP version in cmake.

svn path=/branches/work/soc-kopete-jingle/; revision=872877

--- cmake/modules/FindLiboRTP.cmake
+++ cmake/modules/FindLiboRTP.cmake
@@ -14,9 +14,17 @@
 FIND_LIBRARY(LIBORTP_LIBRARY NAMES ortp)

 IF( LIBORTP_INCLUDE_DIR AND LIBORTP_LIBRARY )
-#  EXECUTE_PROCESS(COMMAND gcc -o ortpversion -lortp ${LIBORTP_INCLUDE_DIR} ortpversion.c RESULT_VARIABLE result)
-#  MESSAGE(gcc -o ortpversion -lortp ${LIBORTP_INCLUDE_DIR} ortpversion.c)
-#  MESSAGE(${result})
-  SET( LIBORTP_FOUND TRUE)
-  MESSAGE( STATUS "Found libortp: ${LIBORTP_LIBRARY}")
+
+  EXECUTE_PROCESS(COMMAND gcc -o ortpversion -lortp -L${LIBORTP_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/cmake/modules/ortpversion.c RESULT_VARIABLE result)
+  if (NOT result)
+    EXECUTE_PROCESS(COMMAND ./ortpversion 0 13 RESULT_VARIABLE result)
+  endif(NOT result)
+  if (NOT result)
+#   Version OK
+    SET( LIBORTP_FOUND TRUE)
+    MESSAGE( STATUS "Found libortp: ${LIBORTP_LIBRARY}")
+  elseif(result)
+#   Version non OK
+    MESSAGE( STATUS "You need ortp version 0.13 minimum !")
+  endif(NOT result)
 ENDIF( LIBORTP_INCLUDE_DIR AND LIBORTP_LIBRARY )


Do not copy shader compiler DLL in OpenGL build.

--- CMake/Modules/Urho3D-CMake-common.cmake
+++ CMake/Modules/Urho3D-CMake-common.cmake
@@ -1033,7 +1033,7 @@
         add_custom_command (TARGET ${TARGET_NAME} POST_BUILD COMMAND scp $<TARGET_FILE:${TARGET_NAME}> ${URHO3D_SCP_TO_TARGET} || exit 0
             COMMENT "Scp-ing ${TARGET_NAME} executable to target system")
     endif ()
-    if (DIRECT3D_DLL)
+    if (DIRECT3D_DLL AND NOT URHO3D_OPENGL)
         # Make a copy of the D3D DLL to the runtime directory in the build tree
         add_custom_command (TARGET ${TARGET_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DIRECT3D_DLL} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
     endif ()


For Travis CI - last attempt to stabilize Emscripten CI build.

--- CMake/Modules/Urho3D-CMake-common.cmake
+++ CMake/Modules/Urho3D-CMake-common.cmake
@@ -1146,12 +1146,11 @@
         list (APPEND ARG_OPTIONS -timeout ${URHO3D_TEST_TIMEOUT})
         if (EMSCRIPTEN)
             if (DEFINED ENV{CI})
-                # The latency on Travis CI server could be very high at time, so set it to the maximum allowed by Travis CI before the process being timed out by Travis CI itself
-                set (EMRUN_TIMEOUT 590)     # 10 minutes (Travis CI timeout) - 10 seconds
-            else ()
-                # Non-CI test
-                math (EXPR EMRUN_TIMEOUT "2 * ${URHO3D_TEST_TIMEOUT}")
-            endif ()
+                # The latency on Travis CI server could be very high at time, so add some adjustment
+                # If it is not enough causing a test case failure then so be it because it is better that than wait for it and still ends up in build error due to time limit
+                set (EMRUN_TIMEOUT_ADJUSTMENT + 8 * \\${URHO3D_TEST_TIMEOUT})
+            endif ()
+            math (EXPR EMRUN_TIMEOUT "2 * ${URHO3D_TEST_TIMEOUT} ${EMRUN_TIMEOUT_ADJUSTMENT}")
             add_test (NAME ${ARG_NAME} COMMAND ${EMRUN} --browser ${EMSCRIPTEN_EMRUN_BROWSER} --timeout ${EMRUN_TIMEOUT} --timeout_returncode 1 --kill_exit ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TARGET_NAME}.html ${ARG_OPTIONS})
         else ()
             add_test (NAME ${ARG_NAME} COMMAND ${TARGET_NAME} ${ARG_OPTIONS})


deactivated ToFImageRecorderFilterTest and ToFNrrdImageWriterTest due to Windows problems

--- Modules/ToFHardware/Testing/files.cmake
+++ Modules/ToFHardware/Testing/files.cmake
@@ -20,9 +20,9 @@
   mitkToFImageCsvWriterTest.cpp
   mitkToFImageGrabberTest.cpp
   mitkToFImageRecorderTest.cpp
-  mitkToFImageRecorderFilterTest.cpp
+  #mitkToFImageRecorderFilterTest.cpp
   mitkToFImageWriterTest.cpp
-  mitkToFNrrdImageWriterTest.cpp
+  #mitkToFNrrdImageWriterTest.cpp
   mitkToFOpenCVImageGrabberTest.cpp
   mitkKinectControllerTest.cpp
   mitkKinectDeviceTest.cpp


Fix ios universal library location

Fix ios universal library location

--- cmake/core/sugar_add_ios_library.cmake
+++ cmake/core/sugar_add_ios_library.cmake
@@ -40,7 +40,25 @@

   # Add "fake" library
   get_target_property(location_base ${name_base} LOCATION_DEBUG)
-  string(REGEX REPLACE ".*DEBUG/" "" location_base "${location_base}")
+  sugar_status_debug("LOCATION_DEBUG: ${location_base}")
+  string(
+      REGEX
+      REPLACE
+      ".*/DEBUG/"
+      ""
+      base_name
+      "${location_base}"
+  )
+  string(
+      REGEX
+      REPLACE
+      "/DEBUG/.*"
+      ""
+      base_dir
+      "${location_base}"
+  )
+  sugar_status_debug("Base name: ${base_name}")
+  sugar_status_debug("Base dir: ${base_dir}")
   set(xcode_command xcodebuild -target "${name_base}")
   set(
       bin_name
@@ -62,8 +80,8 @@
       -output
       ${PROJECT_BINARY_DIR}/$<CONFIGURATION>-${build_dir}/${bin_name}
       -create
-      ${PROJECT_BINARY_DIR}/$<CONFIGURATION>-iphoneos/${location_base}
-      ${PROJECT_BINARY_DIR}/$<CONFIGURATION>-iphonesimulator/${location_base}
+      ${base_dir}/$<CONFIGURATION>-iphoneos/${base_name}
+      ${base_dir}/$<CONFIGURATION>-iphonesimulator/${base_name}
       WORKING_DIRECTORY
       ${PROJECT_BINARY_DIR}
   )


Revert "cmake : update to boost 1.47"

Revert "cmake : update to boost 1.47"

This reverts commit cd6539bd07b931a851bab088cd53c956fbbe0453.

--- cmake/qibuild/modules/boostutils.cmake
+++ cmake/qibuild/modules/boostutils.cmake
@@ -6,7 +6,7 @@

 function(boost_flib _suffix _libname)
-  set (BOOST_VERSION 1_47)
+  set (BOOST_VERSION 1_44)
   set(_linux_names
     "boost_${_libname}-mt"
     # for boost-locale < 1.37


Remove nparseasm from AIX xlc toolchain. (#140)

--- cmake/toolchains/aix/xlc-default.cmake
+++ cmake/toolchains/aix/xlc-default.cmake
@@ -16,7 +16,6 @@
        "-bmaxdata:0x50000000 "      # DRQS 13597546
        "-qalias=noansi "
        "-qarch=pwr6 "
-       "-qdebug=nparseasm "
        "-qfuncsect "
        "-qinline "
        "-qlanglvl=staticstoreoverlinkage "


boost cleaning

boost cleaning

The point is: you NEVER want to look for boost_${liname} on debug on windows

--- cmake/qibuild/modules/boostutils.cmake
+++ cmake/qibuild/modules/boostutils.cmake
@@ -1,43 +1,79 @@
 ## Copyright (C) 2011 Aldebaran Robotics
+
+
+

 function(boost_flib _suffix _libname)
   set (BOOST_VERSION 1_44)
-  flib(BOOST_${_suffix} OPTIMIZED NAMES
-    # windows vs dynamic
+  set(_linux_names
+    "boost_${_libname}-mt"
+    # for boost-locale < 1.37
+    "boost_${_libname}"
+  )
+
+  set(_osx_names
+    "boost_${_libname}-xgcc40-mt-${BOOST_VERSION}"
+    # for boost-locale < 1.37
+    "boost_${_libname}"
+  )
+
+  set(_vc_names_release
+    # dynamic
     "boost_${_libname}-vc80-mt-${BOOST_VERSION}"
     "boost_${_libname}-vc90-mt-${BOOST_VERSION}"
     "boost_${_libname}-vc100-mt-${BOOST_VERSION}"
-    # windows vs static
+    # for boost-locale < 1.37
+    "boost_${_libname}"
+    # static
     "libboost_${_libname}-vc80-mt-${BOOST_VERSION}"
     "libboost_${_libname}-vc90-mt-${BOOST_VERSION}"
     "libboost_${_libname}-vc100-mt-${BOOST_VERSION}"
-    # mingw
-    "libboost_${_libname}-mgw44-mt-${BOOST_VERSION}"
-    # osx
-    "boost_${_libname}-xgcc40-mt-${BOOST_VERSION}"
+  )

-    # linux
-    "boost_${_libname}-mt"
-    "boost_${_libname}"
-  )
-  flib(BOOST_${_suffix} DEBUG NAMES
-    # windows dynamic
+  set(_vc_names_debug
+    # dynamic
     "boost_${_libname}-vc80-mt-gd-${BOOST_VERSION}"
     "boost_${_libname}-vc90-mt-gd-${BOOST_VERSION}"
     "boost_${_libname}-vc100-mt-gd-${BOOST_VERSION}"
-    # windows static
+    # for boost-locale < 1.37
+    "boost_${_libname}_d"
+    # static
     "libboost_${_libname}-vc80-mt-gd-${BOOST_VERSION}"
     "libboost_${_libname}-vc90-mt-gd-${BOOST_VERSION}"
     "libboost_${_libname}-vc100-mt-gd-${BOOST_VERSION}"
-    # mingw
+  )
+
+  set (_mingw_names_debug
     "libboost_${_libname}-mgw44-mt-d-${BOOST_VERSION}"
+  )

-    # osx
-    "boost_${_libname}-xgcc40-mt-${BOOST_VERSION}"
+  set (_mingw_names_release
+    "libboost_${_libname}-mgw44-mt-${BOOST_VERSION}"
+  )

-    # linux
-    "boost_${_libname}_d"
-    "boost_${_libname}-mt"
-    "boost_${_libname}"
-  )
+  if(WIN32)
+    if(MSCV)
+      # vs
+      flib(BOOST_${_suffix} DEBUG NAMES
+        ${_vc_names_debug}
+      )
+      flib(BOOST_${_suffix} OPTIMIZED NAMES
+        ${_vc_names_release}
+      )
+    else()
+      # mingw
+      flib(BOOST_${_suffix} DEBUG NAMES
+        ${_mingw_names_debug}
+      )
+      flib(BOOST_${_suffix} OPTIMIZED NAMES
+        ${_mingw_names_release}
+      )
+    endif()
+  else() # No win32, no need for debug/release
+    if(APPLE)
+      flib(BOOST_${_suffix} NAMES ${_osx_names})
+    else()
+      flib(BOOST_${_suffix} NAMES ${_osx_names})
+    endif()
+  endif()
 endfunction()


ogre: cmake fix for plugins config

ogre: cmake fix for plugins config

--- cmake/qibuild/modules/ogre-tools.cmake
+++ cmake/qibuild/modules/ogre-tools.cmake
@@ -59,7 +59,7 @@
   file(APPEND "${_plugins_cfg}" "Plugin=${ARG_RENDER_PLUGIN}\n")

   if(WIN32)
-    set(_plugins_d_cfg "${QI_SDK_DIR}/${QI_SDK_CONF}/ogre/plugins_d.cfg")
+    set(_plugins_d_cfg "${QI_SDK_DIR}/${QI_SDK_CONF}/${ARG_APPLICATION_NAME}/ogre/plugins_d.cfg")
     file(WRITE  "${_plugins_d_cfg}" "# Defines Ogre plugins to load\n")
     file(APPEND "${_plugins_d_cfg}" "PluginFolder=${_ogre_plugins_folder}\n")
     file(APPEND "${_plugins_d_cfg}" "Plugin=${ARG_RENDER_PLUGIN}_d\n")


Fixed netcdf url

Fixed netcdf url

--- external/UseGDAL.cmake
+++ external/UseGDAL.cmake
@@ -65,7 +65,7 @@
     ExternalProject_Add(
         netcdf
         DEPENDS hdf5 proj4
-        URL "ftp://ftp.unidata.ucar.edu/pub/netcdf/${NETCDF_TGZ}"
+        URL "http://omegalib.googlecode.com/files/${NETCDF_TGZ}"
         CMAKE_ARGS
           -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
           -DBUILD_SHARED_LIBS=ON


delete build/cmake_modules/FindCryptoPP.cmake (now using openssl)

--- build/cmake_modules/FindCryptoPP.cmake
+++ build/cmake_modules/FindCryptoPP.cmake
@@ -1,61 +0,0 @@
-# - Find Crypto++
-
-if(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
-   set(CRYPTO++_FOUND TRUE)
-
-else(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
-  find_path(CRYPTO++_INCLUDE_DIR cryptopp/cryptlib.h
-      /usr/include
-      /usr/local/include
-      $ENV{SystemDrive}/Crypto++/include
-      $ENV{CRYPTOPP}
-      $ENV{CRYPTOPP}/..
-      $ENV{CRYPTOPP}/include
-      ${PROJECT_SOURCE_DIR}/../..
-      )
-
-  find_library(CRYPTO++_LIBRARIES NAMES cryptopp
-      PATHS
-      /usr/lib
-      /usr/local/lib
-      /opt/local/lib
-      $ENV{SystemDrive}/Crypto++/lib
-      $ENV{CRYPTOPP}/lib
-      )
-
-  if(MSVC AND NOT CRYPTO++_LIBRARIES) # Give a chance for MSVC multiconfig
-      if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-          set(PLATFORM x64)
-      else()
-          set(PLATFORM Win32)
-      endif()
-      find_library(CRYPTO++_LIBRARIES_RELEASE NAMES cryptlib cryptopp
-          HINTS
-          ${PROJECT_SOURCE_DIR}/../../cryptopp/${PLATFORM}/Output/Release
-          PATHS
-          $ENV{CRYPTOPP}/Win32/Output/Release
-      )
-      find_library(CRYPTO++_LIBRARIES_DEBUG NAMES cryptlib cryptopp
-          HINTS
-          ${PROJECT_SOURCE_DIR}/../../cryptopp/${PLATFORM}/Output/Debug
-          PATHS
-          $ENV{CRYPTOPP}/Win32/Output/Debug
-      )
-      set(CRYPTO++_LIBRARIES
-          debug ${CRYPTO++_LIBRARIES_DEBUG}
-          optimized ${CRYPTO++_LIBRARIES_RELEASE}
-          CACHE PATH "Path to Crypto++ library" FORCE
-      )
-  endif()
-
-  if(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
-    set(CRYPTO++_FOUND TRUE)
-    message(STATUS "Found Crypto++: ${CRYPTO++_INCLUDE_DIR}, ${CRYPTO++_LIBRARIES}")
-  else(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
-    set(CRYPTO++_FOUND FALSE)
-    message(STATUS "Crypto++ not found.")
-  endif(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
-
-  mark_as_advanced(CRYPTO++_INCLUDE_DIR CRYPTO++_LIBRARIES)
-
-endif(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)


update FindGraphicsOrigin to include share/cmake/ in CMAKE_MODULE_PATH

--- cmake/modules/FindGraphicsOrigin.cmake
+++ cmake/modules/FindGraphicsOrigin.cmake
@@ -38,6 +38,8 @@

 if( GRAPHICS_ORIGIN_INCLUDE_DIR )
 	set( GRAPHICS_ORIGIN_FOUND ON )
+
+	set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${GRAPHICS_ORIGIN_INCLUDE_DIR}/../share/cmake/modules )
   set( GRAPHICS_ORIGIN_LIBRARY_DIR "${GRAPHICS_ORIGIN_INCLUDE_DIR}/../lib")

   if( CMAKE_BUILD_TYPE STREQUAL "Debug" )


ManageRPM: Correct the format of rpm file

--- Modules/ManageRPM.cmake
+++ Modules/ManageRPM.cmake
@@ -320,10 +320,10 @@

     MACRO(PACK_RPM)
 	IF(NOT _manage_rpm_dependency_missing )
-	    SET(PRJ_SRPM_FILE "${RPM_BUILD_SRPMS}/${PROJECT_NAME}-${PRJ_VER}-${RPM_RELEASE_NO}.src.rpm"
+	    SET(PRJ_SRPM_FILE "${RPM_BUILD_SRPMS}/${PROJECT_NAME}-${PRJ_VER}-${RPM_RELEASE_NO}.${RPM_DIST_TAG}.src.rpm"
 		CACHE STRING "RPM files" FORCE)

-	    SET(PRJ_RPM_FILES "${RPM_BUILD_RPMS}/${PRJ_RPM_BUILD_ARCH}/${PROJECT_NAME}-${PRJ_VER}-${RPM_RELEASE_NO}.${PRJ_RPM_BUILD_ARCH}.rpm"
+	    SET(PRJ_RPM_FILES "${RPM_BUILD_RPMS}/${PRJ_RPM_BUILD_ARCH}/${PROJECT_NAME}-${PRJ_VER}-${RPM_RELEASE_NO}.${RPM_DIST_TAG}.${PRJ_RPM_BUILD_ARCH}.rpm"
 		CACHE STRING "RPM files" FORCE)

 	    PRJ_RPM_SPEC_DATA_PREPARE()


Do not enforce bodhi, just omit bodhi target if bodhi is not found

--- Modules/UseFedpkg.cmake
+++ Modules/UseFedpkg.cmake
@@ -60,7 +60,8 @@
     SET(_bodhi_template_file "bodhi.NO_PACK.template")
     SET(PACK_SOURCE_IGNORE_FILES ${PACK_SOURCE_IGNORE_FILES} "/${FEDPKG_DIR}/")

-    MACRO(_use_koji_make_targets srpm tags)
+    MACRO(_use_koji_make_targets srpm)
+	SET(_tags ${ARGN})
 	#commit
 	IF(DEFINED CHANGE_SUMMARY)
 	    SET (COMMIT_MSG  "-m \"${CHANGE_SUMMARY}\"")
@@ -68,13 +69,12 @@
 	    SET (COMMIT_MSG  "")
 	ENDIF(DEFINED CHANGE_SUMMARY)
 	SET(_first_branch "")
-	FOREACH(_tag ${tags})
+	FOREACH(_tag ${_tags})
+	    SET(_branch ${_tag})
 	    IF(_tag MATCHES "^el")
 		STRING(REGEX REPLACE "el\([0-9]+\)"
 		    "\\1E-epel-testing-candidate"  _branch
 		    "${_tag}")
-	    ELSE(_tag MATCHES "^el")
-		SET(_branch "${_tag}")
 	    ENDIF(_tag MATCHES "^el")

 	    ADD_CUSTOM_TARGET(koji_scratch_build_${_branch}
@@ -83,10 +83,11 @@
 		)

 	    ADD_DEPENDENCIES(koji_scratch_build koji_scratch_build_${_branch})
-	ENDFOREACH(_tag ${tags})
-    ENDMACRO(_use_koji_make_targets srpm tags)
-
-    MACRO(_use_fedpkg_make_targets srpm tags)
+	ENDFOREACH(_tag ${_tags})
+    ENDMACRO(_use_koji_make_targets srpm)
+
+    MACRO(_use_fedpkg_make_targets srpm)
+	SET(_tags ${ARGN})
 	#commit
 	IF (DEFINED CHANGE_SUMMARY)
 	    SET (COMMIT_MSG  "-m \"${CHANGE_SUMMARY}\"")
@@ -106,18 +107,15 @@
 	ADD_CUSTOM_TARGET(fedpkg_update
 	    COMMENT "fedpkg update"
 	    )
-	MESSAGE("tags=${tags}")

 	## Know the tag file path
-	#LIST(GET tags 0 _first_tag)
-	LIST(LENGTH "${tags}"  _first_tag)
-	MESSAGE("_first_tag=${_first_tag}")
+	LIST(GET _tags 0 _first_tag)
 	# bodhi tags is used as tag file name
 	_use_bodhi_convert_tag(_first_bodhi_tag ${_first_tag})
-	SET(_first_tag_path  ${FEDPKG_DIR}/${PROJECT_NAME}/.git/ref/tags/${PROJECT_NAME}-${PRJ_VER}-${PRJ_RELEASE_NO}.${_first_tag})
-	MESSAGE("_first_tag_path=${_first_tag_path}")
-
-	FOREACH(_tag ${tags})
+	SET(_first_tag_path  ${FEDPKG_DIR}/${PROJECT_NAME}/.git/ref/tags/${PROJECT_NAME}-${PRJ_VER}-${PRJ_RELEASE_NO}.${_first_bodhi_tag})
+	# MESSAGE("_first_tag_path=${_first_tag_path}")
+
+	FOREACH(_tag ${_tags})
 	    IF(_tag STREQUAL "${FEDORA_RAWHIDE_TAG}")
 		SET(_branch "master")
 	    ELSE(_tag STREQUAL "${FEDORA_RAWHIDE_TAG}")
@@ -186,14 +184,15 @@
 	    ADD_DEPENDENCIES(fedpkg_commit fedpkg_commit_${_branch})
 	    ADD_DEPENDENCIES(fedpkg_build_${_branch} fedpkg_commit_${_branch})

-	ENDFOREACH(_tag ${tags})
-    ENDMACRO(_use_fedpkg_make_targets tags srpm)
+	ENDFOREACH(_tag ${_tags})
+    ENDMACRO(_use_fedpkg_make_targets srpm)

     MACRO(USE_FEDPKG srpm)
 	IF(EXISTS $ENV{HOME}/.fedora-upload-ca.cert)
 	    SET(_rawhide 1)
 	    SET(_koji_dist_tags "")
 	    SET(_stage "")
+
 	    FOREACH(_arg ${ARGN})
 		IF ("${_arg}" STREQUAL "NORAWHIDE")
 		    SET(_rawhide 0)
@@ -201,17 +200,15 @@
 		    SET(_stage "TAGS")
 		ELSE("${_arg}" STREQUAL "NORAWHIDE")
 		    IF(_stage STREQUAL "TAGS")
-			SET(_koji_dist_tags ${_koji_dist_tags} ${_arg})
+			LIST(APPEND _koji_dist_tags ${_arg})
 		    ENDIF(_stage STREQUAL "TAGS")
 		ENDIF("${_arg}" STREQUAL "NORAWHIDE")
 	    ENDFOREACH(_arg)

-	    IF(_koji_dist_tags STREQUAL "")
-		SET(_koji_dist_tags ${FEDORA_CURRENT_RELEASE_TAGS})
-	    ENDIF(_koji_dist_tags STREQUAL "")
-
 	    IF(NOT "${FEDORA_RELEASE_TAGS}" STREQUAL "")
 		SET(_koji_dist_tags ${FEDORA_RELEASE_TAGS})
+	    ELSEIF(_koji_dist_tags STREQUAL "")
+		LIST(APPEND _koji_dist_tags ${FEDORA_CURRENT_RELEASE_TAGS})
 	    ENDIF(NOT "${FEDORA_RELEASE_TAGS}" STREQUAL "")

 	    IF(_rawhide EQUAL 1)
@@ -235,7 +232,7 @@

 		## Make target commands for the released dist
-		_use_fedpkg_make_targets("${srpm}" "${_koji_dist_tags}")
+		_use_fedpkg_make_targets("${srpm}" ${_koji_dist_tags})

 		#ADD_DEPENDENCIES(fedpkg_build fedpkg_commit)

@@ -248,7 +245,7 @@
 		ADD_CUSTOM_TARGET(koji_scratch_build
 		    COMMENT "Koji scratch build"
 		    )
-		_use_koji_make_targets("${srpm}" "${_koji_dist_tags}")
+		_use_koji_make_targets("${srpm}" ${_koji_dist_tags})

 	    ENDIF(KOJI STREQUAL "KOJI-NOTFOUND")

@@ -280,79 +277,78 @@
 	IF(EXISTS $ENV{HOME}/.fedora-upload-ca.cert)
 	    FIND_PROGRAM(BODHI bodhi)
 	    IF(BODHI STREQUAL "BODHI-NOTFOUND")
-		MESSAGE(FATAL-ERROR "Program bodhi is not found!")
+		MESSAGE("Program bodhi is not found!")
+	    ELSE(BODHI STREQUAL "BODHI-NOTFOUND")
+		SET(_stage "NONE")
+		FOREACH(_arg ${ARGN})
+		    IF(_arg STREQUAL "TAGS")
+			SET(_stage "TAGS")
+		    ELSEIF(_arg STREQUAL "KARMA")
+			SET(_stage "KARMA")
+		    ELSE(_arg STREQUAL "TAGS")
+			# option values
+			IF(_stage STREQUAL "TAGS")
+			    SET(_tags ${_tags} ${_arg})
+			ELSEIF(_stage STREQUAL "KARMA")
+			    IF(_arg STREQUAL "0")
+				SET(_autokarma "False")
+			    ELSE(_arg STREQUAL "0")
+				SET(_autokarma "True")
+			    ENDIF(_arg STREQUAL "0")
+			    SET(_stable_karma "${_arg}")
+			    SET(_unstable_karma "-${_arg}")
+			    SET(_tags ${_arg})
+			ENDIF(_stage STREQUAL "TAGS")
+		    ENDIF(_arg STREQUAL "TAGS")
+		ENDFOREACH(_arg ${ARGN})
+
+		IF(NOT _tags)
+		    SET(_tags ${FEDORA_CURRENT_RELEASE_TAGS})
+		ENDIF(NOT _tags)
+
+		IF(NOT "${FEDORA_RELEASE_TAGS}" STREQUAL "")
+		    SET(_tags ${FEDORA_RELEASE_TAGS})
+		ENDIF(NOT "${FEDORA_RELEASE_TAGS}" STREQUAL "")
+
+		FILE(REMOVE ${_bodhi_template_file})
+		FOREACH(_tag ${_tags})
+		    _use_bodhi_convert_tag(_bodhi_tag ${_tag})
+
+		    FILE(APPEND ${_bodhi_template_file} "[${PROJECT_NAME}-${PRJ_VER}-${PRJ_RELEASE_NO}.${_bodhi_tag}]\n\n")
+
+		    IF(BODHI_UPDATE_TYPE)
+			FILE(APPEND ${_bodhi_template_file} "type=${BODHI_UPDATE_TYPE}\n\n")
+		    ELSE(BODHI_UPDATE_TYPE)
+			FILE(APPEND ${_bodhi_template_file} "type=bugfix\n\n")
+		    ENDIF(BODHI_UPDATE_TYPE)
+
+		    FILE(APPEND ${_bodhi_template_file} "request=testing\n")
+		    FILE(APPEND ${_bodhi_template_file} "bugs=${REDHAT_BUGZILLA}\n")
+
+		    _append_notes(${_bodhi_template_file})
+
+		    FILE(APPEND ${_bodhi_template_file} "autokarma=${_autokarma}\n")
+		    FILE(APPEND ${_bodhi_template_file} "stable_karma=${_stable_karma}\n")
+		    FILE(APPEND ${_bodhi_template_file} "unstable_karma=${_unstable_karma}\n")
+		    FILE(APPEND ${_bodhi_template_file} "close_bugs=True\n")
+
+		    IF(SUGGEST_REBOOT)
+			FILE(APPEND ${_bodhi_template_file} "suggest_reboot=True\n")
+		    ELSE(SUGGEST_REBOOT)
+			FILE(APPEND ${_bodhi_template_file} "suggest_reboot=False\n\n")
+		    ENDIF(SUGGEST_REBOOT)
+		ENDFOREACH(_tag ${_tags})
+
+		IF(BODHI_USER)
+		    SET(_bodhi_login "-u ${BODHI_USER}")
+		ENDIF(BODHI_USER)
+
+		ADD_CUSTOM_TARGET(bodhi_new
+		    COMMAND eval "bodhi --new ${_bodhi_login} --file ${_bodhi_template_file}"
+		    COMMENT "Send new package to bodhi"
+		    VERBATIM
+		    )
 	    ENDIF(BODHI STREQUAL "BODHI-NOTFOUND")
-
-	    SET(_stage "NONE")
-	    FOREACH(_arg ${ARGN})
-		IF(_arg STREQUAL "TAGS")
-		    SET(_stage "TAGS")
-		ELSEIF(_arg STREQUAL "KARMA")
-		    SET(_stage "KARMA")
-		ELSE(_arg STREQUAL "TAGS")
-		    # option values
-		    IF(_stage STREQUAL "TAGS")
-			SET(_tags ${_tags} ${_arg})
-		    ELSEIF(_stage STREQUAL "KARMA")
-			IF(_arg STREQUAL "0")
-			    SET(_autokarma "False")
-			ELSE(_arg STREQUAL "0")
-			    SET(_autokarma "True")
-			ENDIF(_arg STREQUAL "0")
-			SET(_stable_karma "${_arg}")
-			SET(_unstable_karma "-${_arg}")
-			SET(_tags ${_arg})
-		    ENDIF(_stage STREQUAL "TAGS")
-		ENDIF(_arg STREQUAL "TAGS")
-	    ENDFOREACH(_arg ${ARGN})
-
-	    IF(NOT _tags)
-		SET(_tags ${FEDORA_CURRENT_RELEASE_TAGS})
-	    ENDIF(NOT _tags)
-
-	    IF(NOT "${FEDORA_RELEASE_TAGS}" STREQUAL "")
-		SET(_tags ${FEDORA_RELEASE_TAGS})
-	    ENDIF(NOT "${FEDORA_RELEASE_TAGS}" STREQUAL "")
-
-	    FILE(REMOVE ${_bodhi_template_file})
-	    FOREACH(_tag ${_tags})
-		_use_bodhi_convert_tag(_bodhi_tag ${_tag})
-
-		FILE(APPEND ${_bodhi_template_file} "[${PROJECT_NAME}-${PRJ_VER}-${PRJ_RELEASE_NO}.${_bodhi_tag}]\n\n")
-
-		IF(BODHI_UPDATE_TYPE)
-		    FILE(APPEND ${_bodhi_template_file} "type=${BODHI_UPDATE_TYPE}\n\n")
-		ELSE(BODHI_UPDATE_TYPE)
-		    FILE(APPEND ${_bodhi_template_file} "type=bugfix\n\n")
-		ENDIF(BODHI_UPDATE_TYPE)
-
-		FILE(APPEND ${_bodhi_template_file} "request=testing\n")
-		FILE(APPEND ${_bodhi_template_file} "bugs=${REDHAT_BUGZILLA}\n")
-
-		_append_notes(${_bodhi_template_file})
-
-		FILE(APPEND ${_bodhi_template_file} "autokarma=${_autokarma}\n")
-		FILE(APPEND ${_bodhi_template_file} "stable_karma=${_stable_karma}\n")
-		FILE(APPEND ${_bodhi_template_file} "unstable_karma=${_unstable_karma}\n")
-		FILE(APPEND ${_bodhi_template_file} "close_bugs=True\n")
-
-		IF(SUGGEST_REBOOT)
-		    FILE(APPEND ${_bodhi_template_file} "suggest_reboot=True\n")
-		ELSE(SUGGEST_REBOOT)
-		    FILE(APPEND ${_bodhi_template_file} "suggest_reboot=False\n\n")
-		ENDIF(SUGGEST_REBOOT)
-	    ENDFOREACH(_tag ${_tags})
-
-	    IF(BODHI_USER)
-		SET(_bodhi_login "-u ${BODHI_USER}")
-	    ENDIF(BODHI_USER)
-
-	    ADD_CUSTOM_TARGET(bodhi_new
-		COMMAND eval "bodhi --new ${_bodhi_login} --file ${_bodhi_template_file}"
-		COMMENT "Send new package to bodhi"
-		VERBATIM
-		)
-
 	ENDIF(EXISTS $ENV{HOME}/.fedora-upload-ca.cert)
     ENDMACRO(USE_BODHI)


fix warning flags on Windows

fix warning flags on Windows

--- rosidl_typesupport_connext_cpp/cmake/rosidl_typesupport_connext_cpp_generate_interfaces.cmake
+++ rosidl_typesupport_connext_cpp/cmake/rosidl_typesupport_connext_cpp_generate_interfaces.cmake
@@ -168,8 +168,12 @@
   target_compile_definitions(${rosidl_generate_interfaces_TARGET}${_target_suffix}
     PRIVATE "NDDS_USER_DLL_EXPORT")
 endif()
-set_target_properties(${rosidl_generate_interfaces_TARGET}${_target_suffix} PROPERTIES COMPILE_FLAGS
-  "-Wall -Wextra")
+set(_target_compile_flags "-Wall")
+if(NOT WIN32)
+  set(_target_compile_flags "${_target_compile_flags} -Wextra")
+endif()
+set_target_properties(${rosidl_generate_interfaces_TARGET}${_target_suffix}
+  PROPERTIES COMPILE_FLAGS "${_target_compile_flags}")
 target_include_directories(${rosidl_generate_interfaces_TARGET}${_target_suffix}
   PUBLIC
   ${CMAKE_CURRENT_BINARY_DIR}/rosidl_generator_cpp


Changed FATAL level when ATLAS is found

Changed FATAL level when ATLAS is found

--- chainerx_cc/cmake/FindBLAS.cmake
+++ chainerx_cc/cmake/FindBLAS.cmake
@@ -738,7 +738,9 @@
       ""
       )
     if(BLAS_LIBRARIES)
-      message(FATAL_ERROR "ATLAS is found (library: ${BLAS_LIBRARIES}), but ChainerX does not support ATLAS.")
+      message(WARNING "ATLAS is found (library: ${BLAS_LIBRARIES}), but ChainerX does not support ATLAS.")
+      set(BLAS_LIBRARIES FALSE)
+      set(BLAS_FOUND FALSE)
     endif()
   endif()
 endif ()


Use octomap also on Windows (#1663)

Use octomap also on Windows (#1663)

--- cmake/DARTFindDependencies.cmake
+++ cmake/DARTFindDependencies.cmake
@@ -91,33 +91,23 @@

 # octomap
 dart_find_package(octomap)
-if(MSVC)
-  # Supporting Octomap on Windows is disabled for the following issue:
-  # https://github.com/OctoMap/octomap/pull/213
-  message(WARNING "Octomap ${octomap_VERSION} is found, but Octomap "
-      "is not supported on Windows until "
-      "'https://github.com/OctoMap/octomap/pull/213' "
-      "is resolved.")
+if(OCTOMAP_FOUND OR octomap_FOUND)
+  if(NOT DEFINED octomap_VERSION)
+    set(HAVE_OCTOMAP FALSE CACHE BOOL "Check if octomap found." FORCE)
+    message(WARNING "Looking for octomap - octomap_VERSION is not defined, "
+        "please install octomap with version information"
+    )
+  else()
+    set(HAVE_OCTOMAP TRUE CACHE BOOL "Check if octomap found." FORCE)
+    if(DART_VERBOSE)
+      message(STATUS "Looking for octomap - version ${octomap_VERSION} found")
+    endif()
+  endif()
+else()
   set(HAVE_OCTOMAP FALSE CACHE BOOL "Check if octomap found." FORCE)
-else()
-  if(OCTOMAP_FOUND OR octomap_FOUND)
-    if(NOT DEFINED octomap_VERSION)
-      set(HAVE_OCTOMAP FALSE CACHE BOOL "Check if octomap found." FORCE)
-      message(WARNING "Looking for octomap - octomap_VERSION is not defined, "
-          "please install octomap with version information"
-      )
-    else()
-      set(HAVE_OCTOMAP TRUE CACHE BOOL "Check if octomap found." FORCE)
-      if(DART_VERBOSE)
-        message(STATUS "Looking for octomap - version ${octomap_VERSION} found")
-      endif()
-    endif()
-  else()
-    set(HAVE_OCTOMAP FALSE CACHE BOOL "Check if octomap found." FORCE)
-    message(WARNING "Looking for octomap - NOT found, to use VoxelGridShape, "
-        "please install octomap"
-    )
-  endif()
+  message(WARNING "Looking for octomap - NOT found, to use VoxelGridShape, "
+      "please install octomap"
+  )
 endif()

 #=======================


Adding gstreamer-allocators as part of required dependencies.

Signed-off-by: Gopal, Puunithaaraj <10308ab826b56f8bbce1ec0c10bd609cace363da@intel.com>

--- cmake/FindBaseDependencies.cmake
+++ cmake/FindBaseDependencies.cmake
@@ -5,6 +5,7 @@
 pkg_check_modules (GIO-2.0 REQUIRED gio-2.0)
 pkg_check_modules (GSTREAMER REQUIRED gstreamer-1.0>=1.4)
 pkg_check_modules (GSTREAMER_VIDEO REQUIRED gstreamer-video-1.0>=1.4)
+pkg_check_modules (GSTREAMER_ALLOCATORS REQUIRED gstreamer-allocators-1.0)
 pkg_check_modules (LIBVA REQUIRED libva)
 pkg_check_modules (LIBDRM REQUIRED libdrm)
 pkg_check_modules (LIBDRM_INTEL REQUIRED libdrm_intel)
@@ -29,12 +30,17 @@
 if(GSTREAMER_FOUND)
     include_directories (${GSTREAMER_INCLUDE_DIRS})
     list(APPEND BASE_LIBRARIES ${GSTEAMER_LIBRARIES})
+    set(GST_API_VERSION ${GSTREAMER_VERSION})
 endif()

 if(GSTREAMER_VIDEO_FOUND)
     include_directories (${GSTREAMER_VIDEO_INCLUDE_DIRS})
     list(APPEND BASE_LIBRARIES ${GSTREAMER_VIDEO_LIBRARIES})
-    set(GST_API_VERSION ${GSTREAMER_VERSION})
+endif()
+
+if(GSTREAMER_ALLOCATORS_FOUND)
+    include_directories (${GSTREAMER_ALLOCATORS_INCLUDE_DIRS})
+    list(APPEND BASE_LIBRARIES ${GSTREAMER_ALLOCATORS_LIBRARIES})
 endif()

 if(LIBVA_FOUND)


PPA work

PPA work

--- cmake/Modules/DebSourcePPA.cmake
+++ cmake/Modules/DebSourcePPA.cmake
@@ -107,7 +107,7 @@
     "Homepage: ${CPACK_PACKAGE_VENDOR}\n"
     "\n"
     "Package: ${CPACK_DEBIAN_PACKAGE_NAME}\n"
-    "Architecture: any\n"
+    "Architecture: amd64\n"
     "Depends: "
     )


cmake: give instructions what to do in internal inconsistency

--- cmake/Modules/LibAddPlugin.cmake
+++ cmake/Modules/LibAddPlugin.cmake
@@ -196,6 +196,8 @@
 				message (
 					FATAL_ERROR
 						"Internally inconsistency, plugin ${PLUGIN_NAME} got different values for variable ${VARIABLE}: '${${VARIABLE}}' != '${VAR}'"
+						"Concatinate variables that contain the value of ${VARIABLE} in a single variable during the DEPENDENCY_PHASE."
+						"Make sure that only a single variable is passed to every argument of add_plugin."
 					)
 			endif ()
 		else ()


CMake: simplify code in set_additional_compile_definitions

Thanks to the feedback by @sanssecours !
See #1042 .

--- cmake/Modules/LibAddPlugin.cmake
+++ cmake/Modules/LibAddPlugin.cmake
@@ -18,21 +18,16 @@
 function (set_additional_compile_definitions shortname)
 	# provide the plugin name as string to the compiler/preprocessor
 	if (NOT "${ARG_COMPILE_DEFINITIONS}" MATCHES "ELEKTRA_PLUGIN_NAME")
-		set (ADDITIONAL_COMPILE_DEFINITIONS_PART1 "ELEKTRA_PLUGIN_NAME=\"${shortname}\"")
+		list (APPEND ADDITIONAL_COMPILE_DEFINITIONS_PARTS "ELEKTRA_PLUGIN_NAME=\"${shortname}\"")
 	endif ()

 	# provide the plugin name as macro that can be used for building function names, etc.
 	if (NOT "${ARG_COMPILE_DEFINITIONS}" MATCHES "ELEKTRA_PLUGIN_NAME_C")
-		if (ADDITIONAL_COMPILE_DEFINITIONS_PART1)
-			set (ADDITIONAL_COMPILE_DEFINITIONS_PART2 ";ELEKTRA_PLUGIN_NAME_C=${shortname}")
-		else ()
-			set (ADDITIONAL_COMPILE_DEFINITIONS_PART2 "ELEKTRA_PLUGIN_NAME_C=${shortname}")
-		endif ()
-	endif ()
-
-	set (ADDITIONAL_COMPILE_DEFINITIONS "${ADDITIONAL_COMPILE_DEFINITIONS_PART1}${ADDITIONAL_COMPILE_DEFINITIONS_PART2}" PARENT_SCOPE)
-	unset (ADDITIONAL_COMPILE_DEFINITIONS_PART1)
-	unset (ADDITIONAL_COMPILE_DEFINITIONS_PART2)
+		list (APPEND ADDITIONAL_COMPILE_DEFINITIONS_PARTS "ELEKTRA_PLUGIN_NAME_C=${shortname}")
+	endif ()
+
+	set (ADDITIONAL_COMPILE_DEFINITIONS "${ADDITIONAL_COMPILE_DEFINITIONS_PARTS}" PARENT_SCOPE)
+	unset (ADDITIONAL_COMPILE_DEFINITIONS_PARTS)
 endfunction (set_additional_compile_definitions)

 # ~~~


build: correct the `DT_SONAME`

build: correct the `DT_SONAME`

When ninja is invoked from a subdirectory it will convert the path to a
relative path, and that resulted in incorrect test results. This
ensures that we get the correct soname.

--- cmake/modules/SwiftSupport.cmake
+++ cmake/modules/SwiftSupport.cmake
@@ -136,7 +136,7 @@
     if(CMAKE_SYSTEM_NAME STREQUAL Windows OR CMAKE_SYSTEM_NAME STREQUAL Darwin)
       set(emit_library -emit-library)
     else()
-      set(emit_library -emit-library -Xlinker -soname -Xlinker ${AST_OUTPUT})
+      set(emit_library -emit-library -Xlinker -soname -Xlinker ${CMAKE_SHARED_LIBRARY_PREFIX}${target}${CMAKE_SHARED_LIBRARY_SUFFIX})
     endif()
   endif()
   if(NOT AST_LIBRARY OR library_kind STREQUAL SHARED)


Support MKL on Windows (#3837)

Support MKL on Windows (#3837)

--- cmake/modules/contrib/BLAS.cmake
+++ cmake/modules/contrib/BLAS.cmake
@@ -31,6 +31,8 @@
     find_library(BLAS_LIBRARY NAMES mklml HINTS ${USE_MKL_PATH}/lib/ ${USE_MKL_PATH}/lib/intel64)
   elseif(UNIX)
     find_library(BLAS_LIBRARY NAMES mkl_rt mklml_gnu HINTS ${USE_MKL_PATH}/lib/ ${USE_MKL_PATH}/lib/intel64)
+  elseif(MSVC)
+    find_library(BLAS_LIBRARY NAMES mkl_rt HINTS ${USE_MKL_PATH}/lib/ ${USE_MKL_PATH}/lib/intel64_win)
   endif()
   include_directories(${USE_MKL_PATH}/include)
   list(APPEND TVM_RUNTIME_LINKER_LIBS ${BLAS_LIBRARY})


Package glfw: patch unrelocatable cmake/glfw3/glfw3Targets.cmake

--- cmake/projects/glfw/hunter.cmake
+++ cmake/projects/glfw/hunter.cmake
@@ -21,6 +21,13 @@
 hunter_cacheable(glfw)
 hunter_download(
     PACKAGE_NAME glfw
-    PACKAGE_UNRELOCATABLE_TEXT_FILES "lib/pkgconfig/glfw3.pc"
+    PACKAGE_INTERNAL_DEPS_ID "1"
+    PACKAGE_UNRELOCATABLE_TEXT_FILES
+    # Patching of glfw3Targets.cmake required as it has full paths due to the lack
+    # of imported targets for x11 packages. This should be removed when
+    # https://github.com/ruslo/hunter/issues/486 is implemented
+      "lib/cmake/glfw3/glfw3Targets.cmake"
+      "lib/pkgconfig/glfw3.pc"
+
 )


[Build] Made various updates for the CMake framework.

--- config/project_config_embeddable.cmake
+++ config/project_config_embeddable.cmake
@@ -30,6 +30,13 @@
   # Set the project name
   project (${PACKAGE})
 endmacro (set_project_names)
+
+##
+# Set the project brief
+macro (set_project_brief _project_brief)
+  set (PACKAGE_BRIEF ${_project_brief})
+endmacro (set_project_brief)
+

 ##
 # Set the project versions
@@ -129,6 +136,10 @@
 	"Where to install ${PROJECT_NAME}" FORCE)
   set (CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
 	"Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE)
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" CACHE STRING
+	"C++ compilation flags" FORCE)
+  set (COMPILE_FLAGS "${COMPILE_FLAGS}" CACHE STRING
+	"Supplementary C++ compilation flags" FORCE)
   set (CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" CACHE PATH
 	"Path to custom CMake Modules" FORCE)
   set (INSTALL_DOC "${INSTALL_DOC}" CACHE BOOL
@@ -144,12 +155,8 @@
   include (InstallRequiredSystemLibraries)

   set (CPACK_PACKAGE_NAME "${_project_name}")
+  set (CPACK_PACKAGE_DESCRIPTION "${PACKAGE_BRIEF}")
 endmacro (packaging_init)
-
-#
-macro (packaging_set_description _project_description)
-  set (CPACK_PACKAGE_DESCRIPTION "${_project_description}")
-endmacro (packaging_set_description)

 #
 macro (packaging_set_summary _project_summary)
@@ -372,7 +379,7 @@
   set (Boost_USE_STATIC_RUNTIME OFF)
   set (BOOST_REQUIRED_COMPONENTS
     program_options date_time iostreams serialization filesystem
-    unit_test_framework)
+    unit_test_framework python)

   # The first check is for the required components.
   find_package (Boost COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
@@ -389,7 +396,8 @@
     # Update the list of dependencies for the project
     list (APPEND PROJ_DEP_LIBS_FOR_LIB
       ${Boost_IOSTREAMS_LIBRARY} ${Boost_SERIALIZATION_LIBRARY}
-      ${Boost_FILESYSTEM_LIBRARY} ${Boost_DATE_TIME_LIBRARY})
+      ${Boost_FILESYSTEM_LIBRARY} ${Boost_DATE_TIME_LIBRARY}
+      ${Boost_PYTHON_LIBRARY})
     list (APPEND PROJ_DEP_LIBS_FOR_BIN ${Boost_PROGRAM_OPTIONS_LIBRARY})
     list (APPEND PROJ_DEP_LIBS_FOR_TST ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})

@@ -397,7 +405,8 @@
     set (BOOST_REQUIRED_LIBS
       ${Boost_IOSTREAMS_LIBRARY} ${Boost_SERIALIZATION_LIBRARY}
       ${Boost_FILESYSTEM_LIBRARY} ${Boost_DATE_TIME_LIBRARY}
-      ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+      ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
+      ${Boost_PYTHON_LIBRARY})
   endif (Boost_FOUND)

 endmacro (get_boost)
@@ -535,11 +544,20 @@
 macro (init_build)
   ##
   # Compilation
-  # Note: the debug flag (-g) is set (or not) by giving the
-  # corresponding option when calling cmake:
-  # cmake -DCMAKE_BUILD_TYPE:STRING={Debug,Release,MinSizeRel,RelWithDebInfo}
-  #set (CMAKE_CXX_FLAGS "-Wall -Wextra -pedantic -Werror")
-  set (CMAKE_CXX_FLAGS "-Wall -Werror")
+  # Note:
+  #  * The debug flag (-g) is set (or not) by giving the corresponding option
+  #    when calling cmake:
+  #    cmake -DCMAKE_BUILD_TYPE:STRING={Debug,Release,MinSizeRel,RelWithDebInfo}
+  #  * The CMAKE_CXX_FLAGS is set by CMake to be equal to the CXXFLAGS
+  #    environment variable. Hence:
+  #    CXXFLAGS="-O2"; export CXXFLAGS; cmake ..
+  #    will set CMAKE_CXX_FLAGS as being equal to -O2.
+  if (NOT CMAKE_CXX_FLAGS)
+	#set (CMAKE_CXX_FLAGS "-Wall -Wextra -pedantic -Werror")
+	set (CMAKE_CXX_FLAGS "-Wall -Werror")
+  endif (NOT CMAKE_CXX_FLAGS)
+
+  #
   include_directories (BEFORE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})

   ##
@@ -744,9 +762,12 @@
     "${${MODULE_LIB_TARGET}_root_HEADERS}" "${${MODULE_LIB_TARGET}_SOURCES}"
     ${_intermodule_dependencies})

-  # Installation of all the remaining header files for the module, i.e.,
-  # the header files located in all the layers except the root.
-  module_header_install_everything_else ()
+  # If so required, installation of all the remaining header files
+  # for the module, i.e., the header files located in all the layers
+  # except the root.
+  if (_publish_all_headers_flag)
+    module_header_install_everything_else()
+  endif (_publish_all_headers_flag)

   # Convenient message to the user/developer
   if (NOT "${INSTALL_LIB_DIR}" MATCHES "^/usr/${LIBDIR}$")
@@ -763,6 +784,8 @@
 #    short name: a 'lib' suffix is just appended to the short name.
 #  * The directory where to find the header files.
 #  * The header files to be published/installed along with the library.
+#    If there are no header to be exported, the 'na' keyword (standing for
+#    'non available') must be given.
 #  * The source files to build the library.
 #    Note that the source files contain at least the header files. Hence,
 #    even when there are no .cpp source files, the .hpp files will appear.
@@ -775,7 +798,7 @@
 # external libraries (e.g., Boost, SOCI, StdAir) are automatically
 # appended, thanks to the get_external_libs() macro.
 macro (module_library_add_specific
-	_lib_short_name _lib_dir _lib_headers _lib_sources)
+    _lib_short_name _lib_dir _lib_headers _lib_sources)
   # Derive the library (CMake) target from its name
   set (_lib_target ${_lib_short_name}lib)

@@ -797,8 +820,13 @@
   #  * on external libraries (Boost, MySQL, SOCI, StdAir), as calculated by
   #    the get_external_libs() macro above;
   #  * on the other module libraries, as provided as paramaters to this macro
-  target_link_libraries (${_lib_target}
-    ${PROJ_DEP_LIBS_FOR_LIB} ${_intermodule_dependencies})
+  #  * on the main/standard library of the module (when, of course, the
+  #    current library is not the main/standard library).
+  if (NOT "${_lib_short_name}" STREQUAL "${MODULE_NAME}")
+	set (_intramodule_dependencies ${MODULE_NAME}lib)
+  endif (NOT "${_lib_short_name}" STREQUAL "${MODULE_NAME}")
+  target_link_libraries (${_lib_target} ${PROJ_DEP_LIBS_FOR_LIB}
+	${_intermodule_dependencies} ${_intramodule_dependencies})

   # Register the library target in the project (for reporting purpose).
   # Note, the list() commands creates a new variable value in the current scope:
@@ -821,9 +849,6 @@
     # as generated by the module_generate_config_helpers() macro
     add_dependencies (${_lib_target} hdr_cfg_${MODULE_NAME})
   endif (${_lib_short_name} STREQUAL ${MODULE_NAME})
-
-  # DEBUG
-  #message ("DEBUG -- [${_lib_target}] _lib_headers = ${_lib_headers}")

   ##
   # Library name (and soname)
@@ -856,8 +881,11 @@
   list (APPEND ${MODULE_NAME}_ALL_LIBS ${_lib_target})
   set (${MODULE_NAME}_ALL_LIBS ${${MODULE_NAME}_ALL_LIBS} PARENT_SCOPE)

-  # Install the header files for the library
-  module_header_install_specific (${_lib_dir} "${_lib_headers}")
+  # If given/existing, install the header files for the library
+  string (TOLOWER "${_lib_headers}" _lib_headers_lower)
+  if (NOT "${_lib_headers_lower}" STREQUAL "na")
+    module_header_install_specific (${_lib_dir} "${_lib_headers}")
+  endif (NOT "${_lib_headers_lower}" STREQUAL "na")

 endmacro (module_library_add_specific)

@@ -946,11 +974,45 @@
 endmacro (module_binary_add)

 ##
+# Add a Python script to be installed
+macro (module_python_add _script_file)
+  #
+  set (_full_script_src_path ${CMAKE_CURRENT_SOURCE_DIR}/${_script_file}.in)
+  set (_full_script_path ${CMAKE_CURRENT_BINARY_DIR}/${_script_file})
+  if (EXISTS ${_full_script_src_path})
+	#
+    configure_file (${_full_script_src_path} ${_full_script_path} @ONLY)
+
+    # Add the 'scripts_${MODULE_NAME}' target, depending on the
+    # converted (Python) scripts
+    add_custom_target (scripts_${MODULE_NAME} ALL DEPENDS ${_full_script_path})
+
+    # Install the (Python) script file
+    install (PROGRAMS ${_full_script_path} DESTINATION bin COMPONENT devel)
+
+  else (EXISTS ${_full_script_src_path})
+    message (FATAL_ERROR
+      "The Python template script, '${_script_file}.in', does not exist")
+  endif (EXISTS ${_full_script_src_path})
+
+  # Register the binary target in the project (for reporting purpose)
+  get_filename_component (_script_alone ${_script_file} NAME)
+  list (APPEND PROJ_ALL_BIN_TARGETS ${_script_alone})
+  set (PROJ_ALL_BIN_TARGETS ${PROJ_ALL_BIN_TARGETS} PARENT_SCOPE)
+
+  # Register, for reporting purpose, the list of executables to be built
+  # and installed for that module
+  list (APPEND ${MODULE_NAME}_ALL_EXECS ${_script_alone})
+  set (${MODULE_NAME}_ALL_EXECS ${${MODULE_NAME}_ALL_EXECS} PARENT_SCOPE)
+
+endmacro (module_python_add)
+
+##
 # Installation of the CMake import helper, so that third party projects
 # can refer to it (for libraries, header files and binaries)
 macro (module_export_install)
-  install (EXPORT ${LIB_DEPENDENCY_EXPORT} DESTINATION
-    "${INSTALL_DATA_DIR}/${PACKAGE}/CMake" COMPONENT devel)
+  install (EXPORT ${LIB_DEPENDENCY_EXPORT}
+    DESTINATION "${INSTALL_DATA_DIR}/${PACKAGE}/CMake" COMPONENT devel)
 endmacro (module_export_install)

@@ -1105,11 +1167,11 @@

   # Install the development helpers
   install (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${CFG_SCRIPT}
-	DESTINATION ${CFG_SCRIPT_PATH})
+    DESTINATION ${CFG_SCRIPT_PATH})
   install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${PKGCFG_SCRIPT}
-	DESTINATION ${PKGCFG_SCRIPT_PATH})
+    DESTINATION ${PKGCFG_SCRIPT_PATH})
   install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${M4_MACROFILE}
-	DESTINATION ${M4_MACROFILE_PATH})
+    DESTINATION ${M4_MACROFILE_PATH})

 endmacro (install_dev_helper_files)

@@ -1221,11 +1283,11 @@
   message (STATUS)
   foreach (_module_name ${PROJ_ALL_MOD_FOR_BLD})
     message (STATUS "* Module ....................... : ${_module_name}")
-    message (STATUS "  + Layers to be built ......... : ${${_module_name}_ALL_LAYERS}")
+    message (STATUS "  + Layers to build ............ : ${${_module_name}_ALL_LAYERS}")
     message (STATUS "  + Dependencies on other layers : ${${_module_name}_INTER_TARGETS}")
-    message (STATUS "  + Libraries to be built ...... : ${${_module_name}_ALL_LIBS}")
-    message (STATUS "  + Executables to be built .... : ${${_module_name}_ALL_EXECS}")
-    message (STATUS "  + Test to be checked ......... : ${${_module_name}_ALL_TESTS}")
+    message (STATUS "  + Libraries to build/install . : ${${_module_name}_ALL_LIBS}")
+    message (STATUS "  + Executables to build/install : ${${_module_name}_ALL_EXECS}")
+    message (STATUS "  + Tests to perform ........... : ${${_module_name}_ALL_TESTS}")
   endforeach (_module_name)
 endmacro (display_status_all_modules)

@@ -1240,6 +1302,7 @@
   message (STATUS "PACKAGE_PRETTY_NAME ............ : ${PACKAGE_PRETTY_NAME}")
   message (STATUS "PACKAGE ........................ : ${PACKAGE}")
   message (STATUS "PACKAGE_NAME ................... : ${PACKAGE_NAME}")
+  message (STATUS "PACKAGE_BRIEF .................. : ${PACKAGE_BRIEF}")
   message (STATUS "PACKAGE_VERSION ................ : ${PACKAGE_VERSION}")
   message (STATUS "GENERIC_LIB_VERSION ............ : ${GENERIC_LIB_VERSION}")
   message (STATUS "GENERIC_LIB_SOVERSION .......... : ${GENERIC_LIB_SOVERSION}")
@@ -1248,14 +1311,18 @@
   message (STATUS "---     Build Configuration    ---")
   message (STATUS "----------------------------------")
   message (STATUS "Modules to build ............... : ${PROJ_ALL_MOD_FOR_BLD}")
-  message (STATUS "Libraries to build ............. : ${PROJ_ALL_LIB_TARGETS}")
-  message (STATUS "Binaries to build .............. : ${PROJ_ALL_BIN_TARGETS}")
+  message (STATUS "Libraries to build/install ..... : ${PROJ_ALL_LIB_TARGETS}")
+  message (STATUS "Binaries to build/install ...... : ${PROJ_ALL_BIN_TARGETS}")
   message (STATUS "Modules to test ................ : ${PROJ_ALL_MOD_FOR_TST}")
   message (STATUS "Binaries to test ............... : ${PROJ_ALL_TST_TARGETS}")
   display_status_all_modules ()
   message (STATUS)
   message (STATUS "BUILD_SHARED_LIBS .............. : ${BUILD_SHARED_LIBS}")
   message (STATUS "CMAKE_BUILD_TYPE ............... : ${CMAKE_BUILD_TYPE}")
+  message (STATUS " * CMAKE_C_FLAGS ............... : ${CMAKE_C_FLAGS}")
+  message (STATUS " * CMAKE_CXX_FLAGS ............. : ${CMAKE_CXX_FLAGS}")
+  message (STATUS " * BUILD_FLAGS ................. : ${BUILD_FLAGS}")
+  message (STATUS " * COMPILE_FLAGS ............... : ${COMPILE_FLAGS}")
   message (STATUS "CMAKE_MODULE_PATH .............. : ${CMAKE_MODULE_PATH}")
   message (STATUS "CMAKE_INSTALL_PREFIX ........... : ${CMAKE_INSTALL_PREFIX}")
   display_doxygen ()


[Build] Fixed the CMake configuration related to the STDAIR_SAMPLE_DIR.

--- project_config_embeddable.cmake
+++ project_config_embeddable.cmake
@@ -108,6 +108,11 @@
       set (${var} "${CMAKE_INSTALL_PREFIX}/${${var}}")
     endif ()
   endforeach (_path_type)
+
+  # Define STDAIR_SAMPLE_DIR if the project is STDAIR
+  if ("${PROJECT_NAME}" STREQUAL "stdair")
+    set (STDAIR_SAMPLE_DIR ${INSTALL_SAMPLE_DIR})
+  endif ("${PROJECT_NAME}" STREQUAL "stdair")

   ##
   # Basic documentation (i.e., AUTHORS, NEWS, README, INSTALL)
@@ -600,7 +605,8 @@
   set (pkgdatadir    ${datarootdir}/${PACKAGE})
   set (sampledir     ${STDAIR_SAMPLE_DIR})
   set (docdir        ${datarootdir}/doc/${PACKAGE}-${PACKAGE_VERSION})
-  set (htmldir       ${docdir})
+  set (htmldir       ${docdir}/html)
+  set (pdfdir        ${htmldir})
   set (mandir        ${datarootdir}/man)
   set (infodir       ${datarootdir}/info)
   set (pkgincludedir ${includedir}/stdair)


Bumping TubeTK to bring in fixes for tube tree display

--- 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 "git@github.com:KitwareMedical/TubeTK.git"
-    GIT_TAG "7da1697ed6beadbac3be46ae39b74cebc3fac393"
+    GIT_TAG "267f5718b0dc56cce95abb6e646deb2607c17234"
     CMAKE_CACHE_ARGS
       -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
       -DCMAKE_CXX_FLAGS:STRING=${ep_common_cxx_flags}


Generate install-dyn-lib-dep.cmake in current binary directory.

	* build-aux/cmake/modules/DynLibDep.cmake: Do that.

Signed-off-by: Vincent Ordy <d26676a94649632b1c477e78d16c5a762a0d6fbf@gostai.com>

--- build-aux/cmake/modules/DynLibDep.cmake
+++ build-aux/cmake/modules/DynLibDep.cmake
@@ -139,11 +139,12 @@
     if(TARGET ${binary})
       get_target_property(binary_loc ${binary} LOCATION_${CMAKE_BUILD_TYPE})
       set(binary_name ${binary})
+      get_filename_component(binary_path ${binary_loc} PATH)
     else(TARGET ${binary})
       set(binary_loc ${binary})
       get_filename_component(binary_name ${binary} NAME)
+      set(binary_path ${CMAKE_CURRENT_BINARY_DIR})
     endif(TARGET ${binary})
-    get_filename_component(binary_path ${binary_loc} PATH)
     configure_file(
       ${CMAKE_MODULE_PATH}/install-dyn-lib-dep.cmake.in
       ${binary_path}/install-dyn-lib-dep.cmake


Add CMAKE_SYSTEM_PROCESSOR variable to prevent this libpng linker error: Undefined symbols for architecture armv7: _png_init_filter_functions_neon, referenced from: _png_init_filter_functions in libpng16d.a(pngrutil.o)

--- ios.toolchain.cmake
+++ ios.toolchain.cmake
@@ -251,6 +251,7 @@
   OUTPUT_STRIP_TRAILING_WHITESPACE)
 # Standard settings.
 set(CMAKE_SYSTEM_NAME Darwin CACHE INTERNAL "")
+set(CMAKE_SYSTEM_PROCESSOR ${IOS_ARCH} CACHE INTERNAL "")
 set(CMAKE_SYSTEM_VERSION ${IOS_SDK_VERSION} CACHE INTERNAL "")
 set(UNIX TRUE CACHE BOOL "")
 set(APPLE TRUE CACHE BOOL "")


Added bundle name

Added bundle name

--- BlueBerry/CMake/FunctionCreateBlueBerryApplication.cmake
+++ BlueBerry/CMake/FunctionCreateBlueBerryApplication.cmake
@@ -112,9 +112,14 @@
 endif()

 # -----------------------------------------------------------------------
-# Add executable icon (Mac)
+# Add executable icon and bundle name (Mac)
 # -----------------------------------------------------------------------
 if(APPLE)
+  if( _APP_DESCRIPTION)
+    set_target_properties(${_APP_NAME} PROPERTIES MACOSX_BUNDLE_NAME "${_APP_DESCRIPTION}")
+  else()
+    set_target_properties(${_APP_NAME} PROPERTIES MACOSX_BUNDLE_NAME "${_APP_NAME}")
+  endif()
   set(icon_name "icon.icns")
   set(icon_full_path "${CMAKE_CURRENT_SOURCE_DIR}/icons/${icon_name}")
   if(EXISTS "${icon_full_path}")


DataTypes.h.cmake: Tweak INT32_MIN for MSVC. MSC treats -2147483648 as -(2147483648U).

It caused an unexpected behavior since r137254.

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

--- include/llvm/Support/DataTypes.h.cmake
+++ include/llvm/Support/DataTypes.h.cmake
@@ -131,7 +131,8 @@
 # define INT32_MAX 2147483647
 #endif
 #ifndef INT32_MIN
-# define INT32_MIN -2147483648
+/* MSC treats -2147483648 as -(2147483648U). */
+# define INT32_MIN (-INT32_MAX - 1)
 #endif
 #ifndef UINT32_MAX
 # define UINT32_MAX 4294967295U


remove unneeded compiler option for c++

remove unneeded compiler option for c++

--- cmake/Modules/DefineCompilerFlags.cmake
+++ cmake/Modules/DefineCompilerFlags.cmake
@@ -2,10 +2,10 @@

 include(CheckCCompilerFlag)

-if (UNIX)
+if (UNIX)
   if (CMAKE_COMPILER_IS_GNUCC)
     if (WITH_CXX)
-       add_definitions(-g -std=c++0x -Weffc++ -Wall -Wextra -Wunused)
+       add_definitions(-g -Weffc++ -Wall -Wextra -Wunused)
     else()
        add_definitions(-g -std=c99 -Wall -Wextra -Wunused)
     endif (WITH_CXX)


PARQUET-956: Specify BUILD_BYPRODUCTS for gtest

Author: Uwe L. Korn <uwe@apache.org>

Closes #301 from xhochy/PARQUET-956 and squashes the following commits:

ea4b7cf [Uwe L. Korn] PARQUET-956: Specify BUILD_BYPRODUCTS for gtest

--- cmake_modules/ThirdpartyToolchain.cmake
+++ cmake_modules/ThirdpartyToolchain.cmake
@@ -281,6 +281,7 @@
       # BUILD_BYPRODUCTS is a 3.2+ feature
       ExternalProject_Add(googletest_ep
         URL "https://github.com/google/googletest/archive/release-${GTEST_VERSION}.tar.gz"
+        BUILD_BYPRODUCTS ${GTEST_STATIC_LIB} ${GTEST_MAIN_STATIC_LIB}
         CMAKE_ARGS ${GTEST_CMAKE_ARGS})
     else()
       ExternalProject_Add(googletest_ep


Update default_build_setup.cmake

Update default_build_setup.cmake

--- cmake_scripts/default_build_setup.cmake
+++ cmake_scripts/default_build_setup.cmake
@@ -28,7 +28,7 @@

 if (UNIX)
     # flags apply for both Linux and OSX!
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra $")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
     if (DISABLE_CXX11_ABI)
         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
     endif()


Search .so first.

Search .so first.

--- cassaforte-config.cmake
+++ cassaforte-config.cmake
@@ -15,7 +15,7 @@
     PATH_SUFFIXES include)

 find_library(cassaforte_LIBRARY
-    NAMES cassaforte libcassaforte
+    NAMES libcassaforte.so cassaforte libcassaforte
     PATHS ${CMAKE_CURRENT_LIST_DIR}
     PATH_SUFFIXES build/${CMAKE_CXX_COMPILER_ID}/${CMAKE_BUILD_TYPE})


#1492 - Changed the OIGTLink version tag to 7812256420

git-svn-id: f70d4c833b20674991d6651a5f592bbdbe6b47b2@9076 30ced1d1-d8fb-0310-b896-84269ee58dd6

--- CMake/CMakeExternals/OPENIGTLINK.cmake
+++ CMake/CMakeExternals/OPENIGTLINK.cmake
@@ -34,7 +34,7 @@

 IF(NOT DEFINED OpenIGTLink_DIR)

-    SET(revision_tag e368df776c)
+    SET(revision_tag 7812256420)
     IF(${proj}_REVISION_TAG)
         SET(revision_tag ${${proj}_REVISION_TAG})
     ENDIF()


COMP: fix configuration when path to OTB sources contains spaces (from L. Hermitte)

--- CMake/CheckCXXSourceRunsWithArgs.cmake
+++ CMake/CheckCXXSourceRunsWithArgs.cmake
@@ -30,7 +30,7 @@
       "${CHECK_CXX_SOURCE_COMPILES_ADD_LIBRARIES}"
       "${CHECK_CXX_SOURCE_COMPILES_ADD_INCLUDES}"
       COMPILE_OUTPUT_VARIABLE OUTPUT
-      ARGS ${ARGUMENT})
+      ARGS "\"${ARGUMENT}\"")

     # if it did not compile make the return value fail code of 1
     IF(NOT ${VAR}_COMPILED)
@@ -44,6 +44,7 @@
         "Performing C++ SOURCE FILE Test ${VAR} succeded with the following output:\n"
         "${OUTPUT}\n"
         "Return value: ${${VAR}}\n"
+        "Argument: ${ARGUMENT}\n"
         "Source file was: ${SOURCE_FILE}\n\n")
     ELSE("${${VAR}_EXITCODE}" EQUAL 0)
       IF(CMAKE_CROSSCOMPILING AND "${${VAR}_EXITCODE}" MATCHES  "FAILED_TO_RUN")
@@ -57,6 +58,7 @@
         "Performing C++ SOURCE FILE Test ${VAR} failed with the following output:\n"
         "${OUTPUT}\n"
         "Return value: ${${VAR}_EXITCODE}\n"
+        "Argument: ${ARGUMENT}\n"
         "Source file was: ${SOURCE_FILE}\n\n")
     ENDIF("${${VAR}_EXITCODE}" EQUAL 0)
   ENDIF("${VAR}" MATCHES "^${VAR}$")


Remove long running tests from valgrind checks to avoid timeout on Travis-CI

--- cmake/Testing.cmake
+++ cmake/Testing.cmake
@@ -83,7 +83,7 @@
       AND NOT ${TEST_TARGET} STREQUAL "runBiodynamoTests_resource_manager_aos_test"
       AND NOT ${TEST_TARGET} STREQUAL "runBiodynamoTests_so_pointer_aos_test")
     # filter out SchedulerTest.Backup because of timing issue
-    add_test(NAME "valgrind_${TEST_TARGET}" COMMAND ${CMAKE_SOURCE_DIR}/util/valgrind.sh ./${TEST_TARGET} -- --gtest_filter=-*DeathTest.*:IOTest.InvalidRead:SchedulerTest.Backup:ResourceManagerTest.SortAndApplyOnAllElementsParallel*:InlineVector*:NeuriteElementTest.RetractAllDendrites)
+    add_test(NAME "valgrind_${TEST_TARGET}" COMMAND ${CMAKE_SOURCE_DIR}/util/valgrind.sh ./${TEST_TARGET} -- --gtest_filter=-*DeathTest.*:IOTest.InvalidRead:SchedulerTest.Backup:ResourceManagerTest.SortAndApplyOnAllElementsParallel*:InlineVector*:NeuriteElementTest.RetractAllDendrites:SchedulerTest.Restore:CellTest.IO:NeuriteElementTest.TotalRetraction:SimObjectUtilTest.Soa_IO:ResourceManagerTest.IO:SimulationTest.InitializeRuntimeParams)
   endif()

   add_dependencies(check ${TEST_TARGET})


Another attempt to make bloody CentOS work!

gcc interpretation of -fno-inline has changed between 4.6.1 and 4.6.3.

--- cmake/libobjc.cmake
+++ cmake/libobjc.cmake
@@ -3,7 +3,12 @@
 #
 macro(libobjc_build)
     if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
-        set (extra_cflags "${CC_DEBUG_OPT} -O0 -fno-inline")
+        set (extra_cflags "${CC_DEBUG_OPT} -O0")
+        if (CMAKE_COMPILER_IS_GNUCC)
+            set (extra_cflags "${extra_cflags} -fgnu89-inline")
+        else()
+            set (extra_cflags "${extra_cflags} -fno-inline")
+        endif()
         set (extra_ldflags "")
     else ()
         set (extra_cflags "-O3")


fix typo

fix typo

--- cmake/AddProtobuf.cmake
+++ cmake/AddProtobuf.cmake
@@ -30,7 +30,7 @@
 get_filename_component(root_dir ${root_dir} ABSOLUTE)
 set(DAWN_PROTOBUF_ROOT ${root_dir})

-# set the path to the install-direcotry of protobuf
+# set the path to the install-directory of protobuf
 set(DAWN_PROTOBUF_RPATH_DIR ${DAWN_PROTOBUF_ROOT}/lib)

 dawn_export_package(


Change the order of the clapack libraries because of some compilation errors.

--- cmake/FindCLAPACK.cmake
+++ cmake/FindCLAPACK.cmake
@@ -20,8 +20,8 @@
 FIND_LIBRARY(F2C_LIBRARY libf2c.a ${CLAPACK_LIB_SEARCH_PATH})

 IF(BLAS_INCLUDE_PATH AND CLAPACK_INCLUDE_PATH AND F2C_INCLUDE_PATH AND BLAS_LIBRARY AND CLAPACK_LIBRARY AND F2C_LIBRARY)
-	SET(CLAPACK_INCLUDE_DIR ${BLAS_INCLUDE_PATH} ${CLAPACK_INCLUDE_PATH} ${F2C_INCLUDE_PATH})
-	SET(CLAPACK_LIBRARY ${BLAS_LIBRARY} ${CLAPACK_LIBRARY} ${F2C_LIBRARY})
+	SET(CLAPACK_INCLUDE_DIR ${CLAPACK_INCLUDE_PATH} ${BLAS_INCLUDE_PATH} ${F2C_INCLUDE_PATH})
+	SET(CLAPACK_LIBRARY ${CLAPACK_LIBRARY} ${BLAS_LIBRARY} ${F2C_LIBRARY})
 	SET(HAVE_CLAPACK YES)
 	find_package_handle_standard_args(LAPACK DEFAULT_MSG CLAPACK_LIBRARY)
 	find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARY)


Fix typo in FindMSGPACK.cmake

Fix typo in FindMSGPACK.cmake

--- cmake/FindMSGPACK.cmake
+++ cmake/FindMSGPACK.cmake
@@ -1,6 +1,6 @@
 find_package(PkgConfig)
 if (PKG_CONFIG_FOUND)
-  pkg_search_module(PC_MSGPACK QUIET
+  pkg_search_module(SHARED_MSGPACK QUIET
       msgpackc>=${Msgpack_FIND_VERSION}
       msgpack>=${Msgpack_FIND_VERSION})
 endif()


Fix errors in cmake files.

Fix errors in cmake files.

git-svn-id: bd2008fbba0f7d30fd6598b54f2cd88503fdd2e4@248 95f4ed2b-212e-0410-8b90-d31948207fce

--- cmake/FindOpenEXR.cmake
+++ cmake/FindOpenEXR.cmake
@@ -1,57 +1,79 @@
-#
-# Try to find OpenEXR's libraries, and include path.
-# Once done this will define:
-#
-# OPENEXR_FOUND = OpenEXR found.
-# OPENEXR_INCLUDE_PATH = OpenEXR include directory.
-# OPENEXR_LIBRARIES = libraries that are needed to use OpenEXR.
-#
-
-
-IF (WIN32)
-ELSE (WIN32)
-
-	FIND_PATH(OPENEXR_INCLUDE_PATH ImfRgbaFile.h
-		/usr/include
-		/usr/local/include
-		/usr/include/OpenEXR
-		/usr/local/include/OpenEXR)
-
-	FIND_LIBRARY(OPENEXR_HALF_LIBRARY
-		NAMES Half
-		PATHS
-			/usr/lib
-			/usr/local/lib)
-
-	FIND_LIBRARY(OPENEXR_IEX_LIBRARY
-		NAMES Iex
-		PATHS
-			/usr/lib
-			/usr/local/lib)
-
-	FIND_LIBRARY(OPENEXR_IMATH_LIBRARY
-		NAMES Imath
-		PATHS
-			/usr/lib
-			/usr/local/lib)
-
-	FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY
-		NAMES IlmImf
-		PATHS
-			/usr/lib
-			/usr/local/lib)
-
-ENDIF (WIN32)
-
-IF (OPENEXR_INCLUDE_PATH AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY)
-	SET(OPENEXR_FOUND TRUE)
-	SET(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR")
-ENDIF (OPENEXR_INCLUDE_PATH AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY)
-
-MARK_AS_ADVANCED(
-	OPENEXR_INCLUDE_DIR
-	OPENEXR_LIBRARIES
-	OPENEXR_ILMIMF_LIBRARY
-	OPENEXR_IMATH_LIBRARY
-	OPENEXR_IEX_LIBRARY
-	OPENEXR_HALF_LIBRARY)
+#
+# Try to find OpenEXR's libraries, and include path.
+# Once done this will define:
+#
+# OPENEXR_FOUND = OpenEXR found.
+# OPENEXR_INCLUDE_PATHS = OpenEXR include directories.
+# OPENEXR_LIBRARIES = libraries that are needed to use OpenEXR.
+#
+
+INCLUDE(FindZLIB)
+
+
+IF(ZLIB_FOUND)
+
+	SET(LIBRARY_PATHS
+		/usr/lib
+		/usr/local/lib
+		/sw/lib
+		/opt/local/lib
+		$ENV{PROGRAM_FILES}/OpenEXR/lib/static)
+
+	FIND_PATH(OPENEXR_INCLUDE_PATH ImfRgbaFile.h
+		PATH_SUFFIXES OpenEXR
+		/usr/include
+		/usr/local/include
+		/sw/include
+		/opt/local/include)
+
+	FIND_LIBRARY(OPENEXR_HALF_LIBRARY
+		NAMES Half
+		PATHS ${LIBRARY_PATHS})
+
+	FIND_LIBRARY(OPENEXR_IEX_LIBRARY
+		NAMES Iex
+		PATHS ${LIBRARY_PATHS})
+
+	FIND_LIBRARY(OPENEXR_IMATH_LIBRARY
+		NAMES Imath
+		PATHS ${LIBRARY_PATHS})
+
+	FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY
+		NAMES IlmImf
+		PATHS ${LIBRARY_PATHS})
+
+	FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY
+		NAMES IlmThread
+		PATHS ${LIBRARY_PATHS})
+
+ENDIF(ZLIB_FOUND)
+
+#MESSAGE(STATUS ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ZLIB_LIBRARY})
+
+IF (OPENEXR_INCLUDE_PATH AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY)
+	SET(OPENEXR_FOUND TRUE)
+	SET(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_PATH} CACHE STRING "The include paths needed to use OpenEXR")
+	SET(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${ZLIB_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR")
+
+	IF(OPENEXR_ILMTHREAD_LIBRARY)
+		SET(OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES} ${OPENEXR_ILMTHREAD_LIBRARY})
+	ENDIF(OPENEXR_ILMTHREAD_LIBRARY)
+ENDIF (OPENEXR_INCLUDE_PATH AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY)
+
+IF(OPENEXR_FOUND)
+	IF(NOT OPENEXR_FIND_QUIETLY)
+		MESSAGE(STATUS "Found OpenEXR: ${OPENEXR_ILMIMF_LIBRARY}")
+	ENDIF(NOT OPENEXR_FIND_QUIETLY)
+ELSE(OPENEXR_FOUND)
+	IF(OPENEXR_FIND_REQUIRED)
+		MESSAGE(FATAL_ERROR "Could not find OpenEXR library")
+	ENDIF(OPENEXR_FIND_REQUIRED)
+ENDIF(OPENEXR_FOUND)
+
+MARK_AS_ADVANCED(
+	OPENEXR_INCLUDE_PATHS
+	OPENEXR_LIBRARIES
+	OPENEXR_ILMIMF_LIBRARY
+	OPENEXR_IMATH_LIBRARY
+	OPENEXR_IEX_LIBRARY
+	OPENEXR_HALF_LIBRARY)


Create tbag_modules__apply_python3_libs() cmake macro.

--- cmake/TbagModules.cmake
+++ cmake/TbagModules.cmake
@@ -1282,6 +1282,36 @@
     endif ()
 endmacro ()

+macro (tbag_modules__check_python3_interpreter)
+    if (NOT Python3_Interpreter_FOUND)
+        message (WARNING "Not found Python interpreter.")
+    endif ()
+    # message (STATUS "Python3 interpreter: ${Python3_EXECUTABLE}")
+    # message (STATUS "Python3 interpreter version: ${Python3_VERSION}")
+endmacro ()
+
+macro (tbag_modules__check_python3_libs)
+    if (NOT Python3_Development_FOUND)
+        message (WARNING "Not found CPython libraries.")
+    endif ()
+    # message (STATUS "CPython version: ${Python3_VERSION_STRING}")
+endmacro ()
+
+macro (tbag_modules__apply_python3_libs)
+    list (APPEND TBAG_PROJECT_INCLUDE_DIRS ${Python3_INCLUDE_DIRS})
+    list (APPEND TBAG_PROJECT_LDFLAGS      ${Python3_LIBRARIES})
+
+    if (WIN32)
+        # list (APPEND TBAG_PROJECT_LDFLAGS)
+    elseif (UNIX)
+        if (APPLE)
+            list (APPEND TBAG_PROJECT_LDFLAGS -ldl -Wl,-framework,CoreFoundation)
+        else ()
+            list (APPEND TBAG_PROJECT_LDFLAGS -lpthread -ldl -lutil)
+        endif ()
+    endif ()
+endmacro ()
+
 macro (tbag_modules__check_numpy)
     if (NOT Python_NumPy_FOUND)
         message (WARNING "Not found NumPy libraries.")


fixed linking because of /DELAYLOAD flags: added 'delayimp.lib' to link libraries

git-svn-id: 1af002208e930b4d920e7c2b948d1e98a012c795@4940 a9d63959-f2ad-4865-b262-bf0e56cfafb6

--- cmake/pcl_targets.cmake
+++ cmake/pcl_targets.cmake
@@ -103,6 +103,10 @@
     add_library(${_name} ${PCL_LIB_TYPE} ${ARGN})
     # must link explicitly against boost.
     target_link_libraries(${_name} ${Boost_LIBRARIES})
+
+	if(MSVC90 OR MSVC10)
+	  target_link_libraries(${_name} delayimp.lib)  # because delay load is enabled for openmp.dll
+	endif()
     #
     # Only link if needed
     if(WIN32 AND MSVC)


Bump CTest timeout from 2m to 5m on dashboards

--- scripts/dashboard/adios_common.cmake
+++ scripts/dashboard/adios_common.cmake
@@ -69,7 +69,7 @@
 endif()

 if(NOT DEFINED CTEST_TEST_TIMEOUT)
-  set(CTEST_TEST_TIMEOUT 120)
+  set(CTEST_TEST_TIMEOUT 300)
 endif()
 if(NOT DEFINED CTEST_SUBMIT_NOTES)
   set(CTEST_SUBMIT_NOTES TRUE)


Set default test timeout to 5m

Set default test timeout to 5m

--- scripts/dashboard/adios_common.cmake
+++ scripts/dashboard/adios_common.cmake
@@ -66,6 +66,9 @@
 set(CTEST_DROP_SITE "open.cdash.org")
 set(dashboard_git_url "https://github.com/ornladios/ADIOS2.git")

+if(NOT DEFINED CTEST_TEST_TIMEOUT)
+  set(CTEST_TEST_TIMEOUT 300)
+endif()
 if(NOT ADIOS_CTEST_SUBMIT_NOTES)
   set(ADIOS_CTEST_SUBMIT_NOTES TRUE)
 endif()


SuperBuild: build only required opencv modules

--- SuperBuild/CMake/External_opencv.cmake
+++ SuperBuild/CMake/External_opencv.cmake
@@ -50,7 +50,7 @@
   -DWITH_FFMPEG:BOOL=OFF
   -DWITH_VFW:BOOL=OFF
   -DBUILD_OPENEXR:BOOL=OFF
-  -DBUILD_PACKAGE:BOOL=ON
+  -DBUILD_PACKAGE:BOOL=OFF
   -DBUILD_PERF_TESTS:BOOL=OFF
   -DBUILD_PNG:BOOL=OFF
   -DBUILD_TBB:BOOL=OFF
@@ -97,6 +97,23 @@
   -DBUILD_opencv_video:BOOL=OFF
   -DBUILD_opencv_videostab:BOOL=OFF
   -DBUILD_opencv_world:BOOL=OFF
+  -DWITH_CUBLAS:BOOL=OFF
+  -DWITH_DIRECTX:BOOL=OFF
+  -DWITH_DSHOW:BOOL=OFF
+  -DWITH_EIGEN:BOOL=OFF
+  -DWITH_IPP:BOOL=OFF
+  -DWITH_ITT:BOOL=OFF
+  -DWITH_LAPACK:BOOL=OFF
+  -DWITH_MATLAB:BOOL=OFF
+  -DWITH_NVCUVID:BOOL=OFF
+  -DWITH_WEBP:BOOL=OFF
+  -DWITH_WIN32UI:BOOL=OFF
+  -DBUILD_PROTOBUF:BOOL=OFF
+  -DBUILD_WEBP:BOOL=OFF
+  -DBUILD_opencv_java_bindings_generator:BOOL=OFF
+  -DBUILD_opencv_python_bindings_generator:BOOL=OFF
+  -DBUILD_opencv_python3:BOOL=OFF
+  -DBUILD_opencv_python2:BOOL=OFF
   -DCMAKE_INSTALL_LIBDIR:PATH=lib
   ${OPENCV_SB_CONFIG}
   DEPENDS ${OPENCV_DEPENDENCIES}
@@ -107,7 +124,6 @@
   LOG_INSTALL 1
   )

-
 SUPERBUILD_PATCH_SOURCE(OPENCV)

 set(_SB_OpenCV_DIR ${SB_INSTALL_PREFIX}/share/OpenCV)


modules: find EGL before linking to it.

modules: find EGL before linking to it.

--- modules/FindSDL2.cmake
+++ modules/FindSDL2.cmake
@@ -111,6 +111,7 @@

         # Link also EGL library, if on ES (and not on WebGL)
         if(MAGNUM_TARGET_GLES AND NOT MAGNUM_TARGET_DESKTOP_GLES AND NOT MAGNUM_TARGET_WEBGL)
+            find_package(EGL REQUIRED)
             set_property(TARGET SDL2::SDL2 APPEND PROPERTY
                 INTERFACE_LINK_LIBRARIES EGL::EGL)
         endif()


1.Build problems on Mac OS X (10.9)
Recommended fix:
https://github.com/mosra/magnum/blob/master/modules/FindSDL2.cmake#L46 to list only SDL_scancode.h (i.e. remove SDL.h)

Test:
Add SDL2 Lib to the /Libraries/Frameworks/
Builds file.

Add SDL2 Lib and SDL1 to the /Libraries/Frameworks/
Build fails.

Remove SDL.h from at line 46.

Builds fine.

Remove SDL 1 from the /Libraries/Frameworks/

Builds fine.

--- modules/FindSDL2.cmake
+++ modules/FindSDL2.cmake
@@ -43,7 +43,7 @@

 # Include dir
 find_path(SDL2_INCLUDE_DIR
-    NAMES SDL.h SDL_scancode.h
+    NAMES SDL_scancode.h
     PATH_SUFFIXES ${PATH_SUFFIXES}
 )


Since Xcode 12 and ios sdk 14.2 I am not allowed to build 32-bit archs anymore. With DROP_32_BIT the system is targetting OS64 and using Min SDK 10 by default.

--- ios.toolchain.cmake
+++ ios.toolchain.cmake
@@ -1,5 +1,6 @@
 # This file is part of the ios-cmake project. It was retrieved from
-# https://github.com/cristeab/ios-cmake.git, which is a fork of
+# https://github.com/gerstrong/ios-cmake.git which is a fork of
+# https://github.com/cristeab/ios-cmake.git, which again is a fork of
 # https://code.google.com/p/ios-cmake/. Which in turn is based off of
 # the Platform/Darwin.cmake and Platform/UnixPaths.cmake files which
 # are included with CMake 2.8.4
@@ -144,6 +145,12 @@
 string(REGEX MATCH "Xcode [0-9\\.]+" XCODE_VERSION "${XCODE_VERSION}")
 string(REGEX REPLACE "Xcode ([0-9\\.]+)" "\\1" XCODE_VERSION "${XCODE_VERSION}")

+# Assuming that xcode 12.0 is installed you most probably have ios sdk 14.2 or later installed (tested on Big Sur)
+# if you don't set a deployment target it will be set the way you only get 64-bit builds
+if(NOT DEFINED DEPLOYMENT_TARGET AND XCODE_VERSION VERSION_GREATER 12.0)
+  option(DROP_32_BIT "Will make drop 32-bit support universally. On later sdks you won't be able to build 32-bit apps" yes)
+endif()
+
 ######## ALIASES (DEPRECATION WARNINGS)

 if(DEFINED IOS_PLATFORM)
@@ -182,7 +189,9 @@
 # CMAKE_OSX_ARCHITECTURES is propagated to them by CMake.
 if(NOT DEFINED PLATFORM)
   if (CMAKE_OSX_ARCHITECTURES)
-    if(CMAKE_OSX_ARCHITECTURES MATCHES ".*arm.*" AND CMAKE_OSX_SYSROOT MATCHES ".*iphoneos.*")
+    if(CMAKE_OSX_ARCHITECTURES MATCHES "arm64" AND CMAKE_OSX_SYSROOT MATCHES ".*iphoneos.*")
+      set(PLATFORM "OS64")
+    elseif(CMAKE_OSX_ARCHITECTURES MATCHES ".*arm.*" AND CMAKE_OSX_SYSROOT MATCHES ".*iphoneos.*")
       set(PLATFORM "OS")
     elseif(CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_SYSROOT MATCHES ".*iphonesimulator.*")
       set(PLATFORM "SIMULATOR")
@@ -199,7 +208,11 @@
     endif()
   endif()
   if (NOT PLATFORM)
-    set(PLATFORM "OS")
+    if(DROP_32_BIT)
+      set(PLATFORM "OS64")
+    else()
+      set(PLATFORM "OS")
+    endif()
   endif()
 endif()


cmake: Add missing malloc library on SCO OpenServer 5 platform

--- platforms/scosv-gcc/platform.cmake
+++ platforms/scosv-gcc/platform.cmake
@@ -9,7 +9,7 @@
 )

 if (CMAKE_SYSTEM_VERSION VERSION_LESS "5.0")
-        set (PLIB_PLATFORM_LINK_LIBRARIES socket nsl gthreads)
+        set (PLIB_PLATFORM_LINK_LIBRARIES socket nsl gthreads malloc)

         message ("
                  You need a working port of FSU Pthreads in order to


Add include directories to interface targets.

--- src/osvr/Macros.cmake
+++ src/osvr/Macros.cmake
@@ -68,6 +68,11 @@
     set(LIBNAME_INTERFACE ${LIBNAME_FULL}${_suffix})
     add_library(${LIBNAME_INTERFACE} INTERFACE)
     target_link_libraries(${LIBNAME_INTERFACE} INTERFACE ${LIBNAME_FULL})
+    target_include_directories(${LIBNAME_INTERFACE}
+        INTERFACE
+        $<BUILD_INTERFACE:${BUILDTREE_HEADER_BASE}>
+        $<BUILD_INTERFACE:${HEADER_BASE}>
+        $<INSTALL_INTERFACE:include>)
     install(TARGETS ${LIBNAME_INTERFACE}
         EXPORT osvrTargets
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime


Fix missing variable dereference

Fix missing variable dereference

--- build_tools/cmake/iree_cc_binary.cmake
+++ build_tools/cmake/iree_cc_binary.cmake
@@ -74,7 +74,7 @@
     # The binary is marked as host only. We need to declare the rules for
     # generating them under host configuration so cross-compiling towards
     # target we can still have this binary.
-    iree_declare_host_excutable(_RULE_NAME)
+    iree_declare_host_excutable(${_RULE_NAME})
     return()
   endif()


[cmake] install_symlink should obey DESTDIR unconditionally

Setting DESTDIR was erroneously buried under a condition here - if
it's set it should always be used.

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

--- cmake/modules/LLVMInstallSymlink.cmake
+++ cmake/modules/LLVMInstallSymlink.cmake
@@ -3,9 +3,9 @@
 # See PR8397.

 function(install_symlink name target outdir)
+  set(DESTDIR $ENV{DESTDIR})
   if(CMAKE_HOST_UNIX)
     set(LINK_OR_COPY create_symlink)
-    set(DESTDIR $ENV{DESTDIR})
   else()
     set(LINK_OR_COPY copy)
   endif()


fix boost build on Windows

fix boost build on Windows

--- superbuild/External-Boost.cmake
+++ superbuild/External-Boost.cmake
@@ -5,11 +5,15 @@

 set( Boost_Bootstrap_Command )
 if( UNIX )
+  set( Boost_url "http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.gz")
+  set( Boost_md5 93780777cfbf999a600f62883bd54b17)
   set( Boost_Bootstrap_Command ./bootstrap.sh )
   set( Boost_b2_Command ./b2 )
   set( SHELL_CMD sh)
 else()
   if( WIN32 )
+    set( Boost_url "http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.zip")
+    set( Boost_md5 8aca361a4713a1f491b0a5e33fee0f1f)
     set( Boost_Bootstrap_Command cmd /C bootstrap.bat msvc )
     set( Boost_b2_Command b2.exe )
     set (SHELL_CMD "")
@@ -28,10 +32,10 @@

 ExternalProject_Add(Boost
   BUILD_IN_SOURCE 1
-  URL "http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.gz"
-  URL_MD5 93780777cfbf999a600f62883bd54b17
+  URL ${Boost_url}
+  URL_MD5 ${Boost_md5}
   UPDATE_COMMAND ""
-  PATCH_COMMAND ${Boost_Patch_Command}
+  #PATCH_COMMAND ${Boost_Patch_Command}
   CONFIGURE_COMMAND ${Boost_Bootstrap_Command} --prefix=${INSTALL_DEPECENCIES_DIR}/lib --with-libraries=thread --with-libraries=system
   BUILD_COMMAND ${Boost_b2_Command} install -j8   --prefix=${INSTALL_DEPECENCIES_DIR} address-model=${Boost_address_model}
   INSTALL_COMMAND ""


[Config] (hopefully) better detection of Boost.Python across platforms

--- config/project_config_embeddable.cmake
+++ config/project_config_embeddable.cmake
@@ -504,7 +504,7 @@
 	  set (PY_MINOR_VERSION "${CMAKE_MATCH_2}")
 	  set (PY_PATCH_VERSION "${CMAKE_MATCH_3}")
 	endif (${PYTHONLIBS_VERSION_STRING} MATCHES "([0-9]).([0-9]).([0-9])")
-
+
 	message (STATUS "Found PythonLibs ${PYTHONLIBS_VERSION} (${PYTHONLIBS_VERSION_STRING} / ${PY_MAJOR_VERSION}.${PY_MINOR_VERSION}.${PY_PATCH_VERSION})")

 	# Set the Python installation directory
@@ -585,15 +585,15 @@
 macro (register_boost_lib _boost_lib_list_name _boost_lib_list)
   # Update the list of library dependencies for the project
   foreach (_lib_cpt ${_boost_lib_list})
-	string (TOUPPER ${_lib_cpt} _lib_cpt_up)
-
-	if (Boost_${_lib_cpt_up}_LIBRARY)
-	  # Update the list of dependencies for the project
-	  list (APPEND ${_boost_lib_list_name} ${Boost_${_lib_cpt_up}_LIBRARY})
-
-	  # Update the list of libraries to be displayed
-	  list (APPEND BOOST_REQUIRED_LIBS ${Boost_${_lib_cpt_up}_LIBRARY})
-	endif (Boost_${_lib_cpt_up}_LIBRARY)
+    string (TOUPPER ${_lib_cpt} _lib_cpt_up)
+
+    if (Boost_${_lib_cpt_up}_LIBRARY)
+      # Update the list of dependencies for the project
+      list (APPEND ${_boost_lib_list_name} ${Boost_${_lib_cpt_up}_LIBRARY})
+
+      # Update the list of libraries to be displayed
+      list (APPEND BOOST_REQUIRED_LIBS ${Boost_${_lib_cpt_up}_LIBRARY})
+    endif (Boost_${_lib_cpt_up}_LIBRARY)
   endforeach (_lib_cpt ${_boost_lib_list})
 endmacro (register_boost_lib _boost_lib_list_name _boost_lib_list)

@@ -606,18 +606,26 @@
   else (${ARGC} GREATER 0)
     message (STATUS "Requires Boost without specifying any version")
   endif (${ARGC} GREATER 0)
-
+
   #
-  # Note: ${Boost_DATE_TIME_LIBRARY} and ${Boost_PROGRAM_OPTIONS_LIBRARY}
-  # are already set by ${SOCIMYSQL_LIBRARIES} and/or ${SOCI_LIBRARIES}.
-  #
-  set (python_component_name "python${PY_MAJOR_VERSION}${PY_MINOR_VERSION}")
+  # Note 1: ${Boost_DATE_TIME_LIBRARY} and ${Boost_PROGRAM_OPTIONS_LIBRARY}
+  #         are already set by ${SOCIMYSQL_LIBRARIES} and/or ${SOCI_LIBRARIES}.
+  # Note 2: Boost libraries are not installed in a consistent way across the
+  #         the different platforms and versions of Boost.
+  #         For a while, the Boost.Python library component was just called
+  #         'python'. It is now suffixed with the version of Python, and
+  #         on some Linux distributions, there is even a '-py' suffix.
+  #         On some platform/Boost version combinations, the Python version
+  #         may be just the major version (2 or 3 as of 2019) or the major
+  #         and minor versions (e.g., 27, 28, 34, 36, 37 as of 2019)
+  set (python_cpt_name1 "python${PY_MAJOR_VERSION}")
+  set (python_cpt_name2 "python${PY_MAJOR_VERSION}${PY_MINOR_VERSION}")
   set (Boost_USE_STATIC_LIBS OFF)
   set (Boost_USE_MULTITHREADED ON)
   set (Boost_USE_STATIC_RUNTIME OFF)
   set (BOOST_REQUIRED_COMPONENTS_FOR_LIB
     date_time random iostreams serialization filesystem system
-	locale ${python_component_name} regex)
+    locale ${python_cpt_name1} ${python_cpt_name2} regex)
   set (BOOST_REQUIRED_COMPONENTS_FOR_BIN program_options)
   set (BOOST_REQUIRED_COMPONENTS_FOR_TST unit_test_framework)
   set (BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS_FOR_LIB}
@@ -637,23 +645,28 @@
   find_package (BoostWrapper ${_required_version} REQUIRED)

   if (Boost_FOUND)
+    # Boost.Python library
+    message (STATUS "  + Boost_PYTHON_LIBRARY: ${Boost_PYTHON_LIBRARY}")
+    message (STATUS "  + Boost_PYTHON3_LIBRARY: ${Boost_PYTHON3_LIBRARY}")
+    message (STATUS "  + Boost_PYTHON37_LIBRARY: ${Boost_PYTHON37_LIBRARY}")
+
     # Update the list of include directories for the project
     include_directories (${Boost_INCLUDE_DIRS})

-	# For display purposes
+    # For display purposes
     set (BOOST_REQUIRED_LIBS "")

     # Update the list of library dependencies for the project
-	register_boost_lib ("PROJ_DEP_LIBS_FOR_LIB"
-	  "${BOOST_REQUIRED_COMPONENTS_FOR_LIB}")
+    register_boost_lib ("PROJ_DEP_LIBS_FOR_LIB"
+      "${BOOST_REQUIRED_COMPONENTS_FOR_LIB}")

     # Update the list of binary dependencies for the project
-	register_boost_lib ("PROJ_DEP_LIBS_FOR_BIN"
-	  "${BOOST_REQUIRED_COMPONENTS_FOR_BIN}")
+    register_boost_lib ("PROJ_DEP_LIBS_FOR_BIN"
+      "${BOOST_REQUIRED_COMPONENTS_FOR_BIN}")

     # Update the list of test dependencies for the project
-	register_boost_lib ("PROJ_DEP_LIBS_FOR_TST"
-	  "${BOOST_REQUIRED_COMPONENTS_FOR_TST}")
+    register_boost_lib ("PROJ_DEP_LIBS_FOR_TST"
+      "${BOOST_REQUIRED_COMPONENTS_FOR_TST}")

   endif (Boost_FOUND)


[CMake][Python] The Python installation directory is now the standard one.

--- config/project_config_embeddable.cmake
+++ config/project_config_embeddable.cmake
@@ -113,8 +113,6 @@
   # Offer the user the choice of overriding the installation directories
   set (INSTALL_LIB_DIR ${LIBDIR} CACHE PATH
 	"Installation directory for libraries")
-  set (INSTALL_PY_LIB_DIR ${LIBDIR}/python${PYTHONLIBS_VERSION}/${PROJECT_NAME}
-	CACHE PATH "Installation directory for Python libraries")
   set (INSTALL_BIN_DIR bin CACHE PATH "Installation directory for executables")
   set (INSTALL_LIBEXEC_DIR CACHE PATH
 	"Installation directory for internal executables")
@@ -498,7 +496,11 @@
       PYTHONLIBS_VERSION "${PYTHONLIBS_LIB_FILENAME}")
 	message (STATUS "Found PythonLibs ${PYTHONLIBS_VERSION}")

-    # Update the list of include directories for the project
+	# Set the Python installation directory
+	set (INSTALL_PY_LIB_DIR ${INSTALL_LIB_DIR}/python${PYTHONLIBS_VERSION}/site-packages/libpy${PROJECT_NAME}
+	  CACHE PATH "Installation directory for Python libraries")
+
+	# Update the list of include directories for the project
     include_directories (${PYTHON_INCLUDE_DIRS})

     # Update the list of dependencies for the project
@@ -1420,7 +1422,7 @@
   set (exec_prefix   ${prefix})
   set (bindir        ${exec_prefix}/bin)
   set (libdir        ${exec_prefix}/${LIBDIR})
-  set (pylibdir	     ${libdir}/python${PYTHONLIBS_VERSION}/${PACKAGE})
+  set (pylibdir	     ${libdir}/python${PYTHONLIBS_VERSION}/site-packages/libpy${PACKAGE})
   set (libexecdir    ${exec_prefix}/libexec)
   set (sbindir       ${exec_prefix}/sbin)
   set (sysconfdir    ${prefix}/etc)


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
@@ -36,6 +36,7 @@
 Name[sv]=VLC
 Name[uk]=VLC
 Name[x-test]=xxVLCxx
+Name[zh_CN]=VLC

 Comment=Phonon VLC backend
 Comment[ca]=Dorsal del VLC pel Phonon
@@ -64,3 +65,4 @@
 Comment[sv]=Phonon VLC-gränssnitt
 Comment[uk]=Модуль VLC Phonon
 Comment[x-test]=xxPhonon VLC backendxx
+Comment[zh_CN]= Phonon VLC 后端


--- src/vlc.desktop.cmake
+++ src/vlc.desktop.cmake
@@ -10,100 +10,5 @@
 InitialPreference=20

 Name=VLC
-Name[ast]=VLC
-Name[bg]=VLC
-Name[bs]=VLC
-Name[ca]=VLC
-Name[ca@valencia]=VLC
-Name[cs]=VLC
-Name[da]=VLC
-Name[de]=VLC
-Name[el]=VLC
-Name[en_GB]=VLC
-Name[es]=VLC
-Name[et]=VLC
-Name[eu]=VLC
-Name[fa]=وی‌ال‌سی (VLC)
-Name[fi]=VLC
-Name[fr]=VLC
-Name[ga]=VLC
-Name[gl]=VLC
-Name[hu]=VLC
-Name[id]=VLC
-Name[it]=VLC
-Name[kk]=VLC
-Name[ko]=VLC
-Name[lt]=VLC
-Name[mr]=व्ही-एल-सी
-Name[nb]=VLC
-Name[nds]=VLC
-Name[nl]=VLC
-Name[nn]=VLC
-Name[pa]=VLC
-Name[pl]=VLC
-Name[pt]=VLC
-Name[pt_BR]=VLC
-Name[ro]=VLC
-Name[ru]=VLC
-Name[sk]=VLC
-Name[sl]=VLC
-Name[sr]=ВЛЦ
-Name[sr@ijekavian]=ВЛЦ
-Name[sr@ijekavianlatin]=VLC
-Name[sr@latin]=VLC
-Name[sv]=VLC
-Name[tr]=VLC
-Name[ug]=VLC
-Name[uk]=VLC
-Name[x-test]=xxVLCxx
-Name[zh_CN]=VLC
-Name[zh_TW]=VLC

 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
-Comment[da]=Phonon VLC-motor
-Comment[de]=Phonon-Treiber für VLC
-Comment[el]=Σύστημα υποστήριξης Phonon VLC
-Comment[en_GB]=Phonon VLC backend
-Comment[es]=Motor VLC para Phonon
-Comment[et]=Phononi VLC taustaprogramm
-Comment[eu]=Phonon-en VLC bizkarraldekoa
-Comment[fa]=پسانه‌ی وی‌ال‌سی برای فنون (Phonon VLC backend)
-Comment[fi]=Phonon VLC -taustajärjestelmä
-Comment[fr]=Module VLC pour Phonon
-Comment[ga]=Inneall VLC Phonon
-Comment[gl]=Infraestrutura de VLC para Phonon
-Comment[hu]=Phonon VLC-backend
-Comment[id]=Backend phonon VLC
-Comment[it]=Motore VLC di Phonon
-Comment[kk]=Phonon VLC тетігі
-Comment[ko]=Phonon VLC 백엔드
-Comment[lt]=Phonon VLC galinė sąsaja
-Comment[mr]=फोनॉन व्ही-एल-सी बॅकएन्ड
-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
-Comment[pt_BR]=Infraestrutura do VLC para o Phonon
-Comment[ro]=Suportul VLC pentru Phonon
-Comment[ru]=Механизм VLC для Phonon
-Comment[sk]=Backend Phonon VLC
-Comment[sl]=Zaledje VLC za Phonon
-Comment[sr]=ВЛЦ као позадина Фонона
-Comment[sr@ijekavian]=ВЛЦ као позадина Фонона
-Comment[sr@ijekavianlatin]=VLC kao pozadina Phonona
-Comment[sr@latin]=VLC kao pozadina Phonona
-Comment[sv]=Phonon VLC-gränssnitt
-Comment[tr]=Phonon VLC arka ucu
-Comment[ug]=Phonon VLC ئارقا ئۇچى
-Comment[uk]=Модуль VLC Phonon
-Comment[x-test]=xxPhonon VLC backendxx
-Comment[zh_CN]= Phonon VLC 后端
-Comment[zh_TW]=Phonon VLC 後端介面


SVN_SILENT made messages (.desktop file)

--- src/vlc.desktop.cmake
+++ src/vlc.desktop.cmake
@@ -21,6 +21,7 @@
 Name[es]=VLC
 Name[et]=VLC
 Name[eu]=VLC
+Name[fa]=وی‌ال‌سی (VLC)
 Name[fi]=VLC
 Name[fr]=VLC
 Name[ga]=VLC
@@ -66,6 +67,7 @@
 Comment[es]=Motor VLC para Phonon
 Comment[et]=Phononi VLC taustaprogramm
 Comment[eu]=Phonon-en VLC bizkarraldekoa
+Comment[fa]=پسانه‌ی وی‌ال‌سی برای فنون (Phonon VLC backend)
 Comment[fi]=Phonon VLC -taustajärjestelmä
 Comment[fr]=Module VLC pour Phonon
 Comment[ga]=Inneall VLC Phonon


Check for process_vm_readv using CheckSymbolExists

Instead of checking if code compiles, I think it is a better to check
if the symbol exists. This is simpler and should do the same thing.

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

git-svn-id: 4c4cc70b1ef44ba2b7963015e681894188cea27e@334219 91177308-0d34-0410-b5e6-96231b3b80d8

--- cmake/modules/LLDBGenerateConfig.cmake
+++ cmake/modules/LLDBGenerateConfig.cmake
@@ -14,14 +14,8 @@
 check_include_file(termios.h HAVE_TERMIOS_H)
 check_include_files("sys/types.h;sys/event.h" HAVE_SYS_EVENT_H)

-check_cxx_source_compiles("
-  #include <sys/uio.h>
-  int main() { process_vm_readv(0, nullptr, 0, nullptr, 0, 0); return 0; }"
-  HAVE_PROCESS_VM_READV)
-check_cxx_source_compiles("
-    #include <sys/syscall.h>
-    int main() { return __NR_process_vm_readv; }"
-    HAVE_NR_PROCESS_VM_READV)
+check_cxx_symbol_exists(process_vm_readv "sys/uio.h" HAVE_PROCESS_VM_READV)
+check_cxx_symbol_exists(__NR_process_vm_readv "sys/syscall.h" HAVE_NR_PROCESS_VM_READV)

 check_library_exists(compression compression_encode_buffer "" HAVE_LIBCOMPRESSION)


CMake: Include private headers / tablegen files in generated Xcode projects.

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

--- cmake/modules/LLVMProcessSources.cmake
+++ cmake/modules/LLVMProcessSources.cmake
@@ -48,7 +48,7 @@
     set( f ${CMAKE_CURRENT_SOURCE_DIR}/${s} )
     add_file_dependencies( ${f} ${TABLEGEN_OUTPUT} )
   endforeach(s)
-  if( MSVC_IDE )
+  if( MSVC_IDE OR XCODE )
     # This adds .td and .h files to the Visual Studio solution:
     # FIXME: Shall we handle *.def here?
     add_td_sources(sources)


[Config] Fixed a small typo in the Python package section

--- config/project_config_embeddable.cmake
+++ config/project_config_embeddable.cmake
@@ -503,7 +503,7 @@
 	  set (PY_MAJOR_VERSION "${CMAKE_MATCH_1}")
 	  set (PY_MINOR_VERSION "${CMAKE_MATCH_2}")
 	  set (PY_PATCH_VERSION "${CMAKE_MATCH_3}")
-	endif (${PYTHONLIBS_VERSION_STRING} MATCHES "([0-9])\.([0-9])\.([0-9])")
+	endif (${PYTHONLIBS_VERSION_STRING} MATCHES "([0-9]).([0-9]).([0-9])")

 	message (STATUS "Found PythonLibs ${PYTHONLIBS_VERSION} (${PYTHONLIBS_VERSION_STRING} / ${PY_MAJOR_VERSION}.${PY_MINOR_VERSION}.${PY_PATCH_VERSION})")


Update paraview

Update paraview

--- versions.cmake
+++ versions.cmake
@@ -64,7 +64,7 @@
   set(_paraview_revision "master")
 else()
   # Test the revision with OpenGL2 rendering before updating, update often!
-  set(_paraview_revision "2cab5606b2ac634e9d7b90595f1f0f906a2c2616")
+  set(_paraview_revision "537964f6c58fc7156a6aefd2526ae34f1126fe7b")
 endif()
 add_revision(paraview
   GIT_REPOSITORY "https://gitlab.kitware.com/paraview/paraview.git"


DataTypes.h.cmake: Define PRIx32 &c for !HAVE_INTTYPES_H hosts.

I supposed PRIx32 might be unused in the tree.

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

--- include/llvm/Support/DataTypes.h.cmake
+++ include/llvm/Support/DataTypes.h.cmake
@@ -101,6 +101,13 @@
 #define PRIu64 "I64u"
 #define PRIx64 "I64x"
 #define PRIX64 "I64X"
+
+#define PRId32 "d"
+#define PRIi32 "i"
+#define PRIo32 "o"
+#define PRIu32 "u"
+#define PRIx32 "x"
+#define PRIX32 "X"
 #endif /* HAVE_INTTYPES_H */

 #endif /* _MSC_VER */


[FIX] Build System: fixed another typo

[FIX] Build System: fixed another typo

--- util/travis/linux-cibuild.cmake
+++ util/travis/linux-cibuild.cmake
@@ -10,8 +10,10 @@
 message(STATUS "CTEST_SOURCE_DIRECTORY: ${CTEST_SOURCE_DIRECTORY}")
 message(STATUS "CTEST_BINARY_DIRECTORY: ${CTEST_BINARY_DIRECTORY}")

-# create cache
-set(INITIAL_CACHE "CMAKE_BUILD_TYPE=Release SEQAN_TRAVIS_BUILD:BOOL=ON")
+# create cache - mind the newline between variables!
+set(INITIAL_CACHE
+"CMAKE_BUILD_TYPE=Release
+SEQAN_TRAVIS_BUILD:BOOL=ON")
 file(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" ${INITIAL_CACHE})

 # customize reporting of errors in CDash


extension building test

extension building test

--- AutoTract.cmake
+++ AutoTract.cmake
@@ -34,11 +34,6 @@
   )

-find_package(QtToCppXML REQUIRED)
-include(${QtToCppXML_USE_FILE})
-
-
-
 IF(Qt4_SUPPORT)
   add_definitions(-DQT_4_SUPPORT=1)
   find_package(Qt4 COMPONENTS QtCore QtGui QtXml REQUIRED)
@@ -55,6 +50,10 @@
 FIND_PACKAGE(SlicerExecutionModel REQUIRED)
 INCLUDE(${SlicerExecutionModel_USE_FILE})
 #INCLUDE(${GenerateCLP_USE_FILE})
+
+
+find_package(QtToCppXML REQUIRED)
+include(${QtToCppXML_USE_FILE})

 set(ITK_IO_MODULES_USED
 ITKIOImageBase


use https instead of http to download binutils. (#639)

Some proxies could block user agent like `wget` and `curl` for
security reasons. So When you use https, the entire connection is
encrypted and authenticated, so such in-between boxes can't see what
is inside.

Signed-off-by: "Manohar Reddy" <a9665c27bcc0de35539d86e6f317d1f747c1c1bb@iiitvadodara.ac.in">

--- scripts/cmake/config/default.cmake
+++ scripts/cmake/config/default.cmake
@@ -692,7 +692,7 @@
 add_config(
     CONFIG_NAME BINUTILS_URL
     CONFIG_TYPE STRING
-    DEFAULT_VAL "http://ftp.gnu.org/gnu/binutils/binutils-2.28.tar.gz"
+    DEFAULT_VAL "https://ftp.gnu.org/gnu/binutils/binutils-2.28.tar.gz"
     DESCRIPTION "Binutils URL"
 )


BUG: During DTIPrep superbuild

BUG: During DTIPrep superbuild

The module vtkCommonDataModel needs to be discovered otherwise there are linking errors for fiberprocess executable

--- DTIProcess.cmake
+++ DTIProcess.cmake
@@ -99,6 +99,7 @@
     find_package(VTK COMPONENTS
       vtkIOLegacy
       vtkIOXML
+      vtkCommonDataModel
       REQUIRED)
     include(${VTK_USE_FILE})
 endif(NOT VTK_FOUND)


Fixed find module for octave (cruft is not available anymore).

--- library/cmake/Modules/FindOctave.cmake
+++ library/cmake/Modules/FindOctave.cmake
@@ -5,10 +5,9 @@
 # This module defines:
 #  OCTAVE_EXECUTABLE           - octave interpreter
 #  OCTAVE_INCLUDE_DIRS         - include path for mex.h, mexproto.h
-#  OCTAVE_LIBRARIES            - required libraries: octinterp, octave, cruft
+#  OCTAVE_LIBRARIES            - required libraries: octinterp, octave
 #  OCTAVE_OCTINTERP_LIBRARY    - path to the library octinterp
 #  OCTAVE_OCTAVE_LIBRARY       - path to the library octave
-#  OCTAVE_CRUFT_LIBRARY        - path to the library cruft
 #  OCTAVE_VERSION_STRING       - octave version string
 #  OCTAVE_MAJOR_VERSION        - major version
 #  OCTAVE_MINOR_VERSION        - minor version
@@ -112,7 +111,7 @@
               HINTS ${OCTAVE_BIN_PATHS}
               NAMES mkoctfile
             )
-
+
 find_library( OCTAVE_OCTINTERP_LIBRARY
               NAMES octinterp liboctinterp
               HINTS ${OCTAVE_LIBRARIES_PATHS}
@@ -121,54 +120,18 @@
               NAMES octave liboctave
               HINTS ${OCTAVE_LIBRARIES_PATHS}
             )
-find_library( OCTAVE_CRUFT_LIBRARY
-              NAMES cruft libcruft
-              HINTS ${OCTAVE_LIBRARIES_PATHS}
-            )

 set ( OCTAVE_LIBRARIES ${OCTAVE_OCTINTERP_LIBRARY} )
-list ( APPEND OCTAVE_LIBRARIES ${OCTAVE_OCTAVE_LIBRARY} )
-list ( APPEND OCTAVE_LIBRARIES ${OCTAVE_CRUFT_LIBRARY} )
+list ( APPEND OCTAVE_LIBRARIES ${OCTAVE_OCTAVE_LIBRARY} )

 find_path ( OCTAVE_INCLUDE_DIR
-            NAMES mex.h
+            NAMES octave.h
             HINTS ${OCTAVE_INCLUDE_PATHS}
             "${OCTAVE_INCLUDE_PATHS}/octave"
           )
+get_filename_component( OCTAVE_INCLUDE_DIR2 ${OCTAVE_INCLUDE_DIR} DIRECTORY )

-set ( OCTAVE_INCLUDE_DIRS ${OCTAVE_INCLUDE_DIR} )
-
-
-macro ( octave_add_oct FUNCTIONNAME )
-  set ( _CMD SOURCES )
-  set ( _SOURCES )
-  set ( _LINK_LIBRARIES )
-  set ( _EXTENSION )
-  set ( _OCT_EXTENSION oct )
-  foreach ( _ARG ${ARGN})
-    if ( ${_ARG} MATCHES SOURCES )
-      set ( _CMD SOURCES )
-    elseif ( ${_ARG} MATCHES LINK_LIBRARIES  )
-      set ( _CMD LINK_LIBRARIES  )
-    elseif ( ${_ARG} MATCHES EXTENSION )
-      set ( _CMD EXTENSION )
-    else ()
-      if ( ${_CMD} MATCHES SOURCES )
-        list ( APPEND _SOURCES "${_ARG}" )
-      elseif ( ${_CMD} MATCHES LINK_LIBRARIES  )
-        list ( APPEND _LINK_LIBRARIES "${_ARG}" )
-      elseif ( ${_CMD} MATCHES EXTENSION )
-        set ( _OCT_EXTENSION ${_ARG} )
-      endif ()
-    endif ()
-  endforeach ()
-  add_library ( ${FUNCTIONNAME} SHARED ${_SOURCES} )
-  target_link_libraries ( ${FUNCTIONNAME} ${OCTAVE_LIBRARIES} ${_LINK_LIBRARIES} )
-  set_target_properties ( ${FUNCTIONNAME} PROPERTIES
-    PREFIX ""
-    SUFFIX  ".${_OCT_EXTENSION}"
-  )
-endmacro ()
+set ( OCTAVE_INCLUDE_DIRS ${OCTAVE_INCLUDE_DIR} ${OCTAVE_INCLUDE_DIR2} )

 # handle REQUIRED and QUIET options
@@ -185,7 +148,6 @@
   OCTAVE_OCT_LIB_DIR
   OCTAVE_OCTINTERP_LIBRARY
   OCTAVE_OCTAVE_LIBRARY
-  OCTAVE_CRUFT_LIBRARY
   OCTAVE_LIBRARIES
   OCTAVE_INCLUDE_DIR
   OCTAVE_INCLUDE_DIRS


#1243 - NiftyLink, tweak location of OpenIGTLink

git-svn-id: f70d4c833b20674991d6651a5f592bbdbe6b47b2@8142 30ced1d1-d8fb-0310-b896-84269ee58dd6

--- CMake/CMakeExternals/OPENIGTLINK.cmake
+++ CMake/CMakeExternals/OPENIGTLINK.cmake
@@ -42,9 +42,7 @@
     ExternalProject_Add(${proj}
     GIT_REPOSITORY git://github.com/zomboir/OpenIGTLink.git
     GIT_TAG ${revision_tag}
-
     BINARY_DIR ${proj}-build
-    INSTALL_COMMAND ""
     CMAKE_GENERATOR ${GEN}
     CMAKE_ARGS
         ${EP_COMMON_ARGS}
@@ -53,7 +51,7 @@
     DEPENDS ${proj_DEPENDENCIES}
     )

-  SET(OpenIGTLink_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build)
+  SET(OpenIGTLink_DIR ${EP_BASE}/Install/${proj}/lib/igtl)
   SET(OpenIGTLink_SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/CMakeExternals/Source/OPENIGTLINK)

   MESSAGE("SuperBuild loading OpenIGTLink from ${OpenIGTLink_DIR}")