diff --git a/examples/multithreaded/CMakeLists.txt b/examples/multithreaded/CMakeLists.txt index 66418655b4..f00ee895da 100644 --- a/examples/multithreaded/CMakeLists.txt +++ b/examples/multithreaded/CMakeLists.txt @@ -14,7 +14,8 @@ set(UIS ) add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) target_link_libraries(${EXENAME} JKQTPExampleToolsLib) -target_include_directories(${EXENAME} PRIVATE ../../lib) +target_include_directories(${EXENAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../../lib) + if(JKQtPlotter_BUILD_STATIC_LIBS) target_link_libraries(${EXENAME} JKQTPlotterLib) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 0073f4f0f3..0ac2bd5a2f 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -44,9 +44,10 @@ message( STATUS ".. BUILDING LIBRARIES" ) message( STATUS "............................................................................." ) +set(JKQTPLOTTER_VERSION_FILE_DIR ${CMAKE_CURRENT_BINARY_DIR}) +set(JKQTPLOTTER_VERSION_FILE ${JKQTPLOTTER_VERSION_FILE_DIR}/jkqtplotter_version.h) configure_file(${CMAKE_CURRENT_LIST_DIR}/jkqtplotter_version.h.in - ${CMAKE_CURRENT_BINARY_DIR}/jkqtplotter_version.h) - + ${JKQTPLOTTER_VERSION_FILE}) include_directories(.) diff --git a/lib/jkqtplotter/CMakeLists.txt b/lib/jkqtplotter/CMakeLists.txt index af2c319a64..73b873192b 100644 --- a/lib/jkqtplotter/CMakeLists.txt +++ b/lib/jkqtplotter/CMakeLists.txt @@ -221,6 +221,10 @@ function(JKQtPlottter_setDefaultLibOptions TARGETNAME) $ $ ) + target_include_directories(${TARGETNAME} PUBLIC + $ + $ + ) # precomiled headers to speed up compilation if (JKQtPlotter_BUILD_WITH_PRECOMPILED_HEADERS) @@ -285,6 +289,7 @@ install(FILES ${HEADERS_GUI} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${libIncludeSubdir}/gui COMPONENT Headers) +install(FILES ${JKQTPLOTTER_VERSION_FILE} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${libIncludeSubdir} COMPONENT Headers ) configure_file(${PROJECT_SOURCE_DIR}/readme.txt.in ${CMAKE_CURRENT_BINARY_DIR}/${libBasename}_Readme.txt @ONLY) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${libBasename}_Readme.txt" DESTINATION doc/JKQtPlotter ) install(FILES "${PROJECT_SOURCE_DIR}/LICENSE" DESTINATION doc/JKQtPlotter RENAME "${libBasename}_LICENSE.txt" ) diff --git a/lib/jkqtplotter_version.h.in b/lib/jkqtplotter_version.h.in index d6c58b4207..ff32fec70b 100644 --- a/lib/jkqtplotter_version.h.in +++ b/lib/jkqtplotter_version.h.in @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2022 Jan W. Krieger () + Copyright (c) 2008-2024 Jan W. Krieger () @@ -24,6 +24,8 @@ namespace JKQTPLOTTER_VERSION { const char* PROJECT_LONGNAME = "@PROJECT_LONGNAME@"; const char* PROJECT_VERSION = "@PROJECT_VERSION@"; const char* PROJECT_BITNESS = "@PROJECT_BITNESS@"; + const char* PROJECT_BUILDTYPE = "@CMAKE_BUILD_TYPE@"; + const char* PROJECT_COMPILED_AGAINST_QT_VERSION = "@QT_VERSION@"; } -#JKQTPLOTTER_VERSION_DEFINES_H +#endif // JKQTPLOTTER_VERSION_DEFINES_H