From 136e7114d76603db3d1a4872ec7afc15ca45b6ab Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Wed, 8 Dec 2021 10:51:34 +0100 Subject: [PATCH 1/3] doc/Doxyfile.doxygen: make include path relative Signed-off-by: Andrew Ammerlaan --- doc/Doxyfile.doxygen | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Doxyfile.doxygen b/doc/Doxyfile.doxygen index 8910fb7..aab863a 100644 --- a/doc/Doxyfile.doxygen +++ b/doc/Doxyfile.doxygen @@ -181,7 +181,7 @@ ENABLE_PREPROCESSING = YES MACRO_EXPANSION = NO EXPAND_ONLY_PREDEF = NO SEARCH_INCLUDES = YES -INCLUDE_PATH = V:/cvs/qwtplot3d/include/ +INCLUDE_PATH = ../include/ INCLUDE_FILE_PATTERNS = *.h PREDEFINED = QWT3D_NOT_FOR_DOXYGEN \ QT_VERSION=0x040000 From 74a2271e68e61858aa52cb5327c600fe8a49c027 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Wed, 8 Dec 2021 10:53:46 +0100 Subject: [PATCH 2/3] qwt3d_function.h: add missing include Signed-off-by: Andrew Ammerlaan --- include/qwt3d_function.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/qwt3d_function.h b/include/qwt3d_function.h index 640ae39..807d29c 100644 --- a/include/qwt3d_function.h +++ b/include/qwt3d_function.h @@ -2,6 +2,7 @@ #define qwt3d_function_h #include "qwt3d_gridmapping.h" +#include namespace Qwt3D { From f622e8bd38b91efc8cbcc0d0a8a3c98d4780b3b7 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Wed, 8 Dec 2021 10:54:57 +0100 Subject: [PATCH 3/3] CMakeLists.txt: install headers - qwt3d_version.h is required to build scidavis, append it to HEADERS - GNUInstallDirs is required to define CMAKE_INSTALL_INCLUDEDIR - set_target_properties is required to actually install HEADERS Signed-off-by: Andrew Ammerlaan --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 12657be..c14ca89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.16) +include(GNUInstallDirs) project( QwtPlot3D VERSION 0.3.0 @@ -104,8 +105,12 @@ set( HEADERS "include/qwt3d_io_gl2ps.h" ) configure_file( "include/qwt3d_version.h.in" "qwt3d_version.h" @ONLY ) +list( APPEND HEADERS + "${CMAKE_BINARY_DIR}/qwt3d_version.h" + ) add_library( qwtplot3d ${SRCS} ${HEADERS} ) +set_target_properties( qwtplot3d PROPERTIES PUBLIC_HEADER "${HEADERS}" ) target_link_libraries( qwtplot3d Qt${QT_VERSION_MAJOR}::Core