Improved naming for _add_variant_link_flags's parameter for library search directories.

`LIBRARY_SEARCH_DIRECTORIES` is actually being used as
`RESULT_VAR_NAME` to affect the value on the parent scope. In this
context `LIBRARY_SEARCH_DIRECTORIES_VAR_NAME` sounds like a better name.

--- cmake/modules/AddSwift.cmake
+++ cmake/modules/AddSwift.cmake
@@ -293,7 +293,7 @@
 function(_add_variant_link_flags)
   set(oneValueArgs SDK ARCH BUILD_TYPE ENABLE_ASSERTIONS ANALYZE_CODE_COVERAGE
   DEPLOYMENT_VERSION_OSX DEPLOYMENT_VERSION_IOS DEPLOYMENT_VERSION_TVOS DEPLOYMENT_VERSION_WATCHOS
-  RESULT_VAR_NAME ENABLE_LTO LTO_OBJECT_NAME LIBRARY_SEARCH_DIRECTORIES)
+  RESULT_VAR_NAME ENABLE_LTO LTO_OBJECT_NAME LIBRARY_SEARCH_DIRECTORIES_VAR_NAME)
   cmake_parse_arguments(LFLAGS
     ""
     "${oneValueArgs}"
@@ -309,7 +309,7 @@
   endif()

   set(result ${${LFLAGS_RESULT_VAR_NAME}})
-  set(library_search_directories ${${LFLAGS_LIBRARY_SEARCH_DIRECTORIES}})
+  set(library_search_directories ${${LFLAGS_LIBRARY_SEARCH_DIRECTORIES_VAR_NAME}})

   _add_variant_c_compile_link_flags(
     SDK "${LFLAGS_SDK}"
@@ -365,7 +365,7 @@
   endif()

   set("${LFLAGS_RESULT_VAR_NAME}" "${result}" PARENT_SCOPE)
-  set("${LFLAGS_LIBRARY_SEARCH_DIRECTORIES}" "${library_search_directories}" PARENT_SCOPE)
+  set("${LFLAGS_LIBRARY_SEARCH_DIRECTORIES_VAR_NAME}" "${library_search_directories}" PARENT_SCOPE)
 endfunction()

 # Look up extra flags for a module that matches a regexp.
@@ -1055,7 +1055,7 @@
     DEPLOYMENT_VERSION_TVOS "${SWIFTLIB_DEPLOYMENT_VERSION_TVOS}"
     DEPLOYMENT_VERSION_WATCHOS "${SWIFTLIB_DEPLOYMENT_VERSION_WATCHOS}"
     RESULT_VAR_NAME link_flags
-    LIBRARY_SEARCH_DIRECTORIES library_search_directories
+    LIBRARY_SEARCH_DIRECTORIES_VAR_NAME library_search_directories
       )

   if(SWIFT_ENABLE_GOLD_LINKER AND


build: remove swiftCore workaround in `_add_swift_host_library`

--- cmake/modules/AddSwift.cmake
+++ cmake/modules/AddSwift.cmake
@@ -976,17 +976,6 @@
     ${link_libraries})
   target_link_directories(${target} PRIVATE
     ${library_search_directories})
-
-  # NOTE(compnerd) use the C linker language to invoke `clang` rather than
-  # `clang++` as we explicitly link against the C++ runtime.  We were previously
-  # actually passing `-nostdlib++` to avoid the C++ runtime linkage.
-  if("${SWIFTLIB_SINGLE_SDK}" STREQUAL "ANDROID")
-    set_property(TARGET "${target}" PROPERTY
-      LINKER_LANGUAGE "C")
-  else()
-    set_property(TARGET "${target}" PROPERTY
-      LINKER_LANGUAGE "CXX")
-  endif()

   # Do not add code here.
 endfunction()


BUG: mantis 1150 - remove with-libkml from gdal superbuild

--- SuperBuild/CMake/External_gdal.cmake
+++ SuperBuild/CMake/External_gdal.cmake
@@ -13,7 +13,7 @@
   message(STATUS "  Using GDAL SuperBuild version")

   # declare dependencies
-  ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(${proj} TIFF CURL GEOTIFF PNG JPEG OPENJPEG SQLITE GEOS ZLIB EXPAT LIBKML)
+  ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(${proj} TIFF CURL GEOTIFF PNG JPEG OPENJPEG SQLITE GEOS ZLIB EXPAT)

   INCLUDE_SUPERBUILD_DEPENDENCIES(${${proj}_DEPENDENCIES})
   # set proj back to its original value
@@ -27,7 +27,6 @@
   ADD_SUPERBUILD_CONFIGURE_VAR(SQLITE_ROOT   --with-sqlite3)
   ADD_SUPERBUILD_CONFIGURE_VAR(ZLIB_ROOT     --with-libz)
   ADD_SUPERBUILD_CONFIGURE_VAR(EXPAT_ROOT    --with-expat)
-  ADD_SUPERBUILD_CONFIGURE_VAR(LIBKML_ROOT   --with-libkml)
   ADD_SUPERBUILD_CONFIGURE_VAR(CURL_ROOT     --with-curl "/bin/curl-config")
   ADD_SUPERBUILD_CONFIGURE_VAR(GEOS_ROOT     --with-geos "/bin/geos-config")


SuperBuild: jpeg cleanup cmake opts

SuperBuild: jpeg cleanup cmake opts

--- SuperBuild/CMake/External_jpeg.cmake
+++ SuperBuild/CMake/External_jpeg.cmake
@@ -23,11 +23,9 @@
     BINARY_DIR ${JPEG_SB_BUILD_DIR}
     INSTALL_DIR ${SB_INSTALL_PREFIX}
     DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
-    DEPENDS ${${proj}_DEPENDENCIES}
     CMAKE_ARGS
     -DCMAKE_BUILD_TYPE=Release
     -DCMAKE_C_FLAGS=-DSIZEOF_SIZE_T=${JPEG_SIZEOF_SIZE_T}
-    -DCMAKE_VERBOSE_MAKEFILE=TRUE
     -DENABLE_SHARED=TRUE
     -DENABLE_STATIC=FALSE
     -DWITH_SIMD=FALSE
@@ -38,6 +36,7 @@
   if(MSVC)
     ExternalProject_Add_Step(${proj} patch_jconfigint
       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/patches/${proj}/jconfigint.h.in ${JPEG_SB_SRC}/win/
+      DEPENDEES update
       DEPENDERS configure)
   endif()


Whitespace changes generated by emacs mode.

svn path=/trunk/; revision=9221

--- cmake/modules/freetype.cmake
+++ cmake/modules/freetype.cmake
@@ -20,100 +20,100 @@
 # Configuration for the freetype support in plplot.

 option(
-WITH_FREETYPE
-"Enable driver options for using freetype library for fonts"
-ON
-)
+  WITH_FREETYPE
+  "Enable driver options for using freetype library for fonts"
+  ON
+  )

 # Look for freetype libraries
 if (WITH_FREETYPE)
   find_package(Freetype)
   if (NOT FREETYPE_FOUND)
     set(WITH_FREETYPE OFF
-    CACHE BOOL "Enable driver options for using freetype library for fonts"
-    FORCE
-    )
+      CACHE BOOL "Enable driver options for using freetype library for fonts"
+      FORCE
+      )
   endif (NOT FREETYPE_FOUND)
 endif (WITH_FREETYPE)

 if (WITH_FREETYPE)

-if(WIN32)
-  set(
-  PL_FREETYPE_FONT_PATH
-  "c:/windows/fonts"
-  CACHE PATH "Path for TrueType fonts"
-  )
-else(WIN32)
-  set(
-  PL_FREETYPE_FONT_PATH
-  "/usr/share/fonts/truetype/freefont"
-  CACHE PATH "Path for TrueType fonts"
-  )
-endif(WIN32)
-# PLplot internally needs a trailing slash for this path.
-set(PL_FREETYPE_FONT_DIR "${PL_FREETYPE_FONT_PATH}/")
+  if(WIN32)
+    set(
+      PL_FREETYPE_FONT_PATH
+      "c:/windows/fonts"
+      CACHE PATH "Path for TrueType fonts"
+      )
+  else(WIN32)
+    set(
+      PL_FREETYPE_FONT_PATH
+      "/usr/share/fonts/truetype/freefont"
+      CACHE PATH "Path for TrueType fonts"
+      )
+  endif(WIN32)
+  # PLplot internally needs a trailing slash for this path.
+  set(PL_FREETYPE_FONT_DIR "${PL_FREETYPE_FONT_PATH}/")

-set(PL_FREETYPE_FONT_LIST
-"PL_FREETYPE_MONO:FreeMono.ttf:cour.ttf"
-"PL_FREETYPE_MONO_BOLD:FreeMonoBold.ttf:courbd.ttf"
-"PL_FREETYPE_MONO_BOLD_ITALIC:FreeMonoBoldOblique.ttf:courbi.ttf"
-"PL_FREETYPE_MONO_BOLD_OBLIQUE:FreeMonoBoldOblique.ttf:courbi.ttf"
-"PL_FREETYPE_MONO_ITALIC:FreeMonoOblique.ttf:couri.ttf"
-"PL_FREETYPE_MONO_OBLIQUE:FreeMonoOblique.ttf:couri.ttf"
-"PL_FREETYPE_SANS:FreeSans.ttf:arial.ttf"
-"PL_FREETYPE_SANS_BOLD:FreeSansBold.ttf:arialbd.ttf"
-"PL_FREETYPE_SANS_BOLD_ITALIC:FreeSansBoldOblique.ttf:arialbi.ttf"
-"PL_FREETYPE_SANS_BOLD_OBLIQUE:FreeSansBoldOblique.ttf:arialbi.ttf"
-"PL_FREETYPE_SANS_ITALIC:FreeSansOblique.ttf:ariali.ttf"
-"PL_FREETYPE_SANS_OBLIQUE:FreeSansOblique.ttf:ariali.ttf"
-"PL_FREETYPE_SCRIPT:FreeSerif.ttf:arial.ttf"
-"PL_FREETYPE_SCRIPT_BOLD:FreeSerifBold.ttf:arialbd.ttf"
-"PL_FREETYPE_SCRIPT_BOLD_ITALIC:FreeSerifBoldItalic.ttf:arialbi.ttf"
-"PL_FREETYPE_SCRIPT_BOLD_OBLIQUE:FreeSerifBoldItalic.ttf:arialbi.ttf"
-"PL_FREETYPE_SCRIPT_ITALIC:FreeSerifItalic.ttf:ariali.ttf"
-"PL_FREETYPE_SCRIPT_OBLIQUE:FreeSerifItalic.ttf:ariali.ttf"
-"PL_FREETYPE_SERIF:FreeSerif.ttf:times.ttf"
-"PL_FREETYPE_SERIF_BOLD:FreeSerifBold.ttf:timesbd.ttf"
-"PL_FREETYPE_SERIF_BOLD_ITALIC:FreeSerifBoldItalic.ttf:timesbi.ttf"
-"PL_FREETYPE_SERIF_BOLD_OBLIQUE:FreeSerifBoldItalic.ttf:timesbi.ttf"
-"PL_FREETYPE_SERIF_ITALIC:FreeSerifItalic.ttf:timesi.ttf"
-"PL_FREETYPE_SERIF_OBLIQUE:FreeSerifItalic.ttf:timesi.ttf"
-"PL_FREETYPE_SYMBOL:FreeSerif.ttf:times.ttf"
-"PL_FREETYPE_SYMBOL_BOLD:FreeSerifBold.ttf:timesbd.ttf"
-"PL_FREETYPE_SYMBOL_BOLD_ITALIC:FreeSerifBoldItalic.ttf:timesbi.ttf"
-"PL_FREETYPE_SYMBOL_BOLD_OBLIQUE:FreeSerifBoldItalic.ttf:timesbi.ttf"
-"PL_FREETYPE_SYMBOL_ITALIC:FreeSerifItalic.ttf:timesi.ttf"
-"PL_FREETYPE_SYMBOL_OBLIQUE:FreeSerifItalic.ttf:timesi.ttf"
-)
+  set(PL_FREETYPE_FONT_LIST
+    "PL_FREETYPE_MONO:FreeMono.ttf:cour.ttf"
+    "PL_FREETYPE_MONO_BOLD:FreeMonoBold.ttf:courbd.ttf"
+    "PL_FREETYPE_MONO_BOLD_ITALIC:FreeMonoBoldOblique.ttf:courbi.ttf"
+    "PL_FREETYPE_MONO_BOLD_OBLIQUE:FreeMonoBoldOblique.ttf:courbi.ttf"
+    "PL_FREETYPE_MONO_ITALIC:FreeMonoOblique.ttf:couri.ttf"
+    "PL_FREETYPE_MONO_OBLIQUE:FreeMonoOblique.ttf:couri.ttf"
+    "PL_FREETYPE_SANS:FreeSans.ttf:arial.ttf"
+    "PL_FREETYPE_SANS_BOLD:FreeSansBold.ttf:arialbd.ttf"
+    "PL_FREETYPE_SANS_BOLD_ITALIC:FreeSansBoldOblique.ttf:arialbi.ttf"
+    "PL_FREETYPE_SANS_BOLD_OBLIQUE:FreeSansBoldOblique.ttf:arialbi.ttf"
+    "PL_FREETYPE_SANS_ITALIC:FreeSansOblique.ttf:ariali.ttf"
+    "PL_FREETYPE_SANS_OBLIQUE:FreeSansOblique.ttf:ariali.ttf"
+    "PL_FREETYPE_SCRIPT:FreeSerif.ttf:arial.ttf"
+    "PL_FREETYPE_SCRIPT_BOLD:FreeSerifBold.ttf:arialbd.ttf"
+    "PL_FREETYPE_SCRIPT_BOLD_ITALIC:FreeSerifBoldItalic.ttf:arialbi.ttf"
+    "PL_FREETYPE_SCRIPT_BOLD_OBLIQUE:FreeSerifBoldItalic.ttf:arialbi.ttf"
+    "PL_FREETYPE_SCRIPT_ITALIC:FreeSerifItalic.ttf:ariali.ttf"
+    "PL_FREETYPE_SCRIPT_OBLIQUE:FreeSerifItalic.ttf:ariali.ttf"
+    "PL_FREETYPE_SERIF:FreeSerif.ttf:times.ttf"
+    "PL_FREETYPE_SERIF_BOLD:FreeSerifBold.ttf:timesbd.ttf"
+    "PL_FREETYPE_SERIF_BOLD_ITALIC:FreeSerifBoldItalic.ttf:timesbi.ttf"
+    "PL_FREETYPE_SERIF_BOLD_OBLIQUE:FreeSerifBoldItalic.ttf:timesbi.ttf"
+    "PL_FREETYPE_SERIF_ITALIC:FreeSerifItalic.ttf:timesi.ttf"
+    "PL_FREETYPE_SERIF_OBLIQUE:FreeSerifItalic.ttf:timesi.ttf"
+    "PL_FREETYPE_SYMBOL:FreeSerif.ttf:times.ttf"
+    "PL_FREETYPE_SYMBOL_BOLD:FreeSerifBold.ttf:timesbd.ttf"
+    "PL_FREETYPE_SYMBOL_BOLD_ITALIC:FreeSerifBoldItalic.ttf:timesbi.ttf"
+    "PL_FREETYPE_SYMBOL_BOLD_OBLIQUE:FreeSerifBoldItalic.ttf:timesbi.ttf"
+    "PL_FREETYPE_SYMBOL_ITALIC:FreeSerifItalic.ttf:timesi.ttf"
+    "PL_FREETYPE_SYMBOL_OBLIQUE:FreeSerifItalic.ttf:timesi.ttf"
+    )

-foreach(FONT_ENTRY ${PL_FREETYPE_FONT_LIST})
-  string(REGEX REPLACE "^(.*):.*:.*$" "\\1" NAME ${FONT_ENTRY})
-  if (WIN32)
-    string(REGEX REPLACE "^.*:.*:(.*)$" "\\1" FONT ${FONT_ENTRY})
-  else (WIN32)
-    string(REGEX REPLACE "^.*:(.*):.*$" "\\1" FONT ${FONT_ENTRY})
-  endif (WIN32)
-  set(${NAME} ${FONT}
-  CACHE FILEPATH "Font file for ${NAME}"
-  )
-endforeach(FONT_ENTRY PL_FREETYPE_FONT_LIST)
+  foreach(FONT_ENTRY ${PL_FREETYPE_FONT_LIST})
+    string(REGEX REPLACE "^(.*):.*:.*$" "\\1" NAME ${FONT_ENTRY})
+    if (WIN32)
+      string(REGEX REPLACE "^.*:.*:(.*)$" "\\1" FONT ${FONT_ENTRY})
+    else (WIN32)
+      string(REGEX REPLACE "^.*:(.*):.*$" "\\1" FONT ${FONT_ENTRY})
+    endif (WIN32)
+    set(${NAME} ${FONT}
+      CACHE FILEPATH "Font file for ${NAME}"
+      )
+  endforeach(FONT_ENTRY PL_FREETYPE_FONT_LIST)

-# Check a couple of fonts actually exists
-if (EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SANS})
-  if (EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SYMBOL})
-  else (EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SYMBOL})
+  # Check a couple of fonts actually exists
+  if (EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SANS})
+    if (EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SYMBOL})
+    else (EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SYMBOL})
+      message("Fonts not found - disabling freetype")
+      set(WITH_FREETYPE OFF CACHE BOOL
+	"Enable driver options for using freetype library for fonts" FORCE
+	)
+    endif (EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SYMBOL})
+  else (EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SANS})
     message("Fonts not found - disabling freetype")
     set(WITH_FREETYPE OFF CACHE BOOL
-    "Enable driver options for using freetype library for fonts" FORCE
-    )
-  endif (EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SYMBOL})
-else (EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SANS})
-  message("Fonts not found - disabling freetype")
-  set(WITH_FREETYPE OFF CACHE BOOL
-  "Enable driver options for using freetype library for fonts" FORCE
-  )
-endif (EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SANS})
+      "Enable driver options for using freetype library for fonts" FORCE
+      )
+  endif (EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SANS})

 endif (WITH_FREETYPE)


[cmake] : Remove deprecated hacks

[cmake] : Remove deprecated hacks

This feels so good !

--- cmake/qibuild/launcher.cmake
+++ cmake/qibuild/launcher.cmake
@@ -5,86 +5,6 @@
 ##
 ## Copyright (C) 2010 Aldebaran Robotics
 ##
-
-##################
-# Given the SDK_DIRS variable,
-# creates a colon separted string with
-# every paths for PATH:
-##################
-function(_gen_path _res)
-  set(_tmp "")
-  foreach(_dir ${LIB_PREFIX} ${BIN_PREFIX})
-    file(TO_NATIVE_PATH ${_dir} _dos_dir)
-    if(WIN32)
-      set(_tmp "${_dos_dir};${_tmp}")
-    else()
-      set(_tmp "${_dos_dir}:${_tmp}")
-    endif()
-  endforeach()
-set(${_res} "${_tmp}" PARENT_SCOPE)
-endfunction()
-
-########################
-# Given the SDK_DIRS variable,
-# creates a colon-separated or a
-# semi-colon-separated with every
-# paths for PYTHONPATH:
-#
-#########################
-function(_gen_python_path _res)
-  set(_tmp "")
-  foreach(_lib ${LIB_PREFIX})
-      file(TO_NATIVE_PATH ${_lib} _native_lib)
-      if(WIN32)
-        set(_tmp "${_native_lib};${_tmp}")
-      else()
-        set(_tmp "${_native_lib}:${_tmp}")
-      endif()
-  endforeach()
-set(${_res} "${_tmp}" PARENT_SCOPE)
-endfunction()
-
-
-########################
-# Given the SDK_DIRS variable,
-# creates a colon-separated strint with every
-# paths for LD_LIBRARY_PATH:
-#
-#########################
-function(_gen_ld_path _res)
-  set(_tmp "")
-  foreach(_lib ${LIB_PREFIX})
-    set(_tmp "${_lib}:${_tmp}")
-  endforeach()
-set(${_res} "${_tmp}" PARENT_SCOPE)
-endfunction()
-
-########################
-# Given the SDK_DIRS variable,
-# creates a colon-separated strint with every
-# paths for DYLD_LIBRARY_PATH:
-#########################
-function(_gen_dyld_path _res)
-  set(_tmp "")
-  foreach(_lib ${LIB_PREFIX})
-    set(_tmp "${_lib}:${_tmp}")
-  endforeach()
-set(${_res} "${_tmp}" PARENT_SCOPE)
-endfunction()
-
-########################
-# Given the SDK_DIRS variable,
-# creates a colon-separated strint with every
-# paths for DYLD_FRAMEWORK_PATH:
-#########################
-function(_gen_framework_path _res)
-  set(_tmp "")
-  foreach(_framework ${FRAMEWORK_PREFIX})
-    set(_tmp "${_framework}:${_tmp}")
-  endforeach()
-set(${_res} "${_tmp}" PARENT_SCOPE)
-endfunction()
-

 #!
 #
@@ -95,6 +15,7 @@
 # Usage:
 # gen_trampoline(_binary_name _trampoline_name)
 #TODO: DOC
+#FIXME: is this really necessary?
 function(qi_create_launcher _binary_name _trampo_name)
   configure_file("${T001CHAIN_DIR}/cmake/templates/trampoline_${TARGET_ARCH}.in"
                  "${CMAKE_CURRENT_BINARY_DIR}/${_trampo_name}"
@@ -105,51 +26,3 @@
     DESTINATION
     ".")
 endfunction()
-
-#! Create a launcher for an executable.
-# This launcher will set environment variable
-# for python and dynamics libraries.
-#
-#TODO: DOC
-function(qi_create_insource_launcher _binary_name _trampo_name)
-  cmake_parse_arguments(ARG "EXTERNAL_BINARY" "" "" ${ARGN})
-  if(WIN32)
-    _gen_path(_path)
-    string(REPLACE "/" "\\" _dos_sdk_dir ${QI_SDK_DIR})
-  else()
-    if(APPLE)
-      _gen_framework_path(_framework_path)
-      _gen_dyld_path(_dyld_path)
-    else()
-      _gen_ld_path(_ld_path)
-    endif()
-  endif()
-  _gen_python_path(_python_path)
-
-  if (ARG_EXTERNAL_BINARY)
-    if(WIN32)
-      string(REPLACE "/" "\\" _dos_binary_name ${_binary_name})
-      set(_exec_path "${_dos_binary_name}")
-    else()
-      set(_exec_path "${_binary_name}")
-    endif()
-  else()
-    if(WIN32)
-      set(_exec_path "${_dos_sdk_dir}\\${QI_SDK_BIN}\\${_binary_name}")
-    else()
-      set(_exec_path "${QI_SDK_DIR}/${QI_SDK_BIN}/${_binary_name}")
-    endif()
-  endif()
-
-  if (NOT APPLE)
-    set(_python_pc_python_home "${_PYTHON_PC_DIR}/${TARGET_ARCH}")
-  else()
-    set(_python_pc_python_home "${_PYTHON_PC_DIR}/${TARGET_ARCH}/Frameworks/Python.framework/Versions/Current")
-  endif()
-
-  configure_file("${QI_TEMPLATE_DIR}/trampoline_sdk_${TARGET_ARCH}.in"
-                 "${CMAKE_CURRENT_BINARY_DIR}/${_trampo_name}.conf"
-                 @ONLY)
-  create_script("${_trampo_name}" "${CMAKE_CURRENT_BINARY_DIR}/${_trampo_name}.conf" NO_INSTALL)
-
-endfunction()


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


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   27)
+SET(KWSYS_DATE_STAMP_DAY   28)


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   07)
+SET(KWSYS_DATE_STAMP_DAY   08)


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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


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

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


idl-config: remove leftover comment.

idl-config: remove leftover comment.

Change-Id: I8ebcd38efead7fcc482188f150c04e9ba853153c

--- codegen/src/idl-config.cmake
+++ codegen/src/idl-config.cmake
@@ -1,6 +1,6 @@

 qi_global_set(qi_create_module_file ${CMAKE_CURRENT_LIST_FILE})
-message("woot ${qi_create_module_file}")
+
 #! Create a naoqi module
 # \group:CLASSES list of class names to be exposed to naoqi as objects
 # \group:SERVICES list of class names to be exposed to naoqi as services


Fixed cmake warning calling find_package_handle_standard_args(...).

--- cmake/CMakeModules/Findossim.cmake
+++ cmake/CMakeModules/Findossim.cmake
@@ -31,7 +31,7 @@
 # This function sets OSSIM_FOUND if variables are valid.
 #---
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args( OSSIM DEFAULT_MSG
+find_package_handle_standard_args( ossim DEFAULT_MSG
                                    OSSIM_LIBRARY
                                    OSSIM_INCLUDE_DIR )


Make arrow verion 0.10.0 default.

Make arrow verion 0.10.0 default.

--- cmake/Modules/ConfigureArrow.cmake
+++ cmake/Modules/ConfigureArrow.cmake
@@ -46,7 +46,7 @@
 set(ARROW_ROOT ${ARROW_DOWNLOAD_BINARY_DIR}/arrow-prefix/src/arrow-install/usr/local/)

 # Need ARROW_VERSION for setting correct ARROW_GENERATED_IPC_DIR
-set(ARROW_VERSION "apache-arrow-0.7.1")
+set(ARROW_VERSION "apache-arrow-0.10.0")
 if (NOT "$ENV{PARQUET_ARROW_VERSION}" STREQUAL "")
     set(ARROW_VERSION "$ENV{PARQUET_ARROW_VERSION}")
 endif()


Add EXEC argument in add_samp_plugin_test()

--- cmake/Modules/SampPluginTest.cmake
+++ cmake/Modules/SampPluginTest.cmake
@@ -16,7 +16,7 @@
 function(add_samp_plugin_test)
 	set(name "${ARGV0}")

-	set(options "TARGET" "OUT_FILE" "SCRIPT" "TIMEOUT")
+	set(options "TARGET" "OUT_FILE" "SCRIPT" "TIMEOUT" "EXEC")
 	cmake_parse_arguments(ARG "" "${options}" ${ARGN})

 	if(NOT ARG_TARGET)
@@ -31,6 +31,9 @@
 	if(NOT ARG_TIMEOUT)
 		set(ARG_TIMEOUT "0.5")
 	endif()
+	if(NOT ARG_EXEC)
+		set(ARG_EXEC "${CMAKE_CURRENT_SOURCE_DIR}/${name}.cfg")
+	endif()

 	get_target_property(PLUGIN_PATH ${ARG_TARGET} LOCATION)

@@ -41,9 +44,8 @@
 		"--gamemode" "${ARG_SCRIPT}"
 	)

-	set(config "${CMAKE_CURRENT_SOURCE_DIR}/${name}.cfg")
-	if(EXISTS ${config})
-		list(APPEND arguments "--exec" "${config}")
+	if(EXISTS "${ARG_EXEC}")
+		list(APPEND arguments "--exec" "${ARG_EXEC}")
 	endif()

 	file(READ "${ARG_OUT_FILE}" out)


Fix compiler checks to match clang on OS X, which CMake labels AppleClang.

--- CMake/CompilerFlags.cmake
+++ CMake/CompilerFlags.cmake
@@ -14,7 +14,7 @@
     -Wunreachable-code
 )

-if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
     add_compile_options(
         -Wassign-enum
         -Wbool-conversion
@@ -29,7 +29,7 @@
 endif()

 if(${CMAKE_GENERATOR} STREQUAL "Ninja")
-    if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+    if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fcolor-diagnostics")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics")
     elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")


Added possibility to add build name suffixes.

--- CMake/MITKDashboardSetup.cmake
+++ CMake/MITKDashboardSetup.cmake
@@ -56,6 +56,7 @@
   else()
     set(CTEST_BUILD_NAME "${MY_OPERATING_SYSTEM} ${MY_COMPILER} ${CTEST_BUILD_CONFIGURATION}")
   endif()
+  set(CTEST_BUILD_NAME "${CTEST_BUILD_NAME}${CTEST_BUILD_NAME_SUFFIX}")
 endif()
 set(PROJECT_BUILD_DIR "MITK-build")


Porting to CMake: improve PYQT4_WRAP_UIC macro for multiple usage in the same project: name of the custom target should be globally unique within the project.

--- adm_local/cmake_files/UsePyQt4.cmake
+++ adm_local/cmake_files/UsePyQt4.cmake
@@ -17,6 +17,31 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 # Author: Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
+
+####################################################################
+#
+# _PYQT4_WRAP_GET_UNIQUE_TARGET_NAME: internal function
+#
+# Used to generate unique custom target name for usage in
+# PYQT4_WRAP_UIC macro.
+#
+# USAGE: _PYQT4_WRAP_GET_UNIQUE_TARGET_NAME(prefix unique_name)
+#
+# ARGUMENTS:
+#   prefix [in] prefix for the name
+#   unique_name [out] unique name generated by function
+#
+####################################################################
+FUNCTION(_PYQT4_WRAP_GET_UNIQUE_TARGET_NAME name unique_name)
+   SET(_propertyName "_PYQT4_WRAP_UNIQUE_COUNTER_${name}")
+   GET_PROPERTY(_currentCounter GLOBAL PROPERTY "${_propertyName}")
+   IF(NOT _currentCounter)
+      SET(_currentCounter 1)
+   ENDIF()
+   SET(${unique_name} "${name}_${_currentCounter}" PARENT_SCOPE)
+   MATH(EXPR _currentCounter "${_currentCounter} + 1")
+   SET_PROPERTY(GLOBAL PROPERTY ${_propertyName} ${_currentCounter} )
+ENDFUNCTION()

 ####################################################################
 #
@@ -49,7 +74,8 @@
       )
     SET(${outfiles} ${${outfiles}} ${_output})
   ENDFOREACH()
-  ADD_CUSTOM_TARGET(BUILD_UI_PY_FILES ALL DEPENDS ${${outfiles}})
+  _PYQT4_WRAP_GET_UNIQUE_TARGET_NAME(BUILD_UI_PY_FILES _uniqueTargetName)
+  ADD_CUSTOM_TARGET(${_uniqueTargetName} ALL DEPENDS ${${outfiles}})
 ENDMACRO(PYQT4_WRAP_UIC)

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


build system: quote LD script search paths in target_linker_script

--- tools/cmake/utilities.cmake
+++ tools/cmake/utilities.cmake
@@ -158,9 +158,9 @@
             get_target_property(link_libraries "${target}" LINK_LIBRARIES)
         endif()

-        list(FIND "${link_libraries}" "-L ${search_dir}" found_search_dir)
+        list(FIND "${link_libraries}" "-L \"${search_dir}\"" found_search_dir)
         if(found_search_dir EQUAL "-1")  # not already added as a search path
-            target_link_libraries("${target}" "${deptype}" "-L ${search_dir}")
+            target_link_libraries("${target}" "${deptype}" "-L \"${search_dir}\"")
         endif()

         target_link_libraries("${target}" "${deptype}" "-T ${scriptname}")


Fix expansion for Adol-C numbers

Fix expansion for Adol-C numbers

--- cmake/configure/configure_adolc.cmake
+++ cmake/configure/configure_adolc.cmake
@@ -69,7 +69,7 @@
   SET(DEAL_II_ADOLC_WITH_ATRIG_ERF ${ADOLC_WITH_ATRIG_ERF})
   SET(DEAL_II_ADOLC_WITH_ADVANCED_BRANCHING ${ADOLC_WITH_ADVANCED_BRANCHING})

-  SET(DEAL_II_EXPAND_ADOLC_TYPES "::adouble; adtl::adouble")
+  SET(DEAL_II_EXPAND_ADOLC_TYPES "adouble; adtl::adouble")
 ENDMACRO()


Silence C4709 in MSVC because it is buggy.

The diagnostic will trigger on code that does not have any comma operator, but instead default-constructs an object with an explicitly defaulted constructor as the array index argument.

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

--- cmake/modules/HandleLLVMOptions.cmake
+++ cmake/modules/HandleLLVMOptions.cmake
@@ -513,6 +513,10 @@
           # Update 1. Re-evaluate the usefulness of this diagnostic with Update 2.
       -wd4592 # Suppress ''var': symbol will be dynamically initialized (implementation limitation)
       -wd4319 # Suppress ''operator' : zero extending 'type' to 'type' of greater size'
+          # C4709 is disabled because of a bug with Visual Studio 2017 as of
+          # v15.8.8. Re-evaluate the usefulness of this diagnostic when the bug
+          # is fixed.
+      -wd4709 # Suppress comma operator within array index expression

       # Ideally, we'd like this warning to be enabled, but MSVC 2013 doesn't
       # support the 'aligned' attribute in the way that clang sources requires (for


Removed ; from generated Makefile.config

--- cmake/modules/RootConfiguration.cmake
+++ cmake/modules/RootConfiguration.cmake
@@ -144,63 +144,62 @@

 set(buildldap ${value${ldap}})
 set(ldaplibdir ${LDAP_LIBRARY_DIR})
-set(ldaplib ${LDAP_LIBRARY})
+string(REPLACE ";" " " ldaplib "${LDAP_LIBRARY}")
 set(ldapincdir ${LDAP_INCLUDE_DIR})

 set(buildmysql ${value${mysql}})
 set(mysqllibdir ${MYSQL_LIBRARY_DIR})
-set(mysqllib ${MYSQL_LIBRARY})
+string(REPLACE ";" " " mysqllib "${MYSQL_LIBRARY}")
 set(mysqlincdir ${MYSQL_INCLUDE_DIR})

 set(buildoracle ${value${oracle}})
 set(oraclelibdir ${ORACLE_LIBRARY_DIR})
-set(oraclelib ${ORACLE_LIBRARY})
+string(REPLACE ";" " " oraclelib "${ORACLE_LIBRARY}")
 set(oracleincdir ${ORACLE_INCLUDE_DIR})

 set(buildpgsql ${value${pgsql}})
 set(pgsqllibdir ${PGSQL_LIBRARY_DIR})
-set(pgsqllib ${PGSQL_LIBRARY})
+string(REPLACE ";" " " pgsqllib "${PGSQL_LIBRARY}")
 set(pgsqlincdir ${PGSQL_INCLUDE_DIR})

 set(buildsqlite ${value${sqlite}})
 set(sqlitelibdir ${SQLITE_LIBRARY_DIR})
-set(sqlitelib ${SQLITE_LIBRARY})
+string(REPLACE ";" " " sqlitelib "${SQLITE_LIBRARY}")
 set(sqliteincdir ${SQLITE_INCLUDE_DIR})

 set(buildsapdb ${value${sapdb}})
 set(sapdblibdir ${SAPDB_LIBRARY_DIR})
-set(sapdblib ${SAPDB_LIBRARY})
+string(REPLACE ";" " " sapdblib "${SAPDB_LIBRARY}")
 set(sapdbincdir ${SAPDB_INCLUDE_DIR})

 set(buildodbc ${value${odbc}})
 set(odbclibdir ${OCDB_LIBRARY_DIR})
-set(odbclib ${OCDB_LIBRARY})
+string(REPLACE ";" " " odbclib "${OCDB_LIBRARY}")
 set(odbcincdir ${OCDB_INCLUDE_DIR})

 set(buildqt ${value${qt}})
 set(buildqtpsi ${value${qtgsi}})
 set(qtlibdir ${QT_LIBRARY_DIR})
-set(qtlib ${QT_QT_LIBRARY})
+string(REPLACE ";" " " qtlib "${QT_QT_LIBRARY}")
 set(qtincdir ${QT_INCLUDE_DIR})
 set(qtvers ${QT_VERSION_MAJOR})
 set(qtmocexe ${QT_MOC_EXECUTABLE})

 set(buildrfio ${value${rfio}})
 set(shiftlibdir ${RFIO_LIBRARY_DIR})
-set(shiftlib ${RFIO_LIBRARY})
+string(REPLACE ";" " " shiftlib "${RFIO_LIBRARY}")
 set(shiftincdir ${RFIO_INCLUDE_DIR})
 set(shiftcflags)

 set(buildcastor ${value${castor}})
 set(castorlibdir ${CASTOR_LIBRARY_DIR})
-set(castorlib ${CASTOR_LIBRARY})
+string(REPLACE ";" " " castorlib "${CASTOR_LIBRARY}")
 set(castorincdir ${CASTOR_INCLUDE_DIR})
 set(castorcflags)

-
 set(builddavix ${value${davix}})
 set(davixlibdir ${DAVIX_LIBRARY_DIR})
-set(davixlib ${DAVIX_LIBRARY})
+string(REPLACE ";" " " davixlib "${DAVIX_LIBRARY}")
 set(davixincdir ${DAVIX_INCLUDE_DIR})
 if(davix)
   set(useoldwebfile no)
@@ -217,59 +216,59 @@

 set(builddcap ${value${dcap}})
 set(dcaplibdir ${DCAP_LIBRARY_DIR})
-set(dcaplib ${DCAP_LIBRARY})
+string(REPLACE ";" " " dcaplib "${DCAP_LIBRARY}")
 set(dcapincdir ${DCAP_INCLUDE_DIR})

 set(buildftgl ${value${builtin_ftgl}})
 set(ftgllibdir ${FTGL_LIBRARY_DIR})
-set(ftgllibs ${FTGL_LIBRARIES})
+string(REPLACE ";" " " ftgllibs "${FTGL_LIBRARIES}")
 set(ftglincdir ${FTGL_INCLUDE_DIR})

 set(buildglew ${value${builtin_glew}})
 set(glewlibdir ${GLEW_LIBRARY_DIR})
-set(glewlibs ${GLEW_LIBRARIES})
+string(REPLACE ";" " " glewlibs "${GLEW_LIBRARIES}")
 set(glewincdir ${GLEW_INCLUDE_DIR})

 set(buildgfal ${value${gfal}})
 set(gfallibdir ${GFAL_LIBRARY_DIR})
-set(gfallib ${GFAL_LIBRARY})
+string(REPLACE ";" " " gfallib "${GFAL_LIBRARY}")
 set(gfalincdir ${GFAL_INCLUDE_DIR})

 set(buildglite ${value${glite}})
 set(glitelibdir ${GLITE_LIBRARY_DIR})
-set(glitelib ${GLITE_LIBRARY})
+string(REPLACE ";" " " glitelib "${GLITE_LIBRARY}")
 set(gaw_cppflags)

 set(buildmemstat ${value${memstat}})

 set(buildbonjour ${value${bonjour}})
 set(dnssdlibdir ${BONJOUR_LIBRARY_DIR})
-set(dnssdlib ${BONJOUR_LIBRARY})
+string(REPLACE ";" " " dnssdlib "${BONJOUR_LIBRARY}")
 set(dnsdincdir ${BONJOUR_INCLUDE_DIR})
 set(bonjourcppflags)

 set(buildchirp ${value${chirp}})
 set(chirplibdir ${CHIRP_LIBRARY_DIR})
-set(chirplib ${CHIRP_LIBRARY})
+string(REPLACE ";" " " chirplib "${CHIRP_LIBRARY}")
 set(chirpincdir ${CHIRP_INCLUDE_DIR})

 set(buildhdfs ${value${hdfs}})
 set(hdfslibdir ${HDFS_LIBRARY_DIR})
-set(hdfslib ${HDFS_LIBRARY})
+string(REPLACE ";" " " hdfslib "${HDFS_LIBRARY}")
 set(hdfsincdir ${HDFS_INCLUDE_DIR})

 set(jniincdir ${Java_INCLUDE_DIRS})
-set(jvmlib ${Java_LIBRARIES})
+string(REPLACE ";" " " jvmlib "${Java_LIBRARIES}")
 set(jvmlibdir ${Java_LIBRARY_DIR})

 set(buildalien ${value${alien}})
 set(alienlibdir ${ALIEN_LIBRARY_DIR})
-set(alienlib ${ALIEN_LIBRARY})
+string(REPLACE ";" " " alienlib "${ALIEN_LIBRARY}")
 set(alienincdir ${ALIEN_INCLUDE_DIR})

 set(buildasimage ${value${asimage}})
 set(builtinafterimage ${builtin_afterimage})
-set(asextralib ${ASEXTRA_LIBRARIES})
+string(REPLACE ";" " " asextralib "${ASEXTRA_LIBRARIES}")
 set(asextralibdir)
 set(asjpegincdir ${JPEG_INCLUDE_DIR})
 set(aspngincdir ${PNG_INCLUDE_DIR})
@@ -281,43 +280,44 @@

 set(buildpythia6 ${value${pythia6}})
 set(pythia6libdir ${PYTHIA6_LIBRARY_DIR})
-set(pythia6lib ${PYTHIA6_LIBRARY})
+string(REPLACE ";" " " pythia6lib "${PYTHIA6_LIBRARY}")
 set(pythia6cppflags)
+
 set(buildpythia8 ${value${pythia8}})
 set(pythia8libdir ${PYTHIA8_LIBRARY_DIR})
-set(pythia8lib ${PYTHIA8_LIBRARY})
+string(REPLACE ";" " " pythia8lib "${PYTHIA8_LIBRARY}")
 set(pythia8cppflags)

 set(buildfftw3 ${value${fftw3}})
 set(fftw3libdir ${FFTW_LIBRARY_DIR})
-set(fftw3lib ${FFTW_LIBRARY})
+string(REPLACE ";" " " fftw3lib "${FFTW_LIBRARY}")
 set(fftw3incdir ${FFTW_INCLUDE_DIR})

 set(buildfitsio ${value${fitsio}})
 set(fitsiolibdir ${FITSIO_LIBRARY_DIR})
-set(fitsiolib ${FITSIO_LIBRARY})
+string(REPLACE ";" " " fitsiolib "${FITSIO_LIBRARY}")
 set(fitsioincdir ${FITSIO_INCLUDE_DIR})

 set(buildgviz ${value${gviz}})
 set(gvizlibdir ${GVIZ_LIBRARY_DIR})
-set(gvizlib ${GVIZ_LIBRARY})
+string(REPLACE ";" " " gvizlib "${GVIZ_LIBRARY}")
 set(gvizincdir ${GVIZ_INCLUDE_DIR})
 set(gvizcflags)

 set(buildpython ${value${python}})
 set(pythonlibdir ${PYTHON_LIBRARY_DIR})
-set(pythonlib ${PYTHON_LIBRARY})
+string(REPLACE ";" " " pythonlib "${PYTHON_LIBRARY}")
 set(pythonincdir ${PYTHON_INCLUDE_DIR})
 set(pythonlibflags)

 set(buildruby ${value${ruby}})
 set(rubylibdir ${RUBY_LIBRARY_DIR})
-set(rubylib ${RUBY_LIBRARY})
+string(REPLACE ";" " " rubylib "${RUBY_LIBRARY}")
 set(rubyincdir ${RUBY_INCLUDE_DIR})

 set(buildxml ${value${xml}})
 set(xmllibdir ${LIBXML2_LIBRARY_DIR})
-set(xmllib ${LIBXML2_LIBRARIES})
+string(REPLACE ";" " " xmllib "${LIBXML2_LIBRARIES}")
 set(xmlincdir ${LIBXML2_INCLUDE_DIR})

 set(buildxrd ${value${xrootd}})
@@ -336,7 +336,7 @@
 set(srputillib)
 set(srputilincdir)

-set(afslib ${AFS_LIBRARY})
+string(REPLACE ";" " " afslib "${AFS_LIBRARY}")
 set(afslibdir ${AFS_LIBRARY_DIR})
 set(afsincdir ${AFS_INCLUDE_DIR})
 set(afsextracflags)
@@ -347,6 +347,7 @@

 set(buildkrb5 ${value${krb5}})
 set(krb5libdir ${KRB5_LIBRARY_DIR})
+string(REPLACE ";" " " krb5lib "${KRB5_LIBRARY}")
 set(krb5lib ${KRB5_LIBRARY})
 set(krb5incdir ${KRB5_INCLUDE_DIR})
 set(krb5init ${KRB5_INIT})
@@ -359,21 +360,21 @@

 set(buildglobus ${value${globus}})
 set(globuslibdir ${GLOBUS_LIBRARY_DIR})
-set(globuslib ${GLOBUS_LIBRARY})
+string(REPLACE ";" " " globuslib "${GLOBUS_LIBRARY}")
 set(globusincdir ${GLOBUS_INCLUDE_DIR})
 set(buildxrdgsi)

 set(buildmonalisa ${value${monalisa}})
 set(monalisalibdir ${MONALISA_LIBRARY_DIR})
-set(monalisalib ${MONALISA_LIBRARY})
+string(REPLACE ";" " " monalisalib "${MONALISA_LIBRARY}")
 set(monalisaincdir ${MONALISA_INCLUDE_DIR})

-set(ssllib ${OPENSSL_LIBRARIES})
+string(REPLACE ";" " " ssllib "${OPENSSL_LIBRARIES}")
 set(ssllibdir)
 set(sslincdir ${OPENSSL_INCLUDE_DIR})
 set(sslshared)

-set(gsllibs ${GSL_LIBRARIES})
+string(REPLACE ";" " " gsllibs "${GSL_LIBRARIES}")
 set(gsllibdir)
 set(gslincdir ${GSL_INCLUDE_DIR})
 set(gslflags)
@@ -394,13 +395,13 @@

 set(buildclarens ${value${clarens}})
 set(clarensincdir ${CLARENS_INCLUDE_DIR})
-set(clarenslibs ${CLARENS_LIBRARIES})
+string(REPLACE ";" " " clarenslibs "${CLARENS_LIBRARIES}")
 set(buildpeac ${value${peac}})

 set(cursesincdir ${CURSES_INCLUDE_DIR})
 set(curseslibdir)
-set(curseslib ${CURSES_LIBRARIES})
+string(REPLACE ";" " " curseslib "${CURSES_LIBRARIES}")
 set(curseshdr ${CURSES_HEADER_FILE})
 set(buildeditline ${value${editline}})
 set(cppunit)


refs #4871 fix finding of gcov47

refs #4871 fix finding of gcov47

git-svn-id: b5c078ec0b4d3a50497e9dd3081db18a5b4f16e5@46067 c7de825b-a66e-492c-adef-691d508d4ae1

--- cmake_modules/TokuSetupCompiler.cmake
+++ cmake_modules/TokuSetupCompiler.cmake
@@ -30,7 +30,7 @@
   if (NOT CMAKE_CXX_COMPILER_ID MATCHES GNU)
     message(FATAL_ERROR "Must use the GNU compiler to compile for test coverage.")
   endif ()
-  find_path(COVERAGE_COMMAND NAMES gcov47 gcov)
+  find_program(COVERAGE_COMMAND NAMES gcov47 gcov)
 endif (USE_GCOV)

 include(CheckCCompilerFlag)


fix cmake

fix cmake

git-svn-id: 39e099a8ed5324aded674b764a67f7a08796d9a7@5168 662fdd30-d327-0410-a531-f549c87e1e9e

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


fix glfw for dynamic builds

fix glfw for dynamic builds

--- cmake/FindGLFW.cmake
+++ cmake/FindGLFW.cmake
@@ -19,7 +19,7 @@
 )

 find_library(GLFW_LIBRARY
-    NAMES glfw3 glfw
+    NAMES glfw3 glfw glfw3dll glfwdll
     PATHS
     ${GLFW_LIBRARY_DIR}  # provided by glfw config
     $ENV{GLFWDIR}/lib


Fixed wrong spelling of LCOV external flag.

--- cmake/FindLcov.cmake
+++ cmake/FindLcov.cmake
@@ -30,7 +30,7 @@
 set(LCOV_DATA_PATH_INIT "${LCOV_DATA_PATH}/init")
 set(LCOV_DATA_PATH_CAPTURE "${LCOV_DATA_PATH}/capture")
 set(LCOV_HTML_PATH "${CMAKE_BINARY_DIR}/lcov/html")
-set(LCOV_EXTERN_FLAG "--no-extern")
+set(LCOV_EXTERN_FLAG "--no-external")

@@ -49,8 +49,8 @@
 # Search for required lcov binaries.
 find_program(LCOV_BIN lcov)
 if (NOT LCOV_BIN STREQUAL "")
-	execute_process(COMMAND ${LCOV_BIN} ERROR_VARIABLE LCOV_ERRSTR)
-	string(REGEX MATCH "Unknown option: no-extern" LCOV_RES "${LCOV_ERRSTR}")
+	execute_process(COMMAND ${LCOV_BIN} --help OUTPUT_VARIABLE LCOV_HELP)
+	string(REGEX MATCH "external" LCOV_RES "${LCOV_ERRSTR}")
 	if (NOT "${LCOV_RES}" STREQUAL "")
 		set(LCOV_EXTERN_FLAG "")
 	endif ()


ROOT include folders set as SYSTEM to eliminate the compilation warnings

--- cmake/FindROOT.cmake
+++ cmake/FindROOT.cmake
@@ -160,12 +160,12 @@

         	# include for AliEn
         	if(EXISTS "${ALIEN}/include")
-        	    include_directories(${ALIEN}/include)
+        	    include_directories(SYSTEM ${ALIEN}/include)
         	endif()

         	# api/include always exists
         	if(EXISTS "${ALIEN}/api/include")
-        	    include_directories(${ALIEN}/api/include)
+        	    include_directories(SYSTEM ${ALIEN}/api/include)
         	endif()

         	set(ROOT_HASALIEN TRUE)
@@ -219,7 +219,7 @@

     # adding the libraries and the inc dir
     link_directories(${ROOT_LIBDIR})
-    include_directories(${ROOT_INCLUDE_DIR})
+    include_directories(SYSTEM ${ROOT_INCLUDE_DIR})
     set(ROOT_FOUND TRUE)

     # Workaround misssing XML, VMC, Minuit from ROOT static library


improve UseBISON

improve UseBISON

--- cmake/UseBISON.cmake
+++ cmake/UseBISON.cmake
@@ -266,8 +266,11 @@
       endif()
       unset(_BISON_CMP0088)

+      get_filename_component(BISON_EXECUTABLE_DIR ${BISON_EXECUTABLE} DIRECTORY)
+      set(BISON_EXECUTABLE_DIR "${BISON_EXECUTABLE_DIR}/data")
+
       add_custom_command(OUTPUT ${BISON_TARGET_outputs}
-        COMMAND ${BISON_EXECUTABLE} ${BISON_TARGET_cmdopt} -o ${BisonOutput} ${_BisonInput}
+        COMMAND  ${CMAKE_COMMAND} -E env BISON_PKGDATADIR=${BISON_EXECUTABLE_DIR} ${BISON_EXECUTABLE} ${BISON_TARGET_cmdopt} -o ${BisonOutput} ${_BisonInput}
         VERBATIM
         DEPENDS ${_BisonInput}
         COMMENT "[BISON][${Name}] Building parser with bison ${BISON_VERSION}"


Need to disable SAFESEH before /ZI

Need to disable SAFESEH before /ZI

--- cmake/compiler.cmake
+++ cmake/compiler.cmake
@@ -10,6 +10,10 @@
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")

   if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    # disabling SAFESEH
+    message(STATUS "Disabling Safe Exception Handlers..")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
+
     # edit and continue
     message(STATUS "Enabling Edit and Continue..")
     add_definitions(/ZI)


config update

config update

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

--- cmake/gsConfig.cmake
+++ cmake/gsConfig.cmake
@@ -172,7 +172,8 @@
 if (MINGW)
   # large files can overflow pe/coff sections
   # this switches binutils to use the pe+ format
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wa -mbig-obj")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wa,-mbig-obj")
+  add_definitions(-O3)
 endif()

 #message("CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}")


Adjust A53 SGEMM parameters to reflect move to 8x8 kernel

--- cmake/prebuild.cmake
+++ cmake/prebuild.cmake
@@ -195,8 +195,13 @@
       "#define HAVE_VFP\n"
       "#define HAVE_NEON\n"
       "#define ARMV8\n")
-    set(SGEMM_UNROLL_M 16)
-    set(SGEMM_UNROLL_N 4)
+if ("${TCORE}" STREQUAL "CORTEXA57")
+    set(SGEMM_UNROLL_M 16)
+    set(SGEMM_UNROLL_N 4)
+else
+    set(SGEMM_UNROLL_M 8)
+    set(SGEMM_UNROLL_N 8)
+endif
     set(DGEMM_UNROLL_M 8)
     set(DGEMM_UNROLL_N 4)
     set(CGEMM_UNROLL_M 8)


Add identifiers to Cmake messages

Add identifiers to Cmake messages

--- data/findOpenFrameworks-v0.9.cmake
+++ data/findOpenFrameworks-v0.9.cmake
@@ -8,10 +8,10 @@
 set(USE_PRECOMPILED_LIB true)
 #This can also be Win32
 if(AR STREQUAL "x64" OR AR STREQUAL "Win32")
-    message("NOTICE: Compiling openFrameworks for ${AR}")
+    message("NOTICE [openFrameworks]: Compiling openFrameworks for ${AR}")
 else()
     set(AR x64)
-    message("NOTICE: Architecture is not set. Defaulting to x64")
+    message("NOTICE [openFrameworks]: Architecture is not set. Defaulting to x64")
 endif()

 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -280,11 +280,11 @@

     if (EXISTS ${OF_LIB_PATH})
         list(APPEND OF_LIBS ${OF_LIB_PATH})
-        message("NOTICE: Using precompiled openFrameworks")
+        message("NOTICE [openFrameworks]: Using precompiled openFrameworks")
     else()
         set(USE_PRECOMPILED_LIB false)
-        message("NOTICE: Compiling openFrameworks from source")
+        message("NOTICE [openFrameworks]: Compiling openFrameworks from source")
     endif()
 else()
-    message("NOTICE: Compiling openFrameworks from source")
+    message("NOTICE [openFrameworks]: Compiling openFrameworks from source")
 endif(USE_PRECOMPILED_LIB)


Ignoring test in 'classic' using TTreeProcessorM{T,P}

--- tutorials/CTestCustom.cmake
+++ tutorials/CTestCustom.cmake
@@ -2,4 +2,8 @@

 set(CTEST_CUSTOM_TESTS_IGNORE ${CTEST_CUSTOM_TESTS_IGNORE} tutorial-pyroot-zdemo)

+if("$ENV{COMPILER}" STREQUAL "classic") #  TTreeProcessorM{T,P} are not available
+  list(APPEND CTEST_CUSTOM_TESTS_IGNORE tutorial-multicore-mp102_readNtuplesFillHistosAndFit)
+endif()

+


Avoid dynamic/static runtime linking (LNK4098) by properly replacing MD(d)->MT(d) in both C and CXX flags, resolves 2074

--- googletest/cmake/internal_utils.cmake
+++ googletest/cmake/internal_utils.cmake
@@ -22,6 +22,8 @@
     # This replacement code is taken from sample in the CMake Wiki at
     # https://gitlab.kitware.com/cmake/community/wikis/FAQ#dynamic-replace.
     foreach (flag_var
+             CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
+             CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO
              CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
              CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
       if (NOT BUILD_SHARED_LIBS AND NOT gtest_force_shared_crt)


board: mimxrt685_evk update flash command

add reset after download, which will trigger board to run

Signed-off-by: Hake Huang <141c0384c6b2febca367ae94dc4dc40a33a7ba79@oss.nxp.com>

--- boards/arm/mimxrt685_evk/board.cmake
+++ boards/arm/mimxrt685_evk/board.cmake
@@ -4,6 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #

-board_runner_args(jlink "--device=MIMXRT685S_M33")
+board_runner_args(jlink "--device=MIMXRT685S_M33" "--reset-after-load")

 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)


Pass flag string to `check_cxx_compiler_flag` (#298)

--- cmake/AddCXXCompilerFlag.cmake
+++ cmake/AddCXXCompilerFlag.cmake
@@ -25,7 +25,7 @@
   string(REGEX REPLACE "[^A-Za-z_0-9]" "_" SANITIZED_FLAG ${SANITIZED_FLAG})
   string(REGEX REPLACE "_+" "_" SANITIZED_FLAG ${SANITIZED_FLAG})
   set(CMAKE_REQUIRED_FLAGS "${FLAG}")
-  check_cxx_compiler_flag("" ${SANITIZED_FLAG})
+  check_cxx_compiler_flag("${FLAG}" ${SANITIZED_FLAG})
   if(${SANITIZED_FLAG})
     set(VARIANT ${ARGV1})
     if(ARGV1)


Changed FindAssimp.cmake a bit.

Changed FindAssimp.cmake a bit.

--- cmake/Modules/FindAssimp.cmake
+++ cmake/Modules/FindAssimp.cmake
@@ -7,7 +7,7 @@

 include( FindPackageHandleStandardArgs )

-FIND_PATH( ASSIMP_INCLUDE_DIR assimp/mesh.h
+FIND_PATH( ASSIMP_INCLUDE_DIR NAMES postprocess.h scene.h version.h config.h cimport.h
 	${ASSIMP_ROOT_DIR}/include
   /usr/include
   /usr/local/include
@@ -22,7 +22,7 @@
   /opt/local/lib
 )

-find_package_handle_standard_args(ASSIMP DEFAULT_MSG ASSIMP_LIBRARIES ASSIMP_INCLUDE_DIR )
+find_package_handle_standard_args(Assimp DEFAULT_MSG ASSIMP_LIBRARIES ASSIMP_INCLUDE_DIR )
 IF(ASSIMP_INCLUDE_DIR AND ASSIMP_LIBRARIES)
   SET( ASSIMP_FOUND TRUE )
 ENDIF(ASSIMP_INCLUDE_DIR AND ASSIMP_LIBRARIES)


remove find libsndfile

remove find libsndfile

--- cmake/Modules/FindCsound.cmake
+++ cmake/Modules/FindCsound.cmake
@@ -3,8 +3,6 @@
 #  CSOUND_FOUND - System has the Csound l;ibrary
 #  CSOUND_INCLUDE_DIRS - The Csound include directories.
 #  CSOUND_LIBRARIES - The libraries needed to use the Csound library.
-
-FIND(sndfile)

 if(APPLE)
 find_path(CSOUND_INCLUDE_DIR csound.h HINTS /Library/Frameworks/CsoundLib64.framework/Headers


added backslash

added backslash

--- cmake/OpenCVGenPkgconfig.cmake
+++ cmake/OpenCVGenPkgconfig.cmake
@@ -59,7 +59,7 @@
 if(OpenCV_EXTRA_COMPONENTS)
   foreach(extra_component ${OpenCV_EXTRA_COMPONENTS})

-    if(extra_component MATCHES "-[lL](.*)" OR extra_component MATCHES "/")
+    if(extra_component MATCHES "-[lL](.*)" OR extra_component MATCHES "[\\/]")
       set(maybe_l_prefix "")
     else()
       set(maybe_l_prefix "-l")


FindOpenCV module now adds include directories automatically if OpenCV is found.

--- cmake/modules/FindOpenCV.cmake
+++ cmake/modules/FindOpenCV.cmake
@@ -33,7 +33,7 @@

 MACRO(DBG_MSG _MSG)
-    MESSAGE(STATUS "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): ${_MSG}")
+#    MESSAGE(STATUS "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): ${_MSG}")
 ENDMACRO(DBG_MSG)

@@ -257,7 +257,9 @@
 SET(OPENCV_INCLUDE_DIR ${OpenCV_INCLUDE_DIRS} )
 SET(OPENCV_FOUND       ${OpenCV_FOUND})

-
+IF (OpenCV_FOUND)
+  include_directories( ${OpenCV_INCLUDE_DIRS} )
+ENDIF(OpenCV_FOUND)


Revert "Fix logic of handling dependencies when NO_CXXMODULE is specified"

This reverts commit 276c4b2066219ac63f1175ddbbf9886816557580 as the
former causes problems with earlier CMake versions.

--- cmake/modules/RootMacros.cmake
+++ cmake/modules/RootMacros.cmake
@@ -562,15 +562,11 @@
   #---Get the library and module dependencies-----------------
   if(ARG_DEPENDENCIES)
     foreach(dep ${ARG_DEPENDENCIES})
-      set(dict "$<TARGET_NAME_IF_EXISTS:G__${dep}>")
-      set(dependent_pcm ${libprefix}${dep}_rdict.pcm})
-      if(runtime_cxxmodules)
-        #---Check for NO_CXXMODULE flag in a dependent module---
-        set(dependent_pcm "$<IF:$<BOOL:$<TARGET_PROPERTY:${dict},ARG_NO_MODULE>>,,-m ${dep}.pcm>")
-        set(newargs ${newargs} ${dependent_pcm})
-      else()
-        set(newargs ${newargs} -m ${dependent_pcm})
-      endif()
+      set(dependent_pcm ${libprefix}${dep}_rdict.pcm)
+      if (runtime_cxxmodules)
+        set(dependent_pcm ${dep}.pcm)
+      endif()
+      set(newargs ${newargs} -m  ${dependent_pcm})
     endforeach()
   endif()

@@ -647,7 +643,7 @@
   # would not happen if we used target_sources() directly with the dictionary source.
   if(TARGET "${ARG_MODULE}" AND NOT "${ARG_MODULE}" STREQUAL "${dictionary}")
     add_library(${dictionary} OBJECT ${dictionary}.cxx)
-    set_target_properties(${dictionary} PROPERTIES POSITION_INDEPENDENT_CODE TRUE ARG_NO_MODULE ${ARG_NO_CXXMODULE})
+    set_target_properties(${dictionary} PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
     target_sources(${ARG_MODULE} PRIVATE $<TARGET_OBJECTS:${dictionary}>)

     target_compile_options(${dictionary} PRIVATE


Allow for empty elements in the lists being processed.

svn path=/trunk/; revision=8403

--- cmake/modules/pkg-config.cmake
+++ cmake/modules/pkg-config.cmake
@@ -164,7 +164,7 @@
     set(_link_directory_list)
     foreach(_list_index RANGE ${_link_flags_length})
       list(GET _link_flags_list ${_list_index} _list_element)
-      string(REGEX REPLACE "^-L" "" _list_element1 ${_list_element})
+      string(REGEX REPLACE "^-L" "" _list_element1 "${_list_element}")
       if(_list_element STREQUAL "-L${_list_element1}")
         list(APPEND _index_list ${_list_index})
         list(APPEND _link_directory_list ${_list_element1})
@@ -186,7 +186,7 @@
     set(${_link_flags_out})
     foreach(_list_index RANGE ${_link_flags_length})
       list(GET _link_flags_list ${_list_index} _list_element)
-      string(REGEX REPLACE "^-l" "" _list_element1 ${_list_element})
+      string(REGEX REPLACE "^-l" "" _list_element1 "${_list_element}")
       if(_list_element STREQUAL "-l${_list_element1}")
         set(_library_pathname "_library_pathname-NOTFOUND")
         find_library(


Fix dependency specifications for ninja build (#1692)

Signed-off-by: Rémi Achard <7ad6674bd5ba2343f3f1375917a1e9698a960b83@gmail.com>

Signed-off-by: Rémi Achard <7ad6674bd5ba2343f3f1375917a1e9698a960b83@gmail.com>
Co-authored-by: Michael Dolan <688080ba093bba32b8050b0536b1c7a964e2656e@gmail.com>

--- share/cmake/modules/FindOpenEXR.cmake
+++ share/cmake/modules/FindOpenEXR.cmake
@@ -115,9 +115,6 @@
     split_version_string(${OpenEXR_VERSION} _OpenEXR_ExternalProject)

     set(_OpenEXR_LIB_VER "${_OpenEXR_ExternalProject_VERSION_MAJOR}_${_OpenEXR_ExternalProject_VERSION_MINOR}")
-
-    set(OpenEXR_LIBRARY
-        "${_EXT_DIST_ROOT}/${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}OpenEXR-${_OpenEXR_LIB_VER}${_OpenEXR_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")

     set_target_location(Iex)
     set_target_location(IlmThread)
@@ -187,7 +184,12 @@
             GIT_CONFIG advice.detachedHead=false
             GIT_SHALLOW TRUE
             PREFIX "${_EXT_BUILD_ROOT}/openexr"
-            BUILD_BYPRODUCTS ${OpenEXR_LIBRARY}
+            BUILD_BYPRODUCTS
+                ${Iex_LIBRARY}
+                ${IlmThread_LIBRARY}
+                ${OpenEXR_LIBRARY}
+                ${OpenEXRCore_LIBRARY}
+                ${OpenEXRUtil_LIBRARY}
             CMAKE_ARGS ${OpenEXR_CMAKE_ARGS}
             EXCLUDE_FROM_ALL TRUE
             BUILD_COMMAND ""


switch liblas to a patched version

switch liblas to a patched version

Change the liblas repository to point to a fork that has fixes for
building on Windows.

--- Superbuild/versions.cmake
+++ Superbuild/versions.cmake
@@ -52,6 +52,9 @@
   URL http://vtk.org/files/support/eigen-3.1.2.tar.gz
   URL_MD5 bb639388192cb80f1ee797f5dbdbe74f)

+#add_revision(liblas
+#  GIT_REPOSITORY git://github.com/libLAS/libLAS
+#  GIT_TAG 6e8657336ba445fcec3c9e70c2ebcd2e25af40b9)
 add_revision(liblas
-  GIT_REPOSITORY git://github.com/libLAS/libLAS
-  GIT_TAG master)
+  GIT_REPOSITORY git://github.com/mwoehlke-kitware/libLAS
+  GIT_TAG fix-windows-stdint)


COMP: Replace the check for a specific version of Linux with any version

The platform check for linux was specifically looking for a three part
version string (ex: Linux-MAJOR.MINOR.PATCH, Linux-2.6.36, etc.).  This
will fail when using the newly released 3.0 kernel as it is only a 2-part
version string (Linux-3.0).  The version check has been modified to only
look for "Linux" instead of "Linux-some.version.number".  The new behavior
is now congruent with the platform check used in the HDF5 autotools build.

Change-Id: I3c44416bcee0b65aef4e0753ad6ef2350d30b542

--- Modules/ThirdParty/HDF5/src/itkhdf5/config/cmake/ConfigureChecks.cmake
+++ Modules/ThirdParty/HDF5/src/itkhdf5/config/cmake/ConfigureChecks.cmake
@@ -293,7 +293,7 @@
 SET (LINUX_LFS 0)

 SET (HDF5_EXTRA_FLAGS)
-IF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
+IF (CMAKE_SYSTEM MATCHES "Linux")
   # Linux Specific flags
   SET (HDF5_EXTRA_FLAGS -D_POSIX_SOURCE -D_BSD_SOURCE)
   OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON)
@@ -302,7 +302,7 @@
     SET (HDF5_EXTRA_FLAGS ${HDF5_EXTRA_FLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
   ENDIF (HDF5_ENABLE_LARGE_FILE)
   SET (CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} ${HDF5_EXTRA_FLAGS})
-ENDIF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
+ENDIF (CMAKE_SYSTEM MATCHES "Linux")

 ADD_DEFINITIONS (${HDF5_EXTRA_FLAGS})


Fix include of default applications

Fix include of default applications

--- support/cmake/handle_applications.cmake
+++ support/cmake/handle_applications.cmake
@@ -38,9 +38,8 @@

         get_application_attribute_default(${app_dir} is_default_application)
         if (${is_default_application})
-            set(OPENSPACE_APPLICATION_${upper_app} ON)
+            set(OPENSPACE_APPLICATION_${upper_app} ON CACHE BOOL "Build ${app} application" FORCE)
         endif ()
-

         if (OPENSPACE_APPLICATION_${upper_app})
             message(STATUS "Adding application ${app}")


ENH: update for Tcl/Tk 8.5

ENH: update for Tcl/Tk 8.5

--- vtkIncludeDirectories.cmake
+++ vtkIncludeDirectories.cmake
@@ -64,7 +64,7 @@
     SET (try_file "tkWinPort.h")
   ENDIF (WIN32)
   IF (APPLE)
-    SET (try_file "tkMacOSXPort.h")
+    SET (try_file "tkMacOSXDefault.h")
   ENDIF (APPLE)
   IF (try_file)
     VTK_GET_TCL_TK_VERSION ("TCL_TK_MAJOR_VERSION" "TCL_TK_MINOR_VERSION")


Use a cache variable for CMAKE_INSTALL_RPATH

This allows the value of this variable to be overriden when calling
CMake to configure ROOT. In particular it will allow release binaries to
be configured with a relative RUNPATH such that setting LD_LIBRARY_PATH
will not be necessary for running ROOT from the binaries, regardless of
where the binary tarballs have been unpacked into the local filesystem.
For non-gnuinstall configuration on Linux, the relative RUNPATH should be
set to '$ORIGIN/../lib' so that it works for both binaries and libraries.
If later on ROOT moves to use lib or lib64 as default depending on the
system, then '$ORIGIN/../$LIB' can be used to make the relative RUNPATH
work in both cases. If LD_LIBRARY_PATH is set anyway, it usually
overrides the embedded RUNPATH set by this method with CMake. See ld(1)
and ld.so(8) for more information on RPATH, RUNPATH, and their precedence
relative to LD_LIBRARY_PATH.

--- cmake/modules/RootBuildOptions.cmake
+++ cmake/modules/RootBuildOptions.cmake
@@ -431,7 +431,7 @@

 # Check whether to add RPATH to the installation (the build tree always has the RPATH enabled)
 if(rpath)
-  set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) # install LIBDIR
+  set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR} CACHE INTERNAL "") # install LIBDIR
   set(CMAKE_SKIP_INSTALL_RPATH FALSE)          # don't skip the full RPATH for the install tree
 elseif(APPLE)
   set(CMAKE_INSTALL_NAME_DIR "@rpath")


Allow again CMake to look for Apache Arrow at configuration time by default.

Revert "Revert "Look for Apache Arrow by default at configuration time""
This reverts commit aef20f136f18546c89985b04fdd31eacb437665d now that all conflicts
have been fixed.

--- cmake/modules/RootBuildOptions.cmake
+++ cmake/modules/RootBuildOptions.cmake
@@ -64,7 +64,7 @@
 ROOT_BUILD_OPTION(afs OFF "AFS support, requires AFS libs and objects")
 ROOT_BUILD_OPTION(alien OFF "AliEn support, requires libgapiUI from ALICE")
 ROOT_BUILD_OPTION(asimage ON "Image processing support, requires libAfterImage")
-ROOT_BUILD_OPTION(arrow OFF "Apache Arrow in memory columnar storage support")
+ROOT_BUILD_OPTION(arrow ON "Apache Arrow in memory columnar storage support")
 ROOT_BUILD_OPTION(astiff ON "Include tiff support in image processing")
 ROOT_BUILD_OPTION(bonjour OFF "Bonjour support, requires libdns_sd and/or Avahi")
 ROOT_BUILD_OPTION(builtin_afterimage ON "Build included libAfterImage, or use system libAfterImage")


RooFit::MultiProcess: turn off by default


link openssl on unix if available

link openssl on unix if available

--- cmake/FindCURL_.cmake
+++ cmake/FindCURL_.cmake
@@ -1,37 +1,36 @@

 find_package(CURL REQUIRED)
+find_package(OpenSSL QUIET COMPONENTS Crypto SSL )

-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(CURL_
-        REQUIRED_VARS CURL_INCLUDE_DIR CURL_LIBRARY)
+if(NOT TARGET CURL::libcurl)
+    add_library(CURL::libcurl UNKNOWN IMPORTED)
+    set_target_properties(CURL::libcurl PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIRS}")

-if (CURL_FOUND)
+    if(EXISTS "${CURL_LIBRARY}")
+        set_target_properties(CURL::libcurl PROPERTIES
+                IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+                IMPORTED_LOCATION "${CURL_LIBRARY}")
+    endif()
+    if(CURL_LIBRARY_RELEASE)
+        set_property(TARGET CURL::libcurl APPEND PROPERTY
+                IMPORTED_CONFIGURATIONS RELEASE)
+        set_target_properties(CURL::libcurl PROPERTIES
+                IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+                IMPORTED_LOCATION_RELEASE "${CURL_LIBRARY_RELEASE}")
+    endif()
+    if(CURL_LIBRARY_DEBUG)
+        set_property(TARGET CURL::libcurl APPEND PROPERTY
+                IMPORTED_CONFIGURATIONS DEBUG)
+        set_target_properties(CURL::libcurl PROPERTIES
+                IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+                IMPORTED_LOCATION_DEBUG "${CURL_LIBRARY_DEBUG}")
+    endif()
+endif()

-    if(NOT TARGET CURL::libcurl)
-        add_library(CURL::libcurl UNKNOWN IMPORTED)
-        set_target_properties(CURL::libcurl PROPERTIES
-                INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIRS}")
+if (UNIX AND OpenSSL_FOUND)
+    set(INTERFACE_LINK_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)

-        if(EXISTS "${CURL_LIBRARY}")
-            set_target_properties(CURL::libcurl PROPERTIES
-                    IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-                    IMPORTED_LOCATION "${CURL_LIBRARY}")
-        endif()
-        if(CURL_LIBRARY_RELEASE)
-            set_property(TARGET CURL::libcurl APPEND PROPERTY
-                    IMPORTED_CONFIGURATIONS RELEASE)
-            set_target_properties(CURL::libcurl PROPERTIES
-                    IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-                    IMPORTED_LOCATION_RELEASE "${CURL_LIBRARY_RELEASE}")
-        endif()
-        if(CURL_LIBRARY_DEBUG)
-            set_property(TARGET CURL::libcurl APPEND PROPERTY
-                    IMPORTED_CONFIGURATIONS DEBUG)
-            set_target_properties(CURL::libcurl PROPERTIES
-                    IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-                    IMPORTED_LOCATION_DEBUG "${CURL_LIBRARY_DEBUG}")
-        endif()
-    endif()
-
-
+    set_property(TARGET CURL::libcurl APPEND PROPERTY
+            INTERFACE_LINK_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)
 endif()


Generalizing NDA lookup for nVidia to match newer SDK versions.

--- cmake/Findnvapi.cmake
+++ cmake/Findnvapi.cmake
@@ -40,7 +40,7 @@
 endif()
 if(NVAPI_INCLUDE_DIR AND NOT "${NVAPI_INCLUDE_DIR}" STREQUAL "${NVAPI_LAST_INCLUDE_DIR}")
 	file(STRINGS "${NVAPI_INCLUDE_DIR}/nvapi.h" _nvapi_strings REGEX "Target Profile:")
-	if("${_nvapi_strings}" MATCHES ".* NDA-developer")
+	if("${_nvapi_strings}" MATCHES ".*NDA-developer")
 		set(NVAPI_EDITION "NDA-developer" CACHE STRING "The detected edition of the NVAPI")
 	elseif("${_nvapi_strings}" MATCHES ".* developer")
 		set(NVAPI_EDITION "developer" CACHE STRING "The detected edition of the NVAPI")


Removing dl from the list of libraries to link.

--HG--
branch : ign_tool

--- cmake/TestUtils.cmake
+++ cmake/TestUtils.cmake
@@ -28,7 +28,6 @@
         libgtest.a
         libgtest_main.a
         pthread
-        dl
       )
     elseif(WIN32)
       target_link_libraries(${BINARY_NAME}


Removed leftover debug message

Removed leftover debug message

--- cmake/createDoc.cmake
+++ cmake/createDoc.cmake
@@ -7,8 +7,6 @@
         DEPENDS ${PROJECT_SOURCE_DIR}/ChangeLog
         COMMAND python ${PROJECT_SOURCE_DIR}/misc/createChangeLog/changeLogToMD.py -i ${PROJECT_SOURCE_DIR}/ChangeLog -o ${PROJECT_BINARY_DIR}/doc/changeLog/ChangeLog.md
     )
-    MESSAGE (python ${PROJECT_SOURCE_DIR}/misc/createChangeLog/changeLogToMD.py -i ${PROJECT_SOURCE_DIR}/ChangeLog -o ${PROJECT_BINARY_DIR}/doc/changeLog/ChangeLog.md)
-

 	configure_file(${PROJECT_SOURCE_DIR}/doc/Doxyfile.in ${PROJECT_BINARY_DIR}/doc/Doxyfile @ONLY)
 	configure_file(${PROJECT_SOURCE_DIR}/doc/footer.html ${PROJECT_BINARY_DIR}/doc/footer.html @ONLY)


remove test from pcl.dot

remove test from pcl.dot

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

--- cmake/dep_graph.cmake
+++ cmake/dep_graph.cmake
@@ -22,9 +22,4 @@
         endforeach(_dep)
       endif()
     endforeach(_ss)
-
-    file(APPEND ${_dot_file}
-        "  \"test\" [style=\"filled\" fillcolor=\"#A3A27C\" shape=\"box\"];\n ")
-    file(APPEND ${_dot_file} "}\n")
 endfunction(MAKE_DEP_GRAPH)
-


[cmake] fix component find

[cmake] fix component find

--- cmake/nd-config.cmake
+++ cmake/nd-config.cmake
@@ -54,8 +54,14 @@
 endif()

 ### Handle components
+# component name and the imported target must be the same
 foreach(package ${ND_FIND_COMPONENTS})
   find_package(${package} CONFIG PATHS .)
+  get_property(plugin TARGET ${package} PROPERTY LOCATION)
+  if(plugin) ## should remove this when I add config files for the plugins?
+    set(ND_${package}_FOUND TRUE)
+  endif()
+  install(FILES ${plugin} DESTINATION bin/plugins)
 endforeach()

 ### Check everything got found
@@ -67,12 +73,43 @@
 )

 ### macro for copying plugins to a target's build Location
-macro(nd_copy_plugins_to_target _target)
-    add_custom_command(TARGET ${_target} POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-          ${INSTALL_DIR}/bin/plugins
-          $<TARGET_FILE_DIR:${_target}>/plugins
-          COMMENT "Copying libnd plugins to build path for ${_target}."
-          )
-    add_dependencies(${_target} libnd)
-endmacro()
+# component name and the imported target must be the same
+#
+# plugins should define an "Extras" variable named <plugin>-EXTRAS
+# that has an extra files (eg associated shared libraries) to be copied
+# along side the plugin.
+function(nd_copy_plugins_to_target _target _plugins)
+    list(REMOVE_AT ARGV 0)
+    foreach(package ${ARGV})
+      if(NOT TARGET ${package})
+        find_package(${package} CONFIG PATHS .)
+      endif()
+      if(TARGET ${package})
+        get_property(plugin TARGET ${package} PROPERTY LOCATION)
+        if(plugin)
+          message(STATUS "Configuring ${package} to be copied to build path for ${_target}.")
+          add_custom_command(TARGET ${_target} POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_FILE_DIR:${_target}>/plugins/
+            COMMAND ${CMAKE_COMMAND} -E copy
+                ${plugin}
+                $<TARGET_FILE_DIR:${_target}>/plugins
+                COMMENT "Copying ${package} to build path for ${_target}."
+                )
+          add_dependencies(${_target} ${package})
+          # extras
+          if(${package}-EXTRAS)
+            message(STATUS "Configuring ${package} extras to be copied to build path for ${_target}.")
+            foreach(extra ${${package}-EXTRAS})
+            add_custom_command(TARGET ${_target} POST_BUILD
+                COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_FILE_DIR:${_target}>/plugins/
+                COMMAND ${CMAKE_COMMAND} -E copy
+                    ${extra}
+                    $<TARGET_FILE_DIR:${_target}>/plugins
+                    COMMENT "Copying ${extra} to build path for ${_target}."
+                    )
+            endforeach()
+          endif()
+        endif()
+      endif()
+    endforeach()
+endfunction()


Added support for finding the threading library on linux.

git-svn-id: b7791fb0f5d07d96612766859ad70a13be88ea96@138 305cdda6-5ce1-45b3-a98d-dfc68c8b3305

--- library/FindBoost.cmake
+++ library/FindBoost.cmake
@@ -1,16 +1,16 @@
 SET(BOOST_INCLUDE_SEARCH_PATH /usr/include /usr/local/include)

 IF( ${CMAKE_GENERATOR} STREQUAL "Visual Studio 7 .NET 2003" )
-	SET(BOOST_INCLUDE_SEARCH_PATH ${BOOST_INCLUDE_SEARCH_PATH}
-	"C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\include"
-	c:\\Boost\\include )
+    SET(BOOST_INCLUDE_SEARCH_PATH ${BOOST_INCLUDE_SEARCH_PATH}
+    "C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\include"
+    c:\\Boost\\include )
 ENDIF( ${CMAKE_GENERATOR} STREQUAL "Visual Studio 7 .NET 2003" )

 IF( ${CMAKE_GENERATOR} STREQUAL "Visual Studio 8 2005" )
-	SET(BOOST_INCLUDE_SEARCH_PATH ${BOOST_INCLUDE_SEARCH_PATH}
-		"C:\\Program Files (x86)\\Microsoft Visual Studio 8\\VC\\include"
-		"C:\\Program Files\\Microsoft Visual Studio 8\\VC\\include"
-		c:\\Boost\\include)
+    SET(BOOST_INCLUDE_SEARCH_PATH ${BOOST_INCLUDE_SEARCH_PATH}
+        "C:\\Program Files (x86)\\Microsoft Visual Studio 8\\VC\\include"
+        "C:\\Program Files\\Microsoft Visual Studio 8\\VC\\include"
+        c:\\Boost\\include)
 ENDIF( ${CMAKE_GENERATOR} STREQUAL "Visual Studio 8 2005" )

 FIND_PATH(BOOST_INCLUDE_DIR boost/weak_ptr.hpp ${BOOST_INCLUDE_SEARCH_PATH} )
@@ -19,53 +19,55 @@
 SET(BoostFileSystemDebugName "")

 IF( ${CMAKE_GENERATOR} STREQUAL "Visual Studio 7 .NET 2003" )
-	SET(BoostFileSystemName "libboost_filesystem-vc71-mt")
-	SET(BoostFileSystemDebugName "libboost_filesystem-vc71-mt-gd")
-	SET(BoostThreadName "boost_thread-vc71-mt")
-	SET(BoostThreadDebugName "boost_thread-vc71-mt-gd")
+    SET(BoostFileSystemName "libboost_filesystem-vc71-mt")
+    SET(BoostFileSystemDebugName "libboost_filesystem-vc71-mt-gd")
+    SET(BoostThreadName "boost_thread-vc71-mt")
+    SET(BoostThreadDebugName "boost_thread-vc71-mt-gd")
 ENDIF( ${CMAKE_GENERATOR} STREQUAL "Visual Studio 7 .NET 2003" )

 IF( ${CMAKE_GENERATOR} STREQUAL "Visual Studio 8 2005" )
-	SET(BoostFileSystemName "libboost_filesystem-vc80-mt")
-	SET(BoostFileSystemDebugName "libboost_filesystem-vc80-mt-gd")
+    SET(BoostFileSystemName "libboost_filesystem-vc80-mt")
+    SET(BoostFileSystemDebugName "libboost_filesystem-vc80-mt-gd")
 ENDIF( ${CMAKE_GENERATOR} STREQUAL "Visual Studio 8 2005" )

 IF( ${CMAKE_GENERATOR} STREQUAL "Unix Makefiles" )
-	IF( ${CMAKE_COMPILER_IS_GNUCXX} )
-		SET(BoostFileSystemName "boost_filesystem-gcc-mt")
-		SET(BoostFileSystemDebugName "boost_filesystem-gcc-mt-d")
-	ENDIF( ${CMAKE_COMPILER_IS_GNUCXX} )
+    IF( ${CMAKE_COMPILER_IS_GNUCXX} )
+        SET(BoostFileSystemName "boost_filesystem-gcc-mt")
+        SET(BoostFileSystemDebugName "boost_filesystem-gcc-mt-d")
+        SET(BoostThreadName "boost_thread-gcc-mt")
+        SET(BoostThreadDebugName "boost_thread-gcc-mt-d")
+    ENDIF( ${CMAKE_COMPILER_IS_GNUCXX} )
 ENDIF( ${CMAKE_GENERATOR} STREQUAL "Unix Makefiles" )

 FIND_LIBRARY( BOOST_FILESYSTEM_LIB NAMES ${BoostFileSystemName}
-	      PATHS
-	      ${BOOST_INCLUDE_DIR}/../lib
-	      /usr/local/lib
-	      /usr/lib
-	      C:\\Boost\\lib )
+          PATHS
+          ${BOOST_INCLUDE_DIR}/../lib
+          /usr/local/lib
+          /usr/lib
+          C:\\Boost\\lib )

 FIND_LIBRARY( BOOST_FILESYSTEM_DEBUG_LIB NAMES ${BoostFileSystemDebugName}
-	      PATHS
-	      ${BOOST_INCLUDE_DIR}/../lib
-	      /usr/local/lib
-	      /usr/lib
-	      C:\\Boost\\lib )
+          PATHS
+          ${BOOST_INCLUDE_DIR}/../lib
+          /usr/local/lib
+          /usr/lib
+          C:\\Boost\\lib )

 FIND_LIBRARY( BOOST_THREAD_LIB NAMES ${BoostThreadName}
-	      PATHS
-	      ${BOOST_INCLUDE_DIR}/../lib
-	      /usr/local/lib
-	      /usr/lib
-	      C:\\Boost\\lib )
+          PATHS
+          ${BOOST_INCLUDE_DIR}/../lib
+          /usr/local/lib
+          /usr/lib
+          C:\\Boost\\lib )

 FIND_LIBRARY( BOOST_THREAD_DEBUG_LIB NAMES ${BoostThreadDebugName}
-	      PATHS
-	      ${BOOST_INCLUDE_DIR}/../lib
-	      /usr/local/lib
-	      /usr/lib
-	      C:\\Boost\\lib )
-
+          PATHS
+          ${BOOST_INCLUDE_DIR}/../lib
+          /usr/local/lib
+          /usr/lib
+          C:\\Boost\\lib )
+
 IF (BOOST_INCLUDE_DIR)
   SET(BOOST_FOUND TRUE)
 ENDIF (BOOST_INCLUDE_DIR)


Add support for MITK_SHOW_CONSOLE_WINDOW and WINDOWS_ICON_RESOURCE_FILE

mitk_create_executable now matches existing functionality in BlueBerry-based executables.

--- CMake/mitkFunctionCreateModule.cmake
+++ CMake/mitkFunctionCreateModule.cmake
@@ -446,9 +446,14 @@
       # set_property(TARGET ${MODULE_TARGET} PROPERTY FOLDER "${MITK_ROOT_FOLDER}/Modules")
     else()
       if(MODULE_EXECUTABLE)
-        add_executable(${MODULE_TARGET}
+        if(MITK_SHOW_CONSOLE_WINDOW)
+          set(_SHOW_CONSOLE_OPTION "")
+        else()
+          set(_SHOW_CONSOLE_OPTION WIN32)
+        endif()
+        add_executable(${MODULE_TARGET} ${_SHOW_CONSOLE_OPTION}
                        ${MODULE_CPP_FILES} ${coverage_sources} ${CPP_FILES_GENERATED} ${Q${KITNAME}_GENERATED_CPP}
-                       ${DOX_FILES} ${UI_FILES} ${QRC_FILES})
+                       ${DOX_FILES} ${UI_FILES} ${QRC_FILES} ${WINDOWS_ICON_RESOURCE_FILE})
         set_property(TARGET ${MODULE_TARGET} PROPERTY FOLDER "${MITK_ROOT_FOLDER}/Modules/Executables")
         set(_us_module_name main)
       else()


-fslp-vectorize-aggressive has been deprecated

More info: https://reviews.llvm.org/D34926

--- toolchains/clang.cmake
+++ toolchains/clang.cmake
@@ -10,7 +10,7 @@

 include( "${CMAKE_CURRENT_LIST_DIR}/gcc_compatibles.cmake" )

-list( APPEND TNUN_compiler_optimize_for_speed -fvectorize -fslp-vectorize -fslp-vectorize-aggressive )
+list( APPEND TNUN_compiler_optimize_for_speed -fvectorize -fslp-vectorize )
 list( APPEND TNUN_compiler_report_optimization -Rpass=loop-.* )

 list( APPEND TNUN_default_warnings -Wdocumentation )


BuildFlatBuffers.cmake: fix arguments not passed properly to flatc (#7013)

Fix regression introduced by commit e9d45324012ed04af97cbe99bab0e6afe475e95d

--- CMake/BuildFlatBuffers.cmake
+++ CMake/BuildFlatBuffers.cmake
@@ -95,7 +95,7 @@
       set(generated_include ${generated_includes_dir}/${filename}_generated.h)
       add_custom_command(
         OUTPUT ${generated_include}
-        COMMAND ${FLATC} ${FLATC_ARGS}
+        COMMAND ${FLATC} ${FLATC_SCHEMA_ARGS}
         -o ${generated_includes_dir}
         ${include_params}
         -c ${schema}


CMake quickfix: Linux debug builds put plugins.cfg to the wrong location

--- CMake/InstallResources.cmake
+++ CMake/InstallResources.cmake
@@ -100,7 +100,7 @@
   set(OGRE_PLUGIN_DIR_DBG ".")
 elseif (UNIX)
   set(OGRE_PLUGIN_DIR_REL "../lib")
-  set(OGRE_PLUGIN_DIR_DBG "../../lib/OGRE")
+  set(OGRE_PLUGIN_DIR_DBG "../lib")
 endif ()
 if (WIN32)
   # create resources.cfg


cleaned up use of variables; improved static compiles

--- myCMakeFiles/FortranEnvironment.cmake
+++ myCMakeFiles/FortranEnvironment.cmake
@@ -1,127 +1,143 @@
 ## CMAKE Script for setting up the fortran compiling and linking flags for different operating systems and compilers
+enable_language(Fortran)

 # Check if linux
 if(UNIX AND NOT APPLE)
-    set(LINUX TRUE)
+  set(LINUX TRUE)
 endif()

+# Make sure the build type is uppercase
+string(TOUPPER "${CMAKE_BUILD_TYPE}" BT)

-# determine, whether we want a static binary
-SET(STATIC FALSE CACHE BOOL "Build a static library or use static linking?")
+if(BT STREQUAL "RELEASE")
+  set(CMAKE_BUILD_TYPE RELEASE CACHE STRING
+    "Choose the type of build, options are DEBUG, or RELEASE."
+    FORCE)
+elseif(BT STREQUAL "DEBUG")
+  set(CMAKE_BUILD_TYPE DEBUG CACHE STRING
+    "Choose the type of build, options are DEBUG, or RELEASE."
+    FORCE)
+elseif(NOT BT)
+  set(CMAKE_BUILD_TYPE RELEASE CACHE STRING
+    "Choose the type of build, options are DEBUG, or RELEASE."
+    FORCE)
+  message(STATUS "CMAKE_BUILD_TYPE not given, defaulting to RELEASE.")
+else()
+  message(FATAL_ERROR "CMAKE_BUILD_TYPE not valid, choices are DEBUG, or RELEASE.")
+endif(BT STREQUAL "RELEASE")

-# do we want static libraries?
-# When STATIC is TRUE, than cmake looks for libraries ending
-# with .a. This is for linux only!
-IF(STATIC)
-    if (WIN32)
-      SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
-    elseif(LINUX)
-      SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-    elseif(APPLE)
-      SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-    endif()
-ENDIF(STATIC)
-
-# set -static, when STATIC_LINKING is TRUE and set LINK_SEARCH_END_STATIC
-# to remove the additional -bdynamic from the linker line.
-#IF(STATIC)
-#    SET(CMAKE_EXE_LINKER_FLAGS "-static")
-#    SET_TARGET_PROPERTIES(${programName} PROPERTIES
-#        LINK_SEARCH_END_STATIC 1)
-#ENDIF(STATIC)
-
-
-# Make sure the build type is uppercase
-STRING(TOUPPER "${CMAKE_BUILD_TYPE}" BT)
-
-IF(BT STREQUAL "RELEASE")
-    SET(CMAKE_BUILD_TYPE RELEASE CACHE STRING
-      "Choose the type of build, options are DEBUG, or RELEASE."
-      FORCE)
-ELSEIF(BT STREQUAL "DEBUG")
-    SET (CMAKE_BUILD_TYPE DEBUG CACHE STRING
-      "Choose the type of build, options are DEBUG, or RELEASE."
-      FORCE)
-ELSEIF(NOT BT)
-    SET(CMAKE_BUILD_TYPE RELEASE CACHE STRING
-      "Choose the type of build, options are DEBUG, or RELEASE."
-      FORCE)
-    MESSAGE(STATUS "CMAKE_BUILD_TYPE not given, defaulting to RELEASE.")
-ELSE()
-    MESSAGE(FATAL_ERROR "CMAKE_BUILD_TYPE not valid, choices are DEBUG, or RELEASE.")
-ENDIF(BT STREQUAL "RELEASE")
-
-## Determine which fortran compiler we are using
-# Get the Fortran Compiler used with cmake
-get_filename_component (F90 ${CMAKE_Fortran_COMPILER} NAME)
-
-# Get a tag corresponding to the compiler
-string(REGEX MATCH "gfortran" F90tag ${F90})
-if (NOT F90tag)
-  string(REGEX MATCH "ifort" F90tag ${F90})
+# Find the openmp package and add compiler-specific flags
+find_package(OpenMP)
+if(OPENMP_FOUND)
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${OpenMP_Fortran_FLAGS}")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
 endif()

+# ================================
+# Set gfortran compile flags
+if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
+  message(STATUS "Getting gfortran flags")

-# Set gfortran compile flags
-if (${F90tag} MATCHES "gfortran")
-  MESSAGE(STATUS "Getting gfortran flags")
+  # Set flags for all build types
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=f2008ts -cpp -ffree-line-length-none -fall-intrinsics")

-  set (COMMONFLAGS "-std=f2008ts -fopenmp -cpp -ffree-line-length-none -ffixed-line-length-none -fall-intrinsics")
+  if(BUILD_SHARED_LIBS)
+    # Add any shared library related stuff here
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -shared -fpic")

-  set (STATIC_FLAGS "")
-  if (STATIC)
-    set (STATIC_FLAGS "-static-libgfortran -static-libgcc")
+    if(NOT WIN32)
+      # Taken from: https://cmake.org/Wiki/CMake_RPATH_handling#Mac_OS_X_and_the_RPATH
+      # use, i.e. don't skip the full RPATH for the build tree
+      set(CMAKE_SKIP_BUILD_RPATH FALSE)
+
+      # when building, don't use the install RPATH already
+      # (but later on when installing)
+      set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+
+      set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+
+      # add the automatically determined parts of the RPATH
+      # which point to directories outside the build tree to the install RPATH
+      set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+      # the RPATH to be used when installing, but only if it's not a system directory
+      list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
+      if("${isSystemDir}" STREQUAL "-1")
+         set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+      endif("${isSystemDir}" STREQUAL "-1")
+    endif()
+  else()
+    # Static build options
+    if(APPLE)
+      # gcc on OS X defaults to the dynamic quadmath library instead of the static
+      # NOTE: LIBRARY_PATH environment variable must be properly defined for the
+      #   current compiler or find_library(quadmath) will return the static
+      #   system version of libquadmath.a
+      set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+      find_library(LIB_QUADMATH quadmath)
+      message(STATUS "LIB_QUADMATH: ${LIB_QUADMATH}")
+      # TODO: The addition of '-lgcc_s.1' is a messy fix for libgcc_s.1.dylib
+      #       not being properly included as an indirect dependency of
+      #       libquadmath.a. This is a brittle hack that needs to be fixed.
+      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgfortran -static-libgcc -lgfortran -lgcc -lgcc_s.1 -lSystem -nodefaultlibs ${LIB_QUADMATH}")
+
+      # Apple's ar and ranlib commands toss out 'no symbols' warnings
+      # The following two lines quiets those warnings
+      set(CMAKE_Fortran_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
+      set(CMAKE_Fortran_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
+    elseif(WIN32)
+      set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
+      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgfortran -static-libgcc")
+    elseif(${LINUX})
+      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static -static-libgfortran -static-libgcc -lgfortran -lgcc")
+    endif()
   endif()

-  set (GFORTRAN_RELEASE "${COMMONFLAGS} -funroll-all-loops -finline-functions ${STATIC_FLAGS}")
-  set (GFORTRAN_DEBUG   "${COMMONFLAGS} -O0 -fbacktrace -fbounds-check -Waliasing -Wampersand -Wconversion -Wsurprising -Wc-binding-type -Wintrinsics-std -Wtabs -Wintrinsic-shadow -Wline-truncation -Wtarget-lifetime -Wreal-q-constant ${STATIC_FLAGS}")
+  set(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -O3 -funroll-all-loops -finline-functions")
+  set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -O0 -fbacktrace -fbounds-check -Waliasing -Wampersand -Wconversion -Wsurprising -Wc-binding-type -Wintrinsics-std -Wtabs -Wintrinsic-shadow -Wline-truncation -Wtarget-lifetime -Wreal-q-constant")

-  set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -shared -fpic")
-
-  if (WIN32)
-    set (CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} ${GFORTRAN_RELEASE} -static-libgfortran -static-libgcc")
-    set (CMAKE_Fortran_FLAGS_DEBUG   "${CMAKE_Fortran_FLAGS_DEBUG} ${GFORTRAN_DEBUG}")
-  endif ()
+  if(APPLE)
+    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fno-underscoring")
+  endif()

-  if (${LINUX})
-    set (CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} ${GFORTRAN_RELEASE}")
-    set (CMAKE_Fortran_FLAGS_DEBUG   "${CMAKE_Fortran_FLAGS_DEBUG} ${GFORTRAN_DEBUG}")
-  endif ()
+# ================================
+elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
+  message(STATUS "Getting ifort flags")

-  if (APPLE)
-    set (CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} ${GFORTRAN_RELEASE}")
-    set (CMAKE_Fortran_FLAGS_DEBUG   "${CMAKE_Fortran_FLAGS_DEBUG} ${GFORTRAN_DEBUG}")
-  endif ()
+  if(WIN32)
+    set(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -nologo -fpp -O3 -heap-arrays1024 -QaxCORE-AVX2,CORE-AVX-I,AVX,SSE4.2,SSSE3 -Qipo -fp:fast=2 -Qdiag-disable:remark -Qmkl")
+    set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -nologo -fpp -g -Od -heap-arrays1024 -traceback -CB -Qfp-stack-check -Qmkl -warn:all -warn:nounused")
+  endif()

-elseif (${F90tag} MATCHES "ifort")
+  if(${LINUX})
+    if(BUILD_SHARED_LIBS)
+      # Add any shared library related stuff here
+    else()
+      # see: https://software.intel.com/en-us/forums/intel-fortran-compiler-for-linux-and-mac-os-x/topic/753635
+      # a better alternative is to use "-static-intel" which allows for dynamic system libraries
+      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
+    endif()

-  MESSAGE(STATUS "Getting ifort flags")
+    set(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -O3 -axCORE-AVX2,CORE-AVX-I,AVX,SSE4.2,SSSE3 -no-prec-div -fp-model fast=2")
+    set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -O0 -g -traceback -CB -fp-stack-check -gen-interfaces -warn interfaces")
+  endif()

-  if (WIN32)
-    set (CMAKE_Fortran_FLAGS_RELEASE "-nologo -fpp -O3 -openmp -heap-arrays1024 -QaxCORE-AVX2,CORE-AVX-I,AVX,SSE4.2,SSSE3 -Qipo -fp:fast=2 -Qdiag-disable:remark -Qmkl")
-    set (CMAKE_Fortran_FLAGS_DEBUG "-nologo -fpp -g -Od -openmp -heap-arrays1024 -traceback -CB -Qfp-stack-check -Qmkl -warn:all -warn:nounused")
-  endif ()
-
-  if (${LINIX})
-
-  endif ()
-
-  if (APPLE)
-    set (CMAKE_Fortran_FLAGS_RELEASE "-O3 -qopenmp -axCORE-AVX2,CORE-AVX-I,AVX,SSE4.2,SSSE3 -no-prec-div -fp-model fast=2")
-    set (CMAKE_Fortran_FLAGS_DEBUG "-O0 -g -qopenmp -traceback -CB -fp-stack-check -gen-interfaces -warn interfaces")
-  endif ()
+  if(APPLE)
+      set(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -O3 -axCORE-AVX2,CORE-AVX-I,AVX,SSE4.2,SSSE3 -no-prec-div -fp-model fast=2")
+      set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -O0 -g -traceback -CB -fp-stack-check -gen-interfaces -warn interfaces")
+  endif()
 endif()

 ##
 ## Display information to the user
 ##
-MESSAGE(STATUS "Build type is ${CMAKE_BUILD_TYPE} use option -DCMAKE_BUILD_TYPE=[DEBUG RELEASE] to switch")
+message(STATUS "Build type is ${CMAKE_BUILD_TYPE} use option -DCMAKE_BUILD_TYPE=[DEBUG RELEASE] to switch")

 if(BT STREQUAL "RELEASE")
-    MESSAGE(STATUS "Using the following compile flags ${CMAKE_Fortran_FLAGS_RELEASE}")
+  message(STATUS "Using the following compile flags ${CMAKE_Fortran_FLAGS_RELEASE}")
 elseif(BT STREQUAL "DEBUG")
-	MESSAGE(STATUS "Using the following compile flags ${CMAKE_Fortran_FLAGS_DEBUG}")
+  message(STATUS "Using the following compile flags ${CMAKE_Fortran_FLAGS_DEBUG}")
 endif()

@@ -129,40 +145,28 @@
 ### Set the output directories for compiled libraries and module files.
 ### Paths are relative to the build folder where you call cmake
 ###
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../lib) # Static library location
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../lib) # Shared library location
+#set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../lib) # Static library location
+#set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../lib) # Shared library location
 # Add a folder for module placement
-set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../include)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../bin)
-
-###
-### Set the library type
-###
-if (STATIC)
-  set(libType STATIC)
-else()
-  set(libType SHARED)
-  MESSAGE(STATUS "Using linker flags ${CMAKE_SHARED_LINKER_FLAGS}")
-endif()
-
-
+#set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../include)
+#set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../bin)

 ###
 ### Function to link a static or shared library
 ###
-function(LINK_LIBRARY target relativePathToBuildDir lib)
-  if (STATIC)
-    if (WIN32)
-      target_link_libraries(${target} ${lib})
-    else()
-      get_filename_component(absPath "${relativePathToBuildDir}/lib${lib}.a"
-                        REALPATH BASE_DIR "${CMAKE_BINARY_DIR}")
-
-      MESSAGE(STATUS "real: ${absPath}")
-
-      target_link_libraries(${target} "${absPath}")
-    endif(WIN32)
-  else()
-    target_link_libraries(${target} ${lib})
-  endif(STATIC)
-endfunction(LINK_LIBRARY)+#function(LINK_LIBRARY target relativePathToBuildDir lib)
+#  if(STATIC)
+#    if(WIN32)
+#      target_link_libraries(${target} ${lib})
+#    else()
+#      get_filename_component(absPath "${relativePathToBuildDir}/lib${lib}.a"
+#        REALPATH BASE_DIR "${CMAKE_BINARY_DIR}")
+#
+#      message(STATUS "real: ${absPath}")
+#
+#      target_link_libraries(${target} "${absPath}")
+#    endif(WIN32)
+#  else()
+#    target_link_libraries(${target} ${lib})
+#  endif(STATIC)
+#endfunction(LINK_LIBRARY)


Fix TestGenericDataSetTesselator

Fix TestGenericDataSetTesselator

The test would segfault because the labelmapper it made wasn't
complete without the freetype module.

Change-Id: Icc85c97afc2fb09ee661c172ca86e5ce5154f508

--- Filters/Generic/module.cmake
+++ Filters/Generic/module.cmake
@@ -8,6 +8,7 @@
     vtkIOXML
     vtkIOLegacy
     vtkRenderingOpenGL
+    vtkRenderingFreeTypeOpenGL
     vtkFiltersModeling
     vtkRenderingLabel
     vtkTestingRendering


ENH: handle system locations in TIFF

ENH: handle system locations in TIFF

--- CMake/External_libtiff.cmake
+++ CMake/External_libtiff.cmake
@@ -4,8 +4,11 @@

 set(DEFAULT_USE_SYSTEM_TIFF  OFF)

-option(USE_SYSTEM_TIFF "  Use a system build of libtiff." ${DEFAULT_USE_SYSTEM_TIFF})
-mark_as_advanced(USE_SYSTEM_TIFF)
+SETUP_SYSTEM_LIBRARY(PROJECT ${proj} DOC "  Use a system build of libtiff.")
+
+ADD_SYSTEM_LOCATION(PROJECT ${proj} VARIABLES ${proj}_LIBRARY ${proj}_INCLUDE_DIR)
+
+ADD_SYSTEM_PREFIX(PROJECT ${proj})

 if(USE_SYSTEM_TIFF)
   message(STATUS "  Using libtiff system version")


remove CppDB cmake module as we are moving to pqxx

--- CMakeModules/FindCppDB.cmake
+++ CMakeModules/FindCppDB.cmake
@@ -1,54 +0,0 @@
-#  (The MIT License)
-#
-#  Copyright (c) 2016 Mohammad S. Babaei
-#
-#  Permission is hereby granted, free of charge, to any person obtaining a copy
-#  of this software and associated documentation files (the "Software"), to deal
-#  in the Software without restriction, including without limitation the rights
-#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-#  copies of the Software, and to permit persons to whom the Software is
-#  furnished to do so, subject to the following conditions:
-#
-#  The above copyright notice and this permission notice shall be included in
-#  all copies or substantial portions of the Software.
-#
-#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-#  THE SOFTWARE.
-
-
-FIND_PATH ( CPPDB_INCLUDE_DIR NAMES cppdb PATHS /usr/include/ /usr/local/include/ )
-FIND_LIBRARY ( CPPDB_LIBRARY NAMES cppdb PATHS /usr/lib /usr/local/lib )
-FIND_LIBRARY ( CPPDB_SQLITE3_DRIVER NAMES cppdb_sqlite3 PATHS /usr/lib /usr/local/lib )
-
-
-IF ( CPPDB_INCLUDE_DIR AND CPPDB_LIBRARY )
-    SET ( CPPDB_FOUND TRUE )
-ENDIF (  )
-
-IF ( CPPDB_SQLITE3_DRIVER )
-    SET ( CPPDB_SQLITE3_DRIVER_FOUND TRUE )
-ENDIF (  )
-
-
-IF ( CPPDB_FOUND )
-    MESSAGE ( STATUS "Found CppDB headers in ${CPPDB_INCLUDE_DIR}" )
-    MESSAGE ( STATUS "Found CppDB library: ${CPPDB_LIBRARY}" )
-ELSE (  )
-    IF ( CPPDB_FIND_REQUIRED )
-        MESSAGE ( FATAL_ERROR "Could not find CppDB." )
-    ENDIF (  )
-ENDIF (  )
-
-
-IF ( CPPDB_SQLITE3_DRIVER_FOUND )
-    MESSAGE ( STATUS "Found CppDB-SQLite3 driver: ${CPPDB_SQLITE3_DRIVER}" )
-ELSE (  )
-    IF ( CPPDB_SQLITE3_DRIVER_FIND_REQUIRED )
-        MESSAGE ( FATAL_ERROR "Could not find CppDB-SQLite3 driver." )
-    ENDIF (  )
-ENDIF (  )


why do external libraries never work

why do external libraries never work

--- external/external.cmake
+++ external/external.cmake
@@ -21,7 +21,10 @@
 	ExternalProject_Add(pugixml_external
 			PREFIX ${EXTERNAL_BUILD_DIR}/pugixml
 			GIT_REPOSITORY https://github.com/zeux/pugixml
+			CMAKE_ARGS “-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>”
 			UPDATE_COMMAND ""
+			BUILD_COMMAND "make pugixml"
+			INSTALL_COMMAND ""
 			)

 	set(PUGIXML_LIBRARY ${EXTERNAL_BUILD_DIR}/pugixml/src/pugixml_external-build/libpugixml${CMAKE_STATIC_LIBRARY_SUFFIX})


generate new skeleton reports

generate new skeleton reports

--- src/osvr/GenerateForReportTypes.cmake
+++ src/osvr/GenerateForReportTypes.cmake
@@ -18,6 +18,13 @@
     EyeTrackerBlink
     NaviVelocity
     NaviPosition
+    SkeletonJoint
+    SkeletonWhole
+    SkeletonTrimmed
+    SkeletonHand
+    SkeletonArm
+    SkeletonFoot
+    SkeletonLeg
     CACHE INTERNAL "" FORCE)

 # Generate a file using a template with the placeholder @BODY@, as well as a


BUG: don't build the kea driver in GDAL Superbuild

--- SuperBuild/CMake/External_gdal.cmake
+++ SuperBuild/CMake/External_gdal.cmake
@@ -81,6 +81,7 @@
     --with-ingres=no
     --with-jp2mrsid=no
     --with-kakadu=no
+    --with-kea=no
     --with-jasper=no
     --with-libgrass=no
     --with-mrsid=no


Hardcode WinML umbrella lib to windowsapp.lib (#4133)


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   03)
+SET(KWSYS_DATE_STAMP_DAY   04)


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

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


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   07)
+SET(KWSYS_DATE_STAMP_DAY   08)


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   22)
+SET(KWSYS_DATE_STAMP_DAY   23)


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   29)
+SET(KWSYS_DATE_STAMP_DAY   30)


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

 # 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
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 01)

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


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   04)
+SET(KWSYS_DATE_STAMP_DAY   05)


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


fix build with QUIC

fix build with QUIC

Summary: fixes #267

Reviewed By: yangchi

Differential Revision: D15885138

fbshipit-source-id: b8ba3d6a8ea96b7325f27d66990d47856dcab3d1

--- cmake/BuildFizz.cmake
+++ cmake/BuildFizz.cmake
@@ -40,9 +40,9 @@
 set(LIBFIZZ_LIBRARY_LOCATION
   "${FIZZ_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}fizz${CMAKE_STATIC_LIBRARY_SUFFIX}"
 )
-add_library(mvfst_fizz STATIC IMPORTED)
-set_target_properties(mvfst_fizz PROPERTIES IMPORTED_LOCATION "${LIBFIZZ_LIBRARY_LOCATION}")
-set_target_properties(mvfst_fizz PROPERTIES INTERFACE_LINK_LIBRARIES Folly::folly)
+add_library(fizz STATIC IMPORTED)
+set_target_properties(fizz PROPERTIES IMPORTED_LOCATION "${LIBFIZZ_LIBRARY_LOCATION}")
+set_target_properties(fizz PROPERTIES INTERFACE_LINK_LIBRARIES Folly::folly)

-set(LIBFIZZ_LIBRARY mvfst_fizz)
+set(LIBFIZZ_LIBRARY fizz)
 set(LIBFIZZ_INCLUDE_DIR "${source_dir}")


Ajout "trouvage" du bon répertoire include (sous Windows en tous cas)

--- cmake/FindCEGUI.cmake
+++ cmake/FindCEGUI.cmake
@@ -65,6 +65,7 @@
 $ENV{CEGUIDIR}/include
 $ENV{CEGUI_ROOT}
 $ENV{CEGUI_ROOT}/include
+$ENV{CEGUI_ROOT}/cegui/include
 $ENV{CEGUI_HOME}
 $ENV{CEGUI_HOME}/include
 /usr/local/include


Replace cmake check for printf with a check for fopen.

Printf is a builtin, and the check fails with -Werror because of a clang
warning about an incompatible redeclaration.

git-svn-id: 62ef012455b6b8fcec9c41ca270ebf409aae1006@255188 91177308-0d34-0410-b5e6-96231b3b80d8

--- cmake/config-ix.cmake
+++ cmake/config-ix.cmake
@@ -39,7 +39,7 @@
 check_cxx_compiler_flag(/EHa-                 LIBUNWIND_HAS_NO_EHA_FLAG)
 check_cxx_compiler_flag(/GR-                  LIBUNWIND_HAS_NO_GR_FLAG)

-check_library_exists(c printf "" LIBUNWIND_HAS_C_LIB)
+check_library_exists(c fopen "" LIBUNWIND_HAS_C_LIB)
 check_library_exists(dl dladdr "" LIBUNWIND_HAS_DL_LIB)
 check_library_exists(pthread pthread_once "" LIBUNWIND_HAS_PTHREAD_LIB)


Added boost path to cegui thx Niektory for this

--- cmake/get-cegui.cmake
+++ cmake/get-cegui.cmake
@@ -44,6 +44,7 @@
     -DCEGUI_BUILD_XMLPARSER_RAPIDXML:BOOL=OFF
     -DCEGUI_BUILD_XMLPARSER_TINYXML:BOOL=OFF
     -DCEGUI_BUILD_XMLPARSER_XERCES:BOOL=OFF
+    -DBOOST_ROOT:PATH=$ENV{boost_root}
 )

 ExternalProject_Add(


customize nsis package filename

customize nsis package filename

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

--- cmake/pcl_cpack.cmake
+++ cmake/pcl_cpack.cmake
@@ -45,6 +45,7 @@
   else(MSVC10)
     set(CPACK_NSIS_PACKAGE_NAME "${CPACK_NSIS_PACKAGE_NAME}-${win_system_name}")
   endif(MSVC10)
+  set(CPACK_PACKAGE_FILE_NAME ${CPACK_NSIS_PACKAGE_NAME})
   # force CPACK_PACKAGE_INSTALL_REGISTRY_KEY because of a known limitation in cmake/cpack to be fixed in next releases
   # http://public.kitware.com/Bug/view.php?id=9094
   # This is to allow a 32bit and a 64bit of PCL to get installed on one system


Allow python 2

Allow python 2

--- Modules/Wrappers/SWIG/otb-module-init.cmake
+++ Modules/Wrappers/SWIG/otb-module-init.cmake
@@ -42,8 +42,15 @@

 if ( OTB_WRAP_PYTHON )
   check_PIC_flag ( Python )
-  find_package ( PythonInterp 3 REQUIRED )
-  find_package ( PythonLibs 3 REQUIRED )
+  set (PythonVersion 3)
+  find_package ( PythonInterp ${PythonVersion} )
+  if( NOT PythonInterp_FOUND)
+    message (WARNING "Python3 not found. There is no longer support of python2 \
+      in OTB, but it can still be used.")
+    set (PythonVersion 2)
+    find_package ( PythonInterp ${PythonVersion} REQUIRED)
+  endif()
+  find_package ( PythonLibs ${PythonVersion} REQUIRED )
   find_package ( Numpy )
 endif()


remove testing for remus

remove testing for remus

--- superbuild/Projects/win32/remus.cmake
+++ superbuild/Projects/win32/remus.cmake
@@ -5,6 +5,7 @@
     -DBUILD_SHARED_LIBS=OFF
     -DRemus_ENABLE_EXAMPLES:BOOL=OFF
     -DRemus_NO_SYSTEM_BOOST:BOOL=ON
+    -DRemus_ENABLE_TESTING:BOOL=OFF
     -DZeroMQ_ROOT_DIR=<INSTALL_DIR>
     -DBOOST_INCLUDEDIR=<INSTALL_DIR>/include/boost
     -DBOOST_LIBRARYDIR=<INSTALL_DIR>/lib


CMake: Add to the relevant upstream bug report

--- cmake/checks/check_01_cxx_features.cmake
+++ cmake/checks/check_01_cxx_features.cmake
@@ -121,6 +121,8 @@
     #
     # Clang-3.5* or older, bail out with a spurious error message in case
     # of an undeduced auto return type.
+    #
+    # https://llvm.org/bugs/show_bug.cgi?id=16876
     #
     PUSH_CMAKE_REQUIRED("${DEAL_II_CXX_FLAGS_DEBUG}")
     CHECK_CXX_SOURCE_COMPILES(


Default navigation module on in CMake

Default navigation module on in CMake

--- Tools/CMake/modules/module_navigation.cmake
+++ Tools/CMake/modules/module_navigation.cmake
@@ -21,8 +21,7 @@
 # -----------------------------------------------------------------------------

 # Navigation module
-option(TORQUE_NAVIGATION "Enable Navigation module" OFF)
-#mark_as_advanced(TORQUE_NAVIGATION)
+option(TORQUE_NAVIGATION "Enable Navigation module" ON)

 if(TORQUE_NAVIGATION)
 	addDef( "TORQUE_NAVIGATION_ENABLED" )


Mise a jour du cmake pour linux 64 partie 2

--- CMake/ConfigXsilium.cmake
+++ CMake/ConfigXsilium.cmake
@@ -271,5 +271,15 @@
 		endif ()
 	endif ()

+	if (XSILIUM_COMPILE_OGRE_COMPONENTS)
+		option(OGRE_BUILD_COMPONENT_PAGING "Build Ogre Paging Compoment" ON)
+		option(OGRE_BUILD_COMPONENT_TERRAIN "Build Ogre Terrain Compoment" ON)
+		option(OGRE_BUILD_COMPONENT_RTSHADERSYSTEM "Build Ogre RTShaderSystem Compoment" ON)
+		option(OGRE_BUILD_COMPONENT_PROPERTY "Build Ogre Property Compoment(Required boost)" ON)
+		option(OGRE_BUILD_COMPONENT_VOLUME "Build Volume component" ON)
+
+	endif()
+
+
 endmacro(configure_xsilium)


ENH: fix GEOS superbuild

ENH: fix GEOS superbuild

--- CMake/External_geos.cmake
+++ CMake/External_geos.cmake
@@ -26,7 +26,7 @@
       -DBUILD_SHARED_LIBS:BOOL=ON
       -DBUILD_TESTING:BOOL=OFF
       -DGEOS_ENABLE_TESTS:BOOL=OFF
-    CONFIGURE_COMMAND
+    CMAKE_COMMAND
       LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib
       ${CMAKE_COMMAND}
     )


Changed SOFA tarball path to official link.

--- CMakeExternals/SOFA.cmake
+++ CMakeExternals/SOFA.cmake
@@ -75,8 +75,8 @@
       SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}-src
       BINARY_DIR ${proj}-build
       PREFIX ${proj}-cmake
-      URL http://dl.dropboxusercontent.com/u/5822501/SOFA-rev${rev}.tar.gz
-      # URL_MD5 ff65b2813dcc27755844f95cb0392bcf
+      URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/SOFA-rev${rev}.tar.gz
+      URL_MD5 d01a194f54b933f4cdfdfc75b2f81a2f
       PATCH_COMMAND ${SOFA_PATCH_COMMAND}
       INSTALL_COMMAND ""
       CMAKE_GENERATOR ${gen}