Remove custom FindGit module

Remove custom FindGit module

--- CMake/FindGit.cmake
+++ CMake/FindGit.cmake
@@ -1,81 +0,0 @@
-#
-# FindGit
-#
-
-set(git_candidates git eg)
-
-if(WIN32)
-  list(APPEND git_candidates eg.cmd)
-  if(NOT MSYS)
-    # We don't append git.cmd, since it does not correctly return
-    # exit codes, see http://code.google.com/p/msysgit/issues/detail?id=428
-    list(APPEND git_candidates git.cmd)
-  endif()
-endif()
-
-find_program(GIT_EXECUTABLE ${git_candidates}
-  PATHS
-    "C:/Program Files/Git/bin"
-    "C:/Program Files (x86)/Git/bin"
-  DOC "git command line client")
-mark_as_advanced(GIT_EXECUTABLE)
-
-if(GIT_EXECUTABLE)
-
-  macro(GIT_IS_REPO dir result_var)
-    # check if ${dir} is a proper Git repository
-    execute_process(COMMAND ${GIT_EXECUTABLE} rev-list -n 1 HEAD
-       WORKING_DIRECTORY ${dir}
-       RESULT_VARIABLE GIT_error
-       OUTPUT_QUIET
-       ERROR_QUIET)
-    if(GIT_error EQUAL 0)
-      set(${result_var} 1)
-    else()
-      set(${result_var} 0)
-    endif()
-  endmacro()
-
-  macro(GIT_WC_INFO dir prefix)
-    execute_process(COMMAND ${GIT_EXECUTABLE} rev-list -n 1 HEAD
-       WORKING_DIRECTORY ${dir}
-       ERROR_VARIABLE GIT_error
-       OUTPUT_VARIABLE ${prefix}_WC_REVISION_HASH
-       OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if(NOT ${GIT_error} EQUAL 0)
-      message(SEND_ERROR "Command \"${GIT_EXECUTBALE} rev-list -n 1 HEAD\" in directory ${dir} failed with output:\n${GIT_error}")
-    else()
-      execute_process(COMMAND ${GIT_EXECUTABLE} name-rev ${${prefix}_WC_REVISION_HASH}
-         WORKING_DIRECTORY ${dir}
-         OUTPUT_VARIABLE ${prefix}_WC_REVISION_NAME
-          OUTPUT_STRIP_TRAILING_WHITESPACE)
-    endif()
-
-    set(${prefix}_WC_GITSVN 0)
-    # In case, git-svn is used, attempt to extract svn info
-    execute_process(COMMAND ${GIT_EXECUTABLE} svn info
-      WORKING_DIRECTORY ${dir}
-      ERROR_VARIABLE git_svn_info_error
-      OUTPUT_VARIABLE ${prefix}_WC_INFO
-      RESULT_VARIABLE git_svn_info_result
-      OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-    if(${git_svn_info_result} EQUAL 0)
-      set(${prefix}_WC_GITSVN 1)
-      string(REGEX REPLACE "^(.*\n)?URL: ([^\n]+).*"
-        "\\2" ${prefix}_WC_URL "${${prefix}_WC_INFO}")
-      string(REGEX REPLACE "^(.*\n)?Revision: ([^\n]+).*"
-        "\\2" ${prefix}_WC_REVISION "${${prefix}_WC_INFO}")
-      string(REGEX REPLACE "^(.*\n)?Last Changed Author: ([^\n]+).*"
-        "\\2" ${prefix}_WC_LAST_CHANGED_AUTHOR "${${prefix}_WC_INFO}")
-      string(REGEX REPLACE "^(.*\n)?Last Changed Rev: ([^\n]+).*"
-        "\\2" ${prefix}_WC_LAST_CHANGED_REV "${${prefix}_WC_INFO}")
-      string(REGEX REPLACE "^(.*\n)?Last Changed Date: ([^\n]+).*"
-        "\\2" ${prefix}_WC_LAST_CHANGED_DATE "${${prefix}_WC_INFO}")
-    endif()
-
-  endmacro()
-endif()
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Git DEFAULT_MSG GIT_EXECUTABLE)


Adding vm to required app libraries

Adding vm to required app libraries

--- CMake/FindIPP.cmake
+++ CMake/FindIPP.cmake
@@ -182,8 +182,9 @@
     endif()
   endif()

+  _ipp_add_library(core)
   _ipp_add_library(s)
-  _ipp_add_library(core)
+  _ipp_add_library(vm)
 endmacro()

 file(TO_CMAKE_PATH "${IPPROOT}" __IPPROOT)


Bump the ParaView SHA again

Bump the ParaView SHA again

--- versions.cmake
+++ versions.cmake
@@ -80,7 +80,7 @@
   set(_paraview_revision "master")
 else()
   # Test the revision with OpenGL2 rendering before updating, update often!
-  set(_paraview_revision "1c94a3b4d9dfb052fdbb0edcb5bbb7beb13a9b7f")
+  set(_paraview_revision "646556962cbe8f2c4a6b11bf45813db2d0e27832")
 endif()
 add_revision(paraview
   GIT_REPOSITORY "https://gitlab.kitware.com/paraview/paraview.git"


python3: use copy of tarball from tomviz.org

--- versions.cmake
+++ versions.cmake
@@ -50,8 +50,8 @@
     URL_MD5 "08c5a23fe5dd095d2aa363816ba25935")
 else()
   add_revision(python
-    URL "https://www.python.org/ftp/python/3.6.0/Python-3.6.0.tgz"
-    URL_MD5 "")
+    URL "http://www.tomviz.org/files/Python-3.6.0.tgz"
+    URL_MD5 "3f7062ccf8be76491884d0e47ac8b251")
 endif()

 foreach (fftw3kind float double long quad)


try again to fix libxml on win32

try again to fix libxml on win32

--- Shared/CMake/modules/LibXml2Config.win32.cmake
+++ Shared/CMake/modules/LibXml2Config.win32.cmake
@@ -8,7 +8,6 @@
 	PATHS
 	"${WIN32_LIBXML2_FOLDER}//include"
 	PATH_SUFFIXES libxml2)
-message("LIBXML2_INCLUDE_DIR : ${LIBXML2_INCLUDE_DIR}")
 # Find the correct .lib / .dll.
 set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
 if(MINGW)
@@ -16,7 +15,6 @@
                 PATHS "${WIN32_LIBXML2_FOLDER}//libmingw")
 	set(LIBXML2_DLL "${WIN32_LIBXML2_FOLDER}//libmingw//libxml2.dll")
 elseif(WIN64)
-		message("looking for 64bit XML library")
 	if(CMAKE_BUILD_TYPE STREQUAL "Debug")
 	    find_library(LIBXML2_LIBRARIES NAMES libxml2
 					 PATHS "${WIN32_LIBXML2_FOLDER}//lib64//debug")
@@ -28,35 +26,15 @@
 	endif()

 elseif(WIN32)
-	message("looking for 32bit XML library")
-	message("LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES}")
-   find_library(LIBXML2_LIBRARIES_DEBUG_STATIC NAMES libxml2_s
-		PATHS
-		"${WIN32_LIBXML2_FOLDER}//lib//debug")
-   message("LIBXML2_LIBRARIES_DEBUG_STATIC ${LIBXML2_LIBRARIES_DEBUG_STATIC}")
-	find_library(LIBXML2_LIBRARIES_RELEASE_STATIC NAMES libxml2_s
-		PATHS
-		"${WIN32_LIBXML2_FOLDER}//lib//release")
-   message("LIBXML2_LIBRARIES_RELEASE_STATIC ${LIBXML2_LIBRARIES_RELEASE_STATIC}")
-   find_library(LIBXML2_LIBRARIES_DEBUG_DYNAMIC NAMES libxml2
-		PATHS
-		"${WIN32_LIBXML2_FOLDER}//lib//debug")
-   message("LIBXML2_LIBRARIES_DEBUG_DYNAMIC ${LIBXML2_LIBRARIES_DEBUG_DYNAMIC}")
-	find_library(LIBXML2_LIBRARIES_RELEASE_DYNAMIC NAMES libxml2
-		PATHS
-		"${WIN32_LIBXML2_FOLDER}//lib//release")
-   message("LIBXML2_LIBRARIES_RELEASE_DYNAMIC ${LIBXML2_LIBRARIES_RELEASE_DYNAMIC}")
 	if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-		set(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES_DEBUG_STATIC})
-		set(LIBXML2_DLL "${WIN32_LIBXML2_FOLDER}//lib//debug//libxml2.dll")
+   		find_library(LIBXML2_LIBRARIES NAMES libxml2_s
+						PATHS "${WIN32_LIBXML2_FOLDER}//lib//debug")
+   		set(LIBXML2_DLL "${WIN32_LIBXML2_FOLDER}//lib//release//libxml2.dll")
 	else()
-		set(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES_RELEASE_STATIC})
+		find_library(LIBXML2_LIBRARIES NAMES libxml2_s
+						PATHS "${WIN32_LIBXML2_FOLDER}//lib//release")
 		set(LIBXML2_DLL "${WIN32_LIBXML2_FOLDER}//lib//release//libxml2.dll")
-	endif()
-
-
-	message("after search : LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES}")
-
+	endif()
 endif()

 set_target_properties(xml2 PROPERTIES


cmake/FindGccFuncAttribute.cmake: Fix missing interpolation

--- cmake/FindGccFuncAttribute.cmake
+++ cmake/FindGccFuncAttribute.cmake
@@ -20,7 +20,7 @@
         MESSAGE(STATUS "Looking for GCC function attribute ${attribute} - not supported")
       ENDIF ()
       IF (_C_GCC_FUNC_ATTRIBUTE_${ATTRIBUTE}_FOUND)
-        SET (C_GCC_FUNC_ATTRIBUTE_${ATTRIBUTE} "_C_GCC_FUNC_ATTRIBUTE_${ATTRIBUTE}" CACHE STRING "GCC function attribute ${attribute}")
+        SET (C_GCC_FUNC_ATTRIBUTE_${ATTRIBUTE} "${_C_GCC_FUNC_ATTRIBUTE_${ATTRIBUTE}}" CACHE STRING "GCC function attribute ${attribute}")
         MARK_AS_ADVANCED (C_GCC_FUNC_ATTRIBUTE_${ATTRIBUTE})
       ENDIF ()
       SET (C_GCC_FUNC_ATTRIBUTE_${ATTRIBUTE}_SINGLETON TRUE CACHE BOOL "GCC function attribute ${attribute}")


BUG: Mantis-1175: avoid parallel install of FFTWF and FFTWD

--- SuperBuild/CMake/External_fftw.cmake
+++ SuperBuild/CMake/External_fftw.cmake
@@ -57,6 +57,7 @@
   --enable-threads
   --disable-fortran
   --disable-dependency-tracking
+  DEPENDS FFTWF
   )

@@ -68,7 +69,7 @@
   CONFIGURE_COMMAND ""
   BUILD_COMMAND ""
   INSTALL_COMMAND ""
-  DEPENDS FFTWF FFTWD
+  DEPENDS FFTWD
   )

 set(_SB_FFTW_INCLUDE_PATH ${SB_INSTALL_PREFIX}/include)


ENH: upgrade SuperBuild GDAL to 3.2.2

ENH: upgrade SuperBuild GDAL to 3.2.2

--- SuperBuild/CMake/External_gdal.cmake
+++ SuperBuild/CMake/External_gdal.cmake
@@ -149,8 +149,8 @@

 ExternalProject_Add(GDAL
   PREFIX GDAL
-  URL "https://download.osgeo.org/gdal/3.2.1/gdal-3.2.1.tar.xz"
-  URL_MD5 cf7fe042403e73ad991aa5797247b586
+  URL "https://download.osgeo.org/gdal/3.2.2/gdal-3.2.2.tar.xz"
+  URL_MD5 c656be582f7beb528c66486cd1fca7a2
   SOURCE_DIR ${GDAL_SB_SRC}
   BINARY_DIR ${GDAL_SB_SRC}
   INSTALL_DIR ${SB_INSTALL_PREFIX}


Remove pointless line in build system

Remove pointless line in build system

--- test/test_driver.cmake
+++ test/test_driver.cmake
@@ -31,7 +31,6 @@
         TARGET ${test_target}
         POST_BUILD
         COMMAND ${test_target} #cmake 2.6 required
-        DEPEND ${test_target}
         WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
         COMMENT "Running ${test_target} ..." VERBATIM
     )


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


tabspace

tabspace

--- Tools/CMake/torque3d.cmake
+++ Tools/CMake/torque3d.cmake
@@ -463,11 +463,11 @@
        # Add other flags to the compiler
        add_definitions(${GTK3_CFLAGS_OTHER})

-	   if(TORQUE_USE_ZENITY)
-			set(BLACKLIST "nfd_win.cpp" "nfd_cocoa.m" "nfd_gtk.c" )
-	   else()
-			set(BLACKLIST "nfd_win.cpp" "nfd_cocoa.m" "simple_exec.h" "nfd_zenity.c")
-	   endif()
+       if(TORQUE_USE_ZENITY)
+          set(BLACKLIST "nfd_win.cpp" "nfd_cocoa.m" "nfd_gtk.c" )
+       else()
+          set(BLACKLIST "nfd_win.cpp" "nfd_cocoa.m" "simple_exec.h" "nfd_zenity.c")
+       endif()
        addLib(nativeFileDialogs)

        set(BLACKLIST ""  )


Define ETIMEDOUT on Windows if it not defined

--- src/platform.h.cmake
+++ src/platform.h.cmake
@@ -104,6 +104,9 @@
 #ifdef _WIN32
 #include <winsock2.h>
 #define CLOSE_SOCKET(__socket) closesocket(__socket)
+#ifndef ETIMEDOUT
+#define ETIMEDOUT WSAETIMEDOUT
+#endif
 #else
 #define CLOSE_SOCKET(__socket) close(__socket)
 #define WSACleanup()


Bug#12710832 - PB2 DAILY-TRUNK BUILD FAILS ON SOLARIS X86_64

Compiler bug:
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6879978

Workaround is to always specify "-xOn".

--- cmake/build_configurations/mysql_release.cmake
+++ cmake/build_configurations/mysql_release.cmake
@@ -210,8 +210,8 @@
       IF(CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
         SET(COMMON_C_FLAGS                   "-g -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic")
         SET(COMMON_CXX_FLAGS                 "-g0 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -features=no%except -xlibmil -xlibmopt -xtarget=generic")
-        SET(CMAKE_C_FLAGS_DEBUG              "${COMMON_C_FLAGS}")
-        SET(CMAKE_CXX_FLAGS_DEBUG            "${COMMON_CXX_FLAGS}")
+        SET(CMAKE_C_FLAGS_DEBUG              "-xO1 ${COMMON_C_FLAGS}")
+        SET(CMAKE_CXX_FLAGS_DEBUG            "-xO1 ${COMMON_CXX_FLAGS}")
         IF(32BIT)
           SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-xO2 ${COMMON_C_FLAGS}")
           SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-xO2 ${COMMON_CXX_FLAGS}")


Compositemodel win cmake fix.

Compositemodel win cmake fix.

--- compositemodel/cmake/Modules/FindPugiXML.cmake
+++ compositemodel/cmake/Modules/FindPugiXML.cmake
@@ -9,11 +9,16 @@
 find_path (PUGIXML_INCLUDE_DIR
            NAMES pugixml.hpp
            PATHS ${PUGIXML_HOME}/include/pugi
-            /usr/local/include/pugixml-1.8/)
+            /usr/local/include/pugixml-1.8/
+	    "~/Install/include/pugi"
+	   )
+
 find_library (PUGIXML_LIBRARY
               NAMES pugixml
               PATHS ${PUGIXML_HOME}/lib
-                /usr/local/lib/pugixml-1.8)
+              /usr/local/lib/pugixml-1.8
+	      PATHS "~/Install/lib"
+	      )
 #MESSAGE("PUGIXML_HOME: " ${PUGIXML_HOME})
 # Support the REQUIRED and QUIET arguments, and set PUGIXML_FOUND if found.
 include (FindPackageHandleStandardArgs)


Indentation fix.

Indentation fix.

--- modules/DownloadModules.cmake
+++ modules/DownloadModules.cmake
@@ -122,10 +122,10 @@

       endforeach (i)

-    # Ensure we successfully downloaded something good
-    if (NOT EXISTS "${outdir}/${_modname}/CMakeLists.txt")
-      message (FATAL_ERROR "Failed to download '${_modname}' after 3 attempts, giving up.")
-    endif (NOT EXISTS "${outdir}/${_modname}/CMakeLists.txt")
+      # Ensure we successfully downloaded something good
+      if (NOT EXISTS "${outdir}/${_modname}/CMakeLists.txt")
+	message (FATAL_ERROR "Failed to download '${_modname}' after 3 attempts, giving up.")
+      endif (NOT EXISTS "${outdir}/${_modname}/CMakeLists.txt")

     endif ("${_getmod}" EQUAL 1)
   endif (modline)


Exclude MSVC to try to unbreak their builds. We have a bad skew between
how CMake drives a windows link and how our custom command does.

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

--- cmake/Modules/AddCompilerRT.cmake
+++ cmake/Modules/AddCompilerRT.cmake
@@ -136,8 +136,16 @@
   if(NOT COMPILER_RT_STANDALONE_BUILD)
     list(APPEND TEST_DEPS clang)
   endif()
-  set(TEST_LINK_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${TEST_LINK_FLAGS}")
-  separate_arguments(TEST_LINK_FLAGS)
+  # If we're not on MSVC, include the linker flags from CMAKE but override them
+  # with the provided link flags. This ensures that flags which are required to
+  # link programs at all are included, but the changes needed for the test
+  # trump. With MSVC we can't do that because CMake is set up to run link.exe
+  # when linking, not the compiler. Here, we hack it to use the compiler
+  # because we want to use -fsanitize flags.
+  if(NOT MSVC)
+    set(TEST_LINK_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${TEST_LINK_FLAGS}")
+    separate_arguments(TEST_LINK_FLAGS)
+  endif()
   add_custom_target(${test_name}
     # MSVS CL doesn't allow a space between -Fe and the output file name.
     COMMAND ${COMPILER_RT_TEST_COMPILER} ${TEST_OBJECTS}


cmake: loosen warnings on spdlog

cmake: loosen warnings on spdlog

--- cmake/external_dependencies.cmake
+++ cmake/external_dependencies.cmake
@@ -177,7 +177,7 @@
                   GIT_TAG v1.x
                   TEST_DEFINITIONS -DSPDLOG_FMT_EXTERNAL
                   TEST_LINK_LIBS ${FMT_TARGET_NAME}
-                  CXX_FLAGS "-Wno-attributes"
+                  CXX_FLAGS "-Wno-attributes -Wno-reorder"
                   )
 endfunction()


remove implicit linking of tensorrt and dnnl ep shared libs (#5262)

* remove trt and dnnl from link command

* add comment

--- cmake/onnxruntime_unittests.cmake
+++ cmake/onnxruntime_unittests.cmake
@@ -397,9 +397,7 @@
     ${ONNXRUNTIME_INTEROP_TEST_LIBS}
     ${onnxruntime_libs}
     ${PROVIDERS_CUDA}
-# These providers are shared libraries now, so aren't linked this way anymore:
-    ${PROVIDERS_DNNL}
-    ${PROVIDERS_TENSORRT}
+    # TENSORRT and DNNL are explicitly linked at runtime
     ${PROVIDERS_MIGRAPHX}
     ${PROVIDERS_NGRAPH}
     ${PROVIDERS_OPENVINO}
@@ -433,7 +431,6 @@
   list(APPEND onnxruntime_test_framework_src_patterns  ${TEST_SRC_DIR}/providers/tensorrt/*)
   list(APPEND onnxruntime_test_framework_libs onnxruntime_providers_tensorrt)
   list(APPEND onnxruntime_test_providers_dependencies onnxruntime_providers_tensorrt onnxruntime_providers_shared)
-  list(APPEND onnxruntime_test_providers_libs onnxruntime_providers_tensorrt)
 endif()

 if(onnxruntime_USE_NNAPI_BUILTIN)


Updated FindGraphviz.cmake script.

Updated FindGraphviz.cmake script.

--- cmake/FindGraphviz.cmake
+++ cmake/FindGraphviz.cmake
@@ -138,6 +138,7 @@
   endif()

   if(NOT GRAPHVIZ_FIND_QUIETLY)
+    message(STATUS "Graphviz include: ${GRAPHVIZ_INCLUDE_DIRS}")
     message(STATUS "Graphviz libraries: ${GRAPHVIZ_CDT_LIBRARY} ${GRAPHVIZ_GVC_LIBRARY} ${GRAPHVIZ_CGRAPH_LIBRARY} ${GRAPHVIZ_PATHPLAN_LIBRARY}")
   endif()
 else()


COMPMID-3639: (3RDPARTY_UPDATE) Move CL kernels to src

 * Change file Armnn GlobalConfig.cmake uses to find ARMCOMPUTE_INCLUDE
 * Original file has been moved and no longer visible

Signed-off-by: Francis Murtagh <e59f6df1240b2b6c2b05aa682b1b9d01b9505720@arm.com>
Change-Id: I91c1376124dad2b2db764f83c421a1cc110e5dd1

--- cmake/GlobalConfig.cmake
+++ cmake/GlobalConfig.cmake
@@ -246,12 +246,12 @@
 # Note that ARM Compute has a different folder layout depending on the branch but also on
 # whether it comes from a prepackaged archive (this is why we add several hints below)
 if(ARMCOMPUTENEON OR ARMCOMPUTECL)
-    find_path(ARMCOMPUTE_INCLUDE arm_compute/core/CL/ICLKernel.h
+    find_path(ARMCOMPUTE_INCLUDE arm_compute/core/CL/OpenCL.h
               PATHS ${ARMCOMPUTE_ROOT}/include
               PATHS ${ARMCOMPUTE_ROOT}/applications/arm_compute
               PATHS ${ARMCOMPUTE_ROOT}
               NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-    find_path(ARMCOMPUTE_INCLUDE arm_compute/core/CL/ICLKernel.h)
+    find_path(ARMCOMPUTE_INCLUDE arm_compute/core/CL/OpenCL.h)
     include_directories(SYSTEM "${ARMCOMPUTE_INCLUDE}")

     # Find the Arm Compute libraries if not already specified (the user may have already defined this in advance,


Core: Cotire, potential fix for inviwo/inviwo-dev#903

--- cmake/globalmacros.cmake
+++ cmake/globalmacros.cmake
@@ -815,6 +815,21 @@
     set(_pchDisabledForThisModule TRUE)
 endmacro()

+
+#--------------------------------------------------------------------
+# Set header ignore paths for cotire
+macro(cotire_ignore)
+    get_target_property(COTIRE_PREFIX_HEADER_IGNORE_PATH ${_projectName} COTIRE_PREFIX_HEADER_IGNORE_PATH)
+    if(NOT COTIRE_PREFIX_HEADER_IGNORE_PATH)
+        set(COTIRE_PREFIX_HEADER_IGNORE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
+    endif()
+
+    list(APPEND COTIRE_PREFIX_HEADER_IGNORE_PATH $IVW_COTIRE_EXCLUDES})
+    list(REMOVE_DUPLICATES COTIRE_PREFIX_HEADER_IGNORE_PATH)
+
+    set_target_properties(${_projectName} PROPERTIES COTIRE_PREFIX_HEADER_IGNORE_PATH "${COTIRE_PREFIX_HEADER_IGNORE_PATH}")
+endmacro()
+
 #--------------------------------------------------------------------
 # Optimize compilation with pre-compilied headers from inviwo core
 macro(ivw_compile_optimize_inviwo_core)
@@ -823,8 +838,8 @@
 			set_target_properties(${_projectName} PROPERTIES COTIRE_ENABLE_PRECOMPILED_HEADER FALSE)
 		endif()

-        set_target_properties(${_projectName} PROPERTIES COTIRE_PREFIX_HEADER_IGNORE_PATH
-            "${COTIRE_PREFIX_HEADER_IGNORE_PATH};$IVW_COTIRE_EXCLUDES}")
+        cotire_ignore()
+
         set_target_properties(${_projectName} PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
         get_target_property(_prefixHeader inviwo-core COTIRE_CXX_PREFIX_HEADER)
         set_target_properties(${_projectName} PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "${_prefixHeader}")
@@ -836,8 +851,7 @@
 # Optimize compilation with pre-compilied headers
 macro(ivw_compile_optimize)
     if(PRECOMPILED_HEADERS)
-        set_target_properties(${_projectName} PROPERTIES COTIRE_PREFIX_HEADER_IGNORE_PATH
-            "${COTIRE_PREFIX_HEADER_IGNORE_PATH};${IVW_COTIRE_EXCLUDES}")
+        cotire_ignore()
         set_target_properties(${_projectName} PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
 		list(APPEND _allPchDirs ${IVW_EXTENSIONS_DIR})
 		set_target_properties(${_projectName} PROPERTIES COTIRE_PREFIX_HEADER_INCLUDE_PATH "${_allPchDirs}")


cleaned up interface for backwards compatibility.
fixed java implementation

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

--- cmake/new_lcmtypes.cmake
+++ cmake/new_lcmtypes.cmake
@@ -3,27 +3,32 @@
 #
 # Defines the following macros/functions:
 #
-#     lcmtypes_setup([C_AGGREGATE_HEADER header_fname]
+#     add_lcmtype(lcmfile)
+#          which generates build rules for C,CPP, Java (if java is available), and
+#	   Python (if python is available) by calling the methods below
+#
+#     add_c_lcmtype(lcmfile)
+#     add_cpp_lcmtype(lcmfile)
+#     add_java_lcmtype(lcmfile)
+#     add_python_lcmtype(lcmfile)
+#
+#  The following should be called AFTER all add_lcmtype calls:
+#
+#     lcmtypes_build([C_AGGREGATE_HEADER header_fname]
 #                    [C_LIBNAME lib_name]
 #		     [CPP_AGGREGATE_HEADER header_fname]
-#                    [JARNAME jar_name]
-#                    )
+#                    [JARNAME jar_name])
+#
+#          In addition to any files added via add_lcm calls, this function will
+#          search the variable ${LCMTYPES_SEARCHDIR} and automatically call
+#          add_lcm() for all .lcm files in that directory.  For backwards
+#          compatibility, the default value is
+#             LCMTYPES_SEARCHDIR=CMAKE_SOURCE_DIR/lcmtypes
 #
 #          After invoking this macro, the following variables will be set:
 #             LCMTYPES_INCLUDE_DIR
 #             LCMTYPES_LIBS
 #             LCMTYPES_JAR
-#
-#     lcmtypes_build()  # this must be called to finish
-#
-#     add_lcmtype(lcmfile)
-#          which generates build rules for C,CPP, Java (if java is available), and
-#	   Python (if python is available) by calling the methods below
-#
-#     add_c_lcmtype(lcmfile)
-#     add_cpp_lcmtype(lcmfile)
-#     add_java_lcmtype(lcmfile)
-#     add_python_lcmtype(lcmfile)
 #
 # C
 # ==
@@ -72,67 +77,93 @@

 cmake_minimum_required(VERSION 2.8.3) # for the CMakeParseArguments macro

-find_package(Java REQUIRED)
-include(UseJava)
-
-macro(lcmtypes_setup)
-  find_package(PkgConfig REQUIRED)
-  pkg_check_modules(LCM REQUIRED lcm)
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(LCM REQUIRED lcm)

-  #find lcm-gen (it may be in the install path)
-  find_program(LCM_GEN_EXECUTABLE lcm-gen ${EXECUTABLE_OUTPUT_PATH} ${EXECUTABLE_INSTALL_PATH})
+#find lcm-gen (it may be in the install path)
+find_program(LCM_GEN_EXECUTABLE lcm-gen ${EXECUTABLE_OUTPUT_PATH} ${EXECUTABLE_INSTALL_PATH})

-  if (NOT LCM_GEN_EXECUTABLE)
-    message(FATAL_ERROR "lcm-gen not found!\n")
-    return()
-  endif()
-
-  cmake_parse_arguments("LCMTYPES" "" "C_AGGREGATE_HEADER;C_LIBNAME;CPP_AGGREGATE_HEADER;JARNAME" "" ${ARGV})
-
+if (NOT LCM_GEN_EXECUTABLE)
+  message(FATAL_ERROR "lcm-gen not found!\n")
+  return()
+endif()
+
+set(LCMTYPES_DIR ${CMAKE_CURRENT_BINARY_DIR}/lcmtypes)
+execute_process(COMMAND mkdir -p ${LCMTYPES_DIR})
+
+set(LCMTYPES_SEARCHDIR ${CMAKE_SOURCE_DIR}/lcmtypes)
+
+macro(lcmtypes_build_c)
+  cmake_parse_arguments("LCMTYPES" "" "C_AGGREGATE_HEADER;C_LIBNAME" "" ${ARGV})
   string(REGEX REPLACE "[^a-zA-Z0-9]" "_" __sanitized_project_name "${PROJECT_NAME}")

-  # default values
   if (NOT LCMTYPES_C_AGGREGATE_HEADER)
     set(LCMTYPES_C_AGGREGATE_HEADER "${__sanitized_project_name}.h")
   endif()
   if (NOT LCMTYPES_C_LIBNAME)
     set(LCMTYPES_C_LIBNAME "${__sanitized_project_name}_lcmtypes")
   endif()
+
+  if (LCMTYPES_C_SOURCEFILES)
+    add_library(${LCMTYPES_C_LIBNAME} ${LCMTYPES_C_SOURCEFILES})
+
+    # todo: write aggregate header
+
+    #  todo: add install rules
+  endif()
+endmacro()
+
+macro(lcmtypes_build_cpp)
+  cmake_parse_arguments("LCMTYPES" "" "CPP_AGGREGATE_HEADER" "" ${ARGV})
+  string(REGEX REPLACE "[^a-zA-Z0-9]" "_" __sanitized_project_name "${PROJECT_NAME}")
+
   if (NOT LCMTYPES_CPP_AGGREGATE_HEADER)
     set(LCMTYPES_C_AGGREGATE_HEADER "${__sanitized_project_name}.hpp")
   endif()
-  if (NOT LCMTYPES_JARNAME)
-    set(LCMTYPES_JARNAME "${__sanitized_project_name}")
-  endif()
-
-  set(LCMTYPES_DIR ${CMAKE_CURRENT_BINARY_DIR}/lcmtypes)
-  execute_process(COMMAND mkdir -p ${LCMTYPES_DIR})
-
-  set(LCMTYPES_C_SOURCEFILES)
-
-endmacro()
-
-macro(lcmtypes_build)
-
-#  add_custom_target(${LCMTYPES_DIR}/${LCMTYPES_C_AGGREGATE_HEADER})
-
-  if (LCMTYPES_C_SOURCEFILES)
-    add_library(${LCMTYPES_C_LIBNAME} ${LCMTYPES_C_SOURCEFILES})
-
-    # todo: write aggregate header
-  endif()

   if (LCMTYPES_CPP_HEADERFILES)
     # todo: write aggregate header
+
+    #  todo: add install rules
+  endif()
+endmacro()
+
+macro(lcmtypes_build_java)
+  cmake_parse_arguments("LCMTYPES" "" "JARNAME" "" ${ARGV})
+  string(REGEX REPLACE "[^a-zA-Z0-9]" "_" __sanitized_project_name "${PROJECT_NAME}")
+
+  if (NOT LCMTYPES_JARNAME)
+    set(LCMTYPES_JARNAME "lcmtypes_${__sanitized_project_name}")
   endif()

   if (LCMTYPES_JAVA_SOURCEFILES)
+    find_package(Java REQUIRED)
+    include(UseJava)
+
+    execute_process(COMMAND pkg-config --variable=classpath lcm-java OUTPUT_VARIABLE LCM_JAR_FILE OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(NOT LCM_JAR_FILE)
+        message(STATUS "Not building Java LCM type bindings (Can't find lcm.jar)")
+        return()
+    endif()
+    set(CMAKE_JAVA_INCLUDE_PATH ${LCM_JAR_FILE})
+
     add_jar(${LCMTYPES_JARNAME} ${LCMTYPES_JAVA_SOURCEFILES})
-  endif()
+
+    #  todo: add install rules
+
+  endif()
+endmacro()
+
+
+macro(lcmtypes_build)
+
+  lcmtypes_build_c(${ARGV})
+
+  lcmtypes_build_cpp(${ARGV})
+
+  lcmtypes_build_java(${ARGV})

 #  todo: handle python
-
-#  todo: add install rules

 endmacro()


set DEBIAN_PACKAGE_DEPENDS for cross compiling

--- cmake/packages/deb.cmake
+++ cmake/packages/deb.cmake
@@ -11,7 +11,10 @@
 set(CPACK_DEBIAN_PACKAGE_SECTION "database")
 set(CPACK_DEBIAN_PACKAGE_CONFLICTS "arangodb, ${CPACKG_PACKAGE_CONFLICTS}, ${CPACKG_PACKAGE_CONFLICTS}-client, ${CPACK_PACKAGE_NAME}-client")
 # build of dependecies (yet) don't works on cross compiling
-if (NOT CROSS_COMPILING)
+if (CROSS_COMPILING)
+  set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS OFF)
+  set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.14), libgcc1 (>= 1:3.4), libssl1.0.0 (>= 1.0.1), libstdc++6 (>= 5.2)")
+else()
   set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
 endif()
 if(NOT DISABLE_XZ_DEB)


Link to ROS libs (ugly!)

Link to ROS libs (ugly!)

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

--- cmake/pcl_find_ros.cmake
+++ cmake/pcl_find_ros.cmake
@@ -1,5 +1,15 @@
 # Look for ROS.
 # This is a temporary and ugly hack.
+
+macro(link_ros_libs _target)
+    if(USE_ROS)
+        target_link_libraries(${_target} sensor_msgs rosbag topic_tools ros
+            boost_thread-mt boost_signals-mt roscpp_serialization XmlRpc
+            rosconsole boost_thread-mt log4cxx rostime cpp_common roslib
+            rospack rosstack)
+    endif(USE_ROS)
+endmacro(link_ros_libs)
+

 macro(get_ros_inc_path _dest _pkg)
     execute_process(COMMAND rospack find ${_pkg}
@@ -10,6 +20,7 @@
         message(STATUS "Found ROS package ${_pkg} path: ${${_dest}}")
     endif(RESULT_VARIABLE)
 endmacro(get_ros_inc_path)
+

 if(ENV{ROS_ROOT})
     option(USE_ROS "Integrate with ROS rather than using native files" ON)


Incremented Android player version

Incremented Android player version

--- FreeRdpPlayers/cmake/ConfigOptionsAndroid.cmake
+++ FreeRdpPlayers/cmake/ConfigOptionsAndroid.cmake
@@ -26,7 +26,7 @@
 option(ANDROID_BUILD_JAVA "Automatically android java code - build type depends on CMAKE_BUILD_TYPE" ON)
 option(ANDROID_BUILD_JAVA_DEBUG "Create a android debug package" ${JAVA_DEBUG_DEFAULT})

-set(ANDROID_APP_VERSION 3 CACHE STRING "Application version")
+set(ANDROID_APP_VERSION 4 CACHE STRING "Application version")
 set(ANDROID_APP_TARGET_SDK 21 CACHE STRING "Application target android SDK")
 set(ANDROID_APP_MIN_SDK 14 CACHE STRING "Application minimum android SDK requirement")
 set(ANDROID_APP_GOOGLE_TARGET_SDK "16" CACHE STRING "Application target google SDK")


BUG: Update ParabolicMorphology remote module

* Update remote module.
* Extra "compressed =" in SHA line that should not be here.

Change-Id: I61d34b5cc49a50c9444cf67e949c549cb2abe5ef

--- Modules/Remote/ParabolicMorphology.remote.cmake
+++ Modules/Remote/ParabolicMorphology.remote.cmake
@@ -5,5 +5,5 @@
   http://www.insight-journal.org/browse/publication/228
   https://hdl.handle.net/1926/1370"
   GIT_REPOSITORY ${git_protocol}://github.com/InsightSoftwareConsortium/ITKParabolicMorphology.git
-  GIT_TAG compressed = a368fe2d0112b2e55694a47e2090fa19e593a09d
+  GIT_TAG 64d3dc00d461f6186ebe9e0bc3afe8615215d959
   )


BUG: OpenGL missing libraries dectection should test also GLVND library

CMake 3.11 and above prefer to choose GLVND libraries, OTB check of OpenGL libraries should check this library. This bug can appear also with previous cmake version if the OpenGL_GL_Preferences is changed.

--- Modules/ThirdParty/OpenGL/otb-module-init.cmake
+++ Modules/ThirdParty/OpenGL/otb-module-init.cmake
@@ -74,8 +74,13 @@
   endif()
 endif()

-if(NOT OPENGL_gl_LIBRARY)
-  message(FATAL_ERROR "Could not find OpenGL (missing: OPENGL_gl_LIBRARY")
+# For CMake > 3.11 the default GLVND instead of legacy GL library
+# Test both of them to
+# FIXME: As stated in CMake documentation we should use the OpenGL::* import targets instead available
+# It should be done when OTB will increase CMake minimum version to 3.X
+# See: https://cmake.org/cmake/help/v3.11/module/FindOpenGL.html
+if(NOT OPENGL_gl_LIBRARY AND NOT OPENGL_opengl_LIBRARY)
+  message(FATAL_ERROR "Could not find OpenGL (missing: OPENGL_gl_LIBRARY or OPENGL_opengl_LIBRARY")
 endif()

 if(NOT OPENGL_glu_LIBRARY)


Remove force of 64 bit mode for xlc

Remove force of 64 bit mode for xlc

--- Common.cmake
+++ Common.cmake
@@ -1,13 +1,16 @@
 # Common settings

 if(CMAKE_VERSION VERSION_LESS 2.8.3)
-  get_filename_component(CMAKE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) # WAR bug
+  # WAR bug
+  get_filename_component(CMAKE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
   list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/2.8.3)
 endif()
+
+include(${CMAKE_CURRENT_LIST_DIR}/System.cmake)
+
 if(CMAKE_VERSION VERSION_LESS 2.8)
   list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/2.8)
 endif()
-

 include(${CMAKE_CURRENT_LIST_DIR}/System.cmake)

@@ -101,9 +104,6 @@
   if(CMAKE_COMPILER_IS_CLANG)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments")
   endif()
-elseif(CMAKE_COMPILER_IS_XLCXX)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -q64")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -q64")
 endif()

 if(MSVC)
@@ -114,7 +114,7 @@
     /wd4244 # conversion from X to Y, possible loss of data
     /wd4800 # forcing value to bool 'true' or 'false' (performance warning)
     )
-
+
   # By default, do not warn when built on machines using only VS Express
   # http://cmake.org/gitweb?p=cmake.git;a=commit;h=fa4a3b04d0904a2e93242c0c3dd02a357d337f77
   if(NOT DEFINED CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)


modules: updated FindCorrade.cmake.

modules: updated FindCorrade.cmake.

--- modules/FindCorrade.cmake
+++ modules/FindCorrade.cmake
@@ -79,7 +79,7 @@
 #   globals unique even across different shared libraries. Enabled by default
 #   for static builds.
 #  CORRADE_BUILD_MULTITHREADED  - Defined if compiled in a way that makes it
-#   possible to safely use certain Corrade features simultaenously in multiple
+#   possible to safely use certain Corrade features simultaneously in multiple
 #   threads
 #  CORRADE_TARGET_UNIX          - Defined if compiled for some Unix flavor
 #   (Linux, BSD, macOS)


Updated FindCorrade.cmake from Corrade repository.

--- modules/FindCorrade.cmake
+++ modules/FindCorrade.cmake
@@ -7,20 +7,26 @@
 #  CORRADE_INCLUDE_DIR              - Include dir for Corrade
 #  CORRADE_INTERCONNECT_LIBRARIES   - Corrade Interconnect library and
 #   dependent libraries
-#  CORRADE_UTILITY_LIBRARIES        - Corrade Utility library and dependent
-#   libraries
-#  CORRADE_PLUGINMANAGER_LIBRARIES  - Corrade Plugin manager library and
+#  CORRADE_UTILITY_LIBRARIES        - Corrade Utility library and
 #   dependent libraries
-#  CORRADE_TESTSUITE_LIBRARIES      - Corrade TestSuite library and dependent
-#   libraries
+#  CORRADE_PLUGINMANAGER_LIBRARIES  - Corrade PluginManager library and
+#   dependent libraries
+#  CORRADE_TESTSUITE_LIBRARIES      - Corrade TestSuite library and
+#   dependent libraries
 #  CORRADE_RC_EXECUTABLE            - Corrade resource compiler executable
 # Additionally these variables are defined for internal usage:
+#  CORRADE_INTERCONNECT_LIBRARY     - Corrade Interconnect library (w/o
+#   dependencies)
 #  CORRADE_UTILITY_LIBRARY          - Corrade Utility library (w/o
 #   dependencies)
 #  CORRADE_PLUGINMANAGER_LIBRARY    - Corrade Plugin manager library (w/o
 #   dependencies)
 #  CORRADE_TESTSUITE_LIBRARY        - Corrade TestSuite library (w/o
 #   dependencies)
+# Corrade configures the compiler to use C++11 standard. Additionally you can
+# use CORRADE_CXX_FLAGS to enable additional pedantic set of warnings and enable
+# hidden visibility by default.
+#
 # If Corrade library is found, these macros and functions are defined:
 #
 #
@@ -42,9 +48,7 @@
 # generates resource file with group group_name from given files in current
 # build directory. Argument name is name under which the resources can be
 # explicitly loaded. Variable 'name' contains compiled resource filename,
-# which is then used for compiling library / executable.
-#
-# Example usage:
+# which is then used for compiling library / executable. Example usage:
 #  corrade_add_resource(name group_name file1 ALIAS alias1 file2 file3)
 #  add_executable(app source1 source2 ... ${name})
 #
@@ -62,13 +66,10 @@
 #                            plugin_name metadata_file
 #                            sources...)
 # The macro adds preprocessor directive CORRADE_STATIC_PLUGIN. Additional
-# libraries can be linked in via target_link_libraries(plugin_name ...).
-#
-# Plugin library name will be added at the end of static_plugins_variable and
-# the variable is meant to be used for linking plugins to main
-# executable/library, e.g:
+# libraries can be linked in via target_link_libraries(plugin_name ...). Plugin
+# library name will be appended to static_plugins_variable and the variable is
+# meant to be used for linking plugins to main executable/library, e.g:
 #  target_link_libraries(app lib1 lib2 ... ${static_plugins_variable})
-#
 # This variable is set with parent scope to be available in parent directory.
 # If there are more intermediate directories between plugin directory and main
 # executable directory, the variable can be propagated to parent scope like
@@ -124,7 +125,9 @@
 set(CORRADE_INTERCONNECT_LIBRARIES ${CORRADE_INTERCONNECT_LIBRARY} ${CORRADE_UTILITY_LIBRARIES})
 set(CORRADE_PLUGINMANAGER_LIBRARIES ${CORRADE_PLUGINMANAGER_LIBRARY} ${CORRADE_UTILITY_LIBRARIES})
 set(CORRADE_TESTSUITE_LIBRARIES ${CORRADE_TESTSUITE_LIBRARY} ${CORRADE_UTILITY_LIBRARIES})
-mark_as_advanced(CORRADE_UTILITY_LIBRARY CORRADE_PLUGINMANAGER_LIBRARY CORRADE_TESTSUITE_LIBRARY)
+mark_as_advanced(CORRADE_UTILITY_LIBRARY
+    CORRADE_INTERCONNECT_LIBRARY
+    CORRADE_PLUGINMANAGER_LIBRARY
+    CORRADE_TESTSUITE_LIBRARY)

-include(CorradeMacros)
-include(CorradeLibSuffix)
+include(UseCorrade)


Enable Wshadow - Lots of shadowed variable warnings. - Several look like real bugs.

--- src/build_options.cmake
+++ src/build_options.cmake
@@ -65,7 +65,7 @@

 if (NOT VOGL_BUILDING_SAMPLES)
     # Samples have tons of shadowing issues. Only add this flag for regular vogl projects.
-    # set(CMAKE_CXX_FLAGS_LIST ${CMAKE_CXX_FLAGS_LIST} "-Wshadow")
+    set(CMAKE_CXX_FLAGS_LIST ${CMAKE_CXX_FLAGS_LIST} "-Wshadow")
 endif()

 set(OPENGL_LIBRARY "GL")


fix version

fix version

--- include/SFCGAL/version.h.cmake
+++ include/SFCGAL/version.h.cmake
@@ -1,11 +1,11 @@
 #ifndef _SFCGAL_VERSION_H_
 #define _SFCGAL_VERSION_H_

-#define SFCAL_VERSION_MAJOR @SFCGAL_VERSION_MAJOR@
-#define SFCAL_VERSION_MINOR @SFCGAL_VERSION_MINOR@
-#define SFCAL_VERSION_PATCH @SFCGAL_VERSION_PATCH@
+#define SFCGAL_VERSION_MAJOR @SFCGAL_VERSION_MAJOR@
+#define SFCGAL_VERSION_MINOR @SFCGAL_VERSION_MINOR@
+#define SFCGAL_VERSION_PATCH @SFCGAL_VERSION_PATCH@

-#define SFCAL_VERSION "@SFCGAL_VERSION@"
+#define SFCGAL_VERSION "@SFCGAL_VERSION@"

 #endif


COMP: Fixing wrong include path when using the BUILD_TREE.

--- otbIncludeDirectories.cmake
+++ otbIncludeDirectories.cmake
@@ -142,14 +142,14 @@
   	        ${EXPAT_INCLUDE_DIR} )
 ELSE(OTB_USE_EXTERNAL_EXPAT)
         SET(OTB_INCLUDE_DIRS_BUILD_TREE_CXX ${OTB_INCLUDE_DIRS_BUILD_TREE_CXX}
-                ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbexpat
-                ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbexpat/lib )
+                ${OTB_SOURCE_DIR}/Utilities/otbexpat
+                ${OTB_SOURCE_DIR}/Utilities/otbexpat/lib )
 ENDIF(OTB_USE_EXTERNAL_EXPAT)

 # For OpenThreads
 IF(NOT OTB_USE_EXTERNAL_OPENTHREADS)
         SET(OTB_INCLUDE_DIRS_BUILD_TREE_CXX ${OTB_INCLUDE_DIRS_BUILD_TREE_CXX}
-                ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbopenthreads/OpenThreads/include
+                ${OTB_SOURCE_DIR}/Utilities/otbopenthreads/OpenThreads/include
 	)
 ENDIF(NOT OTB_USE_EXTERNAL_OPENTHREADS)


ft2build.h is in freetype2/ folder with Freetype 2.53. so look there as well.

--HG--
branch : findft2update

--- CMake/Packages/FindFreetype.cmake
+++ CMake/Packages/FindFreetype.cmake
@@ -44,7 +44,7 @@
 message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")

 find_path(FREETYPE_INCLUDE_DIR NAMES freetype.h freetype/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2)
-find_path(FREETYPE_FT2BUILD_INCLUDE_DIR NAMES ft2build.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS})
+find_path(FREETYPE_FT2BUILD_INCLUDE_DIR NAMES ft2build.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2)

 find_library(FREETYPE_LIBRARY_REL NAMES ${FREETYPE_LIBRARY_NAMES} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
 find_library(FREETYPE_LIBRARY_DBG NAMES ${FREETYPE_LIBRARY_NAMES_DBG} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug)


BUG: Copy ctkMacroBuildQtPlugin if from branch plugin-framework

--- CMake/ctkMacroBuildQtPlugin.cmake
+++ CMake/ctkMacroBuildQtPlugin.cmake
@@ -6,7 +6,7 @@

 MACRO(ctkMacroBuildQtPlugin)
   CtkMacroParseArguments(MY
-    "NAME;EXPORT_DIRECTIVE;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;UI_RESOURCES;QRC_FILES;LIBRARY_TYPE"
+    "NAME;EXPORT_DIRECTIVE;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;RESOURCES;LIBRARY_TYPE"
     ""
     ${ARGN}
     )
@@ -32,10 +32,10 @@
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${MY_INCLUDE_DIRECTORIES}
-    )
+    )
   INCLUDE_DIRECTORIES(
     ${my_includes}
-    )
+    )

   SET(MY_LIBRARY_EXPORT_DIRECTIVE ${MY_EXPORT_DIRECTIVE})
   SET(MY_EXPORT_HEADER_PREFIX ${MY_NAME})
@@ -51,12 +51,12 @@
   QT4_WRAP_CPP(MY_SRCS ${MY_MOC_SRCS})
   QT4_WRAP_UI(MY_UI_CXX ${MY_UI_FORMS})
   SET(MY_QRC_SRCS "")
-  IF(DEFINED MY_QRC_FILES)
-    QT4_ADD_RESOURCES(MY_QRC_SRCS ${MY_QRC_FILES})
+  IF(DEFINED MY_RESOURCES)
+    QT4_ADD_RESOURCES(MY_QRC_SRCS ${MY_RESOURCES})
   ENDIF()

   SOURCE_GROUP("Resources" FILES
-    ${MY_UI_RESOURCES}
+    ${MY_RESOURCES}
     ${MY_UI_FORMS}
     )

@@ -72,20 +72,16 @@
     ${MY_QRC_SRCS}
     )

-  # Set labels associated with the target.
-  SET_TARGET_PROPERTIES(${lib_name} PROPERTIES LABELS ${lib_name})
-
   # Note: The plugin may be installed in some other location ???
   # Install rules
-#   IF(CTK_BUILD_SHARED_LIBS)
-#     INSTALL(TARGETS ${lib_name}
-#       RUNTIME DESTINATION ${CTK_INSTALL_BIN_DIR} COMPONENT Runtime
-#       LIBRARY DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Runtime
-#       ARCHIVE DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Development)
-#   ENDIF()
+# IF(CTK_BUILD_SHARED_LIBS)
+# INSTALL(TARGETS ${lib_name}
+# RUNTIME DESTINATION ${CTK_INSTALL_BIN_DIR} COMPONENT Runtime
+# LIBRARY DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Runtime
+# ARCHIVE DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Development)
+# ENDIF()

   SET(my_libs
-    ${CTK_BASE_LIBRARIES}
     ${MY_TARGET_LIBRARIES}
     )
   TARGET_LINK_LIBRARIES(${lib_name} ${my_libs})
@@ -93,9 +89,10 @@
   # Install headers
   #FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   #INSTALL(FILES
-  #  ${headers}
-  #  ${dynamicHeaders}
-  #  DESTINATION ${CTK_INSTALL_INCLUDE_DIR} COMPONENT Development
-  #  )
+  # ${headers}
+  # ${dynamicHeaders}
+  # DESTINATION ${CTK_INSTALL_INCLUDE_DIR} COMPONENT Development
+  # )

 ENDMACRO()
+


Using this find script without libdl caused undefined dlxxx errors on Ubuntu 12.04

--- FindVTune.cmake
+++ FindVTune.cmake
@@ -42,7 +42,7 @@
   VTUNE_INCLUDE_DIR VTUNE_ITTNOTIFY_LIBRARY)

 set(VTUNE_INCLUDE_DIRS ${VTUNE_INCLUDE_DIR})
-set(VTUNE_LIBRARIES ${VTUNE_ITTNOTIFY_LIBRARY})
+set(VTUNE_LIBRARIES ${VTUNE_ITTNOTIFY_LIBRARY} dl)
 set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DINTEL_NO_ITTNOTIFY_API")
 set(CMAKE_CXX_FLAGS_RELEASE
   "${CMAKE_CXX_FLAGS_RELEASE} -DINTEL_NO_ITTNOTIFY_API")


r9755/sofa : CHANGE: cmake - config files are copied just once

Former-commit-id: 4aeb64bae5f725c05f4ed262660899bc140ec5fc

--- sofa-dependencies.cmake
+++ sofa-dependencies.cmake
@@ -150,7 +150,11 @@
 endif()

 # copying default config files
-file(GLOB configFiles "${SOFA_SRC_DIR}/share/config/default/*.*")
-foreach(configFile ${configFiles})
-	file(COPY ${configFile} DESTINATION "${SOFA_BUILD_DIR}/share/config")
-endforeach()
+if(NOT CONFIG_FILES_ALREADY_COPIED)
+	file(GLOB configFiles "${SOFA_SRC_DIR}/share/config/default/*.*")
+	foreach(configFile ${configFiles})
+		file(COPY ${configFile} DESTINATION "${SOFA_BUILD_DIR}/share/config")
+	endforeach()
+
+	set(CONFIG_FILES_ALREADY_COPIED 1 CACHE INTERNAL "Config files copied" FORCE)
+endif()


Only warn if variable name is wrong (for now)

--- CMake/MITKDashboardSetup.cmake
+++ CMake/MITKDashboardSetup.cmake
@@ -65,7 +65,8 @@

 # Remove this if block after all dartclients work
 if(DEFINED ADDITIONNAL_CMAKECACHE_OPTION)
-  message(FATAL_ERROR "Rename ADDITIONNAL to ADDITIONAL in your dartlclient script: ${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
+  message(WARNING "Rename ADDITIONNAL to ADDITIONAL in your dartlclient script: ${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
+  set(ADDITIONAL_CMAKECACHE_OPTION ${ADDITIONNAL_CMAKECACHE_OPTION})
 endif()

 set(INITIAL_CMAKECACHE_OPTIONS "


Added vespa-preprocess-application script to rpm.

--- install_java.cmake
+++ install_java.cmake
@@ -48,6 +48,7 @@
 install_fat_java_artifact(vespaclient-container-plugin)
 install_fat_java_artifact(zkfacade)

+vespa_install_script(application-preprocessor/src/main/sh/vespa-preprocess-application bin)
 vespa_install_script(jdisc_core/src/main/perl/jdisc_logfmt bin)
 vespa_install_script(config-proxy/src/main/sh/config-ctl bin)
 vespa_install_script(config-model/src/main/perl/deploy bin)


build_tools:cmake:iree_bytecode_module: Use get_filename_component to get path (#6910)

--- build_tools/cmake/iree_bytecode_module.cmake
+++ build_tools/cmake/iree_bytecode_module.cmake
@@ -52,11 +52,7 @@
   iree_get_executable_path(_EMBEDDED_LINKER_TOOL_EXECUTABLE "lld")

   set(_ARGS "${_RULE_FLAGS}")
-  # Check source file path to support absolute path.
-  set(_SRC_PATH "${_RULE_SRC}")
-  if (NOT IS_ABSOLUTE ${_SRC_PATH})
-    set(_SRC_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${_RULE_SRC}")
-  endif()
+  get_filename_component(_SRC_PATH "${_RULE_SRC}" REALPATH)
   list(APPEND _ARGS "${_SRC_PATH}")
   list(APPEND _ARGS "-o")
   list(APPEND _ARGS "${_RULE_NAME}.vmfb")


Fix cmake report to show correct Qt version

--- cMake/FreeCAD_Helpers/PrintFinalReport.cmake
+++ cMake/FreeCAD_Helpers/PrintFinalReport.cmake
@@ -70,7 +70,7 @@
     endif(DEFINED EIGEN3_FOUND)

     if(NOT BUILD_QT5)
-        message(STATUS "Qt4:                 ${Qt4_VERSION}")
+        message(STATUS "Qt4:                 ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}")
         if(QT_QTWEBKIT_FOUND)
             message(STATUS "QtWebKit:            found")
         else(QT_QTWEBKIT_FOUND)


Add gostai_add_library function.

Add gostai_add_library function.

	* build-aux/cmake/modules/Gostai.cmake: here.

--- build-aux/cmake/modules/Gostai.cmake
+++ build-aux/cmake/modules/Gostai.cmake
@@ -427,6 +427,106 @@

 endfunction(gostai_add_qt_assistant name)

+function(gostai_add_library name)
+
+  parse_arguments(
+    ${name}
+    "SOURCES;MOCS;UIS;CPPFLAGS;INCLUDE_DIRS;LIBRARIES;RESOURCES"
+    "QTPLUGIN"
+    ${ARGN})
+
+  # =================== #
+  # Include directories #
+  # =================== #
+  if(${name}_INCLUDE_DIRS)
+    include_directories(${${name}_INCLUDE_DIRS})
+  endif(${name}_INCLUDE_DIRS)
+
+  # =================== #
+  # Prepare the sources #
+  # =================== #
+  if(${name}_QTPLUGIN)
+    set(${name}_OPTS
+      -DQT_PLUGIN
+      -DQT_SHARED
+      )
+  else(${name}_QTPLUGIN)
+    set(${name}_OPTS "")
+  endif(${name}_QTPLUGIN)
+  if(CMAKE_BUILD_TYPE STREQUAL "Release")
+    list(APPEND ${name}_OPTS -DQT_NO_DEBUG)
+  endif(CMAKE_BUILD_TYPE STREQUAL "Release")
+  qt4_wrap_ui(${name}_UI_SOURCES ${${name}_UIS})
+  qt4_add_resources(${name}_SOURCES ${${name}_RESOURCES})
+  qt4_wrap_cpp(${name}_MOC_SOURCES ${${name}_MOCS}
+    OPTIONS ${${name}_OPTS})
+
+  set(${name}_ALL_SOURCES
+    ${${name}_SOURCES}
+    ${${name}_MOC_SOURCES}
+    ${${name}_RES_SOURCES}
+    ${${name}_UI_SOURCES}
+    )
+
+  if(NOT ${name}_ALL_SOURCES)
+    message(FATAL_ERROR "No sources provided for target library '${name}'")
+  endif(NOT ${name}_ALL_SOURCES)
+
+  # =================== #
+  # Compile the sources #
+  # =================== #
+  if(${name}_QTPLUGIN)
+    set(TYPE MODULE)
+  else(${name}_QTPLUGIN)
+    set(TYPE SHARED)
+  endif(${name}_QTPLUGIN)
+  add_library(${name} ${TYPE}
+    ${${name}_SOURCES}
+    ${${name}_MOC_SOURCES}
+    )
+
+
+  if(NOT ${name}_CPPFLAGS)
+    set(${name}_CPPFLAGS "")
+  endif(NOT ${name}_CPPFLAGS)
+  if(${name}_QTPLUGIN)
+    list(APPEND ${name}_QTPLUGIN QT_PLUGIN QT_SHARED)
+  endif(${name}_QTPLUGIN)
+  if(CMAKE_BUILD_TYPE STREQUAL "Release")
+    list(APPEND ${name}_QTPLUGIN QT_NO_DEBUG)
+  endif(CMAKE_BUILD_TYPE STREQUAL "Release")
+  set_target_properties(${name} PROPERTIES
+    COMPILE_DEFINITIONS "${${name}_CPPFLAGS}")
+
+  # ===================== #
+  # Prepare the libraries #
+  # ===================== #
+  if(WIN32)
+    list(APPEND ${name}_LIBRARIES ${QT_QTMAIN_LIBRARY})
+  endif(WIN32)
+
+  if(${name}_LIBRARIES)
+    target_link_libraries(${name} ${${name}_LIBRARIES})
+  endif(${name}_LIBRARIES)
+
+  # ============= #
+  # Install files #
+  # ============= #
+
+  if(${name}_QTPLUGIN)
+    install(TARGETS ${name} DESTINATION ${PLUGINS_DIR})
+  else(${name}_QTPLUGIN)
+    install(TARGETS ${name} DESTINATION ${LIBRARIES_DIR})
+  endif(${name}_QTPLUGIN)
+
+  # ========================== #
+  # Deploy dependent libraries #
+  # ========================== #
+
+  dldep_install(${name})
+
+endfunction(gostai_add_library name)
+
 endif(NOT GOSTAI_CMAKE_GUARD)

 # LocalWords:  docbook


Update Freetype versions. Thanks Transporter!

--- CMake/Packages/FindFreetype.cmake
+++ CMake/Packages/FindFreetype.cmake
@@ -31,7 +31,7 @@
   FREETYPE_INCLUDE_DIR
 )

-set(FREETYPE_LIBRARY_NAMES freetype2410 freetype249 freetype248 freetype246 freetype2311 freetype239 freetype238 freetype235 freetype219 freetype)
+set(FREETYPE_LIBRARY_NAMES freetype2411 freetype2410 freetype249 freetype248 freetype246 freetype2311 freetype239 freetype238 freetype235 freetype219 freetype)
 get_debug_names(FREETYPE_LIBRARY_NAMES)

 use_pkgconfig(FREETYPE_PKGC freetype2)


BUG: fix cmake variable name

BUG: fix cmake variable name

--- CMake/otbIncludeDirectories.cmake
+++ CMake/otbIncludeDirectories.cmake
@@ -108,7 +108,7 @@

 IF(OTB_USE_EXTERNAL_MUPARSER)
   SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
-      ${MUPARSER_INCLUDE_DIRS})
+      ${MUPARSER_INCLUDE_DIR})
 ELSEIF(OTB_USE_EXTERNAL_MUPARSER)
   SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
       ${OTB_SOURCE_DIR}/Utilities/otbmuparser)
@@ -374,7 +374,7 @@
 #For MuParser header file
 IF(OTB_USE_EXTERNAL_MUPARSER)
         SET(OTB_INCLUDE_ABSOLUE_DIRS ${OTB_INCLUDE_ABSOLUE_DIRS}
-                ${MUPARSER_INCLUDE_DIRS})
+                ${MUPARSER_INCLUDE_DIR})
 ELSE(OTB_USE_EXTERNAL_MUPARSER)
         SET(OTB_INCLUDE_RELATIVE_DIRS ${OTB_INCLUDE_RELATIVE_DIRS}
                 Utilities/otbmuparser)


BUG: mantis #1315. fixed after moving to cmake

--- SuperBuild/CMake/External_geotiff.cmake
+++ SuperBuild/CMake/External_geotiff.cmake
@@ -35,63 +35,26 @@
 ADD_SUPERBUILD_CMAKE_VAR(GEOTIFF JPEG_INCLUDE_DIR)
 ADD_SUPERBUILD_CMAKE_VAR(GEOTIFF JPEG_LIBRARY)

-# #RK: we are forced to use autoconf on osx due to cmake's find_* functions
-# #Do we need to use the same of Linux ?
-# if(UNIX)
-#   set(GEOTIFF_SB_CONFIG)
-#   ADD_SUPERBUILD_CONFIGURE_VAR(GEOTIFF PROJ_ROOT     --with-proj)
-#   ADD_SUPERBUILD_CONFIGURE_VAR(GEOTIFF TIFF_ROOT     --with-libtiff)
-#   ADD_SUPERBUILD_CONFIGURE_VAR(GEOTIFF JPEG_ROOT     --with-jpeg)
-#   ADD_SUPERBUILD_CONFIGURE_VAR(GEOTIFF ZLIB_ROOT     --with-libz)
-
-#   ExternalProject_Add(GEOTIFF
-#     PREFIX GEOTIFF
-#     URL "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.4.2.tar.gz"
-#     URL_MD5 96ab80e0d4eff7820579957245d844f8
-#     SOURCE_DIR ${GEOTIFF_SB_SRC}
-#     BINARY_DIR ${GEOTIFF_SB_SRC}
-#     INSTALL_DIR ${SB_INSTALL_PREFIX}
-#     DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
-#     DEPENDS ${GEOTIFF_DEPENDENCIES}
-#     CONFIGURE_COMMAND
-#     ${SB_ENV_CONFIGURE_CMD}
-#     ${GEOTIFF_SB_SRC}/configure
-#     ${SB_CONFIGURE_ARGS}
-#     ${GEOTIFF_SB_CONFIG}
-#     LOG_BUILD 1
-#     LOG_INSTALL 1
-#     )
-
-#   # [LOG_CONFIGURE 1]           # Wrap configure in script to log output
-#   # [LOG_BUILD 1]               # Wrap build in script to log output
-#   # [LOG_TEST 1]                # Wrap test in script to log output
-#   # [LOG_INSTALL 1]             # Wrap install in script to log output
-#   SUPERBUILD_PATCH_SOURCE(GEOTIFF)
-
-# else()
-
-  ExternalProject_Add(GEOTIFF
-    PREFIX GEOTIFF
-    URL "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.4.2.tar.gz"
-    URL_MD5 96ab80e0d4eff7820579957245d844f8
-    SOURCE_DIR ${GEOTIFF_SB_SRC}
-    BINARY_DIR ${GEOTIFF_SB_BUILD_DIR}
-    INSTALL_DIR ${SB_INSTALL_PREFIX}
-    DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
-    DEPENDS ${GEOTIFF_DEPENDENCIES}
-    CMAKE_CACHE_ARGS
-    ${SB_CMAKE_CACHE_ARGS}
-    -DBUILD_TESTING:BOOL=OFF
-    -DPROJ4_OSGEO4W_HOME:PATH=${SB_INSTALL_PREFIX}
-    ${GEOTIFF_SB_CONFIG}
-    CMAKE_COMMAND ${SB_CMAKE_COMMAND}
-    LOG_DOWNLOAD 1
-    LOG_CONFIGURE 1
-    LOG_BUILD 1
-    LOG_INSTALL 1
-    )
-
-#endif()
+ExternalProject_Add(GEOTIFF
+  PREFIX GEOTIFF
+  URL "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.4.2.tar.gz"
+  URL_MD5 96ab80e0d4eff7820579957245d844f8
+  SOURCE_DIR ${GEOTIFF_SB_SRC}
+  BINARY_DIR ${GEOTIFF_SB_BUILD_DIR}
+  INSTALL_DIR ${SB_INSTALL_PREFIX}
+  DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
+  DEPENDS ${GEOTIFF_DEPENDENCIES}
+  CMAKE_CACHE_ARGS
+  ${SB_CMAKE_CACHE_ARGS}
+  -DBUILD_TESTING:BOOL=OFF
+  -DPROJ4_OSGEO4W_HOME:PATH=${SB_INSTALL_PREFIX}
+  ${GEOTIFF_SB_CONFIG}
+  CMAKE_COMMAND ${SB_CMAE_COMMAND}
+  LOG_DOWNLOAD 1
+  LOG_CONFIGURE 1
+  LOG_BUILD 1
+  LOG_INSTALL 1
+  )

 set(_SB_GEOTIFF_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
 if(WIN32)


Disable another ICC warning.

Disable another ICC warning.

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

--- deal.II/cmake/setup_compiler_flags_intel.cmake
+++ deal.II/cmake/setup_compiler_flags_intel.cmake
@@ -71,6 +71,10 @@
 #             friend struct Implementation;
 #           };)
 #   -w177  declared but not referenced
+#   -w191  type qualifier is meaningless on cast type
+#          Warnings from this warn about code like this:
+#             static_cast<T const * const>(p)
+#          There are many places in boost that do this kind of stuff
 #   -w193  zero used for undefined preprocessing identifier "..."
 #          This happens when using undefined preprocessor names in
 #          conditions such as
@@ -101,6 +105,7 @@
 ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-wd135")
 ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-wd175")
 ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-wd177")
+ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-wd191")
 ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-wd193")
 ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-wd279")
 ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-wd327")


PKG: patch otbopengl code

PKG: patch otbopengl code

--- Packaging/patch_cmake_files.cmake
+++ Packaging/patch_cmake_files.cmake
@@ -47,4 +47,17 @@

   install_without_message("${PATCH_STAGE_DIR}" "lib/cmake")

+  file( GLOB otb_opengl
+    "${SUPERBUILD_INSTALL_DIR}/lib/cmake/OTB*/Modules/OTBOpenGL.cmake" )
+  if(EXISTS ${otb_opengl})
+    file(STRINGS "${otb_opengl}" otb_opengl_cmake)
+    set(otb_opengl_cmake_NEW)
+    foreach(line ${otb_opengl_cmake})
+      if( NOT line MATCHES "/usr")
+	list(APPEND otb_opengl_cmake_NEW "${line}\n")
+      endif()
+    endforeach()
+  endif()
+  file(WRITE "${otb_opengl}" ${otb_opengl_cmake_NEW})
+
 endfunction()


Fixing more errors

Fixing more errors

--- Resources/CMake/CMakeMacros.cmake
+++ Resources/CMake/CMakeMacros.cmake
@@ -237,10 +237,11 @@
         #  message(STATUS "lib_path: ${lib_path}")
         #  message(STATUS "lib_name: ${lib_name}")

-          find_path(${upperlib}_LIBRARY_DLL_${TYPE}
-                NAMES ${lib_name}.dll
-                PATHS ${lib_path}/ ${lib_path}/../bin ${lib_path}/..
-                NO_DEFAULT_PATH )
+          find_file(${upperlib}_LIBRARY_DLL_${TYPE}
+                        NAMES ${lib_name}.dll
+                        PATHS  ${lib_path}/../bin ${lib_path}/.. ${lib_path}/
+                        NO_DEFAULT_PATH )
+          message(STATUS "${upperlib}_LIBRARY_DLL_${TYPE}: ${${upperlib}_LIBRARY_DLL_${TYPE}}")

           if ( ${${upperlib}_LIBRARY_DLL_${TYPE}} STREQUAL  "${upperlib}_LIBRARY_DLL_${TYPE}-NOTFOUND")
             message(FATAL_ERROR "According to how ${upperlib}_LIBRARY_${TYPE} was found the library should"
@@ -248,13 +249,13 @@
                                 " following locations:  ${lib_path}\n  ${lib_path}/..\n  ${lib_path}/../bin")
           endif()

-          SET(${upperlib}_LIBRARY_DLL_${TYPE} "${${upperlib}_LIBRARY_DLL_${TYPE}}/${lib_name}.dll" CACHE FILEPATH "The path to the DLL Portion of the library" FORCE)
+         # SET(${upperlib}_LIBRARY_DLL_${TYPE} "${${upperlib}_LIBRARY_DLL_${TYPE}}/${lib_name}.dll" CACHE FILEPATH "The path to the DLL Portion of the library" FORCE)
          # message(STATUS "${upperlib}_LIBRARY_DLL_${TYPE}: ${${upperlib}_LIBRARY_DLL_${TYPE}}")
          # message(STATUS "  Copy: ${${upperlib}_LIBRARY_DLL_${TYPE}}/${lib_name}.dll\n    To: ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${BTYPE}/")
           ADD_CUSTOM_TARGET(ZZ_${upperlib}_DLL_${TYPE}-Copy ALL
-                      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${${upperlib}_LIBRARY_DLL_${TYPE}}/${lib_name}.dll
+                      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${${upperlib}_LIBRARY_DLL_${TYPE}}
                       ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${BTYPE}/
-                      COMMENT "  Copy: ${${upperlib}_LIBRARY_DLL_${TYPE}}/${lib_name}.dll\n    To: ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${BTYPE}/")
+                      COMMENT "  Copy: ${${upperlib}_LIBRARY_DLL_${TYPE}}\n    To: ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${BTYPE}/")

         ENDFOREACH(BTYPE ${TYPES})
       ENDIF(${upperlib}_IS_SHARED)
@@ -262,7 +263,7 @@
   ENDIF(MSVC)

 endmacro()
-
+#
 # --------------------------------------------------------------------
 # This macro generates install rules for Visual Studio builds so that
 # dependent DLL libraries (HDF5, Tiff, Expat, MXADataModel) will be


Modified AddUnitTest macro to consider WIN32 output path, which is ${CMAKE_BINARY_DIR}/bin

--- cmake/Modules/MacroAddUnitTest.cmake
+++ cmake/Modules/MacroAddUnitTest.cmake
@@ -17,6 +17,11 @@
 macro (MACRO_ADD_UNIT_TEST _testName _testSource)
   add_executable(${_testName} ${_testSource})
   target_link_libraries(${_testName} ${ARGN})
+if (WIN32)
+  add_test(${_testName} ${EXECUTABLE_OUTPUT_PATH}/${_testName})
+else()
   add_test(${_testName} ${CMAKE_CURRENT_BINARY_DIR}/${_testName})
+endif (WIN32)
+
 endmacro (MACRO_ADD_UNIT_TEST)


change the dependency 'qtwebkit' to 'qt-webkit' for fc14 and fc15. fixes #1750.

--- packaging/linux/LinuxPackaging.cmake
+++ packaging/linux/LinuxPackaging.cmake
@@ -51,6 +51,9 @@
 if(${DISTRIBUTOR_ID} MATCHES fc|fedora|Fedora|Centos|centos|SUSE|Suse|suse)
   set(CPACK_GENERATOR RPM)
   set(CPACK_RPM_PACKAGE_REQUIRES "qt, qtwebkit")
+  if(${DISTRIBUTOR_ID} MATCHES 14|15)
+    set(CPACK_RPM_PACKAGE_REQUIRES "qt, qt-webkit")
+  endif()
   set(CPACK_RPM_PACKAGE_OBSOLETES
     "dcmtk-inria, itk-inria-build, medinria-plugins, medinria-plugins-asclepios, medinria-visages-plugins, vtk-inria-build"
     )#TODO When we will not support old fedora it will not be necessary anymore.


add option DEVEL_BUILD

add option DEVEL_BUILD

with option DEVEL_BUILD ON it builds cloning from upstream STIR,
Gadgetron and ISMRMRD.

--- version_config.cmake
+++ version_config.cmake
@@ -49,19 +49,6 @@

-## STIR
-
-set(STIR_URL https://github.com/CCPPETMR/STIR )
-set(STIR_TAG 8bf37d9d7fdde7cb3a98a6f848d93827dbd98a18)
-
-## Gadgetron
-set(Gadgetron_URL https://github.com/CCPPETMR/gadgetron )
-set(Gadgetron_TAG f03829ef45e57466829e6ec46da7a7cf61db1c8a)
-
-## ISMRMRD
-set(ISMRMRD_URL https://github.com/CCPPETMR/ismrmrd )
-set(ISMRMRD_TAG 35012c6c8000616546c2d6b1757eba0c5b21b2d4)
-

 ## HDF5
 set(HDF5_URL https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.0-patch1/src/CMake-hdf5-1.10.0-patch1.tar.gz )
@@ -81,12 +68,37 @@
 set(googletest_URL https://github.com/google/googletest )
 set(googletest_TAG release-1.8.0)

+option (DEVEL_BUILD "Developer Build" ON)
 #SIRF
 set(SIRF_URL https://github.com/CCPPETMR/SIRF )
 if (DEVEL_BUILD)
-set (SIRF_TAG master)
+  set (SIRF_TAG master)
+  ## STIR
+  set(STIR_URL https://github.com/UCL/STIR )
+  set(STIR_TAG master)
+
+  ## Gadgetron
+  set(Gadgetron_URL https://github.com/gadgetron/gadgetron )
+  set(Gadgetron_TAG master)
+
+  ## ISMRMRD
+  set(ISMRMRD_URL https://github.com/ismrmrd/ismrmrd )
+  set(ISMRMRD_TAG master)
+
 else()
-set(SIRF_TAG v0.9.0)
+  set(SIRF_TAG v0.9.0)
+  ## STIR
+  set(STIR_URL https://github.com/CCPPETMR/STIR )
+  set(STIR_TAG 8bf37d9d7fdde7cb3a98a6f848d93827dbd98a18)
+
+  ## Gadgetron
+  set(Gadgetron_URL https://github.com/CCPPETMR/gadgetron )
+  set(Gadgetron_TAG f03829ef45e57466829e6ec46da7a7cf61db1c8a)
+
+  ## ISMRMRD
+  set(ISMRMRD_URL https://github.com/CCPPETMR/ismrmrd )
+  set(ISMRMRD_TAG 35012c6c8000616546c2d6b1757eba0c5b21b2d4)
+
 endif()
-option(GIT_TAG_SIRF "git tag for SIRF" ${default_SIRF_GIT_TAG})
+option(GIT_TAG_SIRF "git tag for SIRF" ${SIRF_TAG})


points to spdhg branch

points to spdhg branch

--- version_config.cmake
+++ version_config.cmake
@@ -125,7 +125,8 @@
   set(DEFAULT_CCPi-RGL_TAG origin/master)

 else()
-  set(DEFAULT_SIRF_TAG v1.1.1)
+  set(DEFAULT_SIRF_URL https://github.com/CCPPETMR/Hackathon-SIRF )
+  set(DEFAULT_SIRF_TAG origin/convert_spdhg_to_cil)

   ## STIR
   set(DEFAULT_STIR_URL https://github.com/UCL/STIR )


build: fix formatting (hard tabs -> spaces)

--- cmake/modules/DispatchCompilerWarnings.cmake
+++ cmake/modules/DispatchCompilerWarnings.cmake
@@ -5,86 +5,86 @@
   endmacro()
 else()
   macro(dispatch_common_warnings)
-	add_compile_options(-Werror)
-	add_compile_options(-Wall)
-	add_compile_options(-Wextra)
-	add_compile_options(-Wno-unknown-warning-option)
-	add_compile_options(-Wno-trigraphs)
-	add_compile_options(-Wmissing-field-initializers)
-	add_compile_options(-Wmissing-prototypes)
-	add_compile_options(-Wdocumentation)
-	add_compile_options(-Wunreachable-code)
-	add_compile_options(-Wmissing-braces)
-	add_compile_options(-Wparentheses)
-	add_compile_options(-Wswitch)
-	add_compile_options(-Wunused-function)
-	add_compile_options(-Wunused-label)
-	add_compile_options(-Wunused-parameter)
-	add_compile_options(-Wunused-variable)
-	add_compile_options(-Wunused-value)
-	add_compile_options(-Wempty-body)
-	add_compile_options(-Wuninitialized)
-	add_compile_options(-Wunknown-pragmas)
-	add_compile_options(-Wshadow)
-	add_compile_options(-Wno-four-char-constants)
-	add_compile_options(-Wconversion)
-	add_compile_options(-Wconstant-conversion)
-	add_compile_options(-Wint-conversion)
-	add_compile_options(-Wbool-conversion)
-	add_compile_options(-Wenum-conversion)
-	add_compile_options(-Wassign-enum)
-	add_compile_options(-Wsign-compare)
-	add_compile_options(-Wshorten-64-to-32)
-	add_compile_options(-Wpointer-sign)
-	add_compile_options(-Wnewline-eof)
-	add_compile_options(-Wdeprecated-declarations)
-	add_compile_options(-Wsign-conversion)
-	add_compile_options(-Winfinite-recursion)
-	add_compile_options(-Warray-bounds-pointer-arithmetic)
-	add_compile_options(-Watomic-properties)
-	add_compile_options(-Wcomma)
-	add_compile_options(-Wconditional-uninitialized)
-	add_compile_options(-Wcovered-switch-default)
-	add_compile_options(-Wdate-time)
-	add_compile_options(-Wdeprecated)
-	add_compile_options(-Wdouble-promotion)
-	add_compile_options(-Wduplicate-enum)
-	add_compile_options(-Wexpansion-to-defined)
-	add_compile_options(-Wfloat-equal)
-	add_compile_options(-Widiomatic-parentheses)
-	add_compile_options(-Wignored-qualifiers)
-	add_compile_options(-Wimplicit-fallthrough)
-	add_compile_options(-Wnullable-to-nonnull-conversion)
-	add_compile_options(-Wobjc-interface-ivars)
-	add_compile_options(-Wover-aligned)
-	add_compile_options(-Wpacked)
-	add_compile_options(-Wpointer-arith)
-	add_compile_options(-Wselector)
-	add_compile_options(-Wstatic-in-inline)
-	add_compile_options(-Wsuper-class-method-mismatch)
-	add_compile_options(-Wswitch-enum)
-	add_compile_options(-Wtautological-compare)
-	add_compile_options(-Wunguarded-availability)
-	add_compile_options(-Wunused)
-	add_compile_options(-Wno-disabled-macro-expansion)
-	add_compile_options(-Wno-pedantic)
-	add_compile_options(-Wno-bad-function-cast)
-	add_compile_options(-Wno-c++-compat)
-	add_compile_options(-Wno-c++98-compat)
-	add_compile_options(-Wno-c++98-compat-pedantic)
-	add_compile_options(-Wno-cast-align)
-	add_compile_options(-Wno-cast-qual)
-	add_compile_options(-Wno-documentation-unknown-command)
-	add_compile_options(-Wno-format-nonliteral)
-	add_compile_options(-Wno-missing-variable-declarations)
-	add_compile_options(-Wno-old-style-cast)
-	add_compile_options(-Wno-padded)
-	add_compile_options(-Wno-reserved-id-macro)
-	add_compile_options(-Wno-shift-sign-overflow)
-	add_compile_options(-Wno-undef)
-	add_compile_options(-Wno-unreachable-code-aggressive)
-	add_compile_options(-Wno-unused-macros)
-	add_compile_options(-Wno-used-but-marked-unused)
-	add_compile_options(-Wno-vla)
+    add_compile_options(-Werror)
+    add_compile_options(-Wall)
+    add_compile_options(-Wextra)
+    add_compile_options(-Wno-unknown-warning-option)
+    add_compile_options(-Wno-trigraphs)
+    add_compile_options(-Wmissing-field-initializers)
+    add_compile_options(-Wmissing-prototypes)
+    add_compile_options(-Wdocumentation)
+    add_compile_options(-Wunreachable-code)
+    add_compile_options(-Wmissing-braces)
+    add_compile_options(-Wparentheses)
+    add_compile_options(-Wswitch)
+    add_compile_options(-Wunused-function)
+    add_compile_options(-Wunused-label)
+    add_compile_options(-Wunused-parameter)
+    add_compile_options(-Wunused-variable)
+    add_compile_options(-Wunused-value)
+    add_compile_options(-Wempty-body)
+    add_compile_options(-Wuninitialized)
+    add_compile_options(-Wunknown-pragmas)
+    add_compile_options(-Wshadow)
+    add_compile_options(-Wno-four-char-constants)
+    add_compile_options(-Wconversion)
+    add_compile_options(-Wconstant-conversion)
+    add_compile_options(-Wint-conversion)
+    add_compile_options(-Wbool-conversion)
+    add_compile_options(-Wenum-conversion)
+    add_compile_options(-Wassign-enum)
+    add_compile_options(-Wsign-compare)
+    add_compile_options(-Wshorten-64-to-32)
+    add_compile_options(-Wpointer-sign)
+    add_compile_options(-Wnewline-eof)
+    add_compile_options(-Wdeprecated-declarations)
+    add_compile_options(-Wsign-conversion)
+    add_compile_options(-Winfinite-recursion)
+    add_compile_options(-Warray-bounds-pointer-arithmetic)
+    add_compile_options(-Watomic-properties)
+    add_compile_options(-Wcomma)
+    add_compile_options(-Wconditional-uninitialized)
+    add_compile_options(-Wcovered-switch-default)
+    add_compile_options(-Wdate-time)
+    add_compile_options(-Wdeprecated)
+    add_compile_options(-Wdouble-promotion)
+    add_compile_options(-Wduplicate-enum)
+    add_compile_options(-Wexpansion-to-defined)
+    add_compile_options(-Wfloat-equal)
+    add_compile_options(-Widiomatic-parentheses)
+    add_compile_options(-Wignored-qualifiers)
+    add_compile_options(-Wimplicit-fallthrough)
+    add_compile_options(-Wnullable-to-nonnull-conversion)
+    add_compile_options(-Wobjc-interface-ivars)
+    add_compile_options(-Wover-aligned)
+    add_compile_options(-Wpacked)
+    add_compile_options(-Wpointer-arith)
+    add_compile_options(-Wselector)
+    add_compile_options(-Wstatic-in-inline)
+    add_compile_options(-Wsuper-class-method-mismatch)
+    add_compile_options(-Wswitch-enum)
+    add_compile_options(-Wtautological-compare)
+    add_compile_options(-Wunguarded-availability)
+    add_compile_options(-Wunused)
+    add_compile_options(-Wno-disabled-macro-expansion)
+    add_compile_options(-Wno-pedantic)
+    add_compile_options(-Wno-bad-function-cast)
+    add_compile_options(-Wno-c++-compat)
+    add_compile_options(-Wno-c++98-compat)
+    add_compile_options(-Wno-c++98-compat-pedantic)
+    add_compile_options(-Wno-cast-align)
+    add_compile_options(-Wno-cast-qual)
+    add_compile_options(-Wno-documentation-unknown-command)
+    add_compile_options(-Wno-format-nonliteral)
+    add_compile_options(-Wno-missing-variable-declarations)
+    add_compile_options(-Wno-old-style-cast)
+    add_compile_options(-Wno-padded)
+    add_compile_options(-Wno-reserved-id-macro)
+    add_compile_options(-Wno-shift-sign-overflow)
+    add_compile_options(-Wno-undef)
+    add_compile_options(-Wno-unreachable-code-aggressive)
+    add_compile_options(-Wno-unused-macros)
+    add_compile_options(-Wno-used-but-marked-unused)
+    add_compile_options(-Wno-vla)
   endmacro()
 endif()


Squashed 'cmake/yacma/' changes from ea80173..1c81092

1c81092 YACMA: restore a flag.
bc5a054 YACMA: try to configure clang-cl with clang style flags, rather than cl-style flags.
537989e YACMA: disable the -Wmaybe-uninitialized debug flag on GCC, as it results in many dubious warnings.

git-subtree-dir: cmake/yacma
git-subtree-split: 1c81092adec764e7e1e9915a14e8320a34066073

--- YACMACompilerLinkerSettings.cmake
+++ YACMACompilerLinkerSettings.cmake
@@ -82,16 +82,13 @@
     set(_YACMA_CXX_FLAGS "")
     set(_YACMA_CXX_FLAGS_DEBUG "")

-    # NOTE: all these flags are with a Unix-like syntax. We will need to change them
-    # for MSVC and clang on windows possibly.
-
     # Configuration bits specific for GCC.
     if(YACMA_COMPILER_IS_GNUCXX)
         _YACMA_CHECK_ENABLE_CXX_FLAG(-fdiagnostics-color=auto)
     endif()

     # Configuration bits specific for clang.
-    if(YACMA_COMPILER_IS_CLANGXX AND NOT YACMA_COMPILER_IS_MSVC)
+    if(YACMA_COMPILER_IS_CLANGXX)
         # For now it seems like -Wshadow from clang behaves better than GCC's, just enable it here
         # for the time being.
         _YACMA_CHECK_ENABLE_DEBUG_CXX_FLAG(-Wshadow)
@@ -100,7 +97,7 @@
     endif()

     # Common configuration for GCC, clang and Intel.
-    if((YACMA_COMPILER_IS_CLANGXX AND NOT YACMA_COMPILER_IS_MSVC) OR YACMA_COMPILER_IS_INTELXX OR YACMA_COMPILER_IS_GNUCXX)
+    if(YACMA_COMPILER_IS_CLANGXX OR YACMA_COMPILER_IS_INTELXX OR YACMA_COMPILER_IS_GNUCXX)
         _YACMA_CHECK_ENABLE_DEBUG_CXX_FLAG(-Wall)
         _YACMA_CHECK_ENABLE_DEBUG_CXX_FLAG(-Wextra)
         _YACMA_CHECK_ENABLE_DEBUG_CXX_FLAG(-Wnon-virtual-dtor)
@@ -142,6 +139,12 @@
             message(STATUS "Activating the '-Wno-attributes' workaround for GCC >= 6.")
             _YACMA_CHECK_ENABLE_CXX_FLAG(-Wno-attributes)
         endif()
+        if(YACMA_COMPILER_IS_GNUCXX)
+            # The -Wmaybe-uninitialized flag is enabled by -Wall, but it is known
+            # to emit a lot of possibly spurious warnings. Let's just disable it.
+            message(STATUS "Activating the '-Wno-maybe-uninitialized' workaround for GCC.")
+            _YACMA_CHECK_ENABLE_DEBUG_CXX_FLAG(-Wno-maybe-uninitialized)
+        endif()
     endif()

     # MSVC setup.


Bugfix

Bugfix

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

--- deal.II/contrib/cmake/setup_compiler_flags_gnu.cmake
+++ deal.II/contrib/cmake/setup_compiler_flags_gnu.cmake
@@ -23,7 +23,7 @@
 # Check whether the -as-needed flag is available. If so set it to link
 # the deal.II library with it.
 #
-ENABLE_IF_SUPPORTED(CMAKE_SHARED_LINKER_FLAGS "-Wl,-as-needed")
+ENABLE_IF_SUPPORTED(CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed")

 #


success to build in release

success to build in release

--- ext_build/boz-vars.cmake
+++ ext_build/boz-vars.cmake
@@ -43,13 +43,13 @@
 endif()

 add_definitions(-std=c99)
-add_definitions(-Wall -Wextra)
+add_definitions(-Wall  -Wextra)

 set(CMAKE_C_FLAGS_DEBUG "-O0 -ggdb")
 set(CMAKE_C_FLAGS_RELEASE "-O2 -Werror")

 set(CMAKE_C_FLAGS "-Wmissing-prototypes -Wbad-function-cast -Wshadow -Wfloat-equal")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wswitch-default")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wswitch-default -Wno-unused-result")
 #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wdeclaration-after-statement")
 add_definitions(-Wmissing-declarations -Wwrite-strings )
 add_definitions(-Wunknown-pragmas)


fix cmake

fix cmake

--- cmake/FileList.cmake
+++ cmake/FileList.cmake
@@ -85,7 +85,7 @@
 set(UTIL_SRC
 src/util/token.cpp
 src/util/token_exception.cpp
-src/util/resource.cpp)
+src/util/resource.cpp
 src/util/tokenreader.cpp
 src/util/timedifference.cpp
 src/util/debug.cpp


iox-#283 Fix build

iox-#283 Fix build

Signed-off-by: Simon Hoinkis <f0773326fce8fa552c28fe58d0e558a9f1b7687f@apex.ai>

--- iceoryx_posh/cmake/install_help_and_config.cmake
+++ iceoryx_posh/cmake/install_help_and_config.cmake
@@ -13,7 +13,7 @@
 # limitations under the License.
 #

-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/doc/website/FAQ.md
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../doc/website/FAQ.md
 	DESTINATION share/doc/iceoryx
 	COMPONENT dev)


[FIX] fixes find java

[FIX] fixes find java

--- util/cmake/FindJava.cmake
+++ util/cmake/FindJava.cmake
@@ -69,7 +69,7 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)

-include(${CMAKE_MODULE_PATH}/CMakeFindJavaCommon.cmake)
+include(${CMAKE_ROOT}/Modules/CMakeFindJavaCommon.cmake)

 # The HINTS option should only be used for values computed from the system.
 set(_JAVA_HINTS)
@@ -184,7 +184,7 @@
   PATHS ${_JAVA_PATHS}
 )

-include(${CMAKE_MODULE_PATH}/FindPackageHandleStandardArgs.cmake)
+include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
 if(Java_FIND_COMPONENTS)
   foreach(component ${Java_FIND_COMPONENTS})
     # User just want to execute some Java byte-compiled


Carry through andrew's rename of openal to openal-soft into cmake, see if that helps

--- indra/cmake/OPENAL.cmake
+++ indra/cmake/OPENAL.cmake
@@ -12,10 +12,10 @@
   if (STANDALONE)
     include(FindPkgConfig)
     include(FindOpenAL)
-    pkg_check_modules(OPENAL_LIB REQUIRED openal)
+    pkg_check_modules(OPENAL_LIB REQUIRED openal-soft)
     pkg_check_modules(FREEALUT_LIB REQUIRED freealut)
   else (STANDALONE)
-    use_prebuilt_binary(openal)
+    use_prebuilt_binary(openal-soft)
   endif (STANDALONE)
   set(OPENAL_LIBRARIES
     openal


haskell-cmake-improvements: also exclude plugins on ENABLE_ASAN

--- cmake/Modules/LibAddHaskellPlugin.cmake
+++ cmake/Modules/LibAddHaskellPlugin.cmake
@@ -40,199 +40,226 @@
 		find_package (Pluginprocess)

 		# set by find_program
-		if (PLUGINPROCESS_FOUND)
-			if (HASKELL_FOUND)
-				check_binding_included ("haskell" HAVE_HASKELL_BINDING)
-				if (HAVE_HASKELL_BINDING)
-
-					# needed for HsFFI.h
-					execute_process (COMMAND ${GHC_EXECUTABLE} --print-libdir
-							 OUTPUT_VARIABLE GHC_LIB_DIR
-							 OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-					set (GHC_INCLUDE_DIRS
-					     ${CMAKE_CURRENT_BINARY_DIR}/dist/build/Elektra # for the haskell function stubs
-					     ${GHC_LIB_DIR}/include # for HsFFI.h
-					     )
-
-					set (CABAL_OPTS "--prefix=${CMAKE_INSTALL_PREFIX}")
-					if (BUILD_SHARED OR BUILD_FULL) # shared variants of ghc libraries have the ghc version as a suffix
-						set (GHC_DYNAMIC_SUFFIX "-ghc${GHC_VERSION}")
-						if (APPLE)
-							set (GHC_DYNAMIC_ENDING ".dylib")
-						else (APPLE)
-							set (GHC_DYNAMIC_ENDING ".so")
-						endif (APPLE)
-						set (CABAL_OPTS "${CABAL_OPTS};--enable-shared")
-					elseif (BUILD_STATIC)
-						set (GHC_DYNAMIC_ENDING ".a")
-						set (CABAL_OPTS "${CABAL_OPTS};--disable-shared")
-					endif ()
-
-					# since we want to continue to use our cmake add_plugin macro
-					# we compile via the c compiler instead of ghc
-					# so we must feed it with the ghc library paths manually
-					# inspired by https://github.com/jarrett/cpphs/blob/master/Makefile
-					# use HSrts_thr for the threaded version of the rts
-					set (GHC_RTS_PATH "${GHC_LIB_DIR}/rts")
-					find_library (GHC_RTS_LIB "HSrts${GHC_DYNAMIC_SUFFIX}" PATHS ${GHC_RTS_PATH})
-
-					execute_process (COMMAND ${GHC-PKG_EXECUTABLE} latest base
-							 OUTPUT_VARIABLE GHC_BASE_NAME
-							 OUTPUT_STRIP_TRAILING_WHITESPACE)
-					set (GHC_BASE_PATH "${GHC_LIB_DIR}/${GHC_BASE_NAME}")
-					find_library (GHC_BASE_LIB "HS${GHC_BASE_NAME}${GHC_DYNAMIC_SUFFIX}" PATHS ${GHC_BASE_PATH})
-
-					execute_process (COMMAND ${GHC-PKG_EXECUTABLE} latest integer-gmp
-							 OUTPUT_VARIABLE GHC_GMP_NAME
-							 OUTPUT_STRIP_TRAILING_WHITESPACE)
-					set (GHC_GMP_PATH "${GHC_LIB_DIR}/${GHC_GMP_NAME}")
-					find_library (GHC_GMP_LIB "HS${GHC_GMP_NAME}${GHC_DYNAMIC_SUFFIX}" PATHS ${GHC_GMP_PATH})
-
-					execute_process (COMMAND ${GHC-PKG_EXECUTABLE} latest ghc-prim
-							 OUTPUT_VARIABLE GHC_PRIM_NAME
-							 OUTPUT_STRIP_TRAILING_WHITESPACE)
-					set (GHC_PRIM_PATH "${GHC_LIB_DIR}/${GHC_PRIM_NAME}")
-					find_library (GHC_PRIM_LIB "HS${GHC_PRIM_NAME}${GHC_DYNAMIC_SUFFIX}" PATHS ${GHC_PRIM_PATH})
-
-					if (GHC_RTS_LIB)
-						if (GHC_BASE_LIB)
-							if (GHC_GMP_LIB)
-								if (GHC_PRIM_LIB)
-
-									set (
-										PLUGIN_HASKELL_NAME
-										"${CMAKE_CURRENT_BINARY_DIR}/libHS${target}${GHC_DYNAMIC_SUFFIX}${GHC_DYNAMIC_ENDING}"
-										)
-
-									set (GHC_LIBS
-									     ${GHC_RTS_LIB}
-									     ${GHC_BASE_LIB}
-									     ${GHC_GMP_LIB}
-									     gmp
-									     ${GHC_PRIM_LIB}
-									     ${PLUGIN_HASKELL_NAME})
-
-									# GHC's structure differs between OSX and Linux
-									# On OSX we need to link iconv and Cffi additionally
-									if (APPLE)
-										find_library (GHC_FFI_LIB Cffi PATHS "${GHC_LIB_DIR}/rts")
-										if (GHC_FFI_LIB)
-											set (GHC_LIBS ${GHC_LIBS} ${GHC_FFI_LIB} iconv)
-										else (GHC_FFI_LIB)
-											remove_plugin (${target} "GHC_FFI_LIB not found")
-										endif (GHC_FFI_LIB)
-									endif (APPLE)
-
-									# configure include paths
-									configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/${target}.cabal.in"
+		if (NOT ENABLE_ASAN)
+			if (PLUGINPROCESS_FOUND)
+				if (HASKELL_FOUND)
+					check_binding_included ("haskell" HAVE_HASKELL_BINDING)
+					if (HAVE_HASKELL_BINDING)
+
+						# needed for HsFFI.h
+						execute_process (COMMAND ${GHC_EXECUTABLE} --print-libdir
+								 OUTPUT_VARIABLE GHC_LIB_DIR
+								 OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+						set (GHC_INCLUDE_DIRS
+						     ${CMAKE_CURRENT_BINARY_DIR}/dist/build/Elektra # for the haskell function stubs
+						     ${GHC_LIB_DIR}/include # for HsFFI.h
+						     )
+
+						set (CABAL_OPTS "--prefix=${CMAKE_INSTALL_PREFIX}")
+						if (BUILD_SHARED OR BUILD_FULL) # shared variants of ghc libraries have the ghc version as a
+										# suffix
+							set (GHC_DYNAMIC_SUFFIX "-ghc${GHC_VERSION}")
+							if (APPLE)
+								set (GHC_DYNAMIC_ENDING ".dylib")
+							else (APPLE)
+								set (GHC_DYNAMIC_ENDING ".so")
+							endif (APPLE)
+							set (CABAL_OPTS "${CABAL_OPTS};--enable-shared")
+						elseif (BUILD_STATIC)
+							set (GHC_DYNAMIC_ENDING ".a")
+							set (CABAL_OPTS "${CABAL_OPTS};--disable-shared")
+						endif ()
+
+						# since we want to continue to use our cmake add_plugin macro
+						# we compile via the c compiler instead of ghc
+						# so we must feed it with the ghc library paths manually
+						# inspired by https://github.com/jarrett/cpphs/blob/master/Makefile
+						# use HSrts_thr for the threaded version of the rts
+						set (GHC_RTS_PATH "${GHC_LIB_DIR}/rts")
+						find_library (GHC_RTS_LIB "HSrts${GHC_DYNAMIC_SUFFIX}" PATHS ${GHC_RTS_PATH})
+
+						execute_process (COMMAND ${GHC-PKG_EXECUTABLE} latest base
+								 OUTPUT_VARIABLE GHC_BASE_NAME
+								 OUTPUT_STRIP_TRAILING_WHITESPACE)
+						set (GHC_BASE_PATH "${GHC_LIB_DIR}/${GHC_BASE_NAME}")
+						find_library (GHC_BASE_LIB "HS${GHC_BASE_NAME}${GHC_DYNAMIC_SUFFIX}" PATHS ${GHC_BASE_PATH})
+
+						execute_process (COMMAND ${GHC-PKG_EXECUTABLE} latest integer-gmp
+								 OUTPUT_VARIABLE GHC_GMP_NAME
+								 OUTPUT_STRIP_TRAILING_WHITESPACE)
+						set (GHC_GMP_PATH "${GHC_LIB_DIR}/${GHC_GMP_NAME}")
+						find_library (GHC_GMP_LIB "HS${GHC_GMP_NAME}${GHC_DYNAMIC_SUFFIX}" PATHS ${GHC_GMP_PATH})
+
+						execute_process (COMMAND ${GHC-PKG_EXECUTABLE} latest ghc-prim
+								 OUTPUT_VARIABLE GHC_PRIM_NAME
+								 OUTPUT_STRIP_TRAILING_WHITESPACE)
+						set (GHC_PRIM_PATH "${GHC_LIB_DIR}/${GHC_PRIM_NAME}")
+						find_library (GHC_PRIM_LIB "HS${GHC_PRIM_NAME}${GHC_DYNAMIC_SUFFIX}" PATHS ${GHC_PRIM_PATH})
+
+						if (GHC_RTS_LIB)
+							if (GHC_BASE_LIB)
+								if (GHC_GMP_LIB)
+									if (GHC_PRIM_LIB)
+
+										set (
+											PLUGIN_HASKELL_NAME
+											"${CMAKE_CURRENT_BINARY_DIR}/libHS${target}${GHC_DYNAMIC_SUFFIX}${GHC_DYNAMIC_ENDING}"
+											)
+
+										set (GHC_LIBS
+										     ${GHC_RTS_LIB}
+										     ${GHC_BASE_LIB}
+										     ${GHC_GMP_LIB}
+										     gmp
+										     ${GHC_PRIM_LIB}
+										     ${PLUGIN_HASKELL_NAME})
+
+										# GHC's structure differs between OSX and Linux
+										# On OSX we need to link iconv and Cffi additionally
+										if (APPLE)
+											find_library (GHC_FFI_LIB
+												      Cffi
+												      PATHS "${GHC_LIB_DIR}/rts")
+											if (GHC_FFI_LIB)
+												set (GHC_LIBS
+												     ${GHC_LIBS}
+												     ${GHC_FFI_LIB}
+												     iconv)
+											else (GHC_FFI_LIB)
+												remove_plugin (${target}
+													       "GHC_FFI_LIB not found")
+											endif (GHC_FFI_LIB)
+										endif (APPLE)
+
+										# configure include paths
+										configure_file (
+											"${CMAKE_CURRENT_SOURCE_DIR}/${target}.cabal.in"
 											"${CMAKE_CURRENT_BINARY_DIR}/${target}.cabal"
 											@ONLY) # configure the haskell plugin base file for
 											       # the current plugin
-									configure_file (
-										"${CMAKE_SOURCE_DIR}/src/plugins/haskell/haskell.c.in"
-										"${CMAKE_CURRENT_BINARY_DIR}/haskell.c"
-										@ONLY) # same for the header
-									configure_file (
-										"${CMAKE_SOURCE_DIR}/src/plugins/haskell/haskell.h.in"
-										"${CMAKE_CURRENT_BINARY_DIR}/haskell.h"
-										@ONLY) # copy the readme so the macro in haskell.c finds it
-									file (COPY
-									      "${CMAKE_CURRENT_SOURCE_DIR}/README.md"
-									      DESTINATION
-									      "${CMAKE_CURRENT_BINARY_DIR}") # same for the setup logic,
-													     # depending on wheter a custom
-													     # one exists  use the default
-													     # suitable for almost
-													     # everything
-									set (CABAL_CUSTOM_SETUP_FILE
-									     "${CMAKE_CURRENT_SOURCE_DIR}/Setup.hs.in")
-									if (NOT EXISTS ${CABAL_CUSTOM_SETUP_FILE})
+										configure_file (
+											"${CMAKE_SOURCE_DIR}/src/plugins/haskell/haskell.c.in"
+											"${CMAKE_CURRENT_BINARY_DIR}/haskell.c"
+											@ONLY) # same for the header
+										configure_file (
+											"${CMAKE_SOURCE_DIR}/src/plugins/haskell/haskell.h.in"
+											"${CMAKE_CURRENT_BINARY_DIR}/haskell.h"
+											@ONLY) # copy the readme so the macro in haskell.c
+											       # finds it
+										file (COPY
+										      "${CMAKE_CURRENT_SOURCE_DIR}/README.md"
+										      DESTINATION
+										      "${CMAKE_CURRENT_BINARY_DIR}") # same for the setup
+														     # logic,  depending on
+														     # wheter a custom  one
+														     # exists  use the
+														     # default  suitable for
+														     # almost  everything
 										set (CABAL_CUSTOM_SETUP_FILE
-										     "${CMAKE_SOURCE_DIR}/src/plugins/haskell/Setup.hs.in")
-									endif (NOT EXISTS ${CABAL_CUSTOM_SETUP_FILE})
-									configure_file (${CABAL_CUSTOM_SETUP_FILE}
-											"${CMAKE_CURRENT_BINARY_DIR}/Setup.hs"
-											@ONLY)
-
-									configure_haskell_sandbox (SHARED_SANDBOX
-												   ${HASKELL_SHARED_SANDBOX}
-												   SANDBOX_ADD_SOURCES
-												   ${ARG_SANDBOX_ADD_SOURCES}
-												   DEPENDS
-												   c2hs_haskell)
-
-									# Grab potential haskell source files
-									file (GLOB_RECURSE PLUGIN_SOURCE_FILES_UNFILTERED
-											   "${CMAKE_CURRENT_SOURCE_DIR}/*.hs"
-											   "${CMAKE_CURRENT_SOURCE_DIR}/*.lhs"
-											   "${CMAKE_CURRENT_BINARY_DIR}/*.hs"
-											   "${CMAKE_CURRENT_BINARY_DIR}/*.lhs")
-
-									# exclude the dist directory
-									set (PLUGIN_SOURCE_FILES)
-									foreach (file ${PLUGIN_SOURCE_FILES_UNFILTERED})
-										if (NOT file MATCHES "${CMAKE_CURRENT_BINARY_DIR}/dist/")
-											list (APPEND PLUGIN_SOURCE_FILES ${file})
-										endif ()
-									endforeach ()
-
-									set (PLUGIN_SOURCE_FILES
-									     "${PLUGIN_SOURCE_FILES}"
-									     "${CMAKE_CURRENT_SOURCE_DIR}/${target}.cabal.in"
-									     "${CMAKE_CURRENT_SOURCE_DIR}/testmod_${target}.c"
-									     "${CMAKE_SOURCE_DIR}/src/plugins/haskell/Setup.hs.in"
-									     "${ARG_ADDITIONAL_SOURCES}")
-
-									# reconfiguration due to Cabal library version issues on stretch
-									add_custom_command (OUTPUT ${PLUGIN_HASKELL_NAME}
-											    COMMAND ${CABAL_EXECUTABLE} configure
-												    ${CABAL_OPTS} -v0
-											    COMMAND ${CABAL_EXECUTABLE} build -v0 ||
-												    ${CABAL_EXECUTABLE} configure
-												    ${CABAL_OPTS} -v0 && ${CABAL_EXECUTABLE}
-												    build -v0
-											    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-											    DEPENDS c2hs_haskell
-												    ${PLUGIN_SOURCE_FILES}
-												    ${HASKELL_ADD_SOURCES_TARGET})
-									add_custom_target (${target} ALL DEPENDS ${PLUGIN_HASKELL_NAME})
-
-									if (BUILD_SHARED OR BUILD_FULL)
-										install (DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/haskell"
-												   DESTINATION
-												   "lib${LIB_SUFFIX}/elektra/")
-									endif (BUILD_SHARED OR BUILD_FULL)
-
-									set (HASKELL_RPATH
-									     "${GHC_RTS_PATH}"
-									     "${GHC_BASE_PATH}"
-									     "${GHC_PRIM_PATH}"
-									     "${GHC_GMP_PATH}"
-									     "${CMAKE_INSTALL_RPATH}"
-									     "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/elektra/haskell")
-
-								else (GHC_PRIM_LIB)
-									remove_plugin (${target} "GHC_PRIM_LIB not found")
-								endif (GHC_PRIM_LIB)
-							else (GHC_GMP_LIB)
-								remove_plugin (${target} "GHC_GMP_LIB not found")
-							endif (GHC_GMP_LIB)
-						else (GHC_BASE_LIB)
-							remove_plugin (${target} "GHC_BASE_LIB not found")
-						endif (GHC_BASE_LIB)
-					else (GHC_RTS_LIB)
-						remove_plugin (${target} "GHC_RTS_LIB not found")
-					endif (GHC_RTS_LIB)
-				else (HAVE_HASKELL_BINDING)
-					remove_plugin (${target} "haskell bindings are not included in the cmake configuration")
-				endif (HAVE_HASKELL_BINDING)
-			else (HASKELL_FOUND)
-				remove_plugin (${target} ${HASKELL_NOTFOUND_INFO})
-			endif (HASKELL_FOUND)
-		else (PLUGINPROCESS_FOUND)
-			remove_plugin (${target} "${PLUGINPROCESS_NOTFOUND_INFO}, but required for haskell plugins")
-		endif (PLUGINPROCESS_FOUND)
+										     "${CMAKE_CURRENT_SOURCE_DIR}/Setup.hs.in")
+										if (NOT EXISTS ${CABAL_CUSTOM_SETUP_FILE})
+											set (
+												CABAL_CUSTOM_SETUP_FILE
+												"${CMAKE_SOURCE_DIR}/src/plugins/haskell/Setup.hs.in"
+												)
+										endif (NOT EXISTS ${CABAL_CUSTOM_SETUP_FILE})
+										configure_file (${CABAL_CUSTOM_SETUP_FILE}
+												"${CMAKE_CURRENT_BINARY_DIR}/Setup.hs"
+												@ONLY)
+
+										configure_haskell_sandbox (SHARED_SANDBOX
+													   ${HASKELL_SHARED_SANDBOX}
+													   SANDBOX_ADD_SOURCES
+													   ${ARG_SANDBOX_ADD_SOURCES}
+													   DEPENDS
+													   c2hs_haskell)
+
+										# Grab potential haskell source files
+										file (GLOB_RECURSE PLUGIN_SOURCE_FILES_UNFILTERED
+												   "${CMAKE_CURRENT_SOURCE_DIR}/*.hs"
+												   "${CMAKE_CURRENT_SOURCE_DIR}/*.lhs"
+												   "${CMAKE_CURRENT_BINARY_DIR}/*.hs"
+												   "${CMAKE_CURRENT_BINARY_DIR}/*.lhs")
+
+										# exclude the dist directory
+										set (PLUGIN_SOURCE_FILES)
+										foreach (file ${PLUGIN_SOURCE_FILES_UNFILTERED})
+											if (NOT
+											    file
+											    MATCHES
+											    "${CMAKE_CURRENT_BINARY_DIR}/dist/")
+												list (APPEND PLUGIN_SOURCE_FILES ${file})
+											endif ()
+										endforeach ()
+
+										set (PLUGIN_SOURCE_FILES
+										     "${PLUGIN_SOURCE_FILES}"
+										     "${CMAKE_CURRENT_SOURCE_DIR}/${target}.cabal.in"
+										     "${CMAKE_CURRENT_SOURCE_DIR}/testmod_${target}.c"
+										     "${CMAKE_SOURCE_DIR}/src/plugins/haskell/Setup.hs.in"
+										     "${ARG_ADDITIONAL_SOURCES}")
+
+										# reconfiguration due to Cabal library version issues on
+										# stretch
+										add_custom_command (OUTPUT ${PLUGIN_HASKELL_NAME}
+												    COMMAND ${CABAL_EXECUTABLE} configure
+													    ${CABAL_OPTS} -v0
+												    COMMAND ${CABAL_EXECUTABLE} build -v0 ||
+													    ${CABAL_EXECUTABLE} configure
+													    ${CABAL_OPTS} -v0 &&
+													    ${CABAL_EXECUTABLE} build -v0
+												    WORKING_DIRECTORY
+													    ${CMAKE_CURRENT_BINARY_DIR}
+												    DEPENDS c2hs_haskell
+													    ${PLUGIN_SOURCE_FILES}
+													    ${HASKELL_ADD_SOURCES_TARGET})
+										add_custom_target (${target}
+												   ALL
+												   DEPENDS ${PLUGIN_HASKELL_NAME})
+
+										if (BUILD_SHARED OR BUILD_FULL)
+											install (
+												DIRECTORY
+													"${CMAKE_CURRENT_BINARY_DIR}/haskell"
+													DESTINATION
+													"lib${LIB_SUFFIX}/elektra/")
+										endif (BUILD_SHARED OR BUILD_FULL)
+
+										set (
+											HASKELL_RPATH
+											"${GHC_RTS_PATH}"
+											"${GHC_BASE_PATH}"
+											"${GHC_PRIM_PATH}"
+											"${GHC_GMP_PATH}"
+											"${CMAKE_INSTALL_RPATH}"
+											"${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/elektra/haskell"
+											)
+
+									else (GHC_PRIM_LIB)
+										remove_plugin (${target} "GHC_PRIM_LIB not found")
+									endif (GHC_PRIM_LIB)
+								else (GHC_GMP_LIB)
+									remove_plugin (${target} "GHC_GMP_LIB not found")
+								endif (GHC_GMP_LIB)
+							else (GHC_BASE_LIB)
+								remove_plugin (${target} "GHC_BASE_LIB not found")
+							endif (GHC_BASE_LIB)
+						else (GHC_RTS_LIB)
+							remove_plugin (${target} "GHC_RTS_LIB not found")
+						endif (GHC_RTS_LIB)
+					else (HAVE_HASKELL_BINDING)
+						remove_plugin (${target} "haskell bindings are not included in the cmake configuration")
+					endif (HAVE_HASKELL_BINDING)
+				else (HASKELL_FOUND)
+					remove_plugin (${target} ${HASKELL_NOTFOUND_INFO})
+				endif (HASKELL_FOUND)
+			else (PLUGINPROCESS_FOUND)
+				remove_plugin (${target} "${PLUGINPROCESS_NOTFOUND_INFO}, but required for haskell plugins")
+			endif (PLUGINPROCESS_FOUND)
+		else (NOT ENABLE_ASAN)
+			remove_plugin (${target} "haskell plugins are not compatible with ENABLE_ASAN")
+		endif (NOT ENABLE_ASAN)
 	endif (DEPENDENCY_PHASE)

 	set (SANDBOX_PACKAGEDB "${HASKELL_SHARED_SANDBOX}/${GHC_TARGET_PLATFORM}-ghc-${GHC_VERSION}-packages.conf.d/")


remove link libs rt for Android NDK compiling. (#1253)

* remove link libs rt for Android NDK compiling.

-lrt ld params will lead Android NDK cross-compiling failed.

Signed-off-by: JayHou <093601ee1a990a433b29aba540323ed330bc7f25@lixiang.com>

* Apply suggestions from code review

Co-authored-by: Miguel Company <8e22e93d3fc2e7264deef6de9af32f393c0e29cd@eprosima.com>
Signed-off-by: JayHou <093601ee1a990a433b29aba540323ed330bc7f25@lixiang.com>

Co-authored-by: JayHou <093601ee1a990a433b29aba540323ed330bc7f25@lixiang.com>
Co-authored-by: Miguel Company <8e22e93d3fc2e7264deef6de9af32f393c0e29cd@eprosima.com>

--- cmake/modules/FindThirdpartyBoost.cmake
+++ cmake/modules/FindThirdpartyBoost.cmake
@@ -13,7 +13,7 @@

 find_package(Threads REQUIRED)

-if(WIN32 OR APPLE)
+if(WIN32 OR APPLE OR ANDROID)
     set(THIRDPARTY_BOOST_LINK_LIBS ${CMAKE_THREAD_LIBS_INIT})
 else() # Posix
     set(THIRDPARTY_BOOST_LINK_LIBS ${CMAKE_THREAD_LIBS_INIT} rt)


PARQUET-949: Pin Arrow version using git archives instead of GIT_TAG

There has been some flakiness with this on PRs today, so this should help prevent accidentally building against master

Author: Wes McKinney <wes.mckinney@twosigma.com>

Closes #294 from wesm/PARQUET-949 and squashes the following commits:

95b0f8a [Wes McKinney] Fix odd variable scope issue
095cbe3 [Wes McKinney] Pin Arrow version using git archives instead of GIT_TAG

--- cmake_modules/ThirdpartyToolchain.cmake
+++ cmake_modules/ThirdpartyToolchain.cmake
@@ -22,7 +22,6 @@

 # Brotli 0.5.2 does not install headers/libraries yet, but 0.6.0.dev does
 set(BROTLI_VERSION "5db62dcc9d386579609540cdf8869e95ad334bbd")
-set(ARROW_VERSION "c2f28cd07413e262fa0b741c286f86d5c7277c56")

 # find boost headers and libs
 set(Boost_DEBUG TRUE)
@@ -394,11 +393,13 @@
     -DARROW_JEMALLOC=OFF
     -DARROW_BUILD_TESTS=OFF)

+  set(ARROW_VERSION "c2f28cd07413e262fa0b741c286f86d5c7277c56")
+  set(ARROW_URL "https://github.com/apache/arrow/archive/${ARROW_VERSION}.tar.gz")
+
   if (CMAKE_VERSION VERSION_GREATER "3.2")
     # BUILD_BYPRODUCTS is a 3.2+ feature
     ExternalProject_Add(arrow_ep
-      GIT_REPOSITORY https://github.com/apache/arrow.git
-      GIT_TAG ${ARROW_VERSION}
+      URL ${ARROW_URL}
       BUILD_BYPRODUCTS "${ARROW_SHARED_LIB}" "${ARROW_STATIC_LIB}"
       # With CMake 3.7.0 there is a SOURCE_SUBDIR argument which we can use
       # to specify that the CMakeLists.txt of Arrow is located in cpp/
@@ -408,8 +409,7 @@
       CMAKE_ARGS ${ARROW_CMAKE_ARGS})
   else()
     ExternalProject_Add(arrow_ep
-      GIT_REPOSITORY https://github.com/apache/arrow.git
-      GIT_TAG ${ARROW_VERSION}
+      URL ${ARROW_URL}
       CONFIGURE_COMMAND "${CMAKE_COMMAND}" ${ARROW_CMAKE_ARGS} ${CMAKE_CURRENT_BINARY_DIR}/arrow_ep-prefix/src/arrow_ep/cpp
       CMAKE_ARGS ${ARROW_CMAKE_ARGS})
   endif()


PARQUET-1262: Use the same BOOST_ROOT and Boost_NAMESPACE for Thrift

Author: Korn, Uwe <Uwe.Korn@blue-yonder.com>

Closes #460 from xhochy/PARQUET-1262 and squashes the following commits:

2a886ce [Korn, Uwe] PARQUET-1262: Use the same BOOST_ROOT and Boost_NAMESPACE for Thrift

--- cmake_modules/ThirdpartyToolchain.cmake
+++ cmake_modules/ThirdpartyToolchain.cmake
@@ -205,6 +205,14 @@
                         "-DWITH_LIBEVENT=OFF"
                         )

+  # Thrift also uses boost. Forward important boost settings if there were ones passed.
+  if (DEFINED BOOST_ROOT)
+    set(THRIFT_CMAKE_ARGS ${THRIFT_CMAKE_ARGS} "-DBOOST_ROOT=${BOOST_ROOT}")
+  endif()
+  if (DEFINED Boost_NAMESPACE)
+    set(THRIFT_CMAKE_ARGS ${THRIFT_CMAKE_ARGS} "-DBoost_NAMESPACE=${Boost_NAMESPACE}")
+  endif()
+
   set(THRIFT_STATIC_LIB_NAME "${CMAKE_STATIC_LIBRARY_PREFIX}thrift")
   if (MSVC)
     if (PARQUET_USE_STATIC_CRT)


Customize Windows build flags

Customize Windows build flags

--- cmake_scripts/default_build_setup.cmake
+++ cmake_scripts/default_build_setup.cmake
@@ -19,8 +19,12 @@
 # build shared instead of static libraries
 set(BUILD_SHARED_LIBS TRUE)

-# flags for all compilation modes
-set(CMAKE_CXX_FLAGS "-Wall -Wextra")
+if (UNIX)
+    # flags apply for both Linux and OSX!
+    set(CMAKE_CXX_FLAGS "-Wall -Wextra")
+elseif()
+    set(CMAKE_CXX_FLAGS "/W4")
+endif()

 if (APPLE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")


Split off 7.12.86

Split off 7.12.86

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

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


Split off 6.0.4

Split off 6.0.4

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

--- version.cmake
+++ version.cmake
@@ -4,7 +4,7 @@
 set ( HPCC_PROJECT "community" )
 set ( HPCC_MAJOR 6 )
 set ( HPCC_MINOR 0 )
-set ( HPCC_POINT 2 )
-set ( HPCC_MATURITY "release" )
+set ( HPCC_POINT 3 )
+set ( HPCC_MATURITY "closedown" )
 set ( HPCC_SEQUENCE 1 )
 ###


Split off 8.0.64

Split off 8.0.64

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

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


Split off 7.10.64

Split off 7.10.64

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

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


Remove yet more standard universe code

Remove yet more standard universe code

--- build/cmake/CondorConfigure.cmake
+++ build/cmake/CondorConfigure.cmake
@@ -1382,20 +1382,6 @@

 	check_cxx_compiler_flag(-shared HAVE_CC_SHARED)

-	if ( NOT CLIPPED AND ${SYS_ARCH} MATCHES "86")
-
-		if (NOT ${SYS_ARCH} MATCHES "64" )
-			add_definitions( -DI386=${SYS_ARCH} )
-		endif()
-
-		# set for maximum binary compatibility based on current machine arch.
-		check_c_compiler_flag(-mtune=generic c_mtune)
-		if (c_mtune)
-			set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mtune=generic")
-		endif(c_mtune)
-
-	endif()
-
 	add_definitions(-D${SYS_ARCH}=${SYS_ARCH})

 	# Append C flags list to C++ flags list.


add library path

add library path

--- cmake/Modules/FindSpinnaker.cmake
+++ cmake/Modules/FindSpinnaker.cmake
@@ -20,7 +20,7 @@

 find_library(SPINNAKER_LIBRARY NAMES Spinnaker libSpinnaker
              HINTS ${PC_SPINNAKER_LIBDIR} ${PC_SPINNAKER_LIBRARY_DIRS}
-             PATHS /opt/
+             PATHS /opt/ /opt/spinnaker/lib
              PATH_SUFFIXES spinnaker/lib)

 include(FindPackageHandleStandardArgs)


CELIX-335: Fix for deploying bundles using absolute paths

--- cmake/cmake_celix/Packaging.cmake
+++ cmake/cmake_celix/Packaging.cmake
@@ -556,7 +556,7 @@
     foreach(BUNDLE IN ITEMS ${BD_BUNDLES})
         if (IS_ABSOLUTE ${BUNDLE} AND EXISTS ${BUNDLE})
             get_filename_component(BUNDLE_FILENAME ${BUNDLE} NAME)
-            set(OUT "${DEPLOY_LOC}/${BD_DIR_NAME}/${BUNDLE_FILENAME}.zip")
+            set(OUT "${DEPLOY_LOC}/${BD_DIR_NAME}/${BUNDLE_FILENAME}")
             add_custom_command(OUTPUT ${OUT}
                 COMMAND ${CMAKE_COMMAND} -E copy_if_different ${BUNDLE} ${OUT}
                 COMMENT "Copying bundle '${BUNDLE}' to '${DEPLOY_LOC}/${BD_DIR_NAME}'"
@@ -591,7 +591,7 @@
            if(COPY)
                 if(IS_ABSOLUTE ${BUNDLE} AND EXISTS ${BUNDLE})
                     get_filename_component(BUNDLE_FILENAME ${BUNDLE} NAME)
-                    list(APPEND BUNDLES ${BUNDLE_FILENAME})
+                    list(APPEND BUNDLES "bundles/${BUNDLE_FILENAME}")
                 else() #assuming target
                     list(APPEND BUNDLES "bundles/${BUNDLE}.zip")
                 endif()
@@ -604,7 +604,7 @@
            endif()
    endforeach()

-   if(DEPLOY_COPY)
+   if(COPY)
        deploy_bundles_dir(${DEPLOY_NAME} DIR_NAME bundles BUNDLES ${ARGN})
    endif()