Updated for doxygen 1.9.5

Updated for doxygen 1.9.5

--- Doxyfile.cmake
+++ Doxyfile.cmake
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.3
+# Doxyfile 1.9.5

 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -12,6 +12,16 @@
 # For lists, items can also be appended using:
 # TAG += value [value, ...]
 # Values that contain spaces should be placed between quotes (\" \").
+#
+# Note:
+#
+# Use doxygen to compare the used configuration file with the template
+# configuration file:
+# doxygen -x [configFile]
+# Use doxygen to compare the used configuration file with the template
+# configuration file without replacing the environment variables or CMake type
+# replacement variables:
+# doxygen -x_noenv [configFile]

 #---------------------------------------------------------------------------
 # Project related configuration options
@@ -60,15 +70,27 @@

 OUTPUT_DIRECTORY       = ./autodocs/

-# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096
+# sub-directories (in 2 levels) under the output directory of each output format
+# and will distribute the generated files over these directories. Enabling this
 # option can be useful when feeding doxygen a huge amount of source files, where
 # putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
+# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to
+# control the number of sub-directories.
 # The default value is: NO.

 CREATE_SUBDIRS         = NO
+
+# Controls the number of sub-directories that will be created when
+# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every
+# level increment doubles the number of directories, resulting in 4096
+# directories at level 8 which is the default and also the maximum value. The
+# sub-directories are organized in 2 levels, the first level always has a fixed
+# numer of 16 directories.
+# Minimum value: 0, maximum value: 8, default value: 8.
+# This tag requires that the tag CREATE_SUBDIRS is set to YES.
+
+CREATE_SUBDIRS_LEVEL   = 8

 # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
 # characters to appear in the names of generated files. If set to NO, non-ASCII
@@ -81,14 +103,14 @@
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
 # documentation generated by doxygen is written. Doxygen will use this
 # information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
-# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
-# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
-# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
-# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
-# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
-# Ukrainian and Vietnamese.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian,
+# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English
+# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek,
+# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with
+# English messages), Korean, Korean-en (Korean with English messages), Latvian,
+# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese,
+# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish,
+# Swedish, Turkish, Ukrainian and Vietnamese.
 # The default value is: English.

 OUTPUT_LANGUAGE        = English
@@ -446,7 +468,7 @@

 LOOKUP_CACHE_SIZE      = 0

-# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use
 # during processing. When set to 0 doxygen will based this on the number of
 # cores available in the system. You can set it explicitly to a value larger
 # than 0 to get more control over the balance between CPU load and processing
@@ -571,14 +593,15 @@
 # filesystem is case sensitive (i.e. it supports files in the same directory
 # whose names only differ in casing), the option must be set to YES to properly
 # deal with such files in case they appear in the input. For filesystems that
-# are not case sensitive the option should be be set to NO to properly deal with
+# are not case sensitive the option should be set to NO to properly deal with
 # output files written for symbols that only differ in casing, such as for two
 # classes, one named CLASS and the other named Class, and to also support
 # references to files without having to specify the exact matching casing. On
 # Windows (including Cygwin) and MacOS, users should typically set this option
 # to NO, whereas on Linux or other Unix flavors it should typically be set to
 # YES.
-# The default value is: system dependent.
+# Possible values are: SYSTEM, NO and YES.
+# The default value is: SYSTEM.

 CASE_SENSE_NAMES       = YES

@@ -845,9 +868,20 @@
 # and the warning text. Optionally the format may contain $version, which will
 # be replaced by the version of the file (if it could be obtained via
 # FILE_VERSION_FILTER)
+# See also: WARN_LINE_FORMAT
 # The default value is: $file:$line: $text.

 WARN_FORMAT            = "$file:$line: $text"
+
+# In the $text part of the WARN_FORMAT command it is possible that a reference
+# to a more specific place is given. To make it easier to jump to this place
+# (outside of doxygen) the user can define a custom "cut" / "paste" string.
+# Example:
+# WARN_LINE_FORMAT = "'vi $file +$line'"
+# See also: WARN_FORMAT
+# The default value is: at line $line of file $file.
+
+WARN_LINE_FORMAT       = "at line $line of file $file"

 # The WARN_LOGFILE tag can be used to specify a file to which warning and error
 # messages should be written. If left blank the output is written to standard
@@ -875,9 +909,20 @@
 # libiconv (or the iconv built into libc) for the transcoding. See the libiconv
 # documentation (see:
 # https://www.gnu.org/software/libiconv/) for the list of possible encodings.
+# See also: INPUT_FILE_ENCODING
 # The default value is: UTF-8.

 INPUT_ENCODING         = UTF-8
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify
+# character encoding on a per file pattern basis. Doxygen will compare the file
+# name with each pattern and apply the encoding instead of the default
+# INPUT_ENCODING) if there is a match. The character encodings are a list of the
+# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding
+# "INPUT_ENCODING" for further information on supported encodings.
+
+INPUT_FILE_ENCODING    =

 # If the value of the INPUT tag contains directories, you can use the
 # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
@@ -966,7 +1011,7 @@
 # that contain images that are to be included in the documentation (see the
 # \image command).

-IMAGE_PATH             =
+IMAGE_PATH             =

 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
@@ -982,6 +1027,11 @@
 # Note that the filter must not add or remove lines; it is applied before the
 # code is scanned, but not when the output code is generated. If lines are added
 # or removed, the anchors will not be placed correctly.
+#
+# Note that doxygen will use the data processed and written to standard output
+# for further processing, therefore nothing else, like debug statements or used
+# commands (so in case of a Windows batch file always use @echo OFF), should be
+# written to standard output.
 #
 # Note that for custom extensions or not directly supported extensions you also
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
@@ -1023,6 +1073,15 @@
 # and want to reuse the introduction page also for the doxygen output.

 USE_MDFILE_AS_MAINPAGE =
+
+# The Fortran standard specifies that for fixed formatted Fortran code all
+# characters from position 72 are to be considered as comment. A common
+# extension is to allow longer lines before the automatic comment starts. The
+# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can
+# be processed before the automatic comment starts.
+# Minimum value: 7, maximum value: 10000, default value: 72.
+
+FORTRAN_COMMENT_AFTER  = 72

 #---------------------------------------------------------------------------
 # Configuration options related to source browsing
@@ -1218,6 +1277,23 @@

 HTML_EXTRA_FILES       =

+# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output
+# should be rendered with a dark or light theme. Default setting AUTO_LIGHT
+# enables light output unless the user preference is dark output. Other options
+# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to
+# default to dark mode unless the user prefers light mode, and TOGGLE to let the
+# user toggle between dark and light mode via a button.
+# Possible values are: LIGHT Always generate light output., DARK Always generate
+# dark output., AUTO_LIGHT Automatically set the mode according to the user
+# preference, use light mode if no preference is set (the default)., AUTO_DARK
+# Automatically set the mode according to the user preference, use dark mode if
+# no preference is set. and TOGGLE Allow to user to switch between light and
+# dark mode via a button..
+# The default value is: AUTO_LIGHT.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE        = AUTO_LIGHT
+
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
 # this color. Hue is specified as an angle on a color-wheel, see
@@ -1580,17 +1656,6 @@
 # This tag requires that the tag GENERATE_HTML is set to YES.

 FORMULA_FONTSIZE       = 12
-
-# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT    = YES

 # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
 # to create new LaTeX commands to be used in formulas as building blocks. See
@@ -2214,7 +2279,8 @@

 # The INCLUDE_PATH tag can be used to specify one or more directories that
 # contain include files that are not input files but should be processed by the
-# preprocessor.
+# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of
+# RECURSIVE has no effect here.
 # This tag requires that the tag SEARCH_INCLUDES is set to YES.

 INCLUDE_PATH           =
@@ -2338,26 +2404,38 @@

 DOT_NUM_THREADS        = 0

-# When you want a differently looking font in the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
+# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of
+# subgraphs. When you want a differently looking font in the dot files that
+# doxygen generates you can specify fontname, fontcolor and fontsize attributes.
+# For details please see Node,
+# Edge and Graph Attributes specification You need to make sure dot is able
+# to find the font, which can be done by putting it in a standard location or by
+# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font. Default graphviz fontsize is 14.
+# The default value is: fontname=Helvetica,fontsize=10.
 # This tag requires that the tag HAVE_DOT is set to YES.

-DOT_FONTNAME           = Helvetica
-
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
+DOT_COMMON_ATTR        = "fontname=Helvetica,fontsize=10"
+
+# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can
+# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about
+# arrows shapes.
+# The default value is: labelfontname=Helvetica,labelfontsize=10.
 # This tag requires that the tag HAVE_DOT is set to YES.

-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
+DOT_EDGE_ATTR          = "labelfontname=Helvetica,labelfontsize=10"
+
+# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes
+# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification
+# The default value is: shape=box,height=0.2,width=0.4.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NODE_ATTR          = "shape=box,height=0.2,width=0.4"
+
+# You can set the path where dot can find font specified with fontname in
+# DOT_COMMON_ATTR and others dot attributes.
 # This tag requires that the tag HAVE_DOT is set to YES.

 DOT_FONTPATH           =
@@ -2383,7 +2461,8 @@
 COLLABORATION_GRAPH    = YES

 # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
+# groups, showing the direct groups dependencies. See also the chapter Grouping
+# in the manual.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.

@@ -2599,18 +2678,6 @@

 MAX_DOT_GRAPH_DEPTH    = 0

-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
 # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
 # files in one run (i.e. multiple -o and -T options on the command line). This
 # makes dot run faster, but since only newer versions of dot (>1.8.10) support


Add Python support to CMake utilities

Add Python support to CMake utilities

Teach lcm_wrap_types to produce __init__.py for Python packages, to fill
PYTHON_SOURCES, and to include Python files in the list of generated
files when Python generation is requested.

--- lcm-cmake/lcmUtilities.cmake
+++ lcm-cmake/lcmUtilities.cmake
@@ -66,6 +66,25 @@
   else()
     file(APPEND ${_header} "#include \"${TYPE_HEADER}\"\n")
   endif()
+endfunction()
+
+#------------------------------------------------------------------------------
+function(_lcm_add_python_package PATH)
+  list(FIND _python_packages "${PATH}" _index)
+  if(_index EQUAL -1)
+    set(_init "${_DESTINATION}/${PATH}/__init__.py")
+    if(EXISTS ${_init})
+      file(REMOVE ${_init})
+    endif()
+    _lcm_parent_list_append(_python_packages ${PATH})
+    _lcm_parent_list_append(${_PYTHON_SOURCES} ${_init})
+  endif()
+endfunction()
+
+#------------------------------------------------------------------------------
+function(_lcm_add_python_type PACKAGE TYPE)
+  set(_init "${_DESTINATION}/${PACKAGE}/__init__.py")
+  file(APPEND ${_init} "from .${TYPE} import ${TYPE}\n")
 endfunction()

 #------------------------------------------------------------------------------
@@ -147,6 +166,7 @@

   # Create build rules
   set(_aggregate_headers "")
+  set(_python_packages "")
   foreach(_lcmtype ${_UNPARSED_ARGUMENTS})
     set(_package "")
     set(_outputs "")
@@ -191,7 +211,12 @@
               "${_type}.hpp" "${_package_dir}")
           endif()
         endif()
-        # TODO Python, Java
+        if(DEFINED _PYTHON_SOURCES)
+          _lcm_add_python_package(${_package_dir})
+          _lcm_add_python_type(${_package_dir} ${_type})
+          _lcm_add_outputs(_PYTHON_SOURCES ${_package_dir}/${_type}.py)
+        endif()
+        # TODO Java
       endif()
     endforeach()


Added utility macro which allows to completely specify the option name.

--- CMake/ctkMacroOptionUtils.cmake
+++ CMake/ctkMacroOptionUtils.cmake
@@ -47,16 +47,20 @@
   ctk_option(CTK_APP ${name} ${doc} ${default} ${ARGN})
 endmacro()

-macro(ctk_enable_option name doc default)
-  option(CTK_ENABLE_${name} "${doc}" ${default})
-  if(DEFINED CTK_ENABLE_${name}_internal)
-    if(${CTK_ENABLE_${name}} AND ${CTK_ENABLE_${name}_internal})
+macro(ctk_enable_option_raw name doc default)
+  option(${name} "${doc}" ${default})
+  if(DEFINED ${name}_internal)
+    if(${${name}} AND ${${name}_internal})
       if(NOT (${ARGN}))
-        get_property(_doc_string CACHE CTK_ENABLE_${name} PROPERTY HELPSTRING)
-        set(CTK_ENABLE_${name} OFF CACHE BOOL ${_doc_string} FORCE)
+        get_property(_doc_string CACHE ${name} PROPERTY HELPSTRING)
+        set(${name} OFF CACHE BOOL ${_doc_string} FORCE)
         message("Full support for [${name}] disabled")
       endif()
     endif()
   endif()
-  set(CTK_ENABLE_${name}_internal ${CTK_ENABLE_${name}} CACHE INTERNAL "" FORCE)
+  set(${name}_internal ${${name}} CACHE INTERNAL "" FORCE)
 endmacro()
+
+macro(ctk_enable_option name doc default)
+  ctk_enable_option_raw(CTK_ENABLE_${name} ${doc} ${default} ${ARGN})
+endmacro()


reduce link time on AMD

reduce link time on AMD

--- CMake/hoomd/HOOMDHIPSetup.cmake
+++ CMake/hoomd/HOOMDHIPSetup.cmake
@@ -78,7 +78,7 @@
             /opt/rocm/include
             NO_DEFAULT_PATH)

-	option(ENABLE_ROCTRACER "Enable roctracer profiler integration" off)
+        option(ENABLE_ROCTRACER "Enable roctracer profiler integration" off)

         list(APPEND HIP_INCLUDE_DIR ${ROCm_hsa_INCLUDE_DIR})
     else()
@@ -99,6 +99,9 @@
     endif()

     ENABLE_LANGUAGE(CUDA)
+
+    # reduce link time (no device linking)
+    set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -fno-gpu-rdc")

     if(NOT TARGET HIP::hip)
         add_library(HIP::hip INTERFACE IMPORTED)


ENH: Use the new Midas3 data repository.

--- CMake/ITKExamplesExternalData.cmake
+++ CMake/ITKExamplesExternalData.cmake
@@ -33,11 +33,11 @@
   # Data published on the Rackspace backup
   "http://c389985.r85.cf1.rackcdn.com/%(algo)/%(hash)"

+  # Data published by MIDAS
+  "http://midas3.kitware.com/midas/api/rest?method=midas.bitstream.download&checksum=%(hash)"
+
   # Data published on dropbox
   "http://dl.dropbox.com/u/61255957/%(algo)/%(hash)"
-
-  # Data published by MIDAS
-  "http://midas.kitware.com/api/rest/midas.bitstream.by.hash?hash=%(hash)&algorithm=%(algo)"
   )

 # Tell ExternalData commands to transform raw files to content links.


use include paths from source ,rather than from install

--- CMakeModules/build_EasyCL.cmake
+++ CMakeModules/build_EasyCL.cmake
@@ -17,7 +17,7 @@
 SET_PROPERTY(TARGET EasyCL PROPERTY IMPORTED_LOCATION "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}EasyCL${CMAKE_SHARED_LIBRARY_SUFFIX}")
 SET_PROPERTY(TARGET EasyCL PROPERTY IMPORTED_IMPLIB "${CMAKE_INSTALL_PREFIX}/lib/EasyCL.lib")
 ADD_DEPENDENCIES(EasyCL EasyCL-external)
-SET(EASYCL_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/EasyCL ${CMAKE_CURRENT_SOURCE_DIR}/EasyCL/thirdparty/clew/include)
+SET(EASYCL_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/EasyCL ${CMAKE_CURRENT_SOURCE_DIR}/EasyCL/thirdparty/clew/include  ${CMAKE_CURRENT_SOURCE_DIR}/EasyCL/thirdparty/clew/include/proxy-opencl)
 #message("lib path ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}EasyCL${CMAKE_SHARED_LIBRARY_SUFFIX}")
 if(WIN32)
 	SET(EASYCL_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/EasyCL.lib ${CMAKE_INSTALL_PREFIX}/lib/clew.lib)


Enable freetype tests when matplotlib is not found.

Only a subset of the freetype tests also need mathtext, but all tests
were disabled when MPL wasn't found.

Change-Id: If19bb0249db5f9f0e256ead1357381aa85115006

--- Rendering/FreeType/module.cmake
+++ Rendering/FreeType/module.cmake
@@ -1,3 +1,10 @@
+# The tests can be built without matplotlib, but we add some additional tests
+# if it is enabled.
+set(optional_test_depends)
+if(${Module_vtkRenderingMatplotlib})
+  set(optional_test_depends "vtkRenderingMatplotlib")
+endif()
+
 vtk_module(vtkRenderingFreeType
   IMPLEMENTS
     vtkRenderingCore
@@ -8,7 +15,7 @@
     vtkfreetype
     vtkftgl
   TEST_DEPENDS
-    vtkRenderingMatplotlib
+    ${optional_test_depends}
     vtkTestingRendering
     vtkViewsContext2D
     vtkRendering${VTK_RENDERING_BACKEND}


[t:4871] add --quiet to valgrind invocation to let us use tokugrind

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

--- DartConfig.cmake
+++ DartConfig.cmake
@@ -1,5 +1,5 @@
 if(BUILD_TESTING)
   set(MEMORYCHECK_COMMAND "${TokuDB_SOURCE_DIR}/scripts/tokuvalgrind")
-  set(MEMORYCHECK_COMMAND_OPTIONS "--gen-suppressions=no --num-callers=20 --leak-check=full --show-reachable=yes --trace-children=yes --trace-children-skip=sh,*/sh,basename,*/basename,dirname,*/dirname,rm,*/rm,cp,*/cp,mv,*/mv,cat,*/cat,diff,*/diff,grep,*/grep,date,*/date,test,*/tokudb_dump* --trace-children-skip-by-arg=--only_create,--test,--no-shutdown,novalgrind" CACHE INTERNAL "options for valgrind")
+  set(MEMORYCHECK_COMMAND_OPTIONS "--gen-suppressions=no --quiet --num-callers=20 --leak-check=full --show-reachable=yes --trace-children=yes --trace-children-skip=sh,*/sh,basename,*/basename,dirname,*/dirname,rm,*/rm,cp,*/cp,mv,*/mv,cat,*/cat,diff,*/diff,grep,*/grep,date,*/date,test,*/tokudb_dump* --trace-children-skip-by-arg=--only_create,--test,--no-shutdown,novalgrind" CACHE INTERNAL "options for valgrind")
   set(MEMORYCHECK_SUPPRESSIONS_FILE "${CMAKE_CURRENT_BINARY_DIR}/valgrind.suppressions" CACHE INTERNAL "suppressions file for valgrind")
 endif()


fix(Build/Windows): For OS locales like CJK (#4912)

--- src/cmake/compiler/msvc/settings.cmake
+++ src/cmake/compiler/msvc/settings.cmake
@@ -18,6 +18,11 @@
 string(REGEX REPLACE "/W[0-4]$" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 string(REGEX REPLACE "/W[0-4] " "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 string(REGEX REPLACE "/W[0-4]$" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+
+# https://tinyurl.com/jxnc4s83
+target_compile_options(acore-compile-option-interface
+    INTERFACE
+      /utf-8)

 if(PLATFORM EQUAL 64)
   # This definition is necessary to work around a bug with Intellisense described


ENH: Upgrade ITK version

ENH: Upgrade ITK version

--- SuperBuild/External_ITKv4.cmake
+++ SuperBuild/External_ITKv4.cmake
@@ -168,7 +168,7 @@
     )
   ### --- End Project specific additions
   set(${proj}_REPOSITORY ${git_protocol}://itk.org/ITK.git)
-  set(${proj}_GIT_TAG 12f11d1f408680d24b6380856dd28dbe43582285)
+  set(${proj}_GIT_TAG 74155d0b7059fde841832c92a9aec78c79bc68c0)
   set(ITK_VERSION_ID ITK-4.8)

   ExternalProject_Add(${proj}


ENH: update git-tag to something not quite as new

--- SuperBuild/External_ITKv4.cmake
+++ SuperBuild/External_ITKv4.cmake
@@ -125,15 +125,32 @@
     )

     if( USE_VTK STREQUAL "ON" )
-      set(${proj}_CMAKE_OPTIONS ${proj}_CMAKE_OPTIONS
-        -DModule_ITKVtkGlue:BOOL=ON )
+      set(${proj}_CMAKE_OPTIONS
+      -DBUILD_TESTING:BOOL=OFF
+      -DBUILD_EXAMPLES:BOOL=OFF
+      -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/${proj}-install
+      -DITK_LEGACY_REMOVE:BOOL=OFF
+      -DITK_FUTURE_LEGACY_REMOVE:=BOOL=ON
+      -DITKV3_COMPATIBILITY:BOOL=ON
+      -DITK_BUILD_DEFAULT_MODULES:BOOL=ON
+      #-DITK_INSTALL_NO_DEVELOPMENT:BOOL=ON
+      -DKWSYS_USE_MD5:BOOL=ON # Required by SlicerExecutionModel
+      -DITK_WRAPPING:BOOL=OFF #${BUILD_SHARED_LIBS} ## HACK:  QUICK CHANGE
+      -DModule_MGHIO:BOOL=ON
+      -DModule_ITKReview:BOOL=ON
+      -DModule_ITKVtkGlue:BOOL=ON
+      ${${proj}_DCMTK_ARGS}
+      ${${proj}_WRAP_ARGS}
+      ${${proj}_FFTWF_ARGS}
+      ${${proj}_FFTWD_ARGS}
+      )
     endif()

   ### --- End Project specific additions
   set(${proj}_REPOSITORY ${git_protocol}://itk.org/ITK.git)
   set(${proj}_REPOSITORY "https://github.com/InsightSoftwareConsortium/ITK.git")
-  set(${proj}_GIT_TAG 32c0b9f0f20de3d26da1e0f5556368113707e039)
+  set(${proj}_GIT_TAG 87dcbb4d9a16b1418369a709f91a258cf9d48ee0)
   set(ITK_VERSION_ID ITK-4.6)

   ExternalProject_Add(${proj}


Split off 8.4.34

Split off 8.4.34

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

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


Nagios Monitoring 6.0.0-1 Gold

Nagios Monitoring 6.0.0-1 Gold

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

--- version.cmake
+++ version.cmake
@@ -5,6 +5,6 @@
 set ( HPCC_MAJOR 6 )
 set ( HPCC_MINOR 0 )
 set ( HPCC_POINT 0 )
-set ( HPCC_MATURITY "rc" )
-set ( HPCC_SEQUENCE 6 )
+set ( HPCC_MATURITY "release" )
+set ( HPCC_SEQUENCE 1 )
 ###


Graph Control 5.0.6 Release Candidate 1

Graph Control 5.0.6 Release Candidate 1

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

--- version.cmake
+++ version.cmake
@@ -4,9 +4,9 @@
 set ( HPCC_PROJECT "community" )
 set ( HPCC_MAJOR 5 )
 set ( HPCC_MINOR 0 )
-set ( HPCC_POINT 5 )
-set ( HPCC_MATURITY "closedown" )
-set ( HPCC_SEQUENCE 0 )
+set ( HPCC_POINT 6 )
+set ( HPCC_MATURITY "rc" )
+set ( HPCC_SEQUENCE 1 )
 ###
 IF ( ${HPCC_POINT} GREATER 65 )
   error ( "HPCC_POINT must be less than 66." )


Split off 7.10.34

Split off 7.10.34

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

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


build: changed spidermonkey threadsafety test to work on 1.8rc1 (1.8.1+ does not work yet)

--- CMakeModules/FindSpidermonkey.cmake
+++ CMakeModules/FindSpidermonkey.cmake
@@ -60,11 +60,9 @@
     SET(CMAKE_REQUIRED_DEFINITIONS ${SPIDERMONKEY_DEFINITIONS})
     SET(CMAKE_REQUIRED_LIBRARIES ${SPIDERMONKEY_LIBRARY})
     CHECK_CXX_SOURCE_RUNS(
-        "#include <js/jsapi.h>
-         #include <stdio.h>
-         #include <stdlib.h>
+        "extern \"C\" void js_GetCurrentThread();
          int main() {
-             return ((void*) JS_BeginRequest) ? EXIT_SUCCESS : EXIT_FAILURE;
+             return ((void*)js_GetCurrentThread) != 0 ? 0 : 1;
          }"
         SPIDERMONKEY_THREADSAFE)


64-bit compatability tweak from papillion

--- CMakeModules/SimGearComponent.cmake
+++ CMakeModules/SimGearComponent.cmake
@@ -16,7 +16,7 @@
         set(libName "sg${name}")
         add_library(${libName} STATIC ${sources} )

-        install (TARGETS ${libName} ARCHIVE DESTINATION lib)
+        install (TARGETS ${libName} ARCHIVE DESTINATION lib${LIB_SUFFIX})
         install (FILES ${headers}  DESTINATION include/simgear/${includePath})
     endif()


CI: missing patches on OTBStandaloneModuleMacros

--- CMake/NamespaceHandler.cmake
+++ CMake/NamespaceHandler.cmake
@@ -53,6 +53,7 @@
     list(APPEND _files_to_process ${_other_targets})
     file(GLOB _module_files "${folder}/Modules/*.cmake")
     list(APPEND _files_to_process ${_module_files})
+    list(APPEND _files_to_process "${folder}/OTBStandaloneModuleMacros.cmake")

     # patch each file
     foreach(_file_path ${_files_to_process})
@@ -87,6 +88,16 @@
           string(REPLACE ")" " )" _filtered_line "${_filtered_line}")
           ns_filter_line()
           string(REPLACE " )" ")" _filtered_line "${_filtered_line}")
+        elseif(_filtered_line MATCHES "<TARGET_FILE:")
+          set(_t_prefix "TARGET_FILE:")
+          set(_t_suffix ">")
+          ns_filter_line()
+        elseif(_filtered_line MATCHES "add_dependencies")
+          set(_t_prefix " ")
+          set(_t_suffix " ")
+          string(REPLACE ")" " )" _filtered_line "${_filtered_line}")
+          ns_filter_line()
+          string(REPLACE " )" ")" _filtered_line "${_filtered_line}")
         endif()
         list(APPEND _file_filtered_content ${_filtered_line})
       endforeach()


Using "-std=c++14" in project template

Using "-std=c++14" in project template

--- project_template/cmake/compiler_options.cmake
+++ project_template/cmake/compiler_options.cmake
@@ -1,2 +1,2 @@
-list(APPEND CMAKE_CXX_FLAGS "-std=c++11")
+list(APPEND CMAKE_CXX_FLAGS "-std=c++14")


Tweaked Phoebus detection script

Tweaked Phoebus detection script

--- src/toolbox/cmake/FindPhoebus.cmake
+++ src/toolbox/cmake/FindPhoebus.cmake
@@ -10,21 +10,19 @@
 # Find the include path

 find_path(PHOEBUS_INCLUDE_DIR liblsl_client.h)
-
-set(APR_NAMES ${APR_NAMES} apr-1)
 find_library(PHOEBUS_LIBRARY NAMES lsl_client dl)

 if (PHOEBUS_LIBRARY AND PHOEBUS_INCLUDE_DIR)
     SET(PHOEBUS_FOUND "YES")
-#else (PHOEBUS_LIBRARY AND PHOEBUS_INCLUDE_DIR)
-#   set(PHOEBUS_FOUND "NO")
 endif (PHOEBUS_LIBRARY AND PHOEBUS_INCLUDE_DIR)

 if (PHOEBUS_FOUND)
-   message(STATUS "Found Phoebus: ${PHOEBUS_LIBRARY}")
+   message(STATUS "Found Phoebus: ${PHOEBUS_LIBRARY} ${PHOEBUS_INCLUDE_DIR}")
 else (PHOEBUS_FOUND)
    message(STATUS "Could not find Phoebus library")
+   set(PHOEBUS_LIBRARY "")
+   set(PHOEBUS_INCLUDE_DIR "")
 endif (PHOEBUS_FOUND)


Use STREQUAL instead of DEFINED to check if package is set in lcm file (#293)

--- lcm-cmake/lcmUtilities.cmake
+++ lcm-cmake/lcmUtilities.cmake
@@ -303,12 +303,12 @@

         # Determine output file name(s) and add to output variables
         if(DEFINED _C_HEADERS AND DEFINED _C_SOURCES)
-          if(DEFINED _package_pre)
+          if(_package_pre STREQUAL "")
+            _lcm_add_outputs(_C_HEADERS ${_type}.h)
+            _lcm_add_outputs(_C_SOURCES ${_type}.c)
+          else()
             _lcm_add_outputs(_C_HEADERS ${_package_pre}_${_type}.h)
             _lcm_add_outputs(_C_SOURCES ${_package_pre}_${_type}.c)
-          else()
-            _lcm_add_outputs(_C_HEADERS ${_type}.h)
-            _lcm_add_outputs(_C_SOURCES ${_type}.c)
           endif()
           if(_CREATE_CPP_AGGREGATE_HEADER)
             _lcm_add_aggregate_include("${_package_dir}.h"


COMP: disable tests until fixed

COMP: disable tests until fixed

--- Modules/MitkExt/Testing/files.cmake
+++ Modules/MitkExt/Testing/files.cmake
@@ -35,7 +35,7 @@
   # failing test
   #mitkExtractImageFilterTest.cpp
   mitkManualSegmentationToSurfaceFilterTest.cpp
-  mitkOverwriteSliceImageFilterTest.cpp
+  #mitkOverwriteSliceImageFilterTest.cpp
   mitkSurfaceToImageFilterTest.cpp
 )
 SET(MODULE_TESTIMAGES


ManageChangeLogScript: Update comment

ManageChangeLogScript: Update comment

--- Modules/ManageChangeLogScript.cmake
+++ Modules/ManageChangeLogScript.cmake
@@ -5,30 +5,30 @@
 # 2. Before source archive being built.
 #
 MACRO(MANAGE_CHANGELOG_SCRIPT_PRINT_USAGE)
-    MESSAGE(
-	"Manage ChangeLog script: This script is not recommend for end users
-  cmake -Dcmd=update
+    MESSAGE("Manage ChangeLog script: This script is not recommend for end users.
+
+cmake -Dcmd=update
       -Dchangelog=<path/ChangeLog>
       -Drelease=<path/RELEASE-NOTES.txt>
       -Dprj_info=<path/prj_info.cmake>
       [\"-D<var>=<value>\"]
-      -P <CmakeModulePath>/ManageChangeLogScript.cmake
-    Update the ChangeLog.
+    -P <CmakeModulePath>/ManageChangeLogScript.cmake
+  Update the ChangeLog.

-  cmake -Dcmd=extract_current
+cmake -Dcmd=extract_current
       -Drelease=<path/RELEASE-NOTES.txt>
       [\"-D<var>=<value>\"]
-      -P <CmakeModulePath>/ManageChangeLogScript.cmake
-    Extract current Changelog items from RELEASE-NOTES.txt
+    -P <CmakeModulePath>/ManageChangeLogScript.cmake
+  Extract current Changelog items from RELEASE-NOTES.txt

-  cmake -Dcmd=extract_prev
+cmake -Dcmd=extract_prev
       -Dver=<ver>
       -Dchangelog=<path/ChangeLog>
       [\"-D<var>=<value>\"]
-      -P <CmakeModulePath>/ManageChangeLogScript.cmake
-    Extract prev Changelog items from ChangeLog.
+    -P <CmakeModulePath>/ManageChangeLogScript.cmake
+  Extract prev Changelog items from ChangeLog.

-	"
+"
 	)
 ENDMACRO()


ENH: Update `Montage` remote module

ENH: Update `Montage` remote module

Update `Montage` remote module to its latest commit.

--- Modules/Remote/Montage.remote.cmake
+++ Modules/Remote/Montage.remote.cmake
@@ -46,5 +46,5 @@
 "Reconstruction of 3D volumetric dataset from a collection of 2D slices"
   MODULE_COMPLIANCE_LEVEL 3
   GIT_REPOSITORY ${git_protocol}://github.com/InsightSoftwareConsortium/ITKMontage.git
-  GIT_TAG 8ee6eb49da613f55a08efcc95cd3c27cbfdbd95a
+  GIT_TAG 2b98d2b720c682b5e64e2e421a00cd597ab906fb
   )


testing: build qs extension

testing: build qs extension


SDL: Upgraded to v2.0.9.

SDL: Upgraded to v2.0.9.

--- build/cmake/SDL2.cmake
+++ build/cmake/SDL2.cmake
@@ -1,8 +1,6 @@
-set(SDL2_TARGET_VERSION 2.0.7)
-set(SDL2_DEV_HASH 572dbed4ddc236498e53bd93092d677f65cfc8faec64e0b99e8752f6358efcc1)
-set(SDL2_BIN32_HASH 9f4de98f10be556c4ecba31d5897bd3b9778f130cf5c05e0f0b8fe241ea62831)
-set(SDL2_BIN64_HASH 444ae8b358f50d8f118163a89d886d452ff6cfbfaf2ef31cb10574604929f960)
-set(SDL2_SOURCE_DIR ${LOCAL_LIBRARY}/SDL)
+set(SDL2_TARGET_VERSION 2.0.9)
+set(SDL2_DEV_HASH ea266ef613f88433f493498f9e72e6bed5d03e4f3fde5b571a557a754ade9065)
+set(SDL2_BIN_HASH 8858e498f68c9c31f0eed0a21014befd63254aa52a284fb779c5150f2659d2be)

 if(ANDROID)
   # Pass through.
@@ -10,17 +8,9 @@
   set(SDL2_INCLUDE_DIRS ${LOCAL_LIBRARY}/SDL/include)
   set_target_properties(rainbow PROPERTIES LINK_FLAGS "-s DEMANGLE_SUPPORT=1 -s USE_SDL=2")
 elseif(MSVC)
-  if(CMAKE_CL_64)
-    set(SDL2_ARCH x64)
-    set(SDL2_BIN_HASH ${SDL2_BIN64_HASH})
-  else()
-    set(SDL2_ARCH x86)
-    set(SDL2_BIN_HASH ${SDL2_BIN32_HASH})
-  endif()
-
   download_library(
       sdl2-bin
-      https://libsdl.org/release/SDL2-${SDL2_TARGET_VERSION}-win32-${SDL2_ARCH}.zip
+      https://libsdl.org/release/SDL2-${SDL2_TARGET_VERSION}-win32-x64.zip
       ${SDL2_BIN_HASH}
   )
   copy_to_build_dir(sdl2-bin SDL2.dll SDL2.dll)
@@ -35,7 +25,7 @@
   add_dependencies(rainbow sdl2-dev)

   target_include_directories(rainbow PRIVATE ${SOURCE_DIR}/include)
-  set(SDL2_LIBRARY_DIR ${SOURCE_DIR}/lib/${SDL2_ARCH})
+  set(SDL2_LIBRARY_DIR ${SOURCE_DIR}/lib/x64)
   target_link_libraries(rainbow ${SDL2_LIBRARY_DIR}/SDL2.lib ${SDL2_LIBRARY_DIR}/SDL2main.lib)
 elseif(UNIX)
   pkg_check_modules(SDL2 REQUIRED sdl2)


pch generation back in build tree for non msvc platforms

--- PCHSupport.cmake
+++ PCHSupport.cmake
@@ -123,7 +123,7 @@
 		SET(_output "${CMAKE_CURRENT_BINARY_DIR}/${_name}.pch")
 	ELSE(MSVC)
 		GET_FILENAME_COMPONENT(_name ${_input} NAME)
-		SET(_output "${CMAKE_CURRENT_SOURCE_DIR}/${_name}.gch")
+		SET(_output "${CMAKE_CURRENT_BINARY_DIR}/${_name}.gch")
 	ENDIF(MSVC)
 ENDMACRO(GET_PRECOMPILED_HEADER_OUTPUT _targetName _input)

@@ -140,8 +140,9 @@

 		# for use with distcc and gcc >4.0.1 if preprocessed files are accessible
 		# on all remote machines set
-		# PCH_ADDITIONAL_COMPILER_FLAGS to -fpch-preprocess
-		SET(_target_cflags "${oldProps} ${PCH_ADDITIONAL_COMPILER_FLAGS}-include ${_input} -Winvalid-pch")
+		# PCH_ADDITIONAL_COMPILER_FLAGS to -fpch-preprocess
+		get_filename_component(_input_stripped_from_path ${_input} NAME)
+		SET(_target_cflags "${oldProps} ${PCH_ADDITIONAL_COMPILER_FLAGS}-include ${_input_stripped_from_path} -Winvalid-pch")
 	ELSE(CMAKE_COMPILER_IS_GNUCXX)
 		IF(MSVC)
 			SET(_target_cflags "${oldProps} /Yu\"${_input}\" /FI\"${_input}\" /Fp\"${_pch_output_to_use}\"")


[cmake] there is no parent scope ...

[cmake] there is no parent scope ...

--- CI/config/default.cmake
+++ CI/config/default.cmake
@@ -1,7 +1,7 @@
 # default configuration for testing

 IF(NOT __DEFAULT_CMAKE__)
-  SET(__DEFAULT_CMAKE__ TRUE PARENT_SCOPE)
+  SET(__DEFAULT_CMAKE__ TRUE)
   set_option(DEV_MODE ON)
   set_option(WITH_TESTING ON)
   set_option(WITH_SYSTEM_INFO ON)


Added missing zlib super-build dependency.

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -308,6 +308,7 @@
     ${MITK-Data_DEPENDS}
     ${Qwt_DEPENDS}
     ${Qxt_DEPENDS}
+    ${ZLIB_DEPENDS}
     ${SimpleITK_DEPENDS}
     ${Numpy_DEPENDS}
 )


Was just a problem with travis build file (depth 1 stoped the history being downloaded, so no version tag to find...)

--- version.cmake
+++ version.cmake
@@ -28,32 +28,18 @@
 		OUTPUT_STRIP_TRAILING_WHITESPACE
 	)
 	message(" Git describe: ${GIT_DESCRIBE}")
-
-	if ("${GIT_DESCRIBE}" STREQUAL "")
-		set(ODC_MAJOR_VERSION "0")
-		set(ODC_MINOR_VERSION "0")
-		set(ODC_MICRO_VERSION "0")
-		set(ODC_RC_VERSION "")
-		set(ODC_AHEAD_VERSION "0")
-		set(ODC_VERSION "${ODC_MAJOR_VERSION}.${ODC_MINOR_VERSION}.${ODC_MICRO_VERSION}${ODC_RC_VERSION}")
+	string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)(-RC[0-9]+)?-([0-9]+)-([^-]+)-?([^-]*)$" GIT_REPO_MATCH ${GIT_DESCRIBE})
+	#message("Matched version: ${CMAKE_MATCH_1} ${CMAKE_MATCH_2} ${CMAKE_MATCH_3} ${CMAKE_MATCH_4}")

-		set(GIT_REPO_COMMIT "TESTBUILD")
-		set(GIT_REPO_DIRTY "")
-	else()
-		string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)(-RC[0-9]+)?-([0-9]+)-([^-]+)-?([^-]*)$" GIT_REPO_MATCH ${GIT_DESCRIBE})
-		#message("Matched version: ${CMAKE_MATCH_1} ${CMAKE_MATCH_2} ${CMAKE_MATCH_3} ${CMAKE_MATCH_4}")
+	set(ODC_MAJOR_VERSION ${CMAKE_MATCH_1})
+	set(ODC_MINOR_VERSION ${CMAKE_MATCH_2})
+	set(ODC_MICRO_VERSION ${CMAKE_MATCH_3})
+	set(ODC_RC_VERSION ${CMAKE_MATCH_4})
+	set(ODC_AHEAD_VERSION ${CMAKE_MATCH_5})
+	set(ODC_VERSION "${ODC_MAJOR_VERSION}.${ODC_MINOR_VERSION}.${ODC_MICRO_VERSION}${ODC_RC_VERSION}")

-		set(ODC_MAJOR_VERSION ${CMAKE_MATCH_1})
-		set(ODC_MINOR_VERSION ${CMAKE_MATCH_2})
-		set(ODC_MICRO_VERSION ${CMAKE_MATCH_3})
-		set(ODC_RC_VERSION ${CMAKE_MATCH_4})
-		set(ODC_AHEAD_VERSION ${CMAKE_MATCH_5})
-		set(ODC_VERSION "${ODC_MAJOR_VERSION}.${ODC_MINOR_VERSION}.${ODC_MICRO_VERSION}${ODC_RC_VERSION}")
-
-		set(GIT_REPO_COMMIT ${CMAKE_MATCH_6})
-		set(GIT_REPO_DIRTY ${CMAKE_MATCH_7})
-	endif()
-
+	set(GIT_REPO_COMMIT ${CMAKE_MATCH_6})
+	set(GIT_REPO_DIRTY ${CMAKE_MATCH_7})
 	message("-- opendatacon version: ${ODC_VERSION} ${GIT_REPO_COMMIT}(${ODC_AHEAD_VERSION} ahead) ${GIT_REPO_DIRTY}")

 	execute_process(


Split off 7.8.60

Split off 7.8.60

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

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


Bump version to 9.0-alpha1

Bump version to 9.0-alpha1

--- version.cmake
+++ version.cmake
@@ -2,7 +2,7 @@

 project(OpenBoardView)
 string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
-set(PROJECT_VERSION "8.0")
+set(PROJECT_VERSION "9.0-alpha1")
 set(PROJECT_DESCRIPTION "Viewer for PCB layouts")
 set(PROJECT_URL "http://openboardview.org")
 set(PROJECT_LICENSE "MIT")


Split off 7.6.28

Split off 7.6.28

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

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


locate librt, libpthread, libdl and libuuid with find commands

--- CMake/Mathematica/FindMathematica.cmake
+++ CMake/Mathematica/FindMathematica.cmake
@@ -1076,11 +1076,20 @@
 			endif()
 		endif()
 		if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-			list (APPEND ${_outLibraries} m pthread rt )
+			list (APPEND ${_outLibraries} m)
+			set (CMAKE_THREAD_PREFER_PTHREAD TRUE)
+			find_package(Threads REQUIRED)
+			list (APPEND ${_outLibraries} "${CMAKE_THREAD_LIBS_INIT}")
+			find_library(Mathematica_rt_LIBRARY rt)
+			mark_as_advanced(Mathematica_rt_LIBRARY)
+			list (APPEND ${_outLibraries} ${Mathematica_rt_LIBRARY})
 			if (DEFINED Mathematica_MathLink_VERSION_MINOR)
 				if ("${Mathematica_MathLink_VERSION_MINOR}" GREATER 24)
 					# Linux MathLink API revision >= 25 has dependency on libdl and libuuid
-					list (APPEND ${_outLibraries} dl uuid)
+					list (APPEND ${_outLibraries} ${CMAKE_DL_LIBS})
+					find_library (Mathematica_uuid_LIBRARY uuid)
+					mark_as_advanced(Mathematica_uuid_LIBRARY)
+					list (APPEND ${_outLibraries} ${Mathematica_UUID_LIBRARY})
 				endif()
 			endif()
 		elseif (CMAKE_SYSTEM_NAME STREQUAL "SunOS")


On windows, building as static isn't yet supported.

--- cmake/Extensions.cmake
+++ cmake/Extensions.cmake
@@ -116,7 +116,7 @@
         target_link_libraries(${target_name} ${ADD_PYTHON_EXTENSION_LIBRARIES})

         if(WIN32)
-            list(APPEND ADD_PYTHON_EXTENSION_DEFINITIONS Py_NO_ENABLE_SHARED)
+            #list(APPEND ADD_PYTHON_EXTENSION_DEFINITIONS Py_NO_ENABLE_SHARED)
             target_link_libraries(${target_name} libpython-shared)
             if(MINGW)
                 set_target_properties(${target_name} PROPERTIES


Do not search for Readline on Android, iOS, and Web platforms.

--- CMake/Modules/Urho3D-CMake-common.cmake
+++ CMake/Modules/Urho3D-CMake-common.cmake
@@ -493,7 +493,7 @@
     if (DIRECT3D_INCLUDE_DIRS)
         include_directories (${DIRECT3D_INCLUDE_DIRS})
     endif ()
-elseif ((URHO3D_LUA AND NOT URHO3D_LUAJIT) OR URHO3D_DATABASE_SQLITE)
+elseif (((URHO3D_LUA AND NOT URHO3D_LUAJIT) OR URHO3D_DATABASE_SQLITE) AND NOT ANDROID AND NOT IOS AND NOT WEB)
     # Find GNU Readline development library for Lua interpreter and SQLite's isql
     find_package (Readline)
 endif ()


update FindJinja

update FindJinja

--- cmake/FindJinja2.cmake
+++ cmake/FindJinja2.cmake
@@ -1,44 +1,16 @@
 #
-# Copyright 2016 Pixar
+# Finds Jinja2 by trying to import it.
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
-#
-# - Find Modo libraries
-#
-# Jinja2 is a python library, ensure that it is available for use with our
-# specified version of Python.
-#
-if (NOT PYTHON_EXECUTABLE)
-  return()
-endif()

-execute_process(
-  COMMAND
-  "${PYTHON_EXECUTABLE}" "-c" "import jinja2"
-  RESULT_VARIABLE
-  jinja2ImportResult
+find_package(PythonInterp)
+
+IF(PYTHONINTERP_FOUND)
+  EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} "-c" "import jinja2;print(jinja2.__version__)"
+    OUTPUT_VARIABLE JINJA2_VERSION_STRING)
+ENDIF()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Jinja2
+  DEFAULT_MSG
+  JINJA2_VERSION_STRING
   )
-if (jinja2ImportResult EQUAL 0)
-  set(JINJA2_FOUND True)
-endif()
-
-message("-- Found Jinja2: ${JINJA2_FOUND}")
-


Updated FindOpenCL.cmake

Updated FindOpenCL.cmake

--- cmake/FindOpenCL.cmake
+++ cmake/FindOpenCL.cmake
@@ -22,62 +22,62 @@

 IF (APPLE)

-	FIND_LIBRARY(OPENCL_LIBRARIES OpenCL DOC "OpenCL lib for OSX")
-	FIND_PATH(OPENCL_INCLUDE_DIRS OpenCL/cl.h DOC "Include for OpenCL on OSX")
-	FIND_PATH(_OPENCL_CPP_INCLUDE_DIRS OpenCL/cl.hpp DOC "Include for OpenCL CPP bindings on OSX")
+    FIND_LIBRARY(OPENCL_LIBRARIES OpenCL DOC "OpenCL lib for OSX")
+    FIND_PATH(OPENCL_INCLUDE_DIRS OpenCL/cl.h DOC "Include for OpenCL on OSX")
+    FIND_PATH(_OPENCL_CPP_INCLUDE_DIRS OpenCL/cl.hpp DOC "Include for OpenCL CPP bindings on OSX")

 ELSE (APPLE)

-	IF (WIN32)
+    IF (WIN32)
+	# The AMD SDK currently installs both x86 and x86_64 libraries
+	# This is only a hack to find out architecture
+	IF( ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64" )
+	    SET(OPENCL_LIB_DIR "$ENV{AMDAPPSDKROOT}/lib/x86_64")
+	ELSE (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64")
+	    SET(OPENCL_LIB_DIR "$ENV{AMDAPPSDKROOT}/lib/x86")
+	ENDIF( ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64" )

-		FIND_PATH(OPENCL_INCLUDE_DIRS CL/cl.h)
-		FIND_PATH(_OPENCL_CPP_INCLUDE_DIRS CL/cl.hpp)
+	FIND_LIBRARY(OPENCL_LIBRARIES OpenCL.lib PATHS
+	    ${OPENCL_LIB_DIR} $ENV{OpenCL_LIBPATH} $ENV{CUDA_LIB_PATH})

-		# The AMD SDK currently installs both x86 and x86_64 libraries
-		# This is only a hack to find out architecture
-		IF( ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64" )
-			SET(OPENCL_LIB_DIR "$ENV{ATISTREAMSDKROOT}/lib/x86_64")
-		ELSE (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64")
-			SET(OPENCL_LIB_DIR "$ENV{ATISTREAMSDKROOT}/lib/x86")
-		ENDIF( ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64" )
-		FIND_LIBRARY(OPENCL_LIBRARIES OpenCL.lib PATHS ${OPENCL_LIB_DIR} ENV OpenCL_LIBPATH)
+	GET_FILENAME_COMPONENT(_OPENCL_INC_CAND ${OPENCL_LIB_DIR}/../../include ABSOLUTE)

-		GET_FILENAME_COMPONENT(_OPENCL_INC_CAND ${OPENCL_LIB_DIR}/../../include ABSOLUTE)
+	# On Win32 search relative to the library
+	FIND_PATH(OPENCL_INCLUDE_DIRS CL/cl.h PATHS
+	    ${_OPENCL_INC_CAND} $ENV{OpenCL_INCPATH} $ENV{CUDA_INC_PATH})
+	FIND_PATH(_OPENCL_CPP_INCLUDE_DIRS CL/cl.hpp PATHS
+	    ${_OPENCL_INC_CAND} $ENV{OpenCL_INCPATH} $ENV{CUDA_INC_PATH})

-		# On Win32 search relative to the library
-		FIND_PATH(OPENCL_INCLUDE_DIRS CL/cl.h PATHS "${_OPENCL_INC_CAND}" ENV OpenCL_INCPATH)
-		FIND_PATH(_OPENCL_CPP_INCLUDE_DIRS CL/cl.hpp PATHS "${_OPENCL_INC_CAND}" ENV OpenCL_INCPATH)
+    ELSE (WIN32)

-	ELSE (WIN32)
+	# Unix style platforms
+	FIND_LIBRARY(OPENCL_LIBRARIES OpenCL
+	    PATHS ENV LD_LIBRARY_PATH ENV OpenCL_LIBPATH
+	    )

-		# Unix style platforms
-		FIND_LIBRARY(OPENCL_LIBRARIES OpenCL
-			PATHS ENV LD_LIBRARY_PATH ENV OpenCL_LIBPATH
-		)
+	GET_FILENAME_COMPONENT(OPENCL_LIB_DIR ${OPENCL_LIBRARIES} PATH)
+	GET_FILENAME_COMPONENT(_OPENCL_INC_CAND ${OPENCL_LIB_DIR}/../../include ABSOLUTE)

-		GET_FILENAME_COMPONENT(OPENCL_LIB_DIR ${OPENCL_LIBRARIES} PATH)
-		GET_FILENAME_COMPONENT(_OPENCL_INC_CAND ${OPENCL_LIB_DIR}/../../include ABSOLUTE)
+	# The AMD SDK currently does not place its headers
+	# in /usr/include, therefore also search relative
+	# to the library
+	FIND_PATH(OPENCL_INCLUDE_DIRS CL/cl.h PATHS ${_OPENCL_INC_CAND} "/usr/local/cuda/include" "/opt/AMDAPP/include" ENV OpenCL_INCPATH)
+	FIND_PATH(_OPENCL_CPP_INCLUDE_DIRS CL/cl.hpp PATHS ${_OPENCL_INC_CAND} "/usr/local/cuda/include" "/opt/AMDAPP/include" ENV OpenCL_INCPATH)

-		# The AMD SDK currently does not place its headers
-		# in /usr/include, therefore also search relative
-		# to the library
-		FIND_PATH(OPENCL_INCLUDE_DIRS CL/cl.h PATHS ${_OPENCL_INC_CAND} "/usr/local/cuda/include" "/opt/AMDAPP/include" ENV OpenCL_INCPATH)
-		FIND_PATH(_OPENCL_CPP_INCLUDE_DIRS CL/cl.hpp PATHS ${_OPENCL_INC_CAND} "/usr/local/cuda/include" "/opt/AMDAPP/include" ENV OpenCL_INCPATH)
-
-	ENDIF (WIN32)
+    ENDIF (WIN32)

 ENDIF (APPLE)

 FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenCL DEFAULT_MSG OPENCL_LIBRARIES OPENCL_INCLUDE_DIRS)

 IF(_OPENCL_CPP_INCLUDE_DIRS)
-	SET( OPENCL_HAS_CPP_BINDINGS TRUE )
-	LIST( APPEND OPENCL_INCLUDE_DIRS ${_OPENCL_CPP_INCLUDE_DIRS} )
-	# This is often the same, so clean up
-	LIST( REMOVE_DUPLICATES OPENCL_INCLUDE_DIRS )
+    SET( OPENCL_HAS_CPP_BINDINGS TRUE )
+    LIST( APPEND OPENCL_INCLUDE_DIRS ${_OPENCL_CPP_INCLUDE_DIRS} )
+    # This is often the same, so clean up
+    LIST( REMOVE_DUPLICATES OPENCL_INCLUDE_DIRS )
 ENDIF(_OPENCL_CPP_INCLUDE_DIRS)

 MARK_AS_ADVANCED(
-  OPENCL_INCLUDE_DIRS
-)
+    OPENCL_INCLUDE_DIRS
+    )


vigra.cmake: Updated git tag.

vigra.cmake: Updated git tag.

--- vigra.cmake
+++ vigra.cmake
@@ -31,7 +31,7 @@
 include (nose)

 # select the desired VIGRA commit
-set(DEFAULT_VIGRA_VERSION "494bd66423782280f31239b12dd2e7a6184d916b")
+set(DEFAULT_VIGRA_VERSION "05cf09388e28ab9db49fda3763500f128445897d") # from 2013-12-17
 IF(NOT DEFINED VIGRA_VERSION)
     SET(VIGRA_VERSION "${DEFAULT_VIGRA_VERSION}")
 ENDIF()


Update dependencies.

Update dependencies.

--- build/cmake/versions.cmake
+++ build/cmake/versions.cmake
@@ -13,8 +13,8 @@
 # Newer version from git fixes https://github.com/json-c/json-c/issues/159
 set(JSON_C_VERSION 8ba19375d53347d08b82efef609ff352eefa9093)
 set(JSON_C_HASH 4433374ec51ae8188fa860914a8fe67d)
-set(KYLIN_VERSION 1.5.2)
-set(KYLIN_HASH cb9d1366df5e08901d4df93920f8bbbf)
+set(KYLIN_VERSION 1.5.2.1)
+set(KYLIN_HASH 81032007daff8fdab8f19d39fe2ca3a3)
 set(LIBCIDR_VERSION 1.2.3)
 set(LIBCIDR_HASH c5efcc7ae114fdaa5583f58dacecd9de)
 set(LIBESTR_VERSION 0.1.10)
@@ -31,7 +31,7 @@
 set(LUAROCK_ICONV_VERSION 7-1)
 set(LUAROCK_INSPECT_VERSION 3.1.0-1)
 set(LUAROCK_LIBCIDR_VERSION 0.1.0-1)
-set(LUAROCK_LUACHECK_VERSION 0.15.0-1)
+set(LUAROCK_LUACHECK_VERSION 0.15.1-1)
 set(LUAROCK_LUAPOSIX_VERSION 33.4.0-1)
 set(LUAROCK_LUASOCKET_VERSION 2.0.2-6)
 set(LUAROCK_LUATZ_VERSION 0.3-1)
@@ -81,5 +81,5 @@
 # https://issues.apache.org/jira/browse/TS-3959
 set(TRAFFICSERVER_VERSION 5.3.2)
 set(TRAFFICSERVER_HASH c8e5f3e81da643ea79cba0494ed37d45)
-set(UNBOUND_VERSION 1.5.8)
-set(UNBOUND_HASH 33567a20f73e288f8daa4ec021fbb30fe1824b346b34f12677ad77899ecd09be)
+set(UNBOUND_VERSION 1.5.9)
+set(UNBOUND_HASH 01328cfac99ab5b8c47115151896a244979e442e284eb962c0ea84b7782b6990)


Trying to find lapacke on ci

Trying to find lapacke on ci

Former-commit-id: 9e3c618efa52760e03a14bc0d2d0b8ff252b8585

--- cmake-modules/Findarpack++.cmake
+++ cmake-modules/Findarpack++.cmake
@@ -25,6 +25,7 @@
     if (NOT TARGET arpack::arpack++)
         include(GNUInstallDirs)
         arpackpp_message(STATUS "Looking for arpack++ in system")
+        message(WARNING "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
         find_library(ARPACKPP_LIBRARY
                 NAMES arpackpp arpack++
                 PATH_SUFFIXES arpack++/${CMAKE_INSTALL_LIBDIR} arpackpp/${CMAKE_INSTALL_LIBDIR}


Set _XOPEN_SOURCE_EXTENDED flag on Apple systems

--- cmake/Modules/FindNcursesw.cmake
+++ cmake/Modules/FindNcursesw.cmake
@@ -122,6 +122,9 @@

   if(${OSX_BREW_NCURSES})
     set(CURSES_INCLUDE_PATH /usr/local/opt/ncurses/include)
+    if (APPLE)
+      add_definitions(-D_XOPEN_SOURCE_EXTENDED)
+    endif()
   else()
     find_path(CURSES_INCLUDE_PATH
       NAMES ncursesw/ncurses.h ncursesw/curses.h ncurses.h curses.h


eliminate sphinx warning

eliminate sphinx warning

--- cmake/catkin_add_env_hooks.cmake
+++ cmake/catkin_add_env_hooks.cmake
@@ -24,7 +24,9 @@
 #   in the event of collisions.
 #
 # Example::
+#
 #   catkin_add_env_hooks(my_prefix SHELLS bash tcsh zsh DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/env-hooks)
+#
 # looks for files env-hooks/my_prefix.[bash|tcsh|zsh].[in|em]
 #
 # :param file_prefix: the filename prefix
@@ -54,7 +56,7 @@
   foreach(shell ${ARG_SHELLS})
     set(ENV_HOOK ${file_prefix}.${shell})
     set(base ${ARG_DIRECTORY}/${ENV_HOOK})
-
+
     # generate environment hook for devel space
     if (EXISTS ${base})
       # copy plain file


update the compiler flag checks

update the compiler flag checks

--- cmake/compiler-flag-checks.cmake
+++ cmake/compiler-flag-checks.cmake
@@ -3,6 +3,7 @@
 FOREACH( FLAG ${COMPILER_FLAGS} )
     STRING(REPLACE "-" "_" FLAG_WORD ${FLAG} )
     STRING(REPLACE "+" "P" FLAG_WORD ${FLAG_WORD} )
+    STRING(REPLACE "=" "E" FLAG_WORD ${FLAG_WORD} )

     CHECK_CXX_COMPILER_FLAG( "${FLAG}" CXX_FLAG_WORKS_${FLAG_WORD} )
     IF( ${CXX_FLAG_WORKS_${FLAG_WORD}} )
@@ -30,7 +31,7 @@

 # Reduce Wstrict-overflow level for some GCC versions due to false positives:
 IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-  IF(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 5.4)
+  IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
      SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-overflow=2")
   ENDIF()
 ENDIF()


Add -mfma for HAVE_FMA3 in the non-DYNAMIC_ARCH case as well

--- cmake/cc.cmake
+++ cmake/cc.cmake
@@ -124,6 +124,9 @@
 	if (HAVE_AVX)
         set (CCOMMON_OPT  "${CCOMMON_OPT} -mavx")
 	endif ()
+	if (HAVE_FMA3)
+	set (CCOMMON_OPT  "${CCOMMON_OPT} -mfma")
+	endif ()
 	if (HAVE_SSE)
 	set (CCOMMON_OPT  "${CCOMMON_OPT} -msse")
 	endif ()


fixed OpenCVDetectTBB.cmake (WIN32 x86 VS library path)

--- cmake/OpenCVDetectTBB.cmake
+++ cmake/OpenCVDetectTBB.cmake
@@ -37,7 +37,7 @@

         if(CMAKE_SYSTEM_PROCESSOR MATCHES amd64*|x86_64* OR MSVC64)
           set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/intel64")
-        elseif()
+        else()
           set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/ia32")
         endif()


Boost: use 1.64 on MINGW and MSVC, broken bootstrap

--- cmake/configs/default.cmake
+++ cmake/configs/default.cmake
@@ -40,7 +40,12 @@
 hunter_config(Avahi VERSION 0.6.31)
 hunter_config(Beast VERSION 1.0.0-b84-hunter-0)
 hunter_config(BZip2 VERSION 1.0.6-p3)
-hunter_config(Boost VERSION 1.65.0)
+if(MSVC OR MINGW)
+  # FIXME: https://ci.appveyor.com/project/ingenue/hunter/build/1.0.2229
+  hunter_config(Boost VERSION 1.64.0)
+else()
+  hunter_config(Boost VERSION 1.65.0)
+endif()
 hunter_config(BoostCompute VERSION 0.5-p0)
 hunter_config(BoostProcess VERSION 0.5)
 hunter_config(CapnProto VERSION 0.6.1)


Default config: hunter_config -> hunter_default_version

--- cmake/configs/default.cmake
+++ cmake/configs/default.cmake
@@ -1,408 +1,399 @@
-# Copyright (c) 2013-2017, Ruslan Baratov
+# Copyright (c) 2013-2018, Ruslan Baratov
 # All rights reserved.

 # Do not place header guards here
-
-# Unset:
-#   * ${PACKAGE_NAME}_ROOT (CMake variable)
-#   * ${PACKAGE_NAME}_ROOT (CMake cache variable)
-#   * ${PACKAGE_NAME}_ROOT (environment variable)

 # Set CMake variables:
 #   * HUNTER_${PACKAGE_NAME}_VERSION
-#   * HUNTER_${PACKAGE_NAME}_CMAKE_ARGS (optionally)

 # Usage:
-#   hunter_config(Foo VERSION 1.0.0)
-#   hunter_config(Boo VERSION 1.2.3z CMAKE_ARGS BOO_WITH_A=ON)
-
-# Wiki:
-#   * https://github.com/ruslo/hunter/wiki/dev.modules#hunter_config
-
-include(hunter_config)
+#   hunter_default_version(Foo VERSION 1.0.0)
+#   hunter_default_version(Boo VERSION 1.2.3z)
+
+include(hunter_default_version)
 include(hunter_user_error)

 # NOTE: no names with spaces!

-hunter_config(ARM_NEON_2_x86_SSE VERSION 1.0.0-p0)
-hunter_config(AllTheFlopsThreads VERSION 0.1-p0)
-hunter_config(Android-Apk VERSION 1.1.14)
-hunter_config(Android-Build-Tools VERSION 27.0.3)
-hunter_config(Android-Google-Repository VERSION 58)
-hunter_config(Android-Modules VERSION 1.0.0)
-hunter_config(Android-SDK VERSION 0.0.6)
-hunter_config(Android-SDK-Platform-tools VERSION r27.0.1)
-hunter_config(Android-SDK-Tools VERSION 25.2.5)
-hunter_config(Android-Support-Repository VERSION 47)
-hunter_config(AngelScript VERSION 2.30-p0)
-hunter_config(ArrayFire VERSION 3.3.1-p0)
-hunter_config(Assimp VERSION 3.2-p2)
-hunter_config(Async++ VERSION 0.0.3-hunter)
-hunter_config(Avahi VERSION 0.6.31)
-hunter_config(Beast VERSION 1.0.0-b84-hunter-0)
-hunter_config(BZip2 VERSION 1.0.6-p3)
+hunter_default_version(ARM_NEON_2_x86_SSE VERSION 1.0.0-p0)
+hunter_default_version(AllTheFlopsThreads VERSION 0.1-p0)
+hunter_default_version(Android-Apk VERSION 1.1.14)
+hunter_default_version(Android-Build-Tools VERSION 27.0.3)
+hunter_default_version(Android-Google-Repository VERSION 58)
+hunter_default_version(Android-Modules VERSION 1.0.0)
+hunter_default_version(Android-SDK VERSION 0.0.6)
+hunter_default_version(Android-SDK-Platform-tools VERSION r27.0.1)
+hunter_default_version(Android-SDK-Tools VERSION 25.2.5)
+hunter_default_version(Android-Support-Repository VERSION 47)
+hunter_default_version(AngelScript VERSION 2.30-p0)
+hunter_default_version(ArrayFire VERSION 3.3.1-p0)
+hunter_default_version(Assimp VERSION 3.2-p2)
+hunter_default_version(Async++ VERSION 0.0.3-hunter)
+hunter_default_version(Avahi VERSION 0.6.31)
+hunter_default_version(Beast VERSION 1.0.0-b84-hunter-0)
+hunter_default_version(BZip2 VERSION 1.0.6-p3)

 if(MSVC)
   # https://github.com/boostorg/build/issues/299
-  hunter_config(Boost VERSION 1.66.0-p0)
+  hunter_default_version(Boost VERSION 1.66.0-p0)
 elseif(MINGW)
   # https://github.com/boostorg/build/issues/301
-  hunter_config(Boost VERSION 1.64.0)
-else()
-  hunter_config(Boost VERSION 1.67.0-p1)
-endif()
-
-hunter_config(BoostCompute VERSION 0.5-p0)
-hunter_config(BoostProcess VERSION 0.5)
-hunter_config(BoringSSL VERSION 1.0.0)
-hunter_config(Box2D VERSION 2.3.1-p0)
-hunter_config(CapnProto VERSION 0.6.1)
-hunter_config(catkin VERSION 0.7.11-p2)
-hunter_config(cctz VERSION 2.2.0)
-hunter_config(CLAPACK VERSION 3.2.1)
-hunter_config(CLI11 VERSION 1.5.3)
-hunter_config(CURL VERSION 7.59.0-p1)
-hunter_config(Clang VERSION 4.0.1-p0)
-hunter_config(ClangToolsExtra VERSION 4.0.1) # Clang
-hunter_config(Comet VERSION 4.0.2)
-hunter_config(cpr VERSION 1.3.0)
-hunter_config(CppNetlib VERSION 0.10.1-hunter-3)
-hunter_config(CppNetlibUri VERSION 1.0.5-hunter)
-hunter_config(crc32c VERSION 1.0.5)
-hunter_config(CsvParserCPlusPlus VERSION 1.0.1)
-hunter_config(Eigen VERSION 3.3.4-p1)
-hunter_config(state_machine VERSION 1.1)
-hunter_config(enet VERSION 1.3.13-p1)
-hunter_config(ethash VERSION 0.3.0)
-hunter_config(Expat VERSION 2.1.1)
+  hunter_default_version(Boost VERSION 1.64.0)
+else()
+  hunter_default_version(Boost VERSION 1.67.0-p1)
+endif()
+
+hunter_default_version(BoostCompute VERSION 0.5-p0)
+hunter_default_version(BoostProcess VERSION 0.5)
+hunter_default_version(BoringSSL VERSION 1.0.0)
+hunter_default_version(Box2D VERSION 2.3.1-p0)
+hunter_default_version(CapnProto VERSION 0.6.1)
+hunter_default_version(catkin VERSION 0.7.11-p2)
+hunter_default_version(cctz VERSION 2.2.0)
+hunter_default_version(CLAPACK VERSION 3.2.1)
+hunter_default_version(CLI11 VERSION 1.5.3)
+hunter_default_version(CURL VERSION 7.59.0-p1)
+hunter_default_version(Clang VERSION 4.0.1-p0)
+hunter_default_version(ClangToolsExtra VERSION 4.0.1) # Clang
+hunter_default_version(Comet VERSION 4.0.2)
+hunter_default_version(cpr VERSION 1.3.0)
+hunter_default_version(CppNetlib VERSION 0.10.1-hunter-3)
+hunter_default_version(CppNetlibUri VERSION 1.0.5-hunter)
+hunter_default_version(crc32c VERSION 1.0.5)
+hunter_default_version(CsvParserCPlusPlus VERSION 1.0.1)
+hunter_default_version(Eigen VERSION 3.3.4-p1)
+hunter_default_version(state_machine VERSION 1.1)
+hunter_default_version(enet VERSION 1.3.13-p1)
+hunter_default_version(ethash VERSION 0.3.0)
+hunter_default_version(Expat VERSION 2.1.1)
 if(MSVC)
-  hunter_config(getopt VERSION 1.0.0-p0)
-endif()
-hunter_config(GPUImage VERSION 0.1.6-p9)
-hunter_config(GSL VERSION 2.1.0-p2)
-hunter_config(ICU VERSION 55.1-p3)
-hunter_config(Igloo VERSION 1.1.1-hunter)
-hunter_config(intsizeof VERSION 2.0.2)
-hunter_config(jansson VERSION 2.11.0)
-hunter_config(jaegertracing VERSION 0.4.1)
-hunter_config(jasper VERSION 2.0.14-p2)
-hunter_config(Jpeg VERSION 9b-p3)
-hunter_config(JsonSpirit VERSION 0.0.4-hunter)
+  hunter_default_version(getopt VERSION 1.0.0-p0)
+endif()
+hunter_default_version(GPUImage VERSION 0.1.6-p9)
+hunter_default_version(GSL VERSION 2.1.0-p2)
+hunter_default_version(ICU VERSION 55.1-p3)
+hunter_default_version(Igloo VERSION 1.1.1-hunter)
+hunter_default_version(intsizeof VERSION 2.0.2)
+hunter_default_version(jansson VERSION 2.11.0)
+hunter_default_version(jaegertracing VERSION 0.4.1)
+hunter_default_version(jasper VERSION 2.0.14-p2)
+hunter_default_version(Jpeg VERSION 9b-p3)
+hunter_default_version(JsonSpirit VERSION 0.0.4-hunter)
 if(MSVC_VERSION LESS 1600)
     # for VS10 - version without support C++11
-  hunter_config(jsoncpp VERSION 0.7.0)
-else()
-  hunter_config(jsoncpp VERSION 1.8.0)
-endif()
-hunter_config(LAPACK VERSION 3.7.1)
-hunter_config(LLVM VERSION 4.0.1-p0) # Clang
-hunter_config(LLVMCompilerRT VERSION 4.0.1-patched) # Clang
-hunter_config(Leathers VERSION 0.1.8)
-hunter_config(Leptonica VERSION 1.74.2-p4)
-hunter_config(LibCDS VERSION 2.3.1)
-hunter_config(Libcxx VERSION 3.6.2) # Clang
-hunter_config(Libcxxabi VERSION 3.6.2) # Clang
-hunter_config(Libevent VERSION 2.1.8-p4)
-hunter_config(lcms VERSION 2.9-p0)
-hunter_config(libevhtp VERSION 1.2.16-p4)
-hunter_config(libffi VERSION 3.2.1)
-hunter_config(librtmp VERSION 2.4.0-p0)
-hunter_config(Libssh2 VERSION 1.7.0)
-hunter_config(Lua VERSION 5.3.2-p2)
-hunter_config(MySQL-client VERSION 6.1.9-p0)
-hunter_config(NASM VERSION 2.12.02)
-hunter_config(OpenAL VERSION 1.18.2)
-hunter_config(OpenBLAS VERSION 0.2.20-p0)
-hunter_config(OpenCL VERSION 2.1-p3)
-hunter_config(OpenCL-cpp VERSION 2.0.10-p0)
-hunter_config(OpenCV VERSION 3.4.1-p1)
-hunter_config(OpenCV-Extra VERSION 3.4.1)
-hunter_config(OpenNMTTokenizer VERSION 0.2.0-p1)
-hunter_config(OpenSSL VERSION 1.1.0h)
-hunter_config(PNG VERSION 1.6.26-p3)
-hunter_config(PocoCpp VERSION 1.7.9-p1)
-hunter_config(PostgreSQL VERSION 10.0.0)
-hunter_config(PROJ4 VERSION 5.0.0)
-hunter_config(Protobuf VERSION 3.5.2-p0)
+  hunter_default_version(jsoncpp VERSION 0.7.0)
+else()
+  hunter_default_version(jsoncpp VERSION 1.8.0)
+endif()
+hunter_default_version(LAPACK VERSION 3.7.1)
+hunter_default_version(LLVM VERSION 4.0.1-p0) # Clang
+hunter_default_version(LLVMCompilerRT VERSION 4.0.1-patched) # Clang
+hunter_default_version(Leathers VERSION 0.1.8)
+hunter_default_version(Leptonica VERSION 1.74.2-p4)
+hunter_default_version(LibCDS VERSION 2.3.1)
+hunter_default_version(Libcxx VERSION 3.6.2) # Clang
+hunter_default_version(Libcxxabi VERSION 3.6.2) # Clang
+hunter_default_version(Libevent VERSION 2.1.8-p4)
+hunter_default_version(lcms VERSION 2.9-p0)
+hunter_default_version(libevhtp VERSION 1.2.16-p4)
+hunter_default_version(libffi VERSION 3.2.1)
+hunter_default_version(librtmp VERSION 2.4.0-p0)
+hunter_default_version(Libssh2 VERSION 1.7.0)
+hunter_default_version(Lua VERSION 5.3.2-p2)
+hunter_default_version(MySQL-client VERSION 6.1.9-p0)
+hunter_default_version(NASM VERSION 2.12.02)
+hunter_default_version(OpenAL VERSION 1.18.2)
+hunter_default_version(OpenBLAS VERSION 0.2.20-p0)
+hunter_default_version(OpenCL VERSION 2.1-p3)
+hunter_default_version(OpenCL-cpp VERSION 2.0.10-p0)
+hunter_default_version(OpenCV VERSION 3.4.1-p1)
+hunter_default_version(OpenCV-Extra VERSION 3.4.1)
+hunter_default_version(OpenNMTTokenizer VERSION 0.2.0-p1)
+hunter_default_version(OpenSSL VERSION 1.1.0h)
+hunter_default_version(PNG VERSION 1.6.26-p3)
+hunter_default_version(PocoCpp VERSION 1.7.9-p1)
+hunter_default_version(PostgreSQL VERSION 10.0.0)
+hunter_default_version(PROJ4 VERSION 5.0.0)
+hunter_default_version(Protobuf VERSION 3.5.2-p0)

 string(COMPARE EQUAL "${CMAKE_SYSTEM_NAME}" "Linux" _is_linux)
 if(_is_linux OR MINGW)
   # qt-qml example is broken on Linux
   # qt-core example is broken on MinGW
-  hunter_config(Qt VERSION 5.5.1-cvpixelbuffer-2-p9)
+  hunter_default_version(Qt VERSION 5.5.1-cvpixelbuffer-2-p9)
 elseif(IOS OR ANDROID)
-  hunter_config(Qt VERSION 5.9.1-p0)
-else()
-  hunter_config(Qt VERSION 5.10.1)
-endif()
-
-hunter_config(QtAndroidCMake VERSION 1.0.9)
-hunter_config(QtCMakeExtra VERSION 1.0.30)
-hunter_config(QtQmlManager VERSION 1.0.0)
-hunter_config(RapidJSON VERSION 1.1.0)
-hunter_config(RapidXML VERSION 1.13)
-hunter_config(rocksdb VERSION 5.8.6)
-hunter_config(SDL2 VERSION 2.0.7-p1)
-hunter_config(SDL_image VERSION 2.0.1-p1)
-hunter_config(SDL_mixer VERSION 2.0.2-p0)
-hunter_config(SDL_ttf VERSION 2.0.14-p0)
-hunter_config(sds VERSION 2.0.0)
-hunter_config(sqlite3 VERSION 3.21.0-p2)
-hunter_config(Sober VERSION 0.1.3)
-hunter_config(sources_for_android_sdk_packer VERSION 1.0.0)
-hunter_config(stdext-path VERSION 0.0.1-p0)
-hunter_config(stormlib VERSION 9.21-p1)
-hunter_config(sugar VERSION 1.3.0)
-hunter_config(SuiteSparse VERSION 4.5.1-p1)
-hunter_config(TCLAP VERSION 1.2.2-p1)
-hunter_config(TIFF VERSION 4.0.2-p5)
-hunter_config(toluapp VERSION 1.0.93-p1)
-hunter_config(tomcrypt VERSION 1.17-p3)
-hunter_config(tommath VERSION 1.0-p2)
-hunter_config(Urho3D VERSION 1.7-p15)
-hunter_config(WTL VERSION 9.1.5321)
-hunter_config(WDC VERSION 1.1.1)
-hunter_config(Washer VERSION 0.1.2)
-hunter_config(WinSparkle VERSION 0.4.0)
-hunter_config(ZLIB VERSION 1.2.8-p3)
-hunter_config(ZMQPP VERSION 4.1.2)
-hunter_config(ZeroMQ VERSION 4.2.3-p1)
-hunter_config(caffe VERSION rc3-p2)
-hunter_config(acf VERSION 0.1.3)
-hunter_config(Catch VERSION 2.2.2)
-hunter_config(aes VERSION 0.0.1-p1)
-hunter_config(aglet VERSION 1.2.2)
-hunter_config(android_arm64_v8a_system_image_packer VERSION 1.0.0)
-hunter_config(android_arm_eabi_v7a_system_image_packer VERSION 1.0)
-hunter_config(android_build_tools_packer VERSION 1.0.0)
-hunter_config(android_google_apis_intel_x86_atom_system_image_packer VERSION 1.0.0)
-hunter_config(android_google_apis_packer VERSION 1.0.0)
-hunter_config(android_google_repository_packer VERSION 1.0.0)
-hunter_config(android_intel_x86_atom_system_image_packer VERSION 1.0.0)
-hunter_config(android_mips_system_image_packer VERSION 1.0.0)
-hunter_config(android_sdk_packer VERSION 1.0.0)
-hunter_config(android_sdk_platform_packer VERSION 1.0.0)
-hunter_config(android_sdk_platform_tools_packer VERSION 1.0.0)
-hunter_config(android_sdk_tools_packer VERSION 1.0.2)
-hunter_config(android_support_repository_packer VERSION 1.0.0)
-hunter_config(autobahn-cpp VERSION 0.2.0)
-hunter_config(autoutils VERSION 0.3.0)
-hunter_config(benchmark VERSION 1.4.0)
-hunter_config(bison VERSION 3.0.4-p0)
-hunter_config(boost-pba VERSION 1.0.0-p0)
-hunter_config(bullet VERSION 2.87-p0)
-hunter_config(c-ares VERSION 1.13.0)
-hunter_config(ccv VERSION 0.7-p6)
-hunter_config(cereal VERSION 1.2.2-p0)
-hunter_config(ceres-solver VERSION 1.12.0-p2)
-hunter_config(check_ci_tag VERSION 1.0.0)
-hunter_config(civetweb VERSION 1.10-p1)
-hunter_config(clBLAS VERSION 2.10.0-p0)
-hunter_config(convertutf VERSION 1.0.1)
-hunter_config(crashpad VERSION v0.0.1-p0)
-hunter_config(crashup VERSION 0.0.2)
-hunter_config(cryptopp VERSION 5.6.5-p0)
-hunter_config(cub VERSION 1.7.4-p0)
-hunter_config(cvmatio VERSION 1.0.28)
-hunter_config(cvsteer VERSION 0.1.2)
-hunter_config(cxxopts VERSION 1.0.0-p0)
-hunter_config(czmq VERSION 4.0.2-p1)
-hunter_config(damageproto VERSION 1.2.1)
-hunter_config(dbus VERSION 1.10.0-hunter-4)
-hunter_config(debug_assert VERSION 1.3.2)
-hunter_config(dest VERSION 0.8.0-p4)
-hunter_config(dlib VERSION 19.12-p0)
-hunter_config(dmlc-core VERSION 0.0.0-p1)
-hunter_config(doctest VERSION 1.2.0)
-hunter_config(double-conversion VERSION 3.0.0)
-hunter_config(dri2proto VERSION 2.8)
-hunter_config(dri3proto VERSION 1.0)
-hunter_config(drishti VERSION 0.8.9)
-hunter_config(drishti_assets VERSION 1.8)
-hunter_config(drishti_faces VERSION 1.2)
-hunter_config(drm VERSION 2.4.67)
-hunter_config(duktape VERSION 1.5.2-p0)
-hunter_config(dynalo VERSION 1.0.3)
-hunter_config(eigen3-nnls VERSION 1.0.1)
-hunter_config(eos VERSION 0.12.1)
-hunter_config(EnumGroup VERSION 0.0.1)
-hunter_config(FakeIt VERSION 2.0.3)
-hunter_config(FunctionalPlus VERSION 0.2-p0)
-hunter_config(farmhash VERSION 1.1)
-hunter_config(fft2d VERSION 1.0.0-p0)
-hunter_config(fixesproto VERSION 5.0)
-hunter_config(flatbuffers VERSION 1.8.0-p1)
-hunter_config(flex VERSION 2.6.4)
-hunter_config(fmt VERSION 4.1.0)
-hunter_config(folly VERSION 2017.11.13.00-p0)
-hunter_config(freetype VERSION 2.6.2)
-hunter_config(frugally-deep VERSION 0.2.2-p0)
-hunter_config(gauze VERSION 0.4.0)
-hunter_config(gemmlowp VERSION 1.0.0)
-hunter_config(geos VERSION 3.4.2)
-hunter_config(giflib VERSION 5.1.4-p0)
-hunter_config(gflags VERSION 2.2.1)
-hunter_config(glbinding VERSION 2.1.3-p0)
-hunter_config(glew VERSION 2.0.0-p1)
-hunter_config(glfw VERSION 3.3.0-p4)
-hunter_config(glib VERSION 2.54.0)
-hunter_config(glm VERSION 0.9.8.5)
-hunter_config(globjects VERSION 1.1.0-p0)
-hunter_config(glog VERSION 0.3.5-p2)
-hunter_config(glproto VERSION 1.4.17)
-hunter_config(gRPC VERSION 1.9.1-p0)
-hunter_config(gst_plugins_bad VERSION 1.10.4)
-hunter_config(gst_plugins_base VERSION 1.10.4)
-hunter_config(gst_plugins_good VERSION 1.10.4)
-hunter_config(gst_plugins_ugly VERSION 1.10.4)
-hunter_config(gstreamer VERSION 1.10.4)
-hunter_config(gumbo VERSION 0.10.1)
-hunter_config(half VERSION 1.1.0-p1)
-hunter_config(harfbuzz VERSION 1.7.6-p0)
-hunter_config(hdf5 VERSION 1.8.15-p1)
-hunter_config(highwayhash VERSION 0.0.0)
-hunter_config(http-parser VERSION 2.8.0)
-hunter_config(h3 VERSION 3.0.4)
-hunter_config(ice VERSION 1.0.8)
-hunter_config(imshow VERSION 1.0.0-p0)
-hunter_config(inja VERSION 0.1.1)
-hunter_config(inputproto VERSION 2.2)
-hunter_config(intltool VERSION 0.51.0)
-hunter_config(ios_sim VERSION 3.1.1)
-hunter_config(ippicv VERSION 20151201)
-hunter_config(irrXML VERSION 1.2)
-hunter_config(jo_jpeg VERSION 0.0.1)
-hunter_config(kbproto VERSION 1.0.6)
-hunter_config(kNet VERSION 2.7-p1)
-hunter_config(leveldb VERSION 1.20)
-hunter_config(libcpuid VERSION 0.4.0)
-hunter_config(libdaemon VERSION 0.14)
-hunter_config(libdill VERSION 1.6)
-hunter_config(libjson-rpc-cpp VERSION 0.7.0-p3)
-hunter_config(libmill VERSION 1.18)
-hunter_config(libogg VERSION 1.3.3-p0)
-hunter_config(libscrypt VERSION 1.21-p1)
-hunter_config(libsodium VERSION 1.0.10)
-hunter_config(libunibreak VERSION 4.0)
-hunter_config(libuv VERSION 1.14.0-p1)
-hunter_config(libxml2 VERSION 2.9.7)
-hunter_config(libyuv VERSION 1514-p3)
-hunter_config(lmdb VERSION 0.9.21-p2)
-hunter_config(lmdbxx VERSION 0.9.14.0)
-hunter_config(log4cplus VERSION 1.2.0-p0)
-hunter_config(lz4 VERSION 1.8.0-p2)
-hunter_config(lzma VERSION 5.2.3-p4)
-hunter_config(md5 VERSION 1.6)
-hunter_config(mini_chromium VERSION 0.0.1-p2)
-hunter_config(minizip VERSION 1.0.1-p3)
-hunter_config(mng VERSION 2.0.3-p2)
-hunter_config(mojoshader VERSION 0.0.1)
-hunter_config(mongoose VERSION 6.10)
-hunter_config(mpark_variant VERSION 1.0.0)
-hunter_config(msgpack VERSION 1.4.1-p2)
-hunter_config(mtplz VERSION 0.1-p3)
-hunter_config(nanoflann VERSION 1.2.3-p0)
-hunter_config(ncnn VERSION 20180314-p2)
-hunter_config(nlohmann_json VERSION 3.1.2)
-hunter_config(nsync VERSION 1.14-p1)
-hunter_config(odb VERSION 2.4.0)
-hunter_config(odb-boost VERSION 2.4.0)
-hunter_config(odb-compiler VERSION 2.4.0)
-hunter_config(odb-mysql VERSION 2.4.0)
-hunter_config(odb-pgsql VERSION 2.4.0)
-hunter_config(odb-sqlite VERSION 2.4.0)
-hunter_config(ogles_gpgpu VERSION 0.2.10)
-hunter_config(oniguruma VERSION 6.8.1-p0)
-hunter_config(onmt VERSION 0.4.1-p2)
-hunter_config(openddlparser VERSION 0.1.0-p2)
-hunter_config(opentracing-cpp VERSION 1.4.0)
-hunter_config(pcg VERSION 0.0.0-p1)
-hunter_config(pciaccess VERSION 0.13.4)
-hunter_config(libpcre VERSION 8.41)
-hunter_config(poly2tri VERSION 1.0.0)
-hunter_config(polyclipping VERSION 4.8.8-p0) # for Assimp
-hunter_config(presentproto VERSION 1.0)
-hunter_config(protobuf-c VERSION 1.3.0-p1)
-hunter_config(pthread-stubs VERSION 0.3)
-hunter_config(pugixml VERSION 1.8.1)
-hunter_config(pybind11 VERSION 2.2.1)
-hunter_config(rabit VERSION 0.0.0-p2)
-hunter_config(rabbitmq-c VERSION 0.7.0-p1)
-hunter_config(randrproto VERSION 1.3.2)
+  hunter_default_version(Qt VERSION 5.9.1-p0)
+else()
+  hunter_default_version(Qt VERSION 5.10.1)
+endif()
+
+hunter_default_version(QtAndroidCMake VERSION 1.0.9)
+hunter_default_version(QtCMakeExtra VERSION 1.0.30)
+hunter_default_version(QtQmlManager VERSION 1.0.0)
+hunter_default_version(RapidJSON VERSION 1.1.0)
+hunter_default_version(RapidXML VERSION 1.13)
+hunter_default_version(rocksdb VERSION 5.8.6)
+hunter_default_version(SDL2 VERSION 2.0.7-p1)
+hunter_default_version(SDL_image VERSION 2.0.1-p1)
+hunter_default_version(SDL_mixer VERSION 2.0.2-p0)
+hunter_default_version(SDL_ttf VERSION 2.0.14-p0)
+hunter_default_version(sds VERSION 2.0.0)
+hunter_default_version(sqlite3 VERSION 3.21.0-p2)
+hunter_default_version(Sober VERSION 0.1.3)
+hunter_default_version(sources_for_android_sdk_packer VERSION 1.0.0)
+hunter_default_version(stdext-path VERSION 0.0.1-p0)
+hunter_default_version(stormlib VERSION 9.21-p1)
+hunter_default_version(sugar VERSION 1.3.0)
+hunter_default_version(SuiteSparse VERSION 4.5.1-p1)
+hunter_default_version(TCLAP VERSION 1.2.2-p1)
+hunter_default_version(TIFF VERSION 4.0.2-p5)
+hunter_default_version(toluapp VERSION 1.0.93-p1)
+hunter_default_version(tomcrypt VERSION 1.17-p3)
+hunter_default_version(tommath VERSION 1.0-p2)
+hunter_default_version(Urho3D VERSION 1.7-p15)
+hunter_default_version(WTL VERSION 9.1.5321)
+hunter_default_version(WDC VERSION 1.1.1)
+hunter_default_version(Washer VERSION 0.1.2)
+hunter_default_version(WinSparkle VERSION 0.4.0)
+hunter_default_version(ZLIB VERSION 1.2.8-p3)
+hunter_default_version(ZMQPP VERSION 4.1.2)
+hunter_default_version(ZeroMQ VERSION 4.2.3-p1)
+hunter_default_version(caffe VERSION rc3-p2)
+hunter_default_version(acf VERSION 0.1.3)
+hunter_default_version(Catch VERSION 2.2.2)
+hunter_default_version(aes VERSION 0.0.1-p1)
+hunter_default_version(aglet VERSION 1.2.2)
+hunter_default_version(android_arm64_v8a_system_image_packer VERSION 1.0.0)
+hunter_default_version(android_arm_eabi_v7a_system_image_packer VERSION 1.0)
+hunter_default_version(android_build_tools_packer VERSION 1.0.0)
+hunter_default_version(android_google_apis_intel_x86_atom_system_image_packer VERSION 1.0.0)
+hunter_default_version(android_google_apis_packer VERSION 1.0.0)
+hunter_default_version(android_google_repository_packer VERSION 1.0.0)
+hunter_default_version(android_intel_x86_atom_system_image_packer VERSION 1.0.0)
+hunter_default_version(android_mips_system_image_packer VERSION 1.0.0)
+hunter_default_version(android_sdk_packer VERSION 1.0.0)
+hunter_default_version(android_sdk_platform_packer VERSION 1.0.0)
+hunter_default_version(android_sdk_platform_tools_packer VERSION 1.0.0)
+hunter_default_version(android_sdk_tools_packer VERSION 1.0.2)
+hunter_default_version(android_support_repository_packer VERSION 1.0.0)
+hunter_default_version(autobahn-cpp VERSION 0.2.0)
+hunter_default_version(autoutils VERSION 0.3.0)
+hunter_default_version(benchmark VERSION 1.4.0)
+hunter_default_version(bison VERSION 3.0.4-p0)
+hunter_default_version(boost-pba VERSION 1.0.0-p0)
+hunter_default_version(bullet VERSION 2.87-p0)
+hunter_default_version(c-ares VERSION 1.13.0)
+hunter_default_version(ccv VERSION 0.7-p6)
+hunter_default_version(cereal VERSION 1.2.2-p0)
+hunter_default_version(ceres-solver VERSION 1.12.0-p2)
+hunter_default_version(check_ci_tag VERSION 1.0.0)
+hunter_default_version(civetweb VERSION 1.10-p1)
+hunter_default_version(clBLAS VERSION 2.10.0-p0)
+hunter_default_version(convertutf VERSION 1.0.1)
+hunter_default_version(crashpad VERSION v0.0.1-p0)
+hunter_default_version(crashup VERSION 0.0.2)
+hunter_default_version(cryptopp VERSION 5.6.5-p0)
+hunter_default_version(cub VERSION 1.7.4-p0)
+hunter_default_version(cvmatio VERSION 1.0.28)
+hunter_default_version(cvsteer VERSION 0.1.2)
+hunter_default_version(cxxopts VERSION 1.0.0-p0)
+hunter_default_version(czmq VERSION 4.0.2-p1)
+hunter_default_version(damageproto VERSION 1.2.1)
+hunter_default_version(dbus VERSION 1.10.0-hunter-4)
+hunter_default_version(debug_assert VERSION 1.3.2)
+hunter_default_version(dest VERSION 0.8.0-p4)
+hunter_default_version(dlib VERSION 19.12-p0)
+hunter_default_version(dmlc-core VERSION 0.0.0-p1)
+hunter_default_version(doctest VERSION 1.2.0)
+hunter_default_version(double-conversion VERSION 3.0.0)
+hunter_default_version(dri2proto VERSION 2.8)
+hunter_default_version(dri3proto VERSION 1.0)
+hunter_default_version(drishti VERSION 0.8.9)
+hunter_default_version(drishti_assets VERSION 1.8)
+hunter_default_version(drishti_faces VERSION 1.2)
+hunter_default_version(drm VERSION 2.4.67)
+hunter_default_version(duktape VERSION 1.5.2-p0)
+hunter_default_version(dynalo VERSION 1.0.3)
+hunter_default_version(eigen3-nnls VERSION 1.0.1)
+hunter_default_version(eos VERSION 0.12.1)
+hunter_default_version(EnumGroup VERSION 0.0.1)
+hunter_default_version(FakeIt VERSION 2.0.3)
+hunter_default_version(FunctionalPlus VERSION 0.2-p0)
+hunter_default_version(farmhash VERSION 1.1)
+hunter_default_version(fft2d VERSION 1.0.0-p0)
+hunter_default_version(fixesproto VERSION 5.0)
+hunter_default_version(flatbuffers VERSION 1.8.0-p1)
+hunter_default_version(flex VERSION 2.6.4)
+hunter_default_version(fmt VERSION 4.1.0)
+hunter_default_version(folly VERSION 2017.11.13.00-p0)
+hunter_default_version(freetype VERSION 2.6.2)
+hunter_default_version(frugally-deep VERSION 0.2.2-p0)
+hunter_default_version(gauze VERSION 0.4.0)
+hunter_default_version(gemmlowp VERSION 1.0.0)
+hunter_default_version(geos VERSION 3.4.2)
+hunter_default_version(giflib VERSION 5.1.4-p0)
+hunter_default_version(gflags VERSION 2.2.1)
+hunter_default_version(glbinding VERSION 2.1.3-p0)
+hunter_default_version(glew VERSION 2.0.0-p1)
+hunter_default_version(glfw VERSION 3.3.0-p4)
+hunter_default_version(glib VERSION 2.54.0)
+hunter_default_version(glm VERSION 0.9.8.5)
+hunter_default_version(globjects VERSION 1.1.0-p0)
+hunter_default_version(glog VERSION 0.3.5-p2)
+hunter_default_version(glproto VERSION 1.4.17)
+hunter_default_version(gRPC VERSION 1.9.1-p0)
+hunter_default_version(gst_plugins_bad VERSION 1.10.4)
+hunter_default_version(gst_plugins_base VERSION 1.10.4)
+hunter_default_version(gst_plugins_good VERSION 1.10.4)
+hunter_default_version(gst_plugins_ugly VERSION 1.10.4)
+hunter_default_version(gstreamer VERSION 1.10.4)
+hunter_default_version(gumbo VERSION 0.10.1)
+hunter_default_version(half VERSION 1.1.0-p1)
+hunter_default_version(harfbuzz VERSION 1.7.6-p0)
+hunter_default_version(hdf5 VERSION 1.8.15-p1)
+hunter_default_version(highwayhash VERSION 0.0.0)
+hunter_default_version(http-parser VERSION 2.8.0)
+hunter_default_version(h3 VERSION 3.0.4)
+hunter_default_version(ice VERSION 1.0.8)
+hunter_default_version(imshow VERSION 1.0.0-p0)
+hunter_default_version(inja VERSION 0.1.1)
+hunter_default_version(inputproto VERSION 2.2)
+hunter_default_version(intltool VERSION 0.51.0)
+hunter_default_version(ios_sim VERSION 3.1.1)
+hunter_default_version(ippicv VERSION 20151201)
+hunter_default_version(irrXML VERSION 1.2)
+hunter_default_version(jo_jpeg VERSION 0.0.1)
+hunter_default_version(kbproto VERSION 1.0.6)
+hunter_default_version(kNet VERSION 2.7-p1)
+hunter_default_version(leveldb VERSION 1.20)
+hunter_default_version(libcpuid VERSION 0.4.0)
+hunter_default_version(libdaemon VERSION 0.14)
+hunter_default_version(libdill VERSION 1.6)
+hunter_default_version(libjson-rpc-cpp VERSION 0.7.0-p3)
+hunter_default_version(libmill VERSION 1.18)
+hunter_default_version(libogg VERSION 1.3.3-p0)
+hunter_default_version(libscrypt VERSION 1.21-p1)
+hunter_default_version(libsodium VERSION 1.0.10)
+hunter_default_version(libunibreak VERSION 4.0)
+hunter_default_version(libuv VERSION 1.14.0-p1)
+hunter_default_version(libxml2 VERSION 2.9.7)
+hunter_default_version(libyuv VERSION 1514-p3)
+hunter_default_version(lmdb VERSION 0.9.21-p2)
+hunter_default_version(lmdbxx VERSION 0.9.14.0)
+hunter_default_version(log4cplus VERSION 1.2.0-p0)
+hunter_default_version(lz4 VERSION 1.8.0-p2)
+hunter_default_version(lzma VERSION 5.2.3-p4)
+hunter_default_version(md5 VERSION 1.6)
+hunter_default_version(mini_chromium VERSION 0.0.1-p2)
+hunter_default_version(minizip VERSION 1.0.1-p3)
+hunter_default_version(mng VERSION 2.0.3-p2)
+hunter_default_version(mojoshader VERSION 0.0.1)
+hunter_default_version(mongoose VERSION 6.10)
+hunter_default_version(mpark_variant VERSION 1.0.0)
+hunter_default_version(msgpack VERSION 1.4.1-p2)
+hunter_default_version(mtplz VERSION 0.1-p3)
+hunter_default_version(nanoflann VERSION 1.2.3-p0)
+hunter_default_version(ncnn VERSION 20180314-p2)
+hunter_default_version(nlohmann_json VERSION 3.1.2)
+hunter_default_version(nsync VERSION 1.14-p1)
+hunter_default_version(odb VERSION 2.4.0)
+hunter_default_version(odb-boost VERSION 2.4.0)
+hunter_default_version(odb-compiler VERSION 2.4.0)
+hunter_default_version(odb-mysql VERSION 2.4.0)
+hunter_default_version(odb-pgsql VERSION 2.4.0)
+hunter_default_version(odb-sqlite VERSION 2.4.0)
+hunter_default_version(ogles_gpgpu VERSION 0.2.10)
+hunter_default_version(oniguruma VERSION 6.8.1-p0)
+hunter_default_version(onmt VERSION 0.4.1-p2)
+hunter_default_version(openddlparser VERSION 0.1.0-p2)
+hunter_default_version(opentracing-cpp VERSION 1.4.0)
+hunter_default_version(pcg VERSION 0.0.0-p1)
+hunter_default_version(pciaccess VERSION 0.13.4)
+hunter_default_version(libpcre VERSION 8.41)
+hunter_default_version(poly2tri VERSION 1.0.0)
+hunter_default_version(polyclipping VERSION 4.8.8-p0) # for Assimp
+hunter_default_version(presentproto VERSION 1.0)
+hunter_default_version(protobuf-c VERSION 1.3.0-p1)
+hunter_default_version(pthread-stubs VERSION 0.3)
+hunter_default_version(pugixml VERSION 1.8.1)
+hunter_default_version(pybind11 VERSION 2.2.1)
+hunter_default_version(rabit VERSION 0.0.0-p2)
+hunter_default_version(rabbitmq-c VERSION 0.7.0-p1)
+hunter_default_version(randrproto VERSION 1.3.2)
 if(MSVC)
-	hunter_config(range-v3 VERSION vcpkg5-p)
-else()
-	hunter_config(range-v3 VERSION 0.3.0-p)
-endif()
-hunter_config(re2 VERSION 2017.11.01-p0)
-hunter_config(recastnavigation VERSION 1.4-p0)
-hunter_config(renderproto VERSION 0.11.1)
-hunter_config(ros_console_bridge VERSION 0.4.0-p0)
-hunter_config(ros_environment VERSION 1.2.0-p0)
-hunter_config(ros_gencpp VERSION 0.6.0-p0)
-hunter_config(ros_geneus VERSION 2.2.6-p0)
-hunter_config(ros_genlisp VERSION 0.4.16-p0)
-hunter_config(ros_genmsg VERSION 0.5.10-p0)
-hunter_config(ros_gennodejs VERSION 2.0.1-p0)
-hunter_config(ros_genpy VERSION 0.6.7-p0)
-hunter_config(ros_message_generation VERSION 0.4.0-p0)
-hunter_config(ros_message_runtime VERSION 0.4.12-p0)
-hunter_config(ros_std_msgs VERSION 0.5.11-p1)
-hunter_config(roscpp_core VERSION 0.6.9-p0)
-hunter_config(rospack VERSION 2.5.0-p0)
-hunter_config(sm VERSION 1.2.1)
-hunter_config(Snappy VERSION 1.1.6-p0)
-hunter_config(sse2neon VERSION 1.0.0-p0)
-hunter_config(sparsehash VERSION 2.0.2)
-hunter_config(stanhull VERSION 0.0.1)
+	hunter_default_version(range-v3 VERSION vcpkg5-p)
+else()
+	hunter_default_version(range-v3 VERSION 0.3.0-p)
+endif()
+hunter_default_version(re2 VERSION 2017.11.01-p0)
+hunter_default_version(recastnavigation VERSION 1.4-p0)
+hunter_default_version(renderproto VERSION 0.11.1)
+hunter_default_version(ros_console_bridge VERSION 0.4.0-p0)
+hunter_default_version(ros_environment VERSION 1.2.0-p0)
+hunter_default_version(ros_gencpp VERSION 0.6.0-p0)
+hunter_default_version(ros_geneus VERSION 2.2.6-p0)
+hunter_default_version(ros_genlisp VERSION 0.4.16-p0)
+hunter_default_version(ros_genmsg VERSION 0.5.10-p0)
+hunter_default_version(ros_gennodejs VERSION 2.0.1-p0)
+hunter_default_version(ros_genpy VERSION 0.6.7-p0)
+hunter_default_version(ros_message_generation VERSION 0.4.0-p0)
+hunter_default_version(ros_message_runtime VERSION 0.4.12-p0)
+hunter_default_version(ros_std_msgs VERSION 0.5.11-p1)
+hunter_default_version(roscpp_core VERSION 0.6.9-p0)
+hunter_default_version(rospack VERSION 2.5.0-p0)
+hunter_default_version(sm VERSION 1.2.1)
+hunter_default_version(Snappy VERSION 1.1.6-p0)
+hunter_default_version(sse2neon VERSION 1.0.0-p0)
+hunter_default_version(sparsehash VERSION 2.0.2)
+hunter_default_version(stanhull VERSION 0.0.1)
 if(MSVC_VERSION LESS 1800)
     # for VS12 - version without support C++11
-  hunter_config(spdlog VERSION 1.0.0-p0)
-else()
-  hunter_config(spdlog VERSION 0.16.3-p1)
-endif()
-hunter_config(stb VERSION 0.0.1)
-hunter_config(szip VERSION 2.1.0-p1)
-hunter_config(Tesseract VERSION 3.05.01-hunter-3)
-hunter_config(thread-pool-cpp VERSION 1.1.0)
-hunter_config(thrift VERSION 0.11.0-p0)
-hunter_config(tinydir VERSION 1.2-p0)
-hunter_config(tinyxml2 VERSION 6.2.0-p1)
-hunter_config(type_safe VERSION 0.2)
-hunter_config(util_linux VERSION 2.30.1)
-hunter_config(vorbis VERSION 1.3.6-p1)
-hunter_config(WebKit VERSION 0.0.2-p0)
-hunter_config(WebP VERSION 0.6.1-p3)
-hunter_config(websocketpp VERSION 0.7.0-p3)
-hunter_config(wxWidgets VERSION 3.0.2)
-hunter_config(x11 VERSION 1.5.0)
-hunter_config(x264 VERSION snapshot-20170420-2245)
-hunter_config(xau VERSION 1.0.7)
-hunter_config(xcb VERSION 1.11.1)
-hunter_config(xcb-proto VERSION 1.11)
-hunter_config(xcursor VERSION 1.1.13)
-hunter_config(xdamage VERSION 1.1.4)
-hunter_config(xext VERSION 1.3.1)
-hunter_config(xextproto VERSION 7.2.1)
-hunter_config(xf86vidmodeproto VERSION 2.3.1)
-hunter_config(xfixes VERSION 5.0.1)
-hunter_config(xgboost VERSION 0.7.0-p4)
-hunter_config(xi VERSION 1.6.1)
-hunter_config(xinerama VERSION 1.1.2)
-hunter_config(xineramaproto VERSION 1.1.2)
-hunter_config(xorg-macros VERSION 1.17)
-hunter_config(xproto VERSION 7.0.23)
-hunter_config(xrandr VERSION 1.3.2)
-hunter_config(xrender VERSION 0.9.7)
-hunter_config(xshmfence VERSION 1.2)
-hunter_config(xtrans VERSION 1.2.7)
-hunter_config(xxf86vm VERSION 1.1.2)
-hunter_config(yaml-cpp VERSION 0.5.3-plus-p0)
+  hunter_default_version(spdlog VERSION 1.0.0-p0)
+else()
+  hunter_default_version(spdlog VERSION 0.16.3-p1)
+endif()
+hunter_default_version(stb VERSION 0.0.1)
+hunter_default_version(szip VERSION 2.1.0-p1)
+hunter_default_version(Tesseract VERSION 3.05.01-hunter-3)
+hunter_default_version(thread-pool-cpp VERSION 1.1.0)
+hunter_default_version(thrift VERSION 0.11.0-p0)
+hunter_default_version(tinydir VERSION 1.2-p0)
+hunter_default_version(tinyxml2 VERSION 6.2.0-p1)
+hunter_default_version(type_safe VERSION 0.2)
+hunter_default_version(util_linux VERSION 2.30.1)
+hunter_default_version(vorbis VERSION 1.3.6-p1)
+hunter_default_version(WebKit VERSION 0.0.2-p0)
+hunter_default_version(WebP VERSION 0.6.1-p3)
+hunter_default_version(websocketpp VERSION 0.7.0-p3)
+hunter_default_version(wxWidgets VERSION 3.0.2)
+hunter_default_version(x11 VERSION 1.5.0)
+hunter_default_version(x264 VERSION snapshot-20170420-2245)
+hunter_default_version(xau VERSION 1.0.7)
+hunter_default_version(xcb VERSION 1.11.1)
+hunter_default_version(xcb-proto VERSION 1.11)
+hunter_default_version(xcursor VERSION 1.1.13)
+hunter_default_version(xdamage VERSION 1.1.4)
+hunter_default_version(xext VERSION 1.3.1)
+hunter_default_version(xextproto VERSION 7.2.1)
+hunter_default_version(xf86vidmodeproto VERSION 2.3.1)
+hunter_default_version(xfixes VERSION 5.0.1)
+hunter_default_version(xgboost VERSION 0.7.0-p4)
+hunter_default_version(xi VERSION 1.6.1)
+hunter_default_version(xinerama VERSION 1.1.2)
+hunter_default_version(xineramaproto VERSION 1.1.2)
+hunter_default_version(xorg-macros VERSION 1.17)
+hunter_default_version(xproto VERSION 7.0.23)
+hunter_default_version(xrandr VERSION 1.3.2)
+hunter_default_version(xrender VERSION 0.9.7)
+hunter_default_version(xshmfence VERSION 1.2)
+hunter_default_version(xtrans VERSION 1.2.7)
+hunter_default_version(xxf86vm VERSION 1.1.2)
+hunter_default_version(yaml-cpp VERSION 0.5.3-plus-p0)

 if(MSVC80)
-  hunter_config(GTest VERSION 1.7.0-hunter-6)
-else()
-  hunter_config(GTest VERSION 1.8.0-hunter-p11)
+  hunter_default_version(GTest VERSION 1.7.0-hunter-6)
+else()
+  hunter_default_version(GTest VERSION 1.8.0-hunter-p11)
 endif()

 if(ANDROID)
@@ -417,33 +408,33 @@
   string(COMPARE EQUAL "${CMAKE_SYSTEM_VERSION}" "16" _is_api_16)

   if(_is_api_21)
-    hunter_config(Android-Google-APIs VERSION 21_r01)
-    hunter_config(Android-Google-APIs-Intel-x86-Atom-System-Image VERSION 21_r10)
-    hunter_config(Android-Intel-x86-Atom-System-Image VERSION 21_r05)
-    hunter_config(Android-SDK-Platform VERSION 21_r02)
-    hunter_config(Sources-for-Android-SDK VERSION 21)
-    hunter_config(Android-ARM-EABI-v7a-System-Image VERSION 21_r04)
+    hunter_default_version(Android-Google-APIs VERSION 21_r01)
+    hunter_default_version(Android-Google-APIs-Intel-x86-Atom-System-Image VERSION 21_r10)
+    hunter_default_version(Android-Intel-x86-Atom-System-Image VERSION 21_r05)
+    hunter_default_version(Android-SDK-Platform VERSION 21_r02)
+    hunter_default_version(Sources-for-Android-SDK VERSION 21)
+    hunter_default_version(Android-ARM-EABI-v7a-System-Image VERSION 21_r04)
   elseif(_is_api_19)
-    hunter_config(Android-Google-APIs VERSION 19_r18)
-    hunter_config(Android-Intel-x86-Atom-System-Image VERSION 19)
-    hunter_config(Android-SDK-Platform VERSION 19_r04)
-    hunter_config(Sources-for-Android-SDK VERSION 19)
-    hunter_config(Android-ARM-EABI-v7a-System-Image VERSION 19_r05)
+    hunter_default_version(Android-Google-APIs VERSION 19_r18)
+    hunter_default_version(Android-Intel-x86-Atom-System-Image VERSION 19)
+    hunter_default_version(Android-SDK-Platform VERSION 19_r04)
+    hunter_default_version(Sources-for-Android-SDK VERSION 19)
+    hunter_default_version(Android-ARM-EABI-v7a-System-Image VERSION 19_r05)
   elseif(_is_api_16)
-    hunter_config(Android-Google-APIs VERSION 16_r04)
-    hunter_config(Android-Intel-x86-Atom-System-Image VERSION 16)
-    hunter_config(Android-SDK-Platform VERSION 16_r05)
-    hunter_config(Sources-for-Android-SDK VERSION 16)
-    hunter_config(Android-ARM-EABI-v7a-System-Image VERSION 16_r04)
-    hunter_config(Android-MIPS-System-Image VERSION 16_r04)
+    hunter_default_version(Android-Google-APIs VERSION 16_r04)
+    hunter_default_version(Android-Intel-x86-Atom-System-Image VERSION 16)
+    hunter_default_version(Android-SDK-Platform VERSION 16_r05)
+    hunter_default_version(Sources-for-Android-SDK VERSION 16)
+    hunter_default_version(Android-ARM-EABI-v7a-System-Image VERSION 16_r04)
+    hunter_default_version(Android-MIPS-System-Image VERSION 16_r04)
   elseif(_is_api_24)
-    hunter_config(Android-Google-APIs VERSION 24_r1)
-    hunter_config(Android-Google-APIs-Intel-x86-Atom-System-Image VERSION 24_r20)
-    hunter_config(Android-Intel-x86-Atom-System-Image VERSION 24_r08)
-    hunter_config(Android-SDK-Platform VERSION 24_r02)
-    hunter_config(Sources-for-Android-SDK VERSION 24)
-    hunter_config(Android-ARM-EABI-v7a-System-Image VERSION 24_r07)
-    hunter_config(Android-ARM64-v8a-System-Image VERSION 24_r07)
+    hunter_default_version(Android-Google-APIs VERSION 24_r1)
+    hunter_default_version(Android-Google-APIs-Intel-x86-Atom-System-Image VERSION 24_r20)
+    hunter_default_version(Android-Intel-x86-Atom-System-Image VERSION 24_r08)
+    hunter_default_version(Android-SDK-Platform VERSION 24_r02)
+    hunter_default_version(Sources-for-Android-SDK VERSION 24)
+    hunter_default_version(Android-ARM-EABI-v7a-System-Image VERSION 24_r07)
+    hunter_default_version(Android-ARM64-v8a-System-Image VERSION 24_r07)
   else()
     hunter_user_error(
         "Android API (CMAKE_SYSTEM_VERSION)"
@@ -453,7 +444,7 @@
   endif()
 endif()

-hunter_config(zookeeper VERSION 3.4.9-p2)
-hunter_config(tacopie VERSION 3.2.0-h1)
-hunter_config(cpp_redis VERSION 3.5.0-h1)
-hunter_config(IF97 VERSION 2.1.2)
+hunter_default_version(zookeeper VERSION 3.4.9-p2)
+hunter_default_version(tacopie VERSION 3.2.0-h1)
+hunter_default_version(cpp_redis VERSION 3.5.0-h1)
+hunter_default_version(IF97 VERSION 2.1.2)


fix default zookeeper version

fix default zookeeper version

--- cmake/configs/default.cmake
+++ cmake/configs/default.cmake
@@ -233,4 +233,4 @@
   endif()
 endif()

-hunter_config(zookeeper VERSION 3.4.9-p1)
+hunter_config(zookeeper VERSION 3.4.9-p2)


add blank

add blank

--- cmake/external/python.cmake
+++ cmake/external/python.cmake
@@ -224,4 +224,4 @@

 IF(NOT WITH_PYTHON)
     SET(PYTHON_LIBRARIES "")
-ENDIF()+ENDIF()


Fixed a bug - part of the code is now only processed if pkgconfig IS available, not the other way round. Thanks, Alan.

svn path=/trunk/; revision=7110

--- cmake/modules/FindAGG.cmake
+++ cmake/modules/FindAGG.cmake
@@ -14,7 +14,7 @@

 else (AGG_INCLUDE_DIR AND AGG_LIBRARIES)

-  if(NOT PKGCONFIG_EXECUTABLE)
+  if(PKGCONFIG_EXECUTABLE)
     # use pkg-config to get the directories and then use these values
     # in the FIND_PATH() and FIND_LIBRARY() calls
     INCLUDE(UsePkgConfig)
@@ -22,7 +22,7 @@
     PKGCONFIG(libagg _AGGIncDir _AGGLinkDir _AGGLinkFlags _AGGCflags)

     set(AGG_DEFINITIONS ${_AGGCflags})
-  endif(NOT PKGCONFIG_EXECUTABLE)
+  endif(PKGCONFIG_EXECUTABLE)

   FIND_PATH(AGG_INCLUDE_DIR agg2/agg_pixfmt_gray.h
     ${_AGGIncDir}


Update FindKTp.cmake

Update FindKTp.cmake

--- cmake/modules/FindKTp.cmake
+++ cmake/modules/FindKTp.cmake
@@ -3,6 +3,7 @@
 # KTP_INCLUDE_DIR
 # KTP_LIBRARIES
 # KTP_MODELS_LIBRARIES
+# KTP_WIDGETS_LIBRARIES

 # Copyright (c) 2011, Dario Freddi <drf@kde.org>
 #
@@ -26,6 +27,7 @@

 find_library(KTP_LIBRARIES NAMES ktpcommoninternalsprivate )
 find_library(KTP_MODELS_LIBRARIES NAMES ktpmodelsprivate )
+find_library(KTP_WIDGETS_LIBRARIES NAMES ktpwidgetsprivate )

 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(KTp DEFAULT_MSG


build: clean up some vestigial support code (NFC)

This was used for the parallel compilation of Swift code which has since
been migrated to CMake.  Remove the vestigial code to clean up the
module.

--- cmake/modules/Utility.cmake
+++ cmake/modules/Utility.cmake
@@ -1,8 +1,4 @@
-include(ProcessorCount)
 include(CMakeParseArguments)
-
-# Compute the number of processors.
-ProcessorCount(NUM_PROCESSORS)

 function(append_if condition value)
   if (${condition})


increase the size of the intermediate disk image

--- cmake/packages/bundle.cmake
+++ cmake/packages/bundle.cmake
@@ -34,7 +34,7 @@
 # we wrap HDIUTIL to inject our own parameter:
 find_program(HDIUTIL_EXECUTABLE hdiutil)
 # for now 240MB seems to be enough:
-set(CMAKE_DMG_SIZE 240)
+set(CMAKE_DMG_SIZE 260)
 configure_file("${PROJECT_SOURCE_DIR}/Installation/MacOSX/Bundle/hdiutilwrapper.sh.in"
   "${CMAKE_CURRENT_BINARY_DIR}/hdiutilwrapper.sh"
   @ONLY)


COMP: Use CIP develop branch

COMP: Use CIP develop branch

after merging SlicerCIPIntegration branch of CIP repository into
develop branch which includes required changes to include CIP CLI
modules

--- SuperBuild/External_CIP.cmake
+++ SuperBuild/External_CIP.cmake
@@ -25,7 +25,7 @@
   ExternalProject_Add(${proj}
     ${${proj}_EP_ARGS}
     GIT_REPOSITORY "${git_protocol}://github.com/acil-bwh/ChestImagingPlatform.git"
-    GIT_TAG "79c752196385124f592776e796c918c2176b0c1f" # use SlicerCIPIntegration branch to include CLI modules
+    GIT_TAG "431ced5ba9a0553ddaece7c11b41ca8d73d41787" # use develop branch to include CLI modules
     #DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E echo "Remove this line and uncomment GIT_REPOSITORY and GIT_TAG"
     SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
     BINARY_DIR ${proj}-build


Update Superbuild ITK version to 4.10rc1

Change-Id: I23ce833279697e31a2194097db78c0e121cb2d03

--- SuperBuild/External_ITK.cmake
+++ SuperBuild/External_ITK.cmake
@@ -35,7 +35,7 @@
 set(ITK_REPOSITORY "${git_protocol}://itk.org/ITK.git")

 # NOTE: it is very important to update the ITK_DIR path with the ITK version
-set(ITK_TAG_COMMAND GIT_TAG v4.9.1 )
+set(ITK_TAG_COMMAND GIT_TAG v4.10rc01 )

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

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


Update ITK superbuild version to 4.12.2

Update ITK superbuild version to 4.12.2

--- SuperBuild/External_ITK.cmake
+++ SuperBuild/External_ITK.cmake
@@ -47,7 +47,7 @@
 mark_as_advanced(ITK_GIT_REPOSITORY)
 sitk_legacy_naming(ITK_GIT_REPOSITORY ITK_REPOSITORY)

-set(ITK_GIT_TAG "v4.12.1" CACHE STRING "Tag in ITK git repo")
+set(ITK_GIT_TAG "v4.12.2" CACHE STRING "Tag in ITK git repo")
 mark_as_advanced(ITK_GIT_TAG)
 set(ITK_TAG_COMMAND GIT_TAG "${ITK_GIT_TAG}")


Update ITK Superbuild version tag v4.7.1

Change-Id: I547c1585d309b9117831b7a808cc16284be09dea

--- SuperBuild/External_ITK.cmake
+++ SuperBuild/External_ITK.cmake
@@ -35,7 +35,7 @@
 set(ITK_REPOSITORY git://itk.org/ITK.git)

 # NOTE: it is very important to update the ITK_DIR path with the ITK version
-set(ITK_TAG_COMMAND GIT_TAG 2fa884e552ea6688dfd6cfc4e0f52d8a05eefb30) # v4.7.0 with patches on release
+set(ITK_TAG_COMMAND GIT_TAG v4.7.1) # v4.7.1 release

 if( ${ITK_WRAPPING} OR ${BUILD_SHARED_LIBS} )
   set( ITK_BUILD_SHARED_LIBS ON )


Add a cuRAND settings.

Add a cuRAND settings.

--- cmake/TbagModule/TbagObjectCUDA.cmake
+++ cmake/TbagModule/TbagObjectCUDA.cmake
@@ -18,5 +18,8 @@
     if (USE_CUBLAS)
         list (APPEND TBAG_OBJECT_LDFLAGS ${CUDA_CUBLAS_LIBRARIES})
     endif ()
+    if (USE_CURAND)
+        list (APPEND TBAG_OBJECT_LDFLAGS ${CUDA_curand_LIBRARY})
+    endif ()
 endif ()


[cmake] Remove MSVC C4355 override

[cmake] Remove MSVC C4355 override

Remove C4355 : ''this' : used in base member initializer list' from the list of forced disabled warnings.

I'm not seeing any regressions in VS2017/VS2019 llvm/clang builds from removing this.

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

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

--- cmake/modules/HandleLLVMOptions.cmake
+++ cmake/modules/HandleLLVMOptions.cmake
@@ -512,7 +512,6 @@
       -wd4291 # Suppress ''declaration' : no matching operator delete found; memory will not be freed if initialization throws an exception'
       -wd4345 # Suppress 'behavior change: an object of POD type constructed with an initializer of the form () will be default-initialized'
       -wd4351 # Suppress 'new behavior: elements of array 'array' will be default initialized'
-      -wd4355 # Suppress ''this' : used in base member initializer list'
       -wd4456 # Suppress 'declaration of 'var' hides local variable'
       -wd4457 # Suppress 'declaration of 'var' hides function parameter'
       -wd4458 # Suppress 'declaration of 'var' hides class member'


cmake/modules/HandleLLVMOptions.cmake: Reorder __STDC_CONSTANT_MACROS and __STDC_LIMIT_MACROS.

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

--- cmake/modules/HandleLLVMOptions.cmake
+++ cmake/modules/HandleLLVMOptions.cmake
@@ -186,7 +186,7 @@
   endif (LLVM_ENABLE_WERROR)
 endif( MSVC )

+add_llvm_definitions( -D__STDC_CONSTANT_MACROS )
 add_llvm_definitions( -D__STDC_LIMIT_MACROS )
-add_llvm_definitions( -D__STDC_CONSTANT_MACROS )

 option(LLVM_INCLUDE_TESTS "Generate build targets for the LLVM unit tests." ON)