diff -Nru openvdb-7.1.0/azure-pipelines.yml openvdb-7.1.1/azure-pipelines.yml --- openvdb-7.1.0/azure-pipelines.yml 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/azure-pipelines.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ - -stages: -- stage: Build - jobs: - - job: testhou180 - displayName: Houdini 18.0 - pool: - vmImage: 'ubuntu-16.04' - container: aswf/ci-base:2019 - timeoutInMinutes: 0 - condition: variables['HOUPASS'] - steps: - - bash: ci/install_houdini_azure.sh 18.0 ${HOUPASS} - - bash: ci/build_houdini_azure.sh clang++ Release OFF diff -Nru openvdb-7.1.0/CHANGES openvdb-7.1.1/CHANGES --- openvdb-7.1.0/CHANGES 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/CHANGES 2020-09-25 03:19:30.000000000 +0000 @@ -1,6 +1,40 @@ OpenVDB Version History ======================= +Version 7.1.1 - In Development + + Improvements: + - util::CpuTimer now uses C++11 chrono instead of TBB. + + Houdini: + - Fixed a bug in the OpenVDB Points Convert SOP where the auto voxel + transform was ignoring the contents of packed geometry. + - Fixed a bug in the OpenVDB Points Convert SOP where points representing + packed geometry were also being converted. + - Fixed a bug where a Houdini SOP's verb would not be correctly associated + with the corresponding node if the node's internal name was changed. + - Fixed bug where OpenVDB Convert SOP could revert the name attribute. + + Bug fixes: + - Fixed a bug which could cause recursive compile time instantiations of + TypeList objects, manifesting in longer compile times. + + Build: + - Removed the Makefiles. + - Re-organised the repository layout such that each independent library + is able to be configured against an existing installation of OpenVDB + without ambiguous include paths. + - Upgraded CMake minimum version support to 3.12. + - Removed OPENVDB_STATIC_SPECIALIZATION macro which is no longer required. + - Fixed various compiler warnings for GCC 9.1. + - Moved to CMake doxygen commands and removed the doxygen-config files for + doxygen documentation. + - Added USE_ZLIB compiler flag that enables zlib compression and defaults + to on. + - Added the OPENVDB_STATICLIB define to all static builds to fix builds on + Windows which use the multithread/DLL-specific version of the CRT. + [Reported by Tobias Rittig] + Version 7.1.0 - August 13, 2020 As of this release, support for grid ABI=4 has been removed. diff -Nru openvdb-7.1.0/ci/build_houdini_azure.sh openvdb-7.1.1/ci/build_houdini_azure.sh --- openvdb-7.1.0/ci/build_houdini_azure.sh 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/ci/build_houdini_azure.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -COMPILER="$1" -RELEASE="$2" -EXTRAS="$3" - -cd hou -source houdini_setup_bash -cd - - -mkdir build -cd build - -# print version -cmake --version - -cmake \ - -DCMAKE_CXX_COMPILER=${COMPILER} \ - -DCMAKE_BUILD_TYPE=${RELEASE} \ - -DOPENVDB_CXX_STRICT=ON \ - -DOPENVDB_BUILD_HOUDINI_PLUGIN=ON \ - -DOPENVDB_BUILD_HOUDINI_ABITESTS=ON \ - -DOPENVDB_BUILD_BINARIES=${EXTRAS} \ - -DOPENVDB_BUILD_PYTHON_MODULE=${EXTRAS} \ - -DOPENVDB_BUILD_UNITTESTS=${EXTRAS} \ - -DOPENVDB_HOUDINI_INSTALL_PREFIX=/tmp \ - .. - -# Can only build using one thread with GCC due to memory constraints -if [ "$COMPILER" = "clang++" ]; then - make -j2 -else - make -fi diff -Nru openvdb-7.1.0/ci/download_houdini2.py openvdb-7.1.1/ci/download_houdini2.py --- openvdb-7.1.0/ci/download_houdini2.py 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/ci/download_houdini2.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,169 +0,0 @@ -#!/usr/local/bin/python -# -# Copyright Contributors to the OpenVDB Project -# SPDX-License-Identifier: MPL-2.0 -# -# Python script to download the latest Houdini builds -# using the SideFX download API: -# -# https://www.sidefx.com/docs/api/download/index.html -# -# Authors: Dan Bailey, SideFX - -import time -import sys -import re -import shutil -import json -import base64 -import requests -import hashlib - -# this argument is for the major.minor version of Houdini to download (such as 15.0, 15.5, 16.0) -version = sys.argv[1] -only_production = True if sys.argv[2] == 'ON' else False -user_client_id = sys.argv[3] -user_client_secret_key = sys.argv[4] - -if not re.match('[0-9][0-9]\.[0-9]$', version): - raise IOError('Invalid Houdini Version "%s", expecting in the form "major.minor" such as "16.0"' % version) - - -# Code that provides convenient Python wrappers to call into the API: - -def service( - access_token_url, client_id, client_secret_key, endpoint_url, - access_token=None, access_token_expiry_time=None): - if (access_token is None or - access_token_expiry_time is None or - access_token_expiry_time < time.time()): - access_token, access_token_expiry_time = ( - get_access_token_and_expiry_time( - access_token_url, client_id, client_secret_key)) - - return _Service( - endpoint_url, access_token, access_token_expiry_time) - - -class _Service(object): - def __init__( - self, endpoint_url, access_token, access_token_expiry_time): - self.endpoint_url = endpoint_url - self.access_token = access_token - self.access_token_expiry_time = access_token_expiry_time - - def __getattr__(self, attr_name): - return _APIFunction(attr_name, self) - - -class _APIFunction(object): - def __init__(self, function_name, service): - self.function_name = function_name - self.service = service - - def __getattr__(self, attr_name): - # This isn't actually an API function, but a family of them. Append - # the requested function name to our name. - return _APIFunction( - "{0}.{1}".format(self.function_name, attr_name), self.service) - - def __call__(self, *args, **kwargs): - return call_api_with_access_token( - self.service.endpoint_url, self.service.access_token, - self.function_name, args, kwargs) - -#--------------------------------------------------------------------------- -# Code that implements authentication and raw calls into the API: - - -def get_access_token_and_expiry_time( - access_token_url, client_id, client_secret_key): - """Given an API client (id and secret key) that is allowed to make API - calls, return an access token that can be used to make calls. - """ - response = requests.post( - access_token_url, - headers={ - "Authorization": u"Basic {0}".format( - base64.b64encode( - "{0}:{1}".format( - client_id, client_secret_key - ).encode() - ).decode('utf-8') - ), - }) - if response.status_code != 200: - raise AuthorizationError(response.status_code, reponse.text) - - response_json = response.json() - access_token_expiry_time = time.time() - 2 + response_json["expires_in"] - return response_json["access_token"], access_token_expiry_time - - -class AuthorizationError(Exception): - """Raised from the client if the server generated an error while generating - an access token. - """ - def __init__(self, http_code, message): - super(AuthorizationError, self).__init__(message) - self.http_code = http_code - - -def call_api_with_access_token( - endpoint_url, access_token, function_name, args, kwargs): - """Call into the API using an access token that was returned by - get_access_token. - """ - response = requests.post( - endpoint_url, - headers={ - "Authorization": "Bearer " + access_token, - }, - data=dict( - json=json.dumps([function_name, args, kwargs]), - )) - if response.status_code == 200: - return response.json() - - raise APIError(response.status_code, response.text) - - -class APIError(Exception): - """Raised from the client if the server generated an error while calling - into the API. - """ - def __init__(self, http_code, message): - super(APIError, self).__init__(message) - self.http_code = http_code - - -service = service( - access_token_url="https://www.sidefx.com/oauth2/application_token", - client_id=user_client_id, - client_secret_key=user_client_secret_key, - endpoint_url="https://www.sidefx.com/api/", - ) - -releases_list = service.download.get_daily_builds_list( - product='houdini', version=version, platform='linux', only_production=only_production) - -latest_release = service.download.get_daily_build_download( - product='houdini', version=version, platform='linux', build=releases_list[0]['build']) - -# Download the file as hou.tar.gz -local_filename = 'hou.tar.gz' -response = requests.get(latest_release['download_url'], stream=True) -if response.status_code == 200: - with open(local_filename, 'wb') as f: - response.raw.decode_content = True - shutil.copyfileobj(response.raw, f) -else: - raise Exception('Error downloading file!') - -# Verify the file checksum is matching -file_hash = hashlib.md5() -with open(local_filename, 'rb') as f: - for chunk in iter(lambda: f.read(4096), b''): - file_hash.update(chunk) -if file_hash.hexdigest() != latest_release['hash']: - raise Exception('Checksum does not match!') diff -Nru openvdb-7.1.0/ci/download_houdini2.sh openvdb-7.1.1/ci/download_houdini2.sh --- openvdb-7.1.0/ci/download_houdini2.sh 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/ci/download_houdini2.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -#!/usr/bin/env bash - -set -e - -HOUDINI_MAJOR="$1" -GOLD="$2" -HOUDINI_CLIENT_ID="$4" -HOUDINI_SECRET_KEY="$5" - -if [ "$HOUDINI_CLIENT_ID" == "" ]; then - echo "HOUDINI_CLIENT_ID GitHub Action Secret needs to be set to install Houdini builds" - exit 0 -fi -if [ "$HOUDINI_SECRET_KEY" == "" ]; then - echo "HOUDINI_SECRET_KEY GitHub Action Secret needs to be set to install Houdini builds" - exit 0 -fi - -pip install --user requests - -python ci/download_houdini2.py $HOUDINI_MAJOR $GOLD $HOUDINI_CLIENT_ID $HOUDINI_SECRET_KEY - -# create dir hierarchy -mkdir -p hou/bin -mkdir -p hou/houdini -mkdir -p hou/toolkit -mkdir -p hou/dsolib - -# unpack hou.tar.gz and cleanup -tar -xzf hou.tar.gz -rm -rf hou.tar.gz -cd houdini* -tar -xzf houdini.tar.gz - -# copy required files into hou dir -cp houdini_setup* ../hou/. -cp -r toolkit/cmake ../hou/toolkit/. -cp -r toolkit/include ../hou/toolkit/. -cp -r dsolib/libHoudini* ../hou/dsolib/. -cp -r dsolib/libopenvdb_sesi* ../hou/dsolib/. -cp -r dsolib/libblosc* ../hou/dsolib/. -cp -r dsolib/libhboost* ../hou/dsolib/. -cp -r dsolib/libz* ../hou/dsolib/. -cp -r dsolib/libbz2* ../hou/dsolib/. -cp -r dsolib/libtbb* ../hou/dsolib/. -cp -r dsolib/libHalf* ../hou/dsolib/. -cp -r dsolib/libjemalloc* ../hou/dsolib/. - -# needed for < H18.0 (due to sesitag) -if [ "$HOUDINI_MAJOR" == "17.0" ] || [ "$HOUDINI_MAJOR" == "17.5" ]; then - cp -r bin/app_init* ../hou/bin/. - cp -r bin/sesitag* ../hou/bin/. - cp -r dsolib/lib* ../hou/dsolib/. -fi - -# write hou into hou.tar.gz and cleanup -cd .. -tar -czvf hou.tar.gz hou - -# move hou.tar.gz into hou subdirectory -rm -rf hou/* -mv hou.tar.gz hou - -# inspect size of tarball -ls -lart hou/hou.tar.gz diff -Nru openvdb-7.1.0/ci/download_houdini_azure.py openvdb-7.1.1/ci/download_houdini_azure.py --- openvdb-7.1.0/ci/download_houdini_azure.py 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/ci/download_houdini_azure.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -# Python script to download the latest Houdini production builds -# -# Note that this can now be replaced with this API: -# https://www.sidefx.com/docs/api/download/index.html -# -# Author: Dan Bailey - -import mechanize -import sys -import re -import exceptions - -# this argument is for the major.minor version of Houdini to download (such as 15.0, 15.5, 16.0) -version = sys.argv[1] -password = sys.argv[2] - -if not re.match('[0-9][0-9]\.[0-9]$', version): - raise IOError('Invalid Houdini Version "%s", expecting in the form "major.minor" such as "16.0"' % version) - -br = mechanize.Browser() -br.set_handle_robots(False) - -# login to sidefx.com as openvdb -br.open('https://www.sidefx.com/login/?next=/download/daily-builds') -br.select_form(nr=0) -br.form['username'] = 'openvdb' -br.form['password'] = password -br.submit() - -# retrieve download id -br.open('https://www.sidefx.com/download/daily-builds/') - -houid = -1 - -for link in br.links(): - if '/download/download-houdini' not in link.url: - continue - if link.text.startswith('houdini-%s' % version) and 'linux_x86_64' in link.text: - response = br.follow_link(text=link.text, nr=0) - url = response.geturl() - houid = url.split('/download-houdini/')[-1] - break - -# download houdini tarball in 50MB chunks -url = 'https://www.sidefx.com/download/download-houdini/%sget/' % houid -response = br.open(url) -mb = 1024*1024 -chunk = 50 -size = 0 -file = open('hou.tar.gz', 'wb') -for bytes in iter((lambda: response.read(chunk*mb)), ''): - size += 50 - print 'Read: %sMB' % size - file.write(bytes) -file.close() diff -Nru openvdb-7.1.0/ci/download_houdini.py openvdb-7.1.1/ci/download_houdini.py --- openvdb-7.1.0/ci/download_houdini.py 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/ci/download_houdini.py 2020-09-25 03:19:30.000000000 +0000 @@ -1,55 +1,169 @@ -# Python script to download the latest Houdini production builds +#!/usr/local/bin/python +# +# Copyright Contributors to the OpenVDB Project +# SPDX-License-Identifier: MPL-2.0 +# +# Python script to download the latest Houdini builds +# using the SideFX download API: # -# Note that this can now be replaced with this API: # https://www.sidefx.com/docs/api/download/index.html # -# Author: Dan Bailey +# Authors: Dan Bailey, SideFX -import mechanize +import time import sys import re -import exceptions +import shutil +import json +import base64 +import requests +import hashlib # this argument is for the major.minor version of Houdini to download (such as 15.0, 15.5, 16.0) version = sys.argv[1] -password = sys.argv[2] +only_production = True if sys.argv[2] == 'ON' else False +user_client_id = sys.argv[3] +user_client_secret_key = sys.argv[4] if not re.match('[0-9][0-9]\.[0-9]$', version): raise IOError('Invalid Houdini Version "%s", expecting in the form "major.minor" such as "16.0"' % version) -br = mechanize.Browser() -br.set_handle_robots(False) -# login to sidefx.com as openvdb -br.open('https://www.sidefx.com/login/?next=/download/daily-builds') -br.select_form(nr=0) -br.form['username'] = 'openvdb' -br.form['password'] = password -br.submit() - -# retrieve download id -br.open('https://www.sidefx.com/download/daily-builds/') - -houid = -1 - -for link in br.links(): - if '/download/download-houdini' not in link.url: - continue - if link.text.startswith('houdini-%s' % version) and 'linux_x86_64' in link.text: - response = br.follow_link(text=link.text, nr=0) - url = response.geturl() - houid = url.split('/download-houdini/')[-1] - break - -# download houdini tarball in 50MB chunks -url = 'https://www.sidefx.com/download/download-houdini/%sget/' % houid -response = br.open(url) -mb = 1024*1024 -chunk = 50 -size = 0 -file = open('hou.tar.gz', 'wb') -for bytes in iter((lambda: response.read(chunk*mb)), ''): - size += 50 - print 'Read: %sMB' % size - file.write(bytes) -file.close() +# Code that provides convenient Python wrappers to call into the API: + +def service( + access_token_url, client_id, client_secret_key, endpoint_url, + access_token=None, access_token_expiry_time=None): + if (access_token is None or + access_token_expiry_time is None or + access_token_expiry_time < time.time()): + access_token, access_token_expiry_time = ( + get_access_token_and_expiry_time( + access_token_url, client_id, client_secret_key)) + + return _Service( + endpoint_url, access_token, access_token_expiry_time) + + +class _Service(object): + def __init__( + self, endpoint_url, access_token, access_token_expiry_time): + self.endpoint_url = endpoint_url + self.access_token = access_token + self.access_token_expiry_time = access_token_expiry_time + + def __getattr__(self, attr_name): + return _APIFunction(attr_name, self) + + +class _APIFunction(object): + def __init__(self, function_name, service): + self.function_name = function_name + self.service = service + + def __getattr__(self, attr_name): + # This isn't actually an API function, but a family of them. Append + # the requested function name to our name. + return _APIFunction( + "{0}.{1}".format(self.function_name, attr_name), self.service) + + def __call__(self, *args, **kwargs): + return call_api_with_access_token( + self.service.endpoint_url, self.service.access_token, + self.function_name, args, kwargs) + +#--------------------------------------------------------------------------- +# Code that implements authentication and raw calls into the API: + + +def get_access_token_and_expiry_time( + access_token_url, client_id, client_secret_key): + """Given an API client (id and secret key) that is allowed to make API + calls, return an access token that can be used to make calls. + """ + response = requests.post( + access_token_url, + headers={ + "Authorization": u"Basic {0}".format( + base64.b64encode( + "{0}:{1}".format( + client_id, client_secret_key + ).encode() + ).decode('utf-8') + ), + }) + if response.status_code != 200: + raise AuthorizationError(response.status_code, reponse.text) + + response_json = response.json() + access_token_expiry_time = time.time() - 2 + response_json["expires_in"] + return response_json["access_token"], access_token_expiry_time + + +class AuthorizationError(Exception): + """Raised from the client if the server generated an error while generating + an access token. + """ + def __init__(self, http_code, message): + super(AuthorizationError, self).__init__(message) + self.http_code = http_code + + +def call_api_with_access_token( + endpoint_url, access_token, function_name, args, kwargs): + """Call into the API using an access token that was returned by + get_access_token. + """ + response = requests.post( + endpoint_url, + headers={ + "Authorization": "Bearer " + access_token, + }, + data=dict( + json=json.dumps([function_name, args, kwargs]), + )) + if response.status_code == 200: + return response.json() + + raise APIError(response.status_code, response.text) + + +class APIError(Exception): + """Raised from the client if the server generated an error while calling + into the API. + """ + def __init__(self, http_code, message): + super(APIError, self).__init__(message) + self.http_code = http_code + + +service = service( + access_token_url="https://www.sidefx.com/oauth2/application_token", + client_id=user_client_id, + client_secret_key=user_client_secret_key, + endpoint_url="https://www.sidefx.com/api/", + ) + +releases_list = service.download.get_daily_builds_list( + product='houdini', version=version, platform='linux', only_production=only_production) + +latest_release = service.download.get_daily_build_download( + product='houdini', version=version, platform='linux', build=releases_list[0]['build']) + +# Download the file as hou.tar.gz +local_filename = 'hou.tar.gz' +response = requests.get(latest_release['download_url'], stream=True) +if response.status_code == 200: + with open(local_filename, 'wb') as f: + response.raw.decode_content = True + shutil.copyfileobj(response.raw, f) +else: + raise Exception('Error downloading file!') + +# Verify the file checksum is matching +file_hash = hashlib.md5() +with open(local_filename, 'rb') as f: + for chunk in iter(lambda: f.read(4096), b''): + file_hash.update(chunk) +if file_hash.hexdigest() != latest_release['hash']: + raise Exception('Checksum does not match!') diff -Nru openvdb-7.1.0/ci/download_houdini.sh openvdb-7.1.1/ci/download_houdini.sh --- openvdb-7.1.0/ci/download_houdini.sh 1970-01-01 00:00:00.000000000 +0000 +++ openvdb-7.1.1/ci/download_houdini.sh 2020-09-25 03:19:30.000000000 +0000 @@ -0,0 +1,65 @@ +#!/usr/bin/env bash + +set -e + +HOUDINI_MAJOR="$1" +GOLD="$2" +HOUDINI_CLIENT_ID="$4" +HOUDINI_SECRET_KEY="$5" + +if [ "$HOUDINI_CLIENT_ID" == "" ]; then + echo "HOUDINI_CLIENT_ID GitHub Action Secret needs to be set to install Houdini builds" + exit 0 +fi +if [ "$HOUDINI_SECRET_KEY" == "" ]; then + echo "HOUDINI_SECRET_KEY GitHub Action Secret needs to be set to install Houdini builds" + exit 0 +fi + +pip install --user requests + +python ci/download_houdini.py $HOUDINI_MAJOR $GOLD $HOUDINI_CLIENT_ID $HOUDINI_SECRET_KEY + +# create dir hierarchy +mkdir -p hou/bin +mkdir -p hou/houdini +mkdir -p hou/toolkit +mkdir -p hou/dsolib + +# unpack hou.tar.gz and cleanup +tar -xzf hou.tar.gz +rm -rf hou.tar.gz +cd houdini* +tar -xzf houdini.tar.gz + +# copy required files into hou dir +cp houdini_setup* ../hou/. +cp -r toolkit/cmake ../hou/toolkit/. +cp -r toolkit/include ../hou/toolkit/. +cp -r dsolib/libHoudini* ../hou/dsolib/. +cp -r dsolib/libopenvdb_sesi* ../hou/dsolib/. +cp -r dsolib/libblosc* ../hou/dsolib/. +cp -r dsolib/libhboost* ../hou/dsolib/. +cp -r dsolib/libz* ../hou/dsolib/. +cp -r dsolib/libbz2* ../hou/dsolib/. +cp -r dsolib/libtbb* ../hou/dsolib/. +cp -r dsolib/libHalf* ../hou/dsolib/. +cp -r dsolib/libjemalloc* ../hou/dsolib/. + +# needed for < H18.0 (due to sesitag) +if [ "$HOUDINI_MAJOR" == "17.0" ] || [ "$HOUDINI_MAJOR" == "17.5" ]; then + cp -r bin/app_init* ../hou/bin/. + cp -r bin/sesitag* ../hou/bin/. + cp -r dsolib/lib* ../hou/dsolib/. +fi + +# write hou into hou.tar.gz and cleanup +cd .. +tar -czvf hou.tar.gz hou + +# move hou.tar.gz into hou subdirectory +rm -rf hou/* +mv hou.tar.gz hou + +# inspect size of tarball +ls -lart hou/hou.tar.gz diff -Nru openvdb-7.1.0/ci/install_boost.sh openvdb-7.1.1/ci/install_boost.sh --- openvdb-7.1.0/ci/install_boost.sh 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/ci/install_boost.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BOOST_VERSION="$1" - -# only install for Boost 1.61 -apt-get install -y libbz2-dev - -git clone https://github.com/boostorg/boost.git -cd boost - -if [ "$BOOST_VERSION" == "latest" ]; then - git checkout tags/boost-1.69.0 -b boost-1.69.0 -else - git checkout tags/boost-${BOOST_VERSION} -b boost-${BOOST_VERSION} -fi - -git submodule update --init -- - -./bootstrap.sh --prefix=/usr/local -./b2 headers -j4 -./b2 install link=shared variant=release \ - --with-atomic \ - --with-chrono \ - --with-date_time \ - --with-iostreams \ - --with-python \ - --with-regex \ - --with-system \ - --with-thread \ - -j4 diff -Nru openvdb-7.1.0/ci/install_houdini2.sh openvdb-7.1.1/ci/install_houdini2.sh --- openvdb-7.1.0/ci/install_houdini2.sh 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/ci/install_houdini2.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -e - -if [ -d "hou" ]; then - # move hou tarball into top-level and untar - cp hou/hou.tar.gz . - tar -xzf hou.tar.gz -fi diff -Nru openvdb-7.1.0/ci/install_houdini_azure.sh openvdb-7.1.1/ci/install_houdini_azure.sh --- openvdb-7.1.0/ci/install_houdini_azure.sh 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/ci/install_houdini_azure.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -set -e - -HOUDINI_MAJOR="$1" -HOUPASS="$2" - -if [ "$HOUPASS" == "" ]; then - echo "Houdini secret not set, skipping" -else - pip install --user future - pip install --user lxml - pip install --user mechanize - - export PYTHONPATH=${PYTHONPATH}:/usr/lib/python2.7/dist-packages - # download and unpack latest houdini headers and libraries from daily-builds - python ci/download_houdini_azure.py $HOUDINI_MAJOR $HOUPASS - - tar -xzf hou.tar.gz - ln -s houdini* hou - cd hou - tar -xzf houdini.tar.gz - - cd - -fi diff -Nru openvdb-7.1.0/ci/install_houdini.sh openvdb-7.1.1/ci/install_houdini.sh --- openvdb-7.1.0/ci/install_houdini.sh 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/ci/install_houdini.sh 2020-09-25 03:19:30.000000000 +0000 @@ -2,24 +2,8 @@ set -e -HOUDINI_MAJOR="$1" -HOUPASS="$2" - -if [ "$HOUPASS" == "" ]; then - echo "Houdini secret not set, skipping" -else - pip install --user future - pip install --user lxml - pip install --user mechanize - - export PYTHONPATH=${PYTHONPATH}:/usr/lib/python2.7/dist-packages - # download and unpack latest houdini headers and libraries from daily-builds - python ci/download_houdini.py $HOUDINI_MAJOR $HOUPASS - +if [ -d "hou" ]; then + # move hou tarball into top-level and untar + cp hou/hou.tar.gz . tar -xzf hou.tar.gz - ln -s houdini* hou - cd hou - tar -xzf houdini.tar.gz - - cd - fi diff -Nru openvdb-7.1.0/ci/install_jemalloc.sh openvdb-7.1.1/ci/install_jemalloc.sh --- openvdb-7.1.0/ci/install_jemalloc.sh 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/ci/install_jemalloc.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -apt-get install -y libjemalloc-dev diff -Nru openvdb-7.1.0/ci/install_openexr.sh openvdb-7.1.1/ci/install_openexr.sh --- openvdb-7.1.0/ci/install_openexr.sh 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/ci/install_openexr.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -OPENEXR_VERSION="$1" - -git clone https://github.com/openexr/openexr.git -cd openexr - -if [ "$OPENEXR_VERSION" != "latest" ]; then - git checkout tags/v${OPENEXR_VERSION} -b v${OPENEXR_VERSION} -fi - -# TODO: CMake support was only introduced with OpenEXR 2.3, expand this to use 2.2 - -mkdir build -cd build -cmake -DOPENEXR_BUILD_PYTHON_LIBS=OFF -DOPENEXR_BUILD_TESTS=OFF -DOPENEXR_BUILD_UTILS=OFF ../. -make -j4 -make install diff -Nru openvdb-7.1.0/ci/install.sh openvdb-7.1.1/ci/install.sh --- openvdb-7.1.0/ci/install.sh 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/ci/install.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -apt-get update - -apt-get install -y zlib1g-dev -apt-get install -y wget -apt-get install -y unzip -apt-get install -y curl -apt-get install -y cmake -apt-get install -y git -apt-get install -y g++ -apt-get install -y clang -apt-get install -y llvm -apt-get install -y pkg-config -apt-get install -y libglu1-mesa-dev -apt-get install -y libgl1-mesa-dev -apt-get install -y libcppunit-dev -apt-get install -y libjemalloc-dev -apt-get install -y liblog4cplus-dev -apt-get install -y libglfw3-dev -apt-get install -y python-dev -apt-get install -y python-numpy -apt-get install -y python-epydoc -apt-get install -y doxygen - -# these libraries are required for vdb_view if USE_X11=ON -apt-get install -y libxinerama-dev -apt-get install -y libxrandr-dev -apt-get install -y libxcursor-dev -apt-get install -y libxi-dev -apt-get install -y libx11-dev diff -Nru openvdb-7.1.0/ci/install_tbb.sh openvdb-7.1.1/ci/install_tbb.sh --- openvdb-7.1.0/ci/install_tbb.sh 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/ci/install_tbb.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -TBB_VERSION="$1" - -git clone https://github.com/01org/tbb.git -cd tbb - -if [ "$TBB_VERSION" != "latest" ]; then - git checkout tags/${TBB_VERSION} -b ${TBB_VERSION} -fi - -make -j4 -cp -r include/serial /usr/local/include/. -cp -r include/tbb /usr/local/include/. -cp -r build/*/*.so* /usr/local/lib/. diff -Nru openvdb-7.1.0/ci/test_install.sh openvdb-7.1.1/ci/test_install.sh --- openvdb-7.1.0/ci/test_install.sh 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/ci/test_install.sh 2020-09-25 03:19:30.000000000 +0000 @@ -8,10 +8,10 @@ # the expected VDB installation cmakelists=" -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.12) project(TestInstall LANGUAGES CXX) find_package(OpenVDB REQUIRED COMPONENTS openvdb) -add_executable(test_vdb_print \"../openvdb/cmd/openvdb_print.cc\") +add_executable(test_vdb_print \"../openvdb/openvdb/cmd/openvdb_print.cc\") target_link_libraries(test_vdb_print OpenVDB::openvdb) " mkdir tmp diff -Nru openvdb-7.1.0/.circleci/config.yml openvdb-7.1.1/.circleci/config.yml --- openvdb-7.1.0/.circleci/config.yml 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/.circleci/config.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ - -# A pre-requisite of the GitHub Checks API is: -# Your project must be using CircleCI 2.0 with Workflows -# (https://circleci.com/docs/2.0/enable-checks/) - -version: 2 - -jobs: - build: - docker: - - image: debian:stretch - steps: - - checkout - - run: echo "hello world" diff -Nru openvdb-7.1.0/cmake/backports/FindOpenGL.cmake openvdb-7.1.1/cmake/backports/FindOpenGL.cmake --- openvdb-7.1.0/cmake/backports/FindOpenGL.cmake 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/cmake/backports/FindOpenGL.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,257 +0,0 @@ -# CMake - Cross Platform Makefile Generator -# Copyright 2000-2019 Kitware, Inc. and Contributors -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# * Neither the name of Kitware, Inc. nor the names of Contributors -# may be used to endorse or promote products derived from this -# software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -#------------------------------------------------------------------------------ -# -#.rst: -# FindOpenGL -# ---------- -# -# FindModule for OpenGL and GLU. -# -# IMPORTED Targets -# ^^^^^^^^^^^^^^^^ -# -# This module defines the :prop_tgt:`IMPORTED` targets: -# -# ``OpenGL::GL`` -# Defined if the system has OpenGL. -# ``OpenGL::GLU`` -# Defined if the system has GLU. -# -# Result Variables -# ^^^^^^^^^^^^^^^^ -# -# This module sets the following variables: -# -# ``OPENGL_FOUND`` -# True, if the system has OpenGL. -# ``OPENGL_XMESA_FOUND`` -# True, if the system has XMESA. -# ``OPENGL_GLU_FOUND`` -# True, if the system has GLU. -# ``OPENGL_INCLUDE_DIR`` -# Path to the OpenGL include directory. -# ``OPENGL_LIBRARIES`` -# Paths to the OpenGL and GLU libraries. -# -# If you want to use just GL you can use these values: -# -# ``OPENGL_gl_LIBRARY`` -# Path to the OpenGL library. -# ``OPENGL_glu_LIBRARY`` -# Path to the GLU library. -# -# OSX Specific -# ^^^^^^^^^^^^ -# -# On OSX default to using the framework version of OpenGL. People will -# have to change the cache values of OPENGL_glu_LIBRARY and -# OPENGL_gl_LIBRARY to use OpenGL with X11 on OSX. - - -set(_OpenGL_REQUIRED_VARS OPENGL_gl_LIBRARY) - -if (CYGWIN) - - find_path(OPENGL_INCLUDE_DIR GL/gl.h ) - list(APPEND _OpenGL_REQUIRED_VARS OPENGL_INCLUDE_DIR) - - find_library(OPENGL_gl_LIBRARY opengl32 ) - - find_library(OPENGL_glu_LIBRARY glu32 ) - -elseif (WIN32) - - if(BORLAND) - set (OPENGL_gl_LIBRARY import32 CACHE STRING "OpenGL library for win32") - set (OPENGL_glu_LIBRARY import32 CACHE STRING "GLU library for win32") - else() - set (OPENGL_gl_LIBRARY opengl32 CACHE STRING "OpenGL library for win32") - set (OPENGL_glu_LIBRARY glu32 CACHE STRING "GLU library for win32") - endif() - -elseif (APPLE) - - # The OpenGL.framework provides both gl and glu - find_library(OPENGL_gl_LIBRARY OpenGL DOC "OpenGL library for OS X") - find_library(OPENGL_glu_LIBRARY OpenGL DOC - "GLU library for OS X (usually same as OpenGL library)") - find_path(OPENGL_INCLUDE_DIR OpenGL/gl.h DOC "Include for OpenGL on OS X") - list(APPEND _OpenGL_REQUIRED_VARS OPENGL_INCLUDE_DIR) - -else() - if (CMAKE_SYSTEM_NAME MATCHES "HP-UX") - # Handle HP-UX cases where we only want to find OpenGL in either hpux64 - # or hpux32 depending on if we're doing a 64 bit build. - if(CMAKE_SIZEOF_VOID_P EQUAL 4) - set(_OPENGL_LIB_PATH - /opt/graphics/OpenGL/lib/hpux32/) - else() - set(_OPENGL_LIB_PATH - /opt/graphics/OpenGL/lib/hpux64/ - /opt/graphics/OpenGL/lib/pa20_64) - endif() - elseif(CMAKE_SYSTEM_NAME STREQUAL Haiku) - set(_OPENGL_LIB_PATH - /boot/develop/lib/x86) - set(_OPENGL_INCLUDE_PATH - /boot/develop/headers/os/opengl) - endif() - - # The first line below is to make sure that the proper headers - # are used on a Linux machine with the NVidia drivers installed. - # They replace Mesa with NVidia's own library but normally do not - # install headers and that causes the linking to - # fail since the compiler finds the Mesa headers but NVidia's library. - # Make sure the NVIDIA directory comes BEFORE the others. - # - Atanas Georgiev - - find_path(OPENGL_INCLUDE_DIR GL/gl.h - /usr/share/doc/NVIDIA_GLX-1.0/include - /usr/openwin/share/include - /opt/graphics/OpenGL/include /usr/X11R6/include - ${_OPENGL_INCLUDE_PATH} - ) - list(APPEND _OpenGL_REQUIRED_VARS OPENGL_INCLUDE_DIR) - - find_path(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h - /usr/share/doc/NVIDIA_GLX-1.0/include - /usr/openwin/share/include - /opt/graphics/OpenGL/include /usr/X11R6/include - ) - - find_library(OPENGL_gl_LIBRARY - NAMES GL MesaGL - PATHS /opt/graphics/OpenGL/lib - /usr/openwin/lib - /usr/shlib /usr/X11R6/lib - ${_OPENGL_LIB_PATH} - ) - - unset(_OPENGL_INCLUDE_PATH) - unset(_OPENGL_LIB_PATH) - - find_library(OPENGL_glu_LIBRARY - NAMES GLU MesaGLU - PATHS ${OPENGL_gl_LIBRARY} - /opt/graphics/OpenGL/lib - /usr/openwin/lib - /usr/shlib /usr/X11R6/lib - ) - -endif () - -if(OPENGL_gl_LIBRARY) - - if(OPENGL_xmesa_INCLUDE_DIR) - set( OPENGL_XMESA_FOUND "YES" ) - else() - set( OPENGL_XMESA_FOUND "NO" ) - endif() - - set( OPENGL_LIBRARIES ${OPENGL_gl_LIBRARY} ${OPENGL_LIBRARIES}) - if(OPENGL_glu_LIBRARY) - set( OPENGL_GLU_FOUND "YES" ) - if(NOT "${OPENGL_glu_LIBRARY}" STREQUAL "${OPENGL_gl_LIBRARY}") - set( OPENGL_LIBRARIES ${OPENGL_glu_LIBRARY} ${OPENGL_LIBRARIES} ) - endif() - else() - set( OPENGL_GLU_FOUND "NO" ) - endif() - - # This deprecated setting is for backward compatibility with CMake1.4 - set (OPENGL_LIBRARY ${OPENGL_LIBRARIES}) - -endif() - -# This deprecated setting is for backward compatibility with CMake1.4 -set(OPENGL_INCLUDE_PATH ${OPENGL_INCLUDE_DIR}) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenGL REQUIRED_VARS ${_OpenGL_REQUIRED_VARS}) -unset(_OpenGL_REQUIRED_VARS) - -# OpenGL:: targets -if(OPENGL_FOUND) - if(NOT TARGET OpenGL::GL) - if(IS_ABSOLUTE "${OPENGL_gl_LIBRARY}") - add_library(OpenGL::GL UNKNOWN IMPORTED) - if(OPENGL_gl_LIBRARY MATCHES "/([^/]+)\\.framework$") - set(_gl_fw "${OPENGL_gl_LIBRARY}/${CMAKE_MATCH_1}") - if(EXISTS "${_gl_fw}.tbd") - set(_gl_fw "${_gl_fw}.tbd") - endif() - set_target_properties(OpenGL::GL PROPERTIES - IMPORTED_LOCATION "${_gl_fw}") - else() - set_target_properties(OpenGL::GL PROPERTIES - IMPORTED_LOCATION "${OPENGL_gl_LIBRARY}") - endif() - else() - add_library(OpenGL::GL INTERFACE IMPORTED) - set_target_properties(OpenGL::GL PROPERTIES - IMPORTED_LIBNAME "${OPENGL_gl_LIBRARY}") - endif() - set_target_properties(OpenGL::GL PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${OPENGL_INCLUDE_DIR}") - endif() - - if(OPENGL_GLU_FOUND AND NOT TARGET OpenGL::GLU) - if(IS_ABSOLUTE "${OPENGL_glu_LIBRARY}") - add_library(OpenGL::GLU UNKNOWN IMPORTED) - if(OPENGL_glu_LIBRARY MATCHES "/([^/]+)\\.framework$") - set(_glu_fw "${OPENGL_glu_LIBRARY}/${CMAKE_MATCH_1}") - if(EXISTS "${_glu_fw}.tbd") - set(_glu_fw "${_glu_fw}.tbd") - endif() - set_target_properties(OpenGL::GLU PROPERTIES - IMPORTED_LOCATION "${_glu_fw}") - else() - set_target_properties(OpenGL::GLU PROPERTIES - IMPORTED_LOCATION "${OPENGL_glu_LIBRARY}") - endif() - else() - add_library(OpenGL::GLU INTERFACE IMPORTED) - set_target_properties(OpenGL::GLU PROPERTIES - IMPORTED_LIBNAME "${OPENGL_glu_LIBRARY}") - endif() - set_target_properties(OpenGL::GLU PROPERTIES - INTERFACE_LINK_LIBRARIES OpenGL::GL) - endif() -endif() - -mark_as_advanced( - OPENGL_INCLUDE_DIR - OPENGL_xmesa_INCLUDE_DIR - OPENGL_glu_LIBRARY - OPENGL_gl_LIBRARY -) diff -Nru openvdb-7.1.0/cmake/FindBlosc.cmake openvdb-7.1.1/cmake/FindBlosc.cmake --- openvdb-7.1.0/cmake/FindBlosc.cmake 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/cmake/FindBlosc.cmake 2020-09-25 03:19:30.000000000 +0000 @@ -71,7 +71,7 @@ #]=======================================================================] -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.12) include(GNUInstallDirs) # Monitoring _ROOT variables diff -Nru openvdb-7.1.0/cmake/FindCppUnit.cmake openvdb-7.1.1/cmake/FindCppUnit.cmake --- openvdb-7.1.0/cmake/FindCppUnit.cmake 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/cmake/FindCppUnit.cmake 2020-09-25 03:19:30.000000000 +0000 @@ -70,7 +70,7 @@ #]=======================================================================] -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.12) include(GNUInstallDirs) # Monitoring _ROOT variables diff -Nru openvdb-7.1.0/cmake/FindIlmBase.cmake openvdb-7.1.1/cmake/FindIlmBase.cmake --- openvdb-7.1.0/cmake/FindIlmBase.cmake 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/cmake/FindIlmBase.cmake 2020-09-25 03:19:30.000000000 +0000 @@ -80,7 +80,7 @@ #]=======================================================================] -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.12) include(GNUInstallDirs) # Monitoring _ROOT variables diff -Nru openvdb-7.1.0/cmake/FindJemalloc.cmake openvdb-7.1.1/cmake/FindJemalloc.cmake --- openvdb-7.1.0/cmake/FindJemalloc.cmake 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/cmake/FindJemalloc.cmake 2020-09-25 03:19:30.000000000 +0000 @@ -64,7 +64,7 @@ #]=======================================================================] -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.12) include(GNUInstallDirs) # Monitoring _ROOT variables diff -Nru openvdb-7.1.0/cmake/FindLog4cplus.cmake openvdb-7.1.1/cmake/FindLog4cplus.cmake --- openvdb-7.1.0/cmake/FindLog4cplus.cmake 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/cmake/FindLog4cplus.cmake 2020-09-25 03:19:30.000000000 +0000 @@ -70,7 +70,7 @@ #]=======================================================================] -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.12) include(GNUInstallDirs) # Monitoring _ROOT variables diff -Nru openvdb-7.1.0/cmake/FindOpenEXR.cmake openvdb-7.1.1/cmake/FindOpenEXR.cmake --- openvdb-7.1.0/cmake/FindOpenEXR.cmake 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/cmake/FindOpenEXR.cmake 2020-09-25 03:19:30.000000000 +0000 @@ -76,7 +76,7 @@ #]=======================================================================] -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.12) include(GNUInstallDirs) # Monitoring _ROOT variables diff -Nru openvdb-7.1.0/cmake/FindOpenVDB.cmake openvdb-7.1.1/cmake/FindOpenVDB.cmake --- openvdb-7.1.0/cmake/FindOpenVDB.cmake 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/cmake/FindOpenVDB.cmake 2020-09-25 03:19:30.000000000 +0000 @@ -52,6 +52,8 @@ True if the system has the named OpenVDB component. ``OpenVDB_USES_BLOSC`` True if the OpenVDB Library has been built with blosc support +``OpenVDB_USES_ZLIB`` + True if the OpenVDB Library has been built with zlib support ``OpenVDB_USES_LOG4CPLUS`` True if the OpenVDB Library has been built with log4cplus support ``OpenVDB_USES_EXR`` @@ -99,7 +101,7 @@ #]=======================================================================] -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.12) include(GNUInstallDirs) # Monitoring _ROOT variables @@ -479,6 +481,7 @@ # the configuration options from the main CMakeLists.txt to allow users # to manually identify the requirements of OpenVDB builds if they know them. set(OpenVDB_USES_BLOSC ${USE_BLOSC}) +set(OpenVDB_USES_ZLIB ${USE_ZLIB}) set(OpenVDB_USES_LOG4CPLUS ${USE_LOG4CPLUS}) set(OpenVDB_USES_EXR ${USE_EXR}) set(OpenVDB_DEFINITIONS) @@ -488,7 +491,11 @@ list(APPEND OpenVDB_DEFINITIONS NOMINMAX) endif() -if(NOT OPENVDB_USE_STATIC_LIBS) +if(OPENVDB_USE_STATIC_LIBS) + if(WIN32) + list(APPEND OpenVDB_DEFINITIONS OPENVDB_STATICLIB) + endif() +else() if(WIN32) list(APPEND OpenVDB_DEFINITIONS OPENVDB_DLL) endif() @@ -524,6 +531,11 @@ set(OpenVDB_USES_BLOSC ON) endif() + string(FIND ${PREREQUISITE} "zlib" _HAS_DEP) + if(NOT ${_HAS_DEP} EQUAL -1) + set(OpenVDB_USES_ZLIB ON) + endif() + string(FIND ${PREREQUISITE} "log4cplus" _HAS_DEP) if(NOT ${_HAS_DEP} EQUAL -1) set(OpenVDB_USES_LOG4CPLUS ON) @@ -543,6 +555,10 @@ find_package(Blosc REQUIRED) endif() +if(OpenVDB_USES_ZLIB) + find_package(ZLIB REQUIRED) +endif() + if(OpenVDB_USES_LOG4CPLUS) find_package(Log4cplus REQUIRED) endif() @@ -612,8 +628,9 @@ if(OpenVDB_USES_BLOSC) list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES Blosc::blosc) endif() - - list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES ZLIB::ZLIB) + if(OpenVDB_USES_ZLIB) + list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES ZLIB::ZLIB) + endif() endif() if(openvdb_je IN_LIST OpenVDB_FIND_COMPONENTS) diff -Nru openvdb-7.1.0/cmake/FindTBB.cmake openvdb-7.1.1/cmake/FindTBB.cmake --- openvdb-7.1.0/cmake/FindTBB.cmake 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/cmake/FindTBB.cmake 2020-09-25 03:19:30.000000000 +0000 @@ -76,7 +76,7 @@ #]=======================================================================] -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.12) include(GNUInstallDirs) # Monitoring _ROOT variables diff -Nru openvdb-7.1.0/cmake/OpenVDBGLFW3Setup.cmake openvdb-7.1.1/cmake/OpenVDBGLFW3Setup.cmake --- openvdb-7.1.0/cmake/OpenVDBGLFW3Setup.cmake 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/cmake/OpenVDBGLFW3Setup.cmake 2020-09-25 03:19:30.000000000 +0000 @@ -47,7 +47,7 @@ # Find the glfw3 installation and use glfw's CMake to initialize # the glfw lib -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.12) set(_FIND_GLFW3_ADDITIONAL_OPTIONS "") if(DISABLE_CMAKE_SEARCH_PATHS) diff -Nru openvdb-7.1.0/cmake/OpenVDBHoudiniSetup.cmake openvdb-7.1.1/cmake/OpenVDBHoudiniSetup.cmake --- openvdb-7.1.0/cmake/OpenVDBHoudiniSetup.cmake 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/cmake/OpenVDBHoudiniSetup.cmake 2020-09-25 03:19:30.000000000 +0000 @@ -75,7 +75,7 @@ # Find the Houdini installation and use Houdini's CMake to initialize # the Houdini lib -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.12) # Monitoring _ROOT variables if(POLICY CMP0074) diff -Nru openvdb-7.1.0/cmake/OpenVDBMayaSetup.cmake openvdb-7.1.1/cmake/OpenVDBMayaSetup.cmake --- openvdb-7.1.0/cmake/OpenVDBMayaSetup.cmake 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/cmake/OpenVDBMayaSetup.cmake 2020-09-25 03:19:30.000000000 +0000 @@ -51,7 +51,7 @@ # Find the Maya installation and use Maya's CMake to initialize # the Maya lib -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.12) # Monitoring _ROOT variables if(POLICY CMP0074) diff -Nru openvdb-7.1.0/cmake/OpenVDBUtils.cmake openvdb-7.1.1/cmake/OpenVDBUtils.cmake --- openvdb-7.1.0/cmake/OpenVDBUtils.cmake 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/cmake/OpenVDBUtils.cmake 2020-09-25 03:19:30.000000000 +0000 @@ -46,7 +46,7 @@ #]=======================================================================] -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.12) function(OPENVDB_VERSION_FROM_HEADER OPENVDB_VERSION_FILE) diff -Nru openvdb-7.1.0/cmake/Uninstall.cmake openvdb-7.1.1/cmake/Uninstall.cmake --- openvdb-7.1.0/cmake/Uninstall.cmake 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/cmake/Uninstall.cmake 2020-09-25 03:19:30.000000000 +0000 @@ -16,7 +16,7 @@ #]=======================================================================] -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.12) set(MANIFEST "${CMAKE_CURRENT_BINARY_DIR}/install_manifest.txt") diff -Nru openvdb-7.1.0/CMakeLists.txt openvdb-7.1.1/CMakeLists.txt --- openvdb-7.1.0/CMakeLists.txt 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/CMakeLists.txt 2020-09-25 03:19:30.000000000 +0000 @@ -42,7 +42,7 @@ # note: cmake_minimum_required must be called before project commands to # ensure policy scope is set up correctly -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.12) # CMP0091 allows for MSVC ABI targetting via CMAKE_MSVC_RUNTIME_LIBRARY # from CMake 3.15 and above. Must come before project(). @@ -86,6 +86,9 @@ Use blosc while building openvdb components. If OPENVDB_BUILD_CORE is OFF, CMake attempts to query the located openvdb build configuration to decide on blosc support. You may set this to on to force blosc to be used if you know it to be required.]=] ON) +option(USE_ZLIB [=[ +Use zlib while building openvdb components. If OPENVDB_BUILD_CORE is OFF, CMake attempts to query the located +openvdb build configuration to decide on zlib support. ZLib can only be disabled if Blosc is also disabled. ]=] ON) option(USE_LOG4CPLUS [=[ Use log4cplus while building openvdb components. If OPENVDB_BUILD_CORE is OFF, CMake attempts to query the located openvdb build configuration to decide on log4cplus support. You may set this to on to force log4cplus @@ -147,58 +150,31 @@ set(OPENVDB_SIMD None CACHE STRING FORCE) endif() +if(USE_BLOSC AND NOT USE_ZLIB) + message(WARNING "ZLib can only be disabled if Blosc is also disabled. Enabling ZLib.") +endif() + # Top-level location for all openvdb headers set(OPENVDB_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/openvdb") ###### Deprecated options -option(OPENVDB_BUILD_HOUDINI_SOPS "Build the Houdini plugin (deprecated - see OPENVDB_BUILD_HOUDINI_PLUGIN)" OFF) -option(OPENVDB_ENABLE_3_ABI_COMPATIBLE "Build with OpenVDB ABI 3 (deprecated - see OPENVDB_ABI_VERSION_NUMBER)" OFF) - -# Alias deprecated vars - if(OPENVDB_BUILD_HOUDINI_SOPS) - # Support for legacy OPENVDB_BUILD_HOUDINI_SOPS variable - message(DEPRECATION "The OPENVDB_BUILD_HOUDINI_SOPS option is deprecated and will be removed. " - "Use OPENVDB_BUILD_HOUDINI_PLUGIN.") - set(OPENVDB_BUILD_HOUDINI_PLUGIN ON) + message(FATAL_ERROR "The OPENVDB_BUILD_HOUDINI_SOPS option has been removed. Use OPENVDB_BUILD_HOUDINI_PLUGIN.") endif() - -if(OPENVDB_ENABLE_3_ABI_COMPATIBLE) - message(DEPRECATION "OPENVDB_ENABLE_3_ABI_COMPATIBLE is deprecated and will be removed. Use " - "-D OPENVDB_ABI_VERSION_NUMBER=N, where N is the abi version.") - if(OPENVDB_ABI_VERSION_NUMBER) - if(NOT (${OPENVDB_ABI_VERSION_NUMBER} EQUAL 3)) - message(WARNING "OPENVDB_ABI_VERSION_NUMBER holds a different ABI value to " - "OPENVDB_ENABLE_3_ABI_COMPATIBLE, which will be ignored.") - endif() - else() - # Don't bother setting the docstring as we'll update it later - set(OPENVDB_ABI_VERSION_NUMBER "3" CACHE STRING "" FORCE) - endif() -endif() - if(DEFINED USE_SYSTEM_LIBRARY_PATHS) - message(DEPRECATION "The USE_SYSTEM_LIBRARY_PATHS option is deprecated and will be removed. " - "Use DISABLE_CMAKE_SEARCH_PATHS.") - if(USE_SYSTEM_LIBRARY_PATHS) - set(DISABLE_CMAKE_SEARCH_PATHS OFF) - else() - set(DISABLE_CMAKE_SEARCH_PATHS ON) - endif() + message(FATAL_ERROR "The USE_SYSTEM_LIBRARY_PATHS option has been removed. Use DISABLE_CMAKE_SEARCH_PATHS.") endif() # Various root level CMake options which are marked as advanced mark_as_advanced( OPENVDB_CXX_STRICT - OPENVDB_ENABLE_3_ABI_COMPATIBLE OPENVDB_ENABLE_RPATH USE_HOUDINI USE_MAYA USE_LOG4CPLUS USE_CCACHE - OPENVDB_BUILD_HOUDINI_SOPS OPENVDB_BUILD_HOUDINI_ABITESTS DISABLE_DEPENDENCY_VERSION_CHECKS DISABLE_CMAKE_SEARCH_PATHS @@ -252,7 +228,9 @@ # VFX 19 deprecations to transition to MINIMUM_* variables in OpenVDB 8.0.0 -set(FUTURE_MINIMUM_CMAKE_VERSION 3.12) +# Note: CMake 3.15 chosen as possible next version due to Windows support +# with CMAKE_MSVC_RUNTIME_LIBRARY and numpy modules with CMake 3.14 +set(FUTURE_MINIMUM_CMAKE_VERSION 3.15) # No compiler upgrades planned #set(FUTURE_MINIMUM_GCC_VERSION 6.3.1) @@ -341,7 +319,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") # Add backports to support older versions of CMake -# FindOpenGL.cmake is needed if CMake < 3.8 # FindNumPy.cmake is needed if CMake < 3.14 if(${CMAKE_VERSION} VERSION_LESS 3.14) @@ -650,7 +627,12 @@ endif() else() include("${CMAKE_CURRENT_LIST_DIR}/cmake/OpenVDBUtils.cmake") - OPENVDB_VERSION_FROM_HEADER("${CMAKE_CURRENT_SOURCE_DIR}/openvdb/version.h" + set(OPENVDB_VERSION_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/openvdb/openvdb/version.h") + if(NOT EXISTS "${OPENVDB_VERSION_HEADER}") + message(FATAL_ERROR "Unable to read ${OPENVDB_VERSION_HEADER}. File does not exist.") + endif() + + OPENVDB_VERSION_FROM_HEADER("${OPENVDB_VERSION_HEADER}" VERSION OpenVDB_VERSION MAJOR OpenVDB_MAJOR_VERSION MINOR OpenVDB_MINOR_VERSION @@ -713,31 +695,31 @@ ########################################################################## if(OPENVDB_BUILD_CORE) - add_subdirectory(openvdb) + add_subdirectory(openvdb/openvdb) endif() if(OPENVDB_BUILD_PYTHON_MODULE) - add_subdirectory(openvdb/python) + add_subdirectory(openvdb/openvdb/python) endif() if(OPENVDB_BUILD_BINARIES) - add_subdirectory(openvdb/cmd) + add_subdirectory(openvdb/openvdb/cmd) endif() if(OPENVDB_BUILD_UNITTESTS) - add_subdirectory(openvdb/unittest) + add_subdirectory(openvdb/openvdb/unittest) endif() if(OPENVDB_BUILD_HOUDINI_PLUGIN) - add_subdirectory(openvdb_houdini) + add_subdirectory(openvdb_houdini/openvdb_houdini) endif() if(OPENVDB_BUILD_HOUDINI_ABITESTS) - add_subdirectory(openvdb_houdini/abitest) + add_subdirectory(openvdb_houdini/openvdb_houdini/abitest) endif() if(OPENVDB_BUILD_MAYA_PLUGIN) - add_subdirectory(openvdb_maya) + add_subdirectory(openvdb_maya/openvdb_maya) endif() ########################################################################## diff -Nru openvdb-7.1.0/debian/changelog openvdb-7.1.1/debian/changelog --- openvdb-7.1.0/debian/changelog 2021-02-28 10:46:58.000000000 +0000 +++ openvdb-7.1.1/debian/changelog 2021-02-28 10:46:58.000000000 +0000 @@ -1,6 +1,6 @@ -openvdb (7.1.0-2focal1) focal; urgency=medium +openvdb (7.1.1-1focal2) focal; urgency=medium - * d/compat: Update compat to 11 + * New upstream 7.1.1 with nanovdb inside. -- Thomas Schiex Sun, 28 Feb 2021 11:46:58 +0100 diff -Nru openvdb-7.1.0/debian/patches/pthread-lpthread openvdb-7.1.1/debian/patches/pthread-lpthread --- openvdb-7.1.0/debian/patches/pthread-lpthread 1970-01-01 00:00:00.000000000 +0000 +++ openvdb-7.1.1/debian/patches/pthread-lpthread 2021-02-28 10:46:58.000000000 +0000 @@ -0,0 +1,11 @@ +--- a/openvdb/unittest/TestFile.cc ++++ b/openvdb/unittest/TestFile.cc +@@ -2533,7 +2533,7 @@ + + for (int compcode = 0; compcode <= BLOSC_ZLIB; ++compcode) { + char* compname = nullptr; +-#if BLOSC_VERSION_MAJOR > 1 || (BLOSC_VERSION_MAJOR == 1 && BLOSC_VERSION_MINOR >= 15) ++#if BLOSC_VERSION_MAJOR > 1 || (BLOSC_VERSION_MAJOR == 1 && BLOSC_VERSION_MINOR >= 14) + if (0 > blosc_compcode_to_compname(compcode, const_cast(&compname))) + #else + if (0 > blosc_compcode_to_compname(compcode, &compname)) diff -Nru openvdb-7.1.0/debian/patches/series openvdb-7.1.1/debian/patches/series --- openvdb-7.1.0/debian/patches/series 2020-08-20 12:57:11.000000000 +0000 +++ openvdb-7.1.1/debian/patches/series 2021-02-28 10:46:58.000000000 +0000 @@ -1,4 +1 @@ -use_svg.patch python3.patch -atomic.patch -unittests.patch diff -Nru openvdb-7.1.0/debian/rules openvdb-7.1.1/debian/rules --- openvdb-7.1.0/debian/rules 2020-08-20 12:57:11.000000000 +0000 +++ openvdb-7.1.1/debian/rules 2021-02-28 10:46:58.000000000 +0000 @@ -79,8 +79,29 @@ -DUSE_EXR:BOOL=TRUE \ -DUSE_NUMPY:BOOL=TRUE +CMAKE_NANO_FLAGS = -DNANOVDB_BUILD_UNITTESTS=OFF \ + -DNANOVDB_BUILD_EXAMPLES:BOOL=OFF \ + -DNANOVDB_BUILD_BENCHMARK:BOOL=OFF \ + -DNANOVDB_BUILD_DOCS:BOOL=OFF \ + -DNANOVDB_BUILD_TOOLS:BOOL=OFF \ + -DNANOVDB_CUDA_KEEP_PTX:BOOL=OFF \ + -DNANOVDB_USE_OPENVDB:BOOL=OFF \ + -DNANOVDB_USE_OPENGL:BOOL=OFF \ + -DNANOVDB_USE_OPENCL:BOOL=OFF \ + -DNANOVDB_USE_CUDA:BOOL=OFF \ + -DNANOVDB_USE_TBB:BOOL=OFF \ + -DNANOVDB_USE_BLOSC:BOOL=OFF \ + -DNANOVDB_USE_ZLIB:BOOL=OFF \ + -DNANOVDB_USE_OPTIX:BOOL=OFF \ + -DNANOVDB_ALLOW_FETCHCONTENT:BOOL=OFF + override_dh_auto_configure: dh_auto_configure -- $(CMAKE_EXTRA_FLAGS) + dh_auto_configure --sourcedirectory=nanovdb --builddirectory=nano-build -- $(CMAKE_NANO_FLAGS) + +override_dh_auto_build: + dh_auto_build --parallel --buildsystem=cmake + dh_auto_build --sourcedirectory=nanovdb --builddirectory=nano-build --buildsystem=cmake override_dh_auto_test-arch: timeout 2h dh_auto_test -- $(TESTOPS) || true @@ -91,6 +112,10 @@ # No tests needed for docs override_dh_auto_test-indep: +override_dh_auto_install: + dh_auto_install + dh_auto_install --sourcedirectory=nanovdb --builddirectory=nano-build + pkg_run = libopenvdb-tools pkg_lib = libopenvdb$(VER_SONAME) pkg_dev = libopenvdb-dev @@ -108,6 +133,7 @@ dh_install -p$(pkg_dev) debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libopenvdb.so dh_install -p$(pkg_dev) debian/tmp/usr/include dh_install -p$(pkg_py) debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/$(PYVERS)/pyopenvdb.so usr/lib/$(PYVERS)/dist-packages/ + dh_install -p$(pkg_dev) debian/tmp/usr/nanovdb /usr/include override_dh_installdocs: MPL dh_installdocs -A $^ diff -Nru openvdb-7.1.0/doc/build.txt openvdb-7.1.1/doc/build.txt --- openvdb-7.1.0/doc/build.txt 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/doc/build.txt 2020-09-25 03:19:30.000000000 +0000 @@ -8,6 +8,7 @@ - @ref buildDependencies - @ref buildMixingDepInstalls - @ref buildBloscSupport + - @ref buildZLibSupport - @ref buildVCPKG - @ref buildComponents - @ref buildGuide @@ -17,7 +18,6 @@ - @ref buildBuildMaya - @ref buildBuildStandalone - @ref buildUsingOpenVDB -- @ref buildUsingMake - @ref buildTroubleshooting @@ -30,17 +30,12 @@ CMake doesn't *actually* build the project but instead generates the files required for your toolchain, for example makefiles that serve as input to [GNU Make](https://www.gnu.org/software/make/). -Makefiles have historically been included in the OpenVDB distribution -and until recently were the preferred means of building OpenVDB -on UNIX platforms (see @ref buildUsingMake below). -But CMake support ensures a high level of +CMake support ensures a high level of flexibility and pre-compile verification to the build process, making it much easier to control and customize the installation process for a wider range of platforms. -CMake also makes it easier to automatically find and handle dependencies. As -OpenVDB has a number of required and optional dependencies, it's recommended -that new users to the software use the CMake build system over the Makefiles. +CMake also makes it easier to automatically find and handle dependencies. If you're completely new to CMake, you may find it useful to read over the brief [introduction to CMake](https://cmake.org/runningcmake/) and the CMake structure section below. However the [build guide](@ref buildGuide) runs @@ -148,16 +143,21 @@ @subsection buildBloscSupport Blosc Support -Blosc is one of the optional dependencies of all OpenVDB components. It is the -only dependency which is enabled by default. The documented build steps below -treat blosc as a required dependency. There are two reasons for this: +Blosc is an optional dependency of all OpenVDB components. The documented +build steps below treat blosc as a required dependency. There are two reasons +for this: - Blosc produces significantly smaller `.vdb` files - If Blosc is disabled, you will not be able to read or use any `.vdb` files that were created using blosc compression. This includes OpenVDB files from Houdini. -You can disable Blosc using `-D USE_BLOSC=OFF`. +@subsection buildZLibSupport ZLIB Support + +ZLIB is an optional dependency of all OpenVDB components. The documented build +steps below treat ZLib as a required dependency. + +You can disable ZLib using `-D USE_ZLIB=OFF` if Blosc is also disabled using `-D USE_BLOSC=OFF`. @subsection buildVCPKG Building Dependencies using VCPKG @@ -209,8 +209,9 @@ of newer dependencies and newer library features. See [here](@ref buildBuildStandalone) for more information. -@b Note: Blosc is treated as a required dependency in these install instructions. -See the [blosc support](@ref buildBloscSupport) section for more information. +@b Note: Blosc and ZLib are treated as required dependencies in these install +instructions. See the [blosc support](@ref buildBloscSupport) and +[zlib support](@ref buildZLibSupport) sections for more information. @subsection buildBuildHouMaya Building Against Houdini/Maya @@ -252,8 +253,8 @@ At a minimum, boost, a matching C++14 compiler and CMake will be required. See the full [dependency list](@ref dependencies) for help with downloading and -installing the above software. Note that as Blosc is provided as part of the -Houdini installation `USE_BLOSC` should be left `ON`. +installing the above software. Note that as Blosc and ZLib are provided as part +of the Houdini installation `USE_BLOSC` and `USE_ZLIB` should be left `ON`. With the necessary dependencies installed, create and enter a directory for cmake to write to. It's generally useful to create this in the location you've @@ -474,7 +475,7 @@ OpenVDB as a dependency: @code{.cmake} -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.12) list(APPEND CMAKE_MODULE_PATH "/location/of/openvdb/install/lib/cmake/OpenVDB") find_package(OpenVDB REQUIRED) target_link_libraries(myapp OpenVDB::openvdb) @@ -491,231 +492,6 @@ dependencies. See [Locating Dependencies](@ref buildDependencies) or the below troubleshooting for more information. - -@section buildUsingMake Building With Make - -Makefiles are provided for those not wishing to use the CMake build system. -However, Make support is now deprecated and will be removed in a future release, -so one should not expect the Makefiles to provide the same level of functionality -as the CMake build system. - -To build the core library, ensure that you have -[GNU Make](https://www.gnu.org/software/make/) version 4.1 or later, -then proceed as follows: - -
    -
  1. -Set values appropriate to your environment for the following variables at the top of -openvdb/Makefile: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    INSTALL_DIRthe directory into which to install libraries, - executables and header files (e.g., /usr/local)
    BOOST_INCL_DIRthe parent directory of the boost/ - header directory (e.g., /usr/include)
    BOOST_LIB_DIRthe directory containing libboost_iostreams, - etc.
    BOOST_LIBlinker flags for libboost_iostreams - and libboost_system
    BOOST_THREAD_LIBlinker flags for libboost_thread
    ILMBASE_INCL_DIRthe parent directory of the OpenEXR/ - header directory (which contains half.h)
    ILMBASE_LIB_DIRthe directory containing libHalf.so and/or - libHalf.a
    ILMBASE_LIBlinker flags for libIlmThread, libIex - and libImath
    HALF_LIBlinker flag(s) for the Half library - (e.g., -lHalf)
    EXR_INCL_DIRthe parent directory of the OpenEXR/ - header directory
    -

    Note: some OpenEXR headers incorrectly include other OpenEXR headers - with, e.g., \#include \ instead of \#include "ImfName.h". - When compiling with Clang, set EXR_INCL_DIR to the parent directory of the - OpenEXR/ directory and ILMBASE_INCL_DIR to the OpenEXR/ - directory itself to avoid errors.

    EXR_LIB_DIRthe directory containing libIlmImf
    EXR_LIBlinker flags for libIlmImf
    TBB_INCL_DIRthe parent directory of the tbb/ - header directory
    TBB_LIB_DIRthe directory containing libtbb
    TBB_LIBlinker flag(s) for the TBB library - (e.g., -ltbb)
    BLOSC_INCL_DIRthe parent directory of the - blosc.h header
    BLOSC_LIB_DIRthe directory containing libblosc
    BLOSC_LIBlinker flags for libblosc
    CONCURRENT_MALLOC_LIB_DIRa directory containing a scalable, - concurrent malloc replacement library such as jemalloc or TBB malloc
    - (leave blank if no such library is available, but be aware that using standard malloc - in concurrent code incurs a significant performance penalty)
    CONCURRENT_MALLOC_LIBlinker flag(s) for the malloc - replacement library
    (e.g., -ltbbmalloc_proxy -ltbbmalloc)
    CPPUNIT_INCL_DIRthe parent directory of the cppunit/ - header directory
    - (leave blank if CppUnit is not available)
    CPPUNIT_LIB_DIRthe directory containing libcppunit.so or - libcppunit.a
    CPPUNIT_LIBlinker flag(s) for the CppUnit library (e.g., - -lcppunit)
    GLFW_INCL_DIRthe directory containing glfw.h
    - (leave blank if GLFW is not available; GLFW is needed only for the - command-line viewer tool)
    GLFW_LIB_DIRthe directory containing libglfw
    GLFW_LIBlinker flags for the GLFW library - (e.g., -lglfw)
    LOG4CPLUS_INCL_DIRthe parent directory of the - log4cplus/ header directory
    - (leave blank if log4cplus is not available)
    LOG4CPLUS_LIB_DIRdirectory containing liblog4cplus.so - or liblog4cplus.a
    LOG4CPLUS_LIBlinker flags for the log4cplus library - (e.g., -llog4cplus)
    PYTHON_VERSIONthe version of Python (e.g., 2.7) for which to build - the OpenVDB module (leave blank if Python is unavailable)
    PYTHON_INCL_DIRthe directory containing the Python.h - header file
    (on macOS, this is usually /System/Library/Frameworks/Python.framework/Versions/\$(PYTHON_VERSION)/Headers)
    PYCONFIG_INCL_DIRthe directory containing the pyconfig.h - header file (usually but not always the same as PYTHON_INCL_DIR)
    PYTHON_LIB_DIRthe directory containing the Python library
    - (on macOS, this is usually - /System/Library/Frameworks/Python.framework/Versions/\$(PYTHON_VERSION)/lib)
    PYTHON_LIBlinker flags for the Python library - (e.g., -lpython2.7)
    BOOST_PYTHON_LIB_DIRthe directory containing the - Boost.Python library
    BOOST_PYTHON_LIBlinker flags for the Boost.Python library - (e.g., -lboost_python-mt)
    NUMPY_INCL_DIRthe directory containing the NumPy arrayobject.h - header file (leave blank if NumPy is unavailable)
    (on macOS, this is usually - /System/Library/Frameworks/Python.framework/Versions/\$(PYTHON_VERSION)/Extras/lib/python/numpy/core/include/numpy)
    EPYDOCthe path to the Epydoc executable - (leave blank if Epydoc is unavailable)
    PYTHON_WRAP_ALL_GRID_TYPESif set to \"no\", - expose only @vdblink::FloatGrid FloatGrid@endlink, @vdblink::BoolGrid BoolGrid@endlink - and @vdblink::Vec3SGrid Vec3SGrid@endlink in Python, otherwise expose - (most of) the standard grid types defined in openvdb.h.
    DOXYGENthe path to the Doxygen executable - (leave blank if Doxygen is unavailable)
    - -Note that if you plan to build the Houdini OpenVDB tools, you must build -the OpenVDB library and the Houdini tools against compatible versions -of the Boost, OpenEXR and TBB libraries. -Until Houdini 16.5, all three were included in the HDK, so by default -several of the variables above reference the Houdini environment variables -$HDSO, $HFS and $HT (source the @c houdini_setup -script provided with your Houdini installation to set those environment variables). -You must provide your own installation of Boost. - -Also note that certain new features in OpenVDB (see the -@subpage changes "Release Notes" for details) necessitated changes to -the ABI of the @vdblink::Grid Grid@endlink class, rendering it incompatible -with earlier versions of the library, such as the ones built into Houdini. -Passing grids between native VDB nodes in a scene graph and nodes built -against the new ABI will lead to crashes, so to use OpenVDB with Houdini 17.5 -set abi=5 to compile with the incompatible features disabled. - -To build the OpenVDB Python module, you will need local installations -of Python, Boost.Python, and optionally NumPy. -Houdini ships with Python 2 but not with the @c libboost_python library -or with NumPy or with the Boost.Python headers, -so both Boost.Python and NumPy have to be built separately. -Point the variables \$(BOOST_PYTHON_LIB_DIR), -\$(BOOST_PYTHON_LIB) and \$(NUMPY_INCL_DIR) -to your local installations of those libraries. -

    2. -
  2. -From the top-level openvdb/ directory, type \"make\" -(or \"make -s\" for less verbose output) to locally build -the library and commands. -The Makefile supports parallel builds (e.g. \"make -j 8\"). - -A default local build generates the following libraries and executables -(but see the Makefile for additional targets and build options): - - - - - - - -
    openvdb/libopenvdb.so.X.Y.Zthe OpenVDB library
    openvdb/libopenvdb.sosymlink to - libopenvdb.so.X.Y.Z
    openvdb/pyopenvdb.sothe OpenVDB Python module - (if Python and Boost.Python are available)
    openvdb/vdb_printcommand-line tool that prints info about OpenVDB - .vdb files
    openvdb/vdb_rendercommand-line tool that ray-traces - OpenVDB volumes
    openvdb/vdb_testunit test runner for @c libopenvdb - (if CppUnit is available)
    - -From the openvdb/ directory, type \"make test\" to run -the unit tests and verify that the library is working correctly. -(Alternatively, once the library has been installed, run the unit test -executable directly with \"./vdb_test\", or \"./vdb_test -v\" -for more verbose output.) -Type \"make pytest\" to run the Python module unit tests. -

    3. -
  3. -From the openvdb/ directory, type \"make doc\" -(or \"make -s doc\") to generate HTML library documentation, -then open the file openvdb/doc/html/index.html in a browser. -Type \"make pydoc\" (or \"make -s pydoc\") to generate -HTML Python module documentation, then open -openvdb/doc/html/python/index.html in a browser. -

    4. -
  4. -Optionally (if OpenGL and GLFW are available), from the top-level -openvdb/ directory, type \"make vdb_view\" -(or \"make -s vdb_view\") to locally build the OpenVDB viewer tool. -Then type \"./vdb_view\" for usage information. -

    5. -
  5. -From the openvdb/ directory, type \"make install\" -(or \"make -s install\") to copy generated files into -the directory tree rooted at \$(INSTALL_DIR). -
    6. -
- -To build the Houdini and Maya plugins the process is similar, -but see the Makefiles in the openvdb_houdini/ and -openvdb_maya/ directories for additional requirements - ------------------------------------------------------------------------------ @section buildTroubleshooting Troubleshooting diff -Nru openvdb-7.1.0/doc/changes.txt openvdb-7.1.1/doc/changes.txt --- openvdb-7.1.0/doc/changes.txt 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/doc/changes.txt 2020-09-25 03:19:30.000000000 +0000 @@ -2,6 +2,47 @@ @page changes Release Notes +@htmlonly @endhtmlonly +@par +Version 7.1.1 - In Development + +@par +Improvements: +- util::CpuTimer now uses C++11 chrono instead of TBB. + +@par +Houdini: +- Fixed a bug in the OpenVDB Points Convert SOP where the auto voxel + transform was ignoring the contents of packed geometry. +- Fixed a bug in the OpenVDB Points Convert SOP where points representing + packed geometry were also being converted. +- Fixed a bug where a Houdini SOP's verb would not be correctly associated + with the corresponding node if the node's internal name was changed. +- Fixed bug where OpenVDB Convert SOP could revert the name attribute. + +@par +Bug Fixes: +- Fixed a bug which could cause recursive compile time instantiations of + TypeList objects, manifesting in longer compile times. + +@par +Build: +- Removed the Makefiles. +- Re-organised the repository layout such that each independent library + is able to be configured against an existing installation of OpenVDB + without ambiguous include paths. +- Upgraded CMake minimum version support to 3.12. +- Removed OPENVDB_STATIC_SPECIALIZATION macro which is no longer required. +- Fixed various compiler warnings for GCC 9.1. +- Moved to CMake doxygen commands and removed the doxygen-config files for + doxygen documentation. +- Added USE_ZLIB compiler flag that enables zlib compression and defaults + to on. +- Added the OPENVDB_STATICLIB define to all static builds to fix builds on + Windows which use the multithread/DLL-specific version of the CRT. + [Reported by Tobias Rittig] + + @htmlonly @endhtmlonly @par Version 7.1.0 - August 13, 2020 diff -Nru openvdb-7.1.0/doc/CMakeLists.txt openvdb-7.1.1/doc/CMakeLists.txt --- openvdb-7.1.0/doc/CMakeLists.txt 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/doc/CMakeLists.txt 2020-09-25 03:19:30.000000000 +0000 @@ -7,12 +7,8 @@ #]=======================================================================] -cmake_minimum_required(VERSION 3.3) - -# Monitoring _ROOT variables -if(POLICY CMP0074) - cmake_policy(SET CMP0074 NEW) -endif() +cmake_minimum_required(VERSION 3.12) +project(OpenVDBDocs LANGUAGES NONE) # If OPENVDB_DOXYGEN_HOUDINI is set, the Houdini documentation is also # built. You can provide this module a value for Houdini_VERSION which will @@ -23,23 +19,102 @@ # all documentation is included. option(OPENVDB_DOXYGEN_HOUDINI "Build Houdini documentation" ON) -# Add the doxygen command if required - do this here so we guarantee -# not to error on unrelated build issues -find_package(Doxygen REQUIRED) -if(DOXYGEN_VERSION VERSION_LESS MINIMUM_DOXYGEN_VERSION) - message(WARNING "The doxygen-config doxyfile has been generated with version " - "\"${MINIMUM_DOXYGEN_VERSION}\". Found Doxygen version \"${DOXYGEN_VERSION}\". " - "Documentation may contain errors." - ) + +find_package(Doxygen REQUIRED doxygen) +if(MINIMUM_DOXYGEN_VERSION) + if(DOXYGEN_VERSION VERSION_LESS MINIMUM_DOXYGEN_VERSION) + message(WARNING "The doxygen-config doxyfile has been generated with version " + "\"${MINIMUM_DOXYGEN_VERSION}\". Found Doxygen version \"${DOXYGEN_VERSION}\". " + "Documentation may contain errors." + ) + endif() endif() -# @todo use cmake doxygen functions available from cmake 3.9 -file(READ ${CMAKE_CURRENT_SOURCE_DIR}/doxygen-config DOXYGEN_CONFIG_CONTENT) -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/openvdb/cmake-doxygen-config ${DOXYGEN_CONFIG_CONTENT}) +set(DOXY_FILES + openvdb/openvdb + openvdb/openvdb/io + openvdb/openvdb/math + openvdb/openvdb/points + openvdb/openvdb/python/pyopenvdb.h + openvdb/openvdb/tools + openvdb/openvdb/tree + openvdb/openvdb/util + doc/build.txt + doc/changes.txt + doc/codingstyle.txt + doc/dependencies.txt + doc/doc.txt + doc/examplecode.txt + doc/faq.txt + doc/math.txt + doc/points.txt + doc/python.txt) + +set(DOXYGEN_PROJECT_NAME "OpenVDB") +set(DOXYGEN_PROJECT_NUMBER "7.1.1") +set(DOXYGEN_PROJECT_BRIEF "") +set(DOXYGEN_FILE_PATTERNS "*.h") # headers only +set(DOXYGEN_IMAGE_PATH "doc/img") +set(DOXYGEN_RECURSIVE NO) + +set(DOXYGEN_GENERATE_HTML YES) +set(DOXYGEN_GENERATE_MAN NO) +set(DOXYGEN_GENERATE_LATEX NO) + +set(DOXYGEN_HTML_COLORSTYLE_HUE 4) +set(DOXYGEN_HTML_COLORSTYLE_SAT 222) +set(DOXYGEN_HTML_TIMESTAMP NO) # for simpler website diffs + +set(DOXYGEN_EXTRACT_ALL YES) +set(DOXYGEN_EXTRACT_STATIC YES) +set(DOXYGEN_EXTRACT_LOCAL_CLASSES NO) + +set(DOXYGEN_ALPHABETICAL_INDEX NO) +set(DOXYGEN_DISTRIBUTE_GROUP_DOC YES) +set(DOXYGEN_FULL_PATH_NAMES NO) +set(DOXYGEN_GENERATE_TODOLIST NO) +set(DOXYGEN_HIDE_IN_BODY_DOCS YES) +set(DOXYGEN_HIDE_SCOPE_NAMES YES) +set(DOXYGEN_INLINE_INHERITED_MEMB YES) +set(DOXYGEN_MACRO_EXPANSION YES) +set(DOXYGEN_CLASS_DIAGRAMS NO) # @todo use dot with class diagrams for relevant classes + +set(DOXYGEN_QUIET YES) + +set(DOXYGEN_ALIASES + [[ijk="(i, j, k)"]] + [[xyz="(x, y, z)"]] + [[const="const"]] + [["vdbnamespace=openvdb::v7_1"]] + [["hunamespace=houdini_utils"]] + [["hvdbnamespace=openvdb_houdini"]] + # Use this command to create a link to an OpenVDB class, function, etc. + # Usage is "@vdblink{,}", where is a fully namespace- + # qualified symbol minus the openvdb and version number namespace components + # and is the text of the link. + # Example: @vdblink{tree::RootNode,root node} + [[vdblink{2}="@link @vdbnamespace::\1 \2@endlink"]] + # Deprecated; use the two-argument overload defined above. + [[vdblink="@link @vdbnamespace"]] + # Use these commands to create links to OpenVDB Houdini symbols. + # Usage is "@hulink{,}", where is the name of + # a symbol in the houdini_utils namespace and is the text of the link + # (and likewise for @hvdblink). + # Example: @hulink{ParmFactory::setDefault(),setDefault} + # These stub implementations are used when Houdini support is disabled; + # see doxygen-config-houdini for the full implementations. + [[hulink{2}="\2"]] + [[hvdblink{2}="\2"]] + ) + +set(DOXYGEN_PREDEFINED + "OPENVDB_VERSION_NAME=v7_1" + "OPENVDB_ABI_VERSION_NUMBER=7" + [[__declspec(x):= __attribute__(x):=]] + "OPENVDB_USE_LOG4CPLUS=") + if(OPENVDB_DOXYGEN_HOUDINI) # Append Houdini-specific settings to the Doxygen config file. - file(READ ${CMAKE_CURRENT_SOURCE_DIR}/doxygen-config-houdini DOXYGEN_CONFIG_CONTENT) - file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/openvdb/cmake-doxygen-config ${DOXYGEN_CONFIG_CONTENT}) if(Houdini_VERSION) # Extract the components of the Houdini version number into a list. string(REPLACE "." ";" HOUDINI_VERSION_COMPONENTS ${Houdini_VERSION}) @@ -55,23 +130,46 @@ # Append Houdini version number macros to the Doxygen config file so that # the generated documentation reflects the API for that version # (i.e, taking into account any conditionally compiled blocks). - set(DOXYGEN_CONFIG_CONTENT - "PREDEFINED += UT_MAJOR_VERSION_INT=${HVERS_MAJOR}\n" - "PREDEFINED += UT_MINOR_VERSION_INT=${HVERS_MINOR}\n" - "PREDEFINED += UT_VERSION_INT=${HVERS_INT}\n\n") - file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/openvdb/cmake-doxygen-config - ${DOXYGEN_CONFIG_CONTENT}) + list(APPEND DOXYGEN_PREDEFINED "UT_MAJOR_VERSION_INT=${HVERS_MAJOR}") + list(APPEND DOXYGEN_PREDEFINED "UT_MINOR_VERSION_INT=${HVERS_MINOR}") + list(APPEND DOXYGEN_PREDEFINED "UT_VERSION_INT=${HVERS_INT}") + + list(APPEND DOXYGEN_ALIASES + [[hulink{2}="@link @hunamespace::\1 \2@endlink"]] + [[hvdblink{2}="@link @hvdbnamespace::\1 \2@endlink"]] + # Deprecated; use the two-argument overloads defined above. + [[hulink="@link @hunamespace"]] + [[hvdblink="@link @hvdbnamespace"]] + ) + + set(DOXYGEN_ENABLED_SECTIONS "OPENVDB_HOUDINI") + + list(APPEND DOXY_FILES + doc/houdini.txt + openvdb_houdini/openvdb_houdini/AttributeTransferUtil.h + openvdb_houdini/openvdb_houdini/GEO_PrimVDB.h + openvdb_houdini/openvdb_houdini/GT_GEOPrimCollectVDB.h + openvdb_houdini/openvdb_houdini/GU_PrimVDB.h + openvdb_houdini/openvdb_houdini/GU_VDBPointTools.h + openvdb_houdini/openvdb_houdini/GeometryUtil.h + openvdb_houdini/openvdb_houdini/OP_NodeChain.h + openvdb_houdini/openvdb_houdini/ParmFactory.h + openvdb_houdini/openvdb_houdini/PointUtils.h + openvdb_houdini/openvdb_houdini/SOP_NodeVDB.h + openvdb_houdini/openvdb_houdini/SOP_VDBVerbUtils.h + openvdb_houdini/openvdb_houdini/UT_VDBTools.h + openvdb_houdini/openvdb_houdini/UT_VDBUtils.h + openvdb_houdini/openvdb_houdini/Utils.h) endif() -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/openvdb/cmake-doxygen-config - "QUIET=YES\nOUTPUT_DIRECTORY=${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc\n" -) - -add_custom_target(doc ALL - COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/openvdb/cmake-doxygen-config - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} - COMMENT "Generating API documentation with Doxygen" VERBATIM -) + +set(DOXYGEN_VERBATIM_VARS DOXYGEN_ALIASES DOXYGEN_PREDEFINED) + +# Always add to build target (can't use USE_STAMP_FILE as we include +# complete directories in DOXY_FILES) +doxygen_add_docs(doc ${DOXY_FILES} + ALL WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + COMMENT "Generating API documentation with Doxygen") # Suppress "Installing..." messages for all but one of the hundreds of generated files. -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html/index.html DESTINATION doc/html) -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html DESTINATION doc MESSAGE_NEVER) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/html/index.html DESTINATION doc/html) +install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION doc MESSAGE_NEVER) diff -Nru openvdb-7.1.0/doc/dependencies.txt openvdb-7.1.1/doc/dependencies.txt --- openvdb-7.1.0/doc/dependencies.txt 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/doc/dependencies.txt 2020-09-25 03:19:30.000000000 +0000 @@ -37,7 +37,7 @@ Component | Requirements | Optional ----------------------- | ------------------------------------------------------------------------------------ | -------- -OpenVDB Core Library | CMake, C++14 compiler, IlmBase::Half, TBB::tbb, ZLIB, Boost::system, Boost::iostream | Blosc, Log4cplus, OpenEXR::IlmImf +OpenVDB Core Library | CMake, C++14 compiler, IlmBase::Half, TBB::tbb, Boost::system, Boost::iostream | Blosc, ZLib, Log4cplus, OpenEXR::IlmImf OpenVDB Print | Core Library dependencies | - OpenVDB LOD | Core Library dependencies | - OpenVDB Render | Core Library dependencies, OpenEXR, IlmBase | - diff -Nru openvdb-7.1.0/doc/doxygen-config openvdb-7.1.1/doc/doxygen-config --- openvdb-7.1.0/doc/doxygen-config 2020-08-13 19:15:58.000000000 +0000 +++ openvdb-7.1.1/doc/doxygen-config 1970-01-01 00:00:00.000000000 +0000 @@ -1,2392 +0,0 @@ -# Doxyfile 1.8.8 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project. -# -# All text after a double hash (##) is considered a comment and is placed in -# front of the TAG it is preceding. -# -# All text after a single hash (#) is considered a comment and will be ignored. -# The format is: -# TAG = value [value, ...] -# For lists, items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (\" \"). - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all text -# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. -# The default value is: UTF-8. - -DOXYFILE_ENCODING = UTF-8 - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by -# double-quotes, unless you are using Doxywizard) that should identify the -# project for which the documentation is generated. This name is used in the -# title of most generated pages and in a few other places. -# The default value is: My Project. - -PROJECT_NAME = "OpenVDB" - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. This -# could be handy for archiving the generated documentation or if some version -# control system is used. - -PROJECT_NUMBER = 7.1.0 - -PREDEFINED = OPENVDB_VERSION_NAME=v7_1 -PREDEFINED += OPENVDB_ABI_VERSION_NUMBER=7 - -ALIASES += ijk="(i, j, k)" \ - xyz="(x, y, z)" \ - const="const" -ALIASES += "vdbnamespace=openvdb::v7_1" \ - "hunamespace=houdini_utils" \ - "hvdbnamespace=openvdb_houdini" -# Use this command to create a link to an OpenVDB class, function, etc. -# Usage is "@vdblink{,}", where is a fully namespace- -# qualified symbol minus the openvdb and version number namespace components -# and is the text of the link. -# Example: @vdblink{tree::RootNode,root node} -ALIASES += vdblink{2}="@link @vdbnamespace::\1 \2@endlink" -# Deprecated; use the two-argument overload defined above. -ALIASES += vdblink="@link @vdbnamespace" \ -# Use these commands to create links to OpenVDB Houdini symbols. -# Usage is "@hulink{,}", where is the name of -# a symbol in the houdini_utils namespace and is the text of the link -# (and likewise for @hvdblink). -# Example: @hulink{ParmFactory::setDefault(),setDefault} -# These stub implementations are used when Houdini support is disabled; -# see doxygen-config-houdini for the full implementations. -ALIASES += hulink{2}="\2" \ - hvdblink{2}="\2" - -PREDEFINED += __declspec(x):= __attribute__(x):= -PREDEFINED += OPENVDB_STATIC_SPECIALIZATION="" -PREDEFINED += OPENVDB_USE_LOG4CPLUS= - -#EXPAND_AS_DEFINED = \ -# OPENVDB_API \ -# OPENVDB_HOUDINI_API \ -# OPENVDB_EXPORT \ -# OPENVDB_IMPORT \ -# OPENVDB_DEPRECATED \ -# OPENVDB_STATIC_SPECIALIZATION - -IMAGE_PATH = doc/img - -INPUT = openvdb \ - openvdb/io \ - openvdb/math \ - openvdb/points \ - openvdb/python/pyopenvdb.h \ - openvdb/tools \ - openvdb/tree \ - openvdb/util \ - doc/build.txt \ - doc/changes.txt \ - doc/codingstyle.txt \ - doc/dependencies.txt \ - doc/doc.txt \ - doc/examplecode.txt \ - doc/faq.txt \ - doc/math.txt \ - doc/points.txt \ - doc/python.txt - - -# Using the PROJECT_BRIEF tag one can provide an optional one line description -# for a project that appears at the top of each page and should give viewer a -# quick idea about the purpose of the project. Keep the description short. - -PROJECT_BRIEF = - -# With the PROJECT_LOGO tag one can specify an logo or icon that is included in -# the documentation. The maximum height of the logo should not exceed 55 pixels -# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo -# to the output directory. - -PROJECT_LOGO = - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path -# into which the generated documentation will be written. If a relative path is -# entered, it will be relative to the location where doxygen was started. If -# left blank the current directory will be used. - -OUTPUT_DIRECTORY = obj/doc - -# 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 -# 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. -# The default value is: NO. - -CREATE_SUBDIRS = NO - -# 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 -# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode -# U+3044. -# The default value is: NO. - -ALLOW_UNICODE_NAMES = NO - -# 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. -# The default value is: English. - -OUTPUT_LANGUAGE = English - -# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member -# descriptions after the members that are listed in the file and class -# documentation (similar to Javadoc). Set to NO to disable this. -# The default value is: YES. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief -# description of a member or function before the detailed description -# -# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. -# The default value is: YES. - -REPEAT_BRIEF = YES - -# This tag implements a quasi-intelligent brief description abbreviator that is -# used to form the text in various listings. Each string in this list, if found -# as the leading text of the brief description, will be stripped from the text -# and the result, after processing the whole list, is used as the annotated -# text. Otherwise, the brief description is used as-is. If left blank, the -# following values are used ($name is automatically replaced with the name of -# the entity):The $name class, The $name widget, The $name file, is, provides, -# specifies, contains, represents, a, an and the. - -ABBREVIATE_BRIEF = - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# doxygen will generate a detailed section even if there is only a brief -# description. -# The default value is: NO. - -ALWAYS_DETAILED_SEC = NO - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment -# operators of the base classes will not be shown. -# The default value is: NO. - -INLINE_INHERITED_MEMB = YES - -# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path -# before files name in the file list and in the header files. If set to NO the -# shortest path that makes the file name unique will be used -# The default value is: YES. - -FULL_PATH_NAMES = NO - -# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. -# Stripping is only done if one of the specified strings matches the left-hand -# part of the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the path to -# strip. -# -# Note that you can specify absolute paths here, but also relative paths, which -# will be relative from the directory where doxygen is started. -# This tag requires that the tag FULL_PATH_NAMES is set to YES. - -STRIP_FROM_PATH = - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the -# path mentioned in the documentation of a class, which tells the reader which -# header file to include in order to use a class. If left blank only the name of -# the header file containing the class definition is used. Otherwise one should -# specify the list of include paths that are normally passed to the compiler -# using the -I flag. - -STRIP_FROM_INC_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but -# less readable) file names. This can be useful is your file systems doesn't -# support long names like on DOS, Mac, or CD-ROM. -# The default value is: NO. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the -# first line (until the first dot) of a Javadoc-style comment as the brief -# description. If set to NO, the Javadoc-style will behave just like regular Qt- -# style comments (thus requiring an explicit @brief command for a brief -# description.) -# The default value is: NO. - -JAVADOC_AUTOBRIEF = NO - -# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first -# line (until the first dot) of a Qt-style comment as the brief description. If -# set to NO, the Qt-style will behave just like regular Qt-style comments (thus -# requiring an explicit \brief command for a brief description.) -# The default value is: NO. - -QT_AUTOBRIEF = NO - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a -# multi-line C++ special comment block (i.e. a block of //! or /// comments) as -# a brief description. This used to be the default behavior. The new default is -# to treat a multi-line C++ comment block as a detailed description. Set this -# tag to YES if you prefer the old behavior instead. -# -# Note that setting this tag to YES also means that rational rose comments are -# not recognized any more. -# The default value is: NO. - -MULTILINE_CPP_IS_BRIEF = NO - -# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the -# documentation from any documented member that it re-implements. -# The default value is: YES. - -INHERIT_DOCS = YES - -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a -# new page for each member. If set to NO, the documentation of a member will be -# part of the file/class/namespace that contains it. -# The default value is: NO. - -SEPARATE_MEMBER_PAGES = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen -# uses this value to replace tabs by spaces in code fragments. -# Minimum value: 1, maximum value: 16, default value: 4. - -TAB_SIZE = 4 - -# This tag can be used to specify a number of aliases that act as commands in -# the documentation. An alias has the form: -# name=value -# For example adding -# "sideeffect=@par Side Effects:\n" -# will allow you to put the command \sideeffect (or @sideeffect) in the -# documentation, which will result in a user-defined paragraph with heading -# "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. -# -#ALIASES = - -# This tag can be used to specify a number of word-keyword mappings (TCL only). -# A mapping has the form "name=value". For example adding "class=itcl::class" -# will allow you to use the command class in the itcl::class meaning. - -TCL_SUBST = - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources -# only. Doxygen will then generate output that is more tailored for C. For -# instance, some of the names that are used will be different. The list of all -# members will be omitted, etc. -# The default value is: NO. - -OPTIMIZE_OUTPUT_FOR_C = NO - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or -# Python sources only. Doxygen will then generate output that is more tailored -# for that language. For instance, namespaces will be presented as packages, -# qualified scopes will look different, etc. -# The default value is: NO. - -OPTIMIZE_OUTPUT_JAVA = NO - -# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources. Doxygen will then generate output that is tailored for Fortran. -# The default value is: NO. - -OPTIMIZE_FOR_FORTRAN = NO - -# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for VHDL. -# The default value is: NO. - -OPTIMIZE_OUTPUT_VHDL = NO - -# Doxygen selects the parser to use depending on the extension of the files it -# parses. With this tag you can assign which parser to use for a given -# extension. Doxygen has a built-in mapping, but you can override or extend it -# using this tag. The format is ext=language, where ext is a file extension, and -# language is one of the parsers supported by doxygen: IDL, Java, Javascript, -# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran: -# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: -# Fortran. In the later case the parser tries to guess whether the code is fixed -# or free formatted code, this is the default for Fortran type files), VHDL. For -# instance to make doxygen treat .inc files as Fortran files (default is PHP), -# and .f files as C (default is Fortran), use: inc=Fortran f=C. -# -# Note For files without extension you can use no_extension as a placeholder. -# -# Note that for custom extensions you also need to set FILE_PATTERNS otherwise -# the files are not read by doxygen. - -EXTENSION_MAPPING = - -# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments -# according to the Markdown format, which allows for more readable -# documentation. See http://daringfireball.net/projects/markdown/ for details. -# The output of markdown processing is further processed by doxygen, so you can -# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in -# case of backward compatibilities issues. -# The default value is: YES. - -MARKDOWN_SUPPORT = YES - -# When enabled doxygen tries to link words that correspond to documented -# classes, or namespaces to their corresponding documentation. Such a link can -# be prevented in individual cases by by putting a % sign in front of the word -# or globally by setting AUTOLINK_SUPPORT to NO. -# The default value is: YES. - -AUTOLINK_SUPPORT = YES - -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should set this -# tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); -# versus func(std::string) {}). This also make the inheritance and collaboration -# diagrams that involve STL classes more complete and accurate. -# The default value is: NO. - -BUILTIN_STL_SUPPORT = NO - -# If you use Microsoft's C++/CLI language, you should set this option to YES to -# enable parsing support. -# The default value is: NO. - -CPP_CLI_SUPPORT = NO - -# Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen -# will parse them like normal C++ but will assume all classes use public instead -# of private inheritance when no explicit protection keyword is present. -# The default value is: NO. - -SIP_SUPPORT = NO - -# For Microsoft's IDL there are propget and propput attributes to indicate -# getter and setter methods for a property. Setting this option to YES will make -# doxygen to replace the get and set methods by a property in the documentation. -# This will only work if the methods are indeed getting or setting a simple -# type. If this is not the case, or you want to show the methods anyway, you -# should set this option to NO. -# The default value is: YES. - -IDL_PROPERTY_SUPPORT = YES - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. -# The default value is: NO. - -DISTRIBUTE_GROUP_DOC = YES - -# Set the SUBGROUPING tag to YES to allow class member groups of the same type -# (for instance a group of public functions) to be put as a subgroup of that -# type (e.g. under the Public Functions section). Set it to NO to prevent -# subgrouping. Alternatively, this can be done per class using the -# \nosubgrouping command. -# The default value is: YES. - -SUBGROUPING = YES - -# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions -# are shown inside the group in which they are included (e.g. using \ingroup) -# instead of on a separate page (for HTML and Man pages) or section (for LaTeX -# and RTF). -# -# Note that this feature does not work in combination with -# SEPARATE_MEMBER_PAGES. -# The default value is: NO. - -INLINE_GROUPED_CLASSES = NO - -# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions -# with only public data fields or simple typedef fields will be shown inline in -# the documentation of the scope in which they are defined (i.e. file, -# namespace, or group documentation), provided this scope is documented. If set -# to NO, structs, classes, and unions are shown on a separate page (for HTML and -# Man pages) or section (for LaTeX and RTF). -# The default value is: NO. - -INLINE_SIMPLE_STRUCTS = NO - -# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or -# enum is documented as struct, union, or enum with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically be -# useful for C code in case the coding convention dictates that all compound -# types are typedef'ed and only the typedef is referenced, never the tag name. -# The default value is: NO. - -TYPEDEF_HIDES_STRUCT = NO - -# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This -# cache is used to resolve symbols given their name and scope. Since this can be -# an expensive process and often the same symbol appears multiple times in the -# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small -# doxygen will become slower. If the cache is too large, memory is wasted. The -# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range -# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536 -# symbols. At the end of a run doxygen will report the cache usage and suggest -# the optimal cache size from a speed point of view. -# Minimum value: 0, maximum value: 9, default value: 0. - -LOOKUP_CACHE_SIZE = 0 - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. Private -# class members and static file members will be hidden unless the -# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. -# Note: This will also disable the warnings about undocumented members that are -# normally produced when WARNINGS is set to YES. -# The default value is: NO. - -EXTRACT_ALL = YES - -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will -# be included in the documentation. -# The default value is: NO. - -EXTRACT_PRIVATE = NO - -# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal -# scope will be included in the documentation. -# The default value is: NO. - -EXTRACT_PACKAGE = NO - -# If the EXTRACT_STATIC tag is set to YES all static members of a file will be -# included in the documentation. -# The default value is: NO. - -EXTRACT_STATIC = YES - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined -# locally in source files will be included in the documentation. If set to NO -# only classes defined in header files are included. Does not have any effect -# for Java sources. -# The default value is: YES. - -EXTRACT_LOCAL_CLASSES = NO - -# This flag is only useful for Objective-C code. When set to YES local methods, -# which are defined in the implementation section but not in the interface are -# included in the documentation. If set to NO only methods in the interface are -# included. -# The default value is: NO. - -EXTRACT_LOCAL_METHODS = NO - -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base name of -# the file that contains the anonymous namespace. By default anonymous namespace -# are hidden. -# The default value is: NO. - -EXTRACT_ANON_NSPACES = NO - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all -# undocumented members inside documented classes or files. If set to NO these -# members will be included in the various overviews, but no documentation -# section is generated. This option has no effect if EXTRACT_ALL is enabled. -# The default value is: NO. - -HIDE_UNDOC_MEMBERS = NO - -# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. If set -# to NO these classes will be included in the various overviews. This option has -# no effect if EXTRACT_ALL is enabled. -# The default value is: NO. - -HIDE_UNDOC_CLASSES = NO - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend -# (class|struct|union) declarations. If set to NO these declarations will be -# included in the documentation. -# The default value is: NO. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any -# documentation blocks found inside the body of a function. If set to NO these -# blocks will be appended to the function's detailed documentation block. -# The default value is: NO. - -HIDE_IN_BODY_DOCS = YES - -# The INTERNAL_DOCS tag determines if documentation that is typed after a -# \internal command is included. If the tag is set to NO then the documentation -# will be excluded. Set it to YES to include the internal documentation. -# The default value is: NO. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file -# names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# and Mac users are advised to set this option to NO. -# The default value is: system dependent. - -CASE_SENSE_NAMES = YES - -# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with -# their full class and namespace scopes in the documentation. If set to YES the -# scope will be hidden. -# The default value is: NO. - -HIDE_SCOPE_NAMES = YES - -# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of -# the files that are included by a file in the documentation of that file. -# The default value is: YES. - -SHOW_INCLUDE_FILES = YES - -# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each -# grouped member an include statement to the documentation, telling the reader -# which file to include in order to use the member. -# The default value is: NO. - -SHOW_GROUPED_MEMB_INC = NO - -# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include -# files with double quotes in the documentation rather than with sharp brackets. -# The default value is: NO. - -FORCE_LOCAL_INCLUDES = NO - -# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the -# documentation for inline members. -# The default value is: YES. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the -# (detailed) documentation of file and class members alphabetically by member -# name. If set to NO the members will appear in declaration order. -# The default value is: YES. - -SORT_MEMBER_DOCS = YES - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief -# descriptions of file, namespace and class members alphabetically by member -# name. If set to NO the members will appear in declaration order. Note that -# this will also influence the order of the classes in the class list. -# The default value is: NO. - -SORT_BRIEF_DOCS = NO - -# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the -# (brief and detailed) documentation of class members so that constructors and -# destructors are listed first. If set to NO the constructors will appear in the -# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS. -# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief -# member documentation. -# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting -# detailed member documentation. -# The default value is: NO. - -SORT_MEMBERS_CTORS_1ST = NO - -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy -# of group names into alphabetical order. If set to NO the group names will -# appear in their defined order. -# The default value is: NO. - -SORT_GROUP_NAMES = NO - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by -# fully-qualified names, including namespaces. If set to NO, the class list will -# be sorted only by class name, not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the alphabetical -# list. -# The default value is: NO. - -SORT_BY_SCOPE_NAME = NO - -# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper -# type resolution of all parameters of a function it will reject a match between -# the prototype and the implementation of a member function even if there is -# only one candidate or it is obvious which candidate to choose by doing a -# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still -# accept a match between prototype and implementation in such cases. -# The default value is: NO. - -STRICT_PROTO_MATCHING = NO - -# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the -# todo list. This list is created by putting \todo commands in the -# documentation. -# The default value is: YES. - -GENERATE_TODOLIST = NO - -# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the -# test list. This list is created by putting \test commands in the -# documentation. -# The default value is: YES. - -GENERATE_TESTLIST = YES - -# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug -# list. This list is created by putting \bug commands in the documentation. -# The default value is: YES. - -GENERATE_BUGLIST = YES - -# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO) -# the deprecated list. This list is created by putting \deprecated commands in -# the documentation. -# The default value is: YES. - -GENERATE_DEPRECATEDLIST= YES - -# The ENABLED_SECTIONS tag can be used to enable conditional documentation -# sections, marked by \if ... \endif and \cond -# ... \endcond blocks. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the -# initial value of a variable or macro / define can have for it to appear in the -# documentation. If the initializer consists of more lines than specified here -# it will be hidden. Use a value of 0 to hide initializers completely. The -# appearance of the value of individual variables and macros / defines can be -# controlled using \showinitializer or \hideinitializer command in the -# documentation regardless of this setting. -# Minimum value: 0, maximum value: 10000, default value: 30. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at -# the bottom of the documentation of classes and structs. If set to YES the list -# will mention the files that were used to generate the documentation. -# The default value is: YES. - -SHOW_USED_FILES = YES - -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This -# will remove the Files entry from the Quick Index and from the Folder Tree View -# (if specified). -# The default value is: YES. - -SHOW_FILES = YES - -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces -# page. This will remove the Namespaces entry from the Quick Index and from the -# Folder Tree View (if specified). -# The default value is: YES. - -SHOW_NAMESPACES = YES - -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from -# the version control system). Doxygen will invoke the program by executing (via -# popen()) the command command input-file, where command is the value of the -# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided -# by doxygen. Whatever the program writes to standard output is used as the file -# version. For an example see the documentation. - -FILE_VERSION_FILTER = - -# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed -# by doxygen. The layout file controls the global structure of the generated -# output files in an output format independent way. To create the layout file -# that represents doxygen's defaults, run doxygen with the -l option. You can -# optionally specify a file name after the option, if omitted DoxygenLayout.xml -# will be used as the name of the layout file. -# -# Note that if you run doxygen from a directory containing a file called -# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE -# tag is left empty. - -LAYOUT_FILE = - -# The CITE_BIB_FILES tag can be used to specify one or more bib files containing -# the reference definitions. This must be a list of .bib files. The .bib -# extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. -# For LaTeX the style of the bibliography can be controlled using -# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the -# search path. See also \cite for info how to create references. - -CITE_BIB_FILES = - -#--------------------------------------------------------------------------- -# Configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated to -# standard output by doxygen. If QUIET is set to YES this implies that the -# messages are off. -# The default value is: NO. - -QUIET = NO - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES -# this implies that the warnings are on. -# -# Tip: Turn warnings on while writing the documentation. -# The default value is: YES. - -WARNINGS = YES - -# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate -# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag -# will automatically be disabled. -# The default value is: YES. - -WARN_IF_UNDOCUMENTED = YES - -# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some parameters -# in a documented function, or documenting parameters that don't exist or using -# markup commands wrongly. -# The default value is: YES. - -WARN_IF_DOC_ERROR = YES - -# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that -# are documented, but have no documentation for their parameters or return -# value. If set to NO doxygen will only warn about wrong or incomplete parameter -# documentation, but not about the absence of documentation. -# The default value is: NO. - -WARN_NO_PARAMDOC = NO - -# The WARN_FORMAT tag determines the format of the warning messages that doxygen -# can produce. The string should contain the $file, $line, and $text tags, which -# will be replaced by the file and line number from which the warning originated -# 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) -# The default value is: $file:$line: $text. - -WARN_FORMAT = "$file:$line: $text" - -# 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 -# error (stderr). - -WARN_LOGFILE = - -#--------------------------------------------------------------------------- -# Configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag is used to specify the files and/or directories that contain -# documented source files. You may enter file names like myfile.cpp or -# directories like /usr/src/myproject. Separate the files or directories with -# spaces. -# Note: If this tag is empty the current directory is searched. -# -#INPUT = - -# This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses -# libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of -# possible encodings. -# The default value is: UTF-8. - -INPUT_ENCODING = UTF-8 - -# 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 -# *.h) to filter out the source-files in the directories. If left blank the -# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii, -# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp, -# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown, -# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, -# *.qsf, *.as and *.js. - -FILE_PATTERNS = *.h - -# The RECURSIVE tag can be used to specify whether or not subdirectories should -# be searched for input files as well. -# The default value is: NO. - -RECURSIVE = NO - -# The EXCLUDE tag can be used to specify files and/or directories that should be -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. -# -# Note that relative paths are relative to the directory from which doxygen is -# run. - -EXCLUDE = - -# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or -# directories that are symbolic links (a Unix file system feature) are excluded -# from the input. -# The default value is: NO. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. -# -# Note that the wildcards are matched against the file with absolute path, so to -# exclude all test directories for example use the pattern */test/* - -EXCLUDE_PATTERNS = - -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the -# output. The symbol name can be a fully qualified name, a word, or if the -# wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test -# -# Note that the wildcards are matched against the file with absolute path, so to -# exclude all test directories use the pattern */test/* - -EXCLUDE_SYMBOLS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or directories -# that contain example code fragments that are included (see the \include -# command). - -EXAMPLE_PATH = - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and -# *.h) to filter out the source-files in the directories. If left blank all -# files are included. - -EXAMPLE_PATTERNS = - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude commands -# irrespective of the value of the RECURSIVE tag. -# The default value is: NO. - -EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or directories -# that contain images that are to be included in the documentation (see the -# \image command). -# -#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 -# by executing (via popen()) the command: -# -# -# -# where is the value of the INPUT_FILTER tag, and is the -# name of an input file. Doxygen will then use the output that the filter -# program writes to standard output. If FILTER_PATTERNS is specified, this tag -# will be ignored. -# -# 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. - -INPUT_FILTER = - -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: pattern=filter -# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how -# filters are used. If the FILTER_PATTERNS tag is empty or if none of the -# patterns match the file name, INPUT_FILTER is applied. - -FILTER_PATTERNS = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER ) will also be used to filter the input files that are used for -# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). -# The default value is: NO. - -FILTER_SOURCE_FILES = NO - -# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file -# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and -# it is also possible to disable source filtering for a specific pattern using -# *.ext= (so without naming a filter). -# This tag requires that the tag FILTER_SOURCE_FILES is set to YES. - -FILTER_SOURCE_PATTERNS = - -# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that -# is part of the input, its contents will be placed on the main page -# (index.html). This can be useful if you have a project on for instance GitHub -# and want to reuse the introduction page also for the doxygen output. - -USE_MDFILE_AS_MAINPAGE = - -#--------------------------------------------------------------------------- -# Configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will be -# generated. Documented entities will be cross-referenced with these sources. -# -# Note: To get rid of all source code in the generated output, make sure that -# also VERBATIM_HEADERS is set to NO. -# The default value is: NO. - -SOURCE_BROWSER = NO - -# Setting the INLINE_SOURCES tag to YES will include the body of functions, -# classes and enums directly into the documentation. -# The default value is: NO. - -INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any -# special comment blocks from generated source code fragments. Normal C, C++ and -# Fortran comments will always remain visible. -# The default value is: YES. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES then for each documented -# function all documented functions referencing it will be listed. -# The default value is: NO. - -REFERENCED_BY_RELATION = NO - -# If the REFERENCES_RELATION tag is set to YES then for each documented function -# all documented entities called/used by that function will be listed. -# The default value is: NO. - -REFERENCES_RELATION = NO - -# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set -# to YES, then the hyperlinks from functions in REFERENCES_RELATION and -# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will -# link to the documentation. -# The default value is: YES. - -REFERENCES_LINK_SOURCE = YES - -# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the -# source code will show a tooltip with additional information such as prototype, -# brief description and links to the definition and documentation. Since this -# will make the HTML file larger and loading of large files a bit slower, you -# can opt to disable this feature. -# The default value is: YES. -# This tag requires that the tag SOURCE_BROWSER is set to YES. - -SOURCE_TOOLTIPS = YES - -# If the USE_HTAGS tag is set to YES then the references to source code will -# point to the HTML generated by the htags(1) tool instead of doxygen built-in -# source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version -# 4.8.6 or higher. -# -# To use it do the following: -# - Install the latest version of global -# - Enable SOURCE_BROWSER and USE_HTAGS in the config file -# - Make sure the INPUT points to the root of the source tree -# - Run doxygen as normal -# -# Doxygen will invoke htags (and that will in turn invoke gtags), so these -# tools must be available from the command line (i.e. in the search path). -# -# The result: instead of the source browser generated by doxygen, the links to -# source code will now point to the output of htags. -# The default value is: NO. -# This tag requires that the tag SOURCE_BROWSER is set to YES. - -USE_HTAGS = NO - -# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a -# verbatim copy of the header file for each class for which an include is -# specified. Set to NO to disable this. -# See also: Section \class. -# The default value is: YES. - -VERBATIM_HEADERS = YES - -#--------------------------------------------------------------------------- -# Configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all -# compounds will be generated. Enable this if the project contains a lot of -# classes, structs, unions or interfaces. -# The default value is: YES. - -ALPHABETICAL_INDEX = NO - -# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in -# which the alphabetical index list will be split. -# Minimum value: 1, maximum value: 20, default value: 5. -# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. - -COLS_IN_ALPHA_INDEX = 5 - -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. -# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output -# The default value is: YES. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a -# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of -# it. -# The default directory is: html. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each -# generated HTML page (for example: .htm, .php, .asp). -# The default value is: .html. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a user-defined HTML header file for -# each generated HTML page. If the tag is left blank doxygen will generate a -# standard header. -# -# To get valid HTML the header file that includes any scripts and style sheets -# that doxygen needs, which is dependent on the configuration options used (e.g. -# the setting GENERATE_TREEVIEW). It is highly recommended to start with a -# default header using -# doxygen -w html new_header.html new_footer.html new_stylesheet.css -# YourConfigFile -# and then modify the file new_header.html. See also section "Doxygen usage" -# for information on how to generate the default header that doxygen normally -# uses. -# Note: The header is subject to change so you typically have to regenerate the -# default header when upgrading to a newer version of doxygen. For a description -# of the possible markers and block names see the documentation. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each -# generated HTML page. If the tag is left blank doxygen will generate a standard -# footer. See HTML_HEADER for more information on how to generate a default -# footer and what special commands can be used inside the footer. See also -# section "Doxygen usage" for information on how to generate the default footer -# that doxygen normally uses. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_FOOTER = - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style -# sheet that is used by each HTML page. It can be used to fine-tune the look of -# the HTML output. If left blank doxygen will generate a default style sheet. -# See also section "Doxygen usage" for information on how to generate the style -# sheet that doxygen normally uses. -# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as -# it is more robust and this tag (HTML_STYLESHEET) will in the future become -# obsolete. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_STYLESHEET = - -# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined -# cascading style sheets that are included after the standard style sheets -# created by doxygen. Using this option one can overrule certain style aspects. -# This is preferred over using HTML_STYLESHEET since it does not replace the -# standard style sheet and is therefor more robust against future updates. -# Doxygen will copy the style sheet files to the output directory. -# Note: The order of the extra stylesheet files is of importance (e.g. the last -# stylesheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_EXTRA_STYLESHEET = - -# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or -# other source files which should be copied to the HTML output directory. Note -# that these files will be copied to the base HTML output directory. Use the -# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these -# files. In the HTML_STYLESHEET file, use the file name only. Also note that the -# files will be copied as-is; there are no commands or markers available. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_EXTRA_FILES = - -# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen -# will adjust the colors in the stylesheet and background images according to -# this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value -# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 -# purple, and 360 is red again. -# Minimum value: 0, maximum value: 359, default value: 220. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_COLORSTYLE_HUE = 4 - -# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors -# in the HTML output. For a value of 0 the output will use grayscales only. A -# value of 255 will produce the most vivid colors. -# Minimum value: 0, maximum value: 255, default value: 100. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_COLORSTYLE_SAT = 222 - -# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the -# luminance component of the colors in the HTML output. Values below 100 -# gradually make the output lighter, whereas values above 100 make the output -# darker. The value divided by 100 is the actual gamma applied, so 80 represents -# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not -# change the gamma. -# Minimum value: 40, maximum value: 240, default value: 80. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_COLORSTYLE_GAMMA = 80 - -# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML -# page will contain the date and time when the page was generated. Setting this -# to NO can help when comparing the output of multiple runs. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_TIMESTAMP = NO - -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_DYNAMIC_SECTIONS = NO - -# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries -# shown in the various tree structured indices initially; the user can expand -# and collapse entries dynamically later on. Doxygen will expand the tree to -# such a level that at most the specified number of entries are visible (unless -# a fully collapsed tree already exceeds this amount). So setting the number of -# entries 1 will produce a full collapsed tree by default. 0 is a special value -# representing an infinite number of entries and will result in a full expanded -# tree by default. -# Minimum value: 0, maximum value: 9999, default value: 100. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_INDEX_NUM_ENTRIES = 100 - -# If the GENERATE_DOCSET tag is set to YES, additional index files will be -# generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with -# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a -# Makefile in the HTML output directory. Running make will produce the docset in -# that directory and running make install will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html -# for more information. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_DOCSET = NO - -# This tag determines the name of the docset feed. A documentation feed provides -# an umbrella under which multiple documentation sets from a single provider -# (such as a company or product suite) can be grouped. -# The default value is: Doxygen generated docs. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_FEEDNAME = "Doxygen generated docs" - -# This tag specifies a string that should uniquely identify the documentation -# set bundle. This should be a reverse domain-name style string, e.g. -# com.mycompany.MyDocSet. Doxygen will append .docset to the name. -# The default value is: org.doxygen.Project. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_BUNDLE_ID = org.doxygen.Project - -# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify -# the documentation publisher. This should be a reverse domain-name style -# string, e.g. com.mycompany.MyDocSet.documentation. -# The default value is: org.doxygen.Publisher. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_PUBLISHER_ID = org.doxygen.Publisher - -# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. -# The default value is: Publisher. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_PUBLISHER_NAME = Publisher - -# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three -# additional HTML index files: index.hhp, index.hhc, and index.hhk. The -# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop -# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on -# Windows. -# -# The HTML Help Workshop contains a compiler that can convert all HTML output -# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML -# files are now used as the Windows 98 help format, and will replace the old -# Windows help format (.hlp) on all Windows platforms in the future. Compressed -# HTML files also contain an index, a table of contents, and you can search for -# words in the documentation. The HTML workshop also contains a viewer for -# compressed HTML files. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_HTMLHELP = NO - -# The CHM_FILE tag can be used to specify the file name of the resulting .chm -# file. You can add a path in front of the file if the result should not be -# written to the html output directory. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -CHM_FILE = - -# The HHC_LOCATION tag can be used to specify the location (absolute path -# including file name) of the HTML help compiler ( hhc.exe). If non-empty -# doxygen will try to run the HTML help compiler on the generated index.hhp. -# The file has to be specified with full path. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -HHC_LOCATION = - -# The GENERATE_CHI flag controls if a separate .chi index file is generated ( -# YES) or that it should be included in the master .chm file ( NO). -# The default value is: NO. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -GENERATE_CHI = NO - -# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc) -# and project file content. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -CHM_INDEX_ENCODING = - -# The BINARY_TOC flag controls whether a binary table of contents is generated ( -# YES) or a normal table of contents ( NO) in the .chm file. Furthermore it -# enables the Previous and Next buttons. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members to -# the table of contents of the HTML help documentation and to the tree view. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -TOC_EXPAND = NO - -# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and -# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that -# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help -# (.qch) of the generated HTML documentation. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_QHP = NO - -# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify -# the file name of the resulting .qch file. The path specified is relative to -# the HTML output folder. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QCH_FILE = - -# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help -# Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). -# The default value is: org.doxygen.Project. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_NAMESPACE = org.doxygen.Project - -# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt -# Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). -# The default value is: doc. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_VIRTUAL_FOLDER = doc - -# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom -# filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_CUST_FILTER_NAME = - -# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the -# custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_CUST_FILTER_ATTRS = - -# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this -# project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_SECT_FILTER_ATTRS = - -# The QHG_LOCATION tag can be used to specify the location of Qt's -# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the -# generated .qhp file. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHG_LOCATION = - -# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be -# generated, together with the HTML files, they form an Eclipse help plugin. To -# install this plugin and make it available under the help contents menu in -# Eclipse, the contents of the directory containing the HTML and XML files needs -# to be copied into the plugins directory of eclipse. The name of the directory -# within the plugins directory should be the same as the ECLIPSE_DOC_ID value. -# After copying Eclipse needs to be restarted before the help appears. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_ECLIPSEHELP = NO - -# A unique identifier for the Eclipse help plugin. When installing the plugin -# the directory name containing the HTML and XML files should also have this -# name. Each documentation set should have its own identifier. -# The default value is: org.doxygen.Project. -# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES. - -ECLIPSE_DOC_ID = org.doxygen.Project - -# If you want full control over the layout of the generated HTML pages it might -# be necessary to disable the index and replace it with your own. The -# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top -# of each HTML page. A value of NO enables the index and the value YES disables -# it. Since the tabs in the index contain the same information as the navigation -# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -DISABLE_INDEX = NO - -# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. If the tag -# value is set to YES, a side panel will be generated containing a tree-like -# index structure (just like the one that is generated for HTML Help). For this -# to work a browser that supports JavaScript, DHTML, CSS and frames is required -# (i.e. any modern browser). Windows users are probably better off using the -# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can -# further fine-tune the look of the index. As an example, the default style -# sheet generated by doxygen has an example that shows how to put an image at -# the root of the tree instead of the PROJECT_NAME. Since the tree basically has -# the same information as the tab index, you could consider setting -# DISABLE_INDEX to YES when enabling this option. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_TREEVIEW = NO - -# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that -# doxygen will group on one line in the generated HTML documentation. -# -# Note that a value of 0 will completely suppress the enum values from appearing -# in the overview section. -# Minimum value: 0, maximum value: 20, default value: 4. -# This tag requires that the tag GENERATE_HTML is set to YES. - -ENUM_VALUES_PER_LINE = 4 - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used -# to set the initial width (in pixels) of the frame in which the tree is shown. -# Minimum value: 0, maximum value: 1500, default value: 250. -# This tag requires that the tag GENERATE_HTML is set to YES. - -TREEVIEW_WIDTH = 250 - -# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to -# external symbols imported via tag files in a separate window. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -EXT_LINKS_IN_WINDOW = NO - -# Use this tag to change the font size of LaTeX formulas included as images in -# the HTML documentation. When you change the font size after a successful -# doxygen run you need to manually remove any form_*.png images from the HTML -# output directory to force them to be regenerated. -# Minimum value: 8, maximum value: 50, default value: 10. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_FONTSIZE = 10 - -# Use the FORMULA_TRANPARENT 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 - -# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering -# instead of using prerendered bitmaps. Use this if you do not have LaTeX -# installed or if you want to formulas look prettier in the HTML output. When -# enabled you may also need to install MathJax separately and configure the path -# to it using the MATHJAX_RELPATH option. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -USE_MATHJAX = NO - -# When MathJax is enabled you can set the default output format to be used for -# the MathJax output. See the MathJax site (see: -# http://docs.mathjax.org/en/latest/output.html) for more details. -# Possible values are: HTML-CSS (which is slower, but has the best -# compatibility), NativeMML (i.e. MathML) and SVG. -# The default value is: HTML-CSS. -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_FORMAT = HTML-CSS - -# When MathJax is enabled you need to specify the location relative to the HTML -# output directory using the MATHJAX_RELPATH option. The destination directory -# should contain the MathJax.js script. For instance, if the mathjax directory -# is located at the same level as the HTML output directory, then -# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax -# Content Delivery Network so you can quickly see the result without installing -# MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest - -# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax -# extension names that should be enabled during MathJax rendering. For example -# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_EXTENSIONS = - -# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces -# of code that will be used on startup of the MathJax code. See the MathJax site -# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an -# example see the documentation. -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_CODEFILE = - -# When the SEARCHENGINE tag is enabled doxygen will generate a search box for -# the HTML output. The underlying search engine uses javascript and DHTML and -# should work on any modern browser. Note that when using HTML help -# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) -# there is already a search function so this one should typically be disabled. -# For large projects the javascript based search engine can be slow, then -# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to -# search using the keyboard; to jump to the search box use + S -# (what the is depends on the OS and browser, but it is typically -# , /