From kde-commits  Sun Jul 31 19:39:50 2016
From: =?utf-8?q?Christian_D=C3=A1vid?= <christian-david () web ! de>
Date: Sun, 31 Jul 2016 19:39:50 +0000
To: kde-commits
Subject: [kmymoney] /: Updated doxygen configuration
Message-Id: <E1bTwaU-0001ZQ-Nb () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=146999400928880

Git commit 05b37759931b26e09a7a181b7c05829a890856a1 by Christian D=C3=A1vid.
Committed on 30/07/2016 at 21:22.
Pushed by christiand into branch 'master'.

Updated doxygen configuration

The target "apidoc" is working correctly again.

M  +2    -3    CMakeLists.txt
M  +5    -6    kmymoney.doxygen.in

http://commits.kde.org/kmymoney/05b37759931b26e09a7a181b7c05829a890856a1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f9e9170..54262f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,11 +70,10 @@ find_package(Doxygen)
 if(DOXYGEN_FOUND)
   set(APIDOC_DIR ${CMAKE_CURRENT_BINARY_DIR}/apidocs)
 =

-  make_directory(${APIDOC_DIR})
-
+  make_directory("${APIDOC_DIR}")
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kmymoney.doxygen.in ${CMAKE_C=
URRENT_BINARY_DIR}/kmymoney.doxygen IMMEDIATE)
 =

-  add_custom_target(apidoc ${DOXYGEN} ${CMAKE_CURRENT_BINARY_DIR}/kmymoney=
.doxygen)
+  add_custom_target(apidoc "${DOXYGEN}" "${CMAKE_CURRENT_BINARY_DIR}/kmymo=
ney.doxygen")
 endif(DOXYGEN_FOUND)
 =

 =

diff --git a/kmymoney.doxygen.in b/kmymoney.doxygen.in
index ceefece..03056e5 100644
--- a/kmymoney.doxygen.in
+++ b/kmymoney.doxygen.in
@@ -32,7 +32,7 @@ PROJECT_NAME           =3D KMyMoney
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 =

-PROJECT_NUMBER         =3D ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PAT=
CH}${VERSION_SUFFIX}
+PROJECT_NUMBER         =3D @PROJECT_VERSION@@PROJECT_VERSION_SUFFIX@
 # Using the PROJECT_BRIEF tag one can provide an optional one line descrip=
tion
 =

 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
@@ -40,7 +40,7 @@ PROJECT_NUMBER         =3D ${VERSION_MAJOR}.${VERSION_MIN=
OR}.${VERSION_PATCH}${VER
 # 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 u=
sed.
 =

-OUTPUT_DIRECTORY       =3D ${APIDOC_DIR}
+OUTPUT_DIRECTORY       =3D @APIDOC_DIR@
 =

 # 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 ou=
tput
@@ -656,7 +656,7 @@ WARN_LOGFILE           =3D
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 =

-INPUT                  =3D ${CMAKE_CURRENT_SOURCE_DIR}
+INPUT                  =3D @CMAKE_CURRENT_SOURCE_DIR@
 =

 # This tag can be used to specify the character encoding of the source fil=
es
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -692,7 +692,7 @@ RECURSIVE              =3D YES
 # Note that relative paths are relative to the directory from which doxyge=
n is
 # run.
 =

-EXCLUDE                =3D ${CMAKE_CURRENT_SOURCE_DIR}/libkdchart/ ${CMAKE=
_CURRENT_BINARY_DIR}
+EXCLUDE                =3D @CMAKE_CURRENT_SOURCE_DIR@/libkdchart/ @CMAKE_C=
URRENT_BINARY_DIR@
 =

 # 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 exc=
luded
@@ -1561,8 +1561,7 @@ SEARCH_INCLUDES        =3D YES
 # contain include files that are not input files but should be processed by
 # the preprocessor.
 =

-INCLUDE_PATH           =3D ${KDE4_INCLUDE_DIR} \
-                         ${QT_INCLUDE_DIR}
+INCLUDE_PATH           =3D @QT_INCLUDE_DIR@
 =

 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the