requiring higher cmake-version, due to CMP0076

using CMAKE_CURRENT_LIST_DIR instead of CMAKE_CURRENT_SOURCE_DIR

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 # Project Name and Version
 # starting from 2020: using semantic version number <major>.<minor>.<patch>
@@ -14,7 +14,7 @@ project(JKQTPlotter LANGUAGES CXX VERSION 4.0.0)
 
 
 # set search path for CMake files
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 # Find includes in the build directories
 set(CMAKE_INCLUDE_CURRENT_DIR ON)

examples/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 message( STATUS )
 message( STATUS "............................................................................." )

examples/advplotstyling/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME advplotstyling)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/barchart/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME barchart)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/boxplot/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME boxplot)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/cmake_link_example/CMakeLists.txt

@@ -41,5 +41,5 @@ target_link_libraries(${EXENAME} Qt5::Core Qt5::Widgets Qt5::Gui Qt5::PrintSuppo
 install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 #Installation of Qt DLLs on Windows
-include(${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/jkqtplotter_deployqt.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/../../cmake/jkqtplotter_deployqt.cmake)
 jkqtplotter_deployqt(${EXENAME})

examples/contourplot/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME contourplot)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/datastore/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME datastore)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/datastore_groupedstat/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME datastore_groupedstat)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/datastore_iterators/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME datastore_iterators)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/datastore_regression/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME datastore_regression)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/datastore_statistics/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME datastore_statistics)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/datastore_statistics_2d/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME datastore_statistics_2d)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/dateaxes/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME dateaxes)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/distributionplot/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME distributionplot)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/errorbarstyles/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME errorbarstyles)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/evalcurve/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME evalcurve)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/filledgraphs/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME filledgraphs)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/functionplot/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME functionplot)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/geo_arrows/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME geo_arrows)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/geo_simple/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME geo_simple)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/geometric/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME geometric)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/imageplot/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME imageplot)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/imageplot_cimg/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 find_package( CImg  )
 if(CImg_FOUND)
 

examples/imageplot_modifier/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME imageplot_modifier)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/imageplot_nodatastore/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME imageplot_nodatastore)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/imageplot_opencv/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 find_package( OpenCV  )
 if(OpenCV_FOUND)
 

examples/imageplot_userpal/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME imageplot_userpal)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/impulsesplot/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME impulsesplot)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/jkqtfastplotter_test/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME jkqtfastplotter_test)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/jkqtmathtext_simpletest/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME jkqtmathtext_simpletest)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/jkqtmathtext_test/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME jkqtmathtext_test)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/jkqtplot_test/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME jkqtplot_test)
 set(EXENAME ${EXAMPLE_NAME})

examples/logaxes/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME logaxes)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/mandelbrot/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME mandelbrot)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/multiplot/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME test_multiplot)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/parametriccurve/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME parametriccurve)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/paramscatterplot/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME paramscatterplot)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/paramscatterplot_image/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME paramscatterplot_image)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/parsedfunctionplot/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME parsedfunctionplot)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/rgbimageplot/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME rgbimageplot)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/rgbimageplot_cimg/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 find_package( CImg  )
 if(CImg_FOUND)
 
@@ -28,6 +28,6 @@ if(CImg_FOUND)
     #Installation of Qt DLLs on Windows
     jkqtplotter_deployqt(${EXENAME})
         add_custom_command(TARGET ${EXENAME} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/rgbimageplot_cimg_example.bmp" $<TARGET_FILE_DIR:${EXENAME}>
+            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_LIST_DIR}/rgbimageplot_cimg_example.bmp" $<TARGET_FILE_DIR:${EXENAME}>
         )
 endif(CImg_FOUND)

examples/rgbimageplot_opencv/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 find_package( OpenCV  )
 if (OpenCV_FOUND)
 
@@ -31,7 +31,7 @@ if (OpenCV_FOUND)
         #Installation of OpenCV DLLs on Windows
         jkqtplotter_deployopencv(${EXENAME})
         add_custom_command(TARGET ${EXENAME} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/rgbimageplot_opencv_example.bmp" $<TARGET_FILE_DIR:${EXENAME}>
+            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_LIST_DIR}/rgbimageplot_opencv_example.bmp" $<TARGET_FILE_DIR:${EXENAME}>
         )
 
 endif(OpenCV_FOUND)

examples/rgbimageplot_qt/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME rgbimageplot_qt)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/simpletest/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME simpletest)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/speed/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME speed)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/stackedbars/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME stackedbars)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/stepplots/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME stepplots)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/styledboxplot/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME styledboxplot)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/styling/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME styling)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/symbols_and_errors/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME symbols_and_errors)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/symbols_and_styles/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME symbols_and_styles)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/ui/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME ui)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/user_interaction/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME user_interaction)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

examples/violinplot/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(EXAMPLE_NAME violinplot)
 set(EXENAME jkqtptest_${EXAMPLE_NAME})

lib/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 
 
@@ -23,7 +23,7 @@ message( STATUS "Installing to:     ${CMAKE_INSTALL_PREFIX}" )
 message( STATUS "=============================================================================" )
 message( STATUS )
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/jkqtplotter_version.h.in
+configure_file(${CMAKE_CURRENT_LIST_DIR}/jkqtplotter_version.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/jkqtplotter_version.h)
 
 

lib/jkqtcommon/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.15)
 
 set(libBasename JKQTCommon)
 set(libIncludeSubdir jkqtcommon)
@@ -21,59 +21,80 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
 # Set up source files
 set(SOURCES
-  jkqtpdebuggingtools.cpp
-  jkqtpmathtools.cpp
-  jkqtpalgorithms.cpp
-  jkqtpstringtools.cpp
-  jkqtplinalgtools.cpp
-  jkqtpcodestructuring.cpp
-  jkqtpbasicimagetools.cpp
-  jkqtpgeometrytools.cpp
-  jkqtpdrawingtools.cpp
-  jkqtpenhancedpainter.cpp
-  jkqtphighrestimer.cpp
-  jkqtpmathparser.cpp
-  jkqttools.cpp
-  jkqtparraytools.cpp
-  jkqtpstatbasics.cpp
-  jkqtpstathistogram.cpp
-  jkqtpstatkde.cpp
-  jkqtpstatregression.cpp
-  jkqtpstatpoly.cpp
-  jkqtpstatgrouped.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/jkqtpdebuggingtools.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/jkqtpmathtools.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/jkqtpalgorithms.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/jkqtpstringtools.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/jkqtplinalgtools.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/jkqtpcodestructuring.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/jkqtpbasicimagetools.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/jkqtpgeometrytools.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/jkqtpdrawingtools.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/jkqtpenhancedpainter.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/jkqtphighrestimer.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/jkqtpmathparser.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/jkqttools.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/jkqtparraytools.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/jkqtpstatbasics.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/jkqtpstathistogram.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/jkqtpstatkde.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/jkqtpstatregression.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/jkqtpstatpoly.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/jkqtpstatgrouped.cpp
 )
 
 set(HEADERS
-  jkqtcommon_imexport.h
-  jkqtpdebuggingtools.h
-  jkqtpmathtools.h
-  jkqtpalgorithms.h
-  jkqtpstringtools.h
-  jkqtplinalgtools.h
-  jkqtpcodestructuring.h
-  jkqtpbasicimagetools.h
-  jkqtpgeometrytools.h
-  jkqtpdrawingtools.h
-  jkqtpenhancedpainter.h
-  jkqtphighrestimer.h
-  jkqtpmathparser.h
-  jkqttools.h
-  jkqtparraytools.h
-  jkqtpstatisticstools.h
-  jkqtpstatbasics.h
-  jkqtpstathistogram.h
-  jkqtpstatkde.h
-  jkqtpstatregression.h
-  jkqtpstatpoly.h
-  jkqtpstatgrouped.h
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtcommon_imexport.h>
+  $<INSTALL_INTERFACE:jkqtcommon_imexport.h>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpdebuggingtools.h>
+  $<INSTALL_INTERFACE:jkqtpdebuggingtools.h>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpmathtools.h>
+  $<INSTALL_INTERFACE:jkqtpmathtools.h>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpalgorithms.h>
+  $<INSTALL_INTERFACE:jkqtpalgorithms.h>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpstringtools.h>
+  $<INSTALL_INTERFACE:jkqtpstringtools.h>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtplinalgtools.h>
+  $<INSTALL_INTERFACE:jkqtplinalgtools.h>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpcodestructuring.h>
+  $<INSTALL_INTERFACE:jkqtpcodestructuring.h>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpbasicimagetools.h>
+  $<INSTALL_INTERFACE:jkqtpbasicimagetools.h>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpgeometrytools.h>
+  $<INSTALL_INTERFACE:jkqtpgeometrytools.h>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpdrawingtools.h>
+  $<INSTALL_INTERFACE:jkqtpdrawingtools.h>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpenhancedpainter.h>
+  $<INSTALL_INTERFACE:jkqtpenhancedpainter.h>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtphighrestimer.h>
+  $<INSTALL_INTERFACE:jkqtphighrestimer.h>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpmathparser.h>
+  $<INSTALL_INTERFACE:jkqtpmathparser.h>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqttools.h>
+  $<INSTALL_INTERFACE:jkqttools.h>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtparraytools.h>
+  $<INSTALL_INTERFACE:jkqtparraytools.h>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpstatisticstools.h>
+  $<INSTALL_INTERFACE:jkqtpstatisticstools.h>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpstatbasics.h>
+  $<INSTALL_INTERFACE:jkqtpstatbasics.h>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpstathistogram.h>
+  $<INSTALL_INTERFACE:jkqtpstathistogram.h>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpstatkde.h>
+  $<INSTALL_INTERFACE:jkqtpstatkde.h>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpstatregression.h>
+  $<INSTALL_INTERFACE:jkqtpstatregression.h>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpstatpoly.h>
+  $<INSTALL_INTERFACE:jkqtpstatpoly.h>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpstatgrouped.h>
+  $<INSTALL_INTERFACE:jkqtpstatgrouped.h>
 )
 
 include(CMakePackageConfigHelpers)
 
 
 if(JKQtPlotter_BUILD_SHARED_LIBS)
-    add_library(${libsh_name} SHARED )
-    target_sources(${libsh_name} PRIVATE ${SOURCES} PUBLIC ${HEADERS})
+    add_library(${libsh_name} SHARED ${SOURCES}  ${HEADERS} )
     set_property(TARGET ${libsh_name} PROPERTY VERSION "${PROJECT_VERSION}")
     set_property(TARGET ${libsh_name} PROPERTY OUTPUT_NAME  "${libsh_name_decorated}")
     target_link_libraries(${libsh_name} PUBLIC Qt5::Core Qt5::Gui Qt5::Xml Qt5::Widgets Qt5::PrintSupport)
@@ -91,18 +112,17 @@ if(JKQtPlotter_BUILD_SHARED_LIBS)
       target_compile_definitions(${libsh_name} PUBLIC NOMINMAX)
     endif()
     target_include_directories(${libsh_name} PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../>
         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>  
     )
     set_target_properties(${libsh_name} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS "ON")
     write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${libsh_name}Version.cmake 
                                      VERSION ${PROJECT_VERSION} 
-                                     COMPATIBILITY AnyNewerVersion )    
+                                     COMPATIBILITY AnyNewerVersion )
 endif()
 
 if(JKQtPlotter_BUILD_STATIC_LIBS)
-    add_library(${lib_name} STATIC )
-    target_sources(${lib_name} PRIVATE ${SOURCES} PUBLIC ${HEADERS})
+    add_library(${lib_name} STATIC ${SOURCES} ${HEADERS})
     set_property(TARGET ${lib_name} PROPERTY VERSION "${PROJECT_VERSION}")
     set_property(TARGET ${lib_name} PROPERTY OUTPUT_NAME  "${lib_name_decorated}")
     set_property(TARGET ${lib_name} PROPERTY CXX_STANDARD 11)
@@ -117,7 +137,7 @@ if(JKQtPlotter_BUILD_STATIC_LIBS)
       target_compile_definitions(${lib_name} PUBLIC NOMINMAX)
     endif()
     target_include_directories(${lib_name} PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../>
         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>  
     )
     target_link_libraries(${lib_name} PUBLIC Qt5::Core Qt5::Gui Qt5::Xml Qt5::Widgets Qt5::PrintSupport)

lib/jkqtfastplotter/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.15)
 
 set(libBasename JKQTFastPlotter)
 set(libIncludeSubdir jkqtfastplotter)
@@ -25,8 +25,10 @@ set(SOURCES
 )
 
 set(HEADERS
-  jkqtfastplotter.h
-  jkqtfastplotter_imexport.h
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtfastplotter.h>
+  $<INSTALL_INTERFACE:jkqtfastplotter.h>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtfastplotter_imexport.h>
+  $<INSTALL_INTERFACE:jkqtfastplotter_imexport.h>
 )
 
 
@@ -34,8 +36,7 @@ include(CMakePackageConfigHelpers)
 
 
 if(JKQtPlotter_BUILD_SHARED_LIBS)
-    add_library(${libsh_name} SHARED )
-    target_sources(${libsh_name} PRIVATE ${SOURCES} ${RESOURCES} PUBLIC ${HEADERS})
+    add_library(${libsh_name} SHARED ${SOURCES} ${RESOURCES} ${HEADERS})
     set_property(TARGET ${libsh_name} PROPERTY VERSION "${PROJECT_VERSION}")
     set_property(TARGET ${libsh_name} PROPERTY OUTPUT_NAME  "${libsh_name_decorated}")
     target_link_libraries(${libsh_name} PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::OpenGL JKQTCommonSharedLib)
@@ -52,8 +53,8 @@ if(JKQtPlotter_BUILD_SHARED_LIBS)
       target_compile_definitions(${libsh_name} PUBLIC NOMINMAX)
     endif()
     target_compile_definitions(${libsh_name} PRIVATE JKQTFASTPLOTTER_LIB_EXPORT_LIBRARY)
-	target_include_directories(${libsh_name} PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>
+	  target_include_directories(${libsh_name} PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../>
         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>  
     )
     set_target_properties(${libsh_name} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS "ON")
@@ -63,8 +64,7 @@ if(JKQtPlotter_BUILD_SHARED_LIBS)
 endif()
 
 if(JKQtPlotter_BUILD_STATIC_LIBS)
-    add_library(${lib_name} STATIC  ${SOURCES} ${HEADERS} ${RESOURCES})
-    target_sources(${lib_name} PRIVATE ${SOURCES} ${RESOURCES} PUBLIC ${HEADERS})
+    add_library(${lib_name} STATIC ${SOURCES} ${RESOURCES} ${HEADERS})
     set_property(TARGET ${lib_name} PROPERTY VERSION "${PROJECT_VERSION}")
     set_property(TARGET ${lib_name} PROPERTY OUTPUT_NAME  "${lib_name_decorated}")
     set_property(TARGET ${lib_name} PROPERTY CXX_STANDARD 11)
@@ -79,8 +79,8 @@ if(JKQtPlotter_BUILD_STATIC_LIBS)
     endif()
     target_compile_features(${lib_name} PUBLIC cxx_std_11)
     target_link_libraries(${lib_name} PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::OpenGL JKQTCommonLib)
-	target_include_directories(${lib_name} PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>
+  	target_include_directories(${lib_name} PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../>
         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>  
     )
     write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${lib_name}Version.cmake

lib/jkqtmathtext/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.15)
 
 set(libBasename JKQTMathText)
 set(libIncludeSubdir jkqtmathtext)
@@ -21,17 +21,19 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
 # Set up source files
 set(SOURCES
-  jkqtmathtext.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/jkqtmathtext.cpp
 )
 
 set(HEADERS
-  jkqtmathtext.h
-  jkqtmathtext_imexport.h
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtmathtext.h>
+  $<INSTALL_INTERFACE:jkqtmathtext.h>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtmathtext_imexport.h>
+  $<INSTALL_INTERFACE:jkqtmathtext_imexport.h>
 )
 
 if(JKQtPlotter_BUILD_INCLUDE_XITS_FONTS)
     set(RESOURCES
-      resources/xits.qrc
+      ${CMAKE_CURRENT_LIST_DIR}/resources/xits.qrc
     )
 endif(JKQtPlotter_BUILD_INCLUDE_XITS_FONTS)
 
@@ -39,8 +41,7 @@ endif(JKQtPlotter_BUILD_INCLUDE_XITS_FONTS)
 include(CMakePackageConfigHelpers)
 
 if(JKQtPlotter_BUILD_SHARED_LIBS)
-    add_library(${libsh_name} SHARED
-    target_sources(${libsh_name} PRIVATE ${SOURCES} ${RESOURCES} PUBLIC ${HEADERS})
+    add_library(${libsh_name} SHARED  ${SOURCES} ${RESOURCES} ${HEADERS} )
     set_property(TARGET ${libsh_name} PROPERTY VERSION "${PROJECT_VERSION}")
     set_property(TARGET ${libsh_name} PROPERTY OUTPUT_NAME  "${libsh_name_decorated}")
     target_link_libraries(${libsh_name} PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport JKQTCommonSharedLib)
@@ -58,7 +59,7 @@ if(JKQtPlotter_BUILD_SHARED_LIBS)
       target_compile_definitions(${libsh_name} PUBLIC NOMINMAX)
     endif()
     target_include_directories(${libsh_name} PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../>
         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>  
     )
     if(JKQtPlotter_BUILD_INCLUDE_XITS_FONTS)
@@ -71,8 +72,7 @@ if(JKQtPlotter_BUILD_SHARED_LIBS)
 endif()
 
 if(JKQtPlotter_BUILD_STATIC_LIBS)
-    add_library(${lib_name} STATIC )
-    target_sources(${lib_name} PRIVATE ${SOURCES} ${RESOURCES} PUBLIC ${HEADERS})
+    add_library(${lib_name} STATIC ${SOURCES} ${RESOURCES} ${HEADERS})
     set_property(TARGET ${lib_name} PROPERTY VERSION "${PROJECT_VERSION}")
     set_property(TARGET ${lib_name} PROPERTY OUTPUT_NAME  "${lib_name_decorated}")
     set_property(TARGET ${lib_name} PROPERTY CXX_STANDARD 11)
@@ -90,8 +90,8 @@ if(JKQtPlotter_BUILD_STATIC_LIBS)
         target_compile_definitions(${lib_name} PRIVATE JKQTMATHTEXT_COMPILED_WITH_XITS)
     endif(JKQtPlotter_BUILD_INCLUDE_XITS_FONTS)
     target_link_libraries(${lib_name} PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport JKQTCommonLib)
-	target_include_directories(${lib_name} PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>
+	  target_include_directories(${lib_name} PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../>
         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>  
     )
     write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${lib_name}Version.cmake

lib/jkqtplotter/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.15)
 
 set(libBasename JKQTPlotter)
 set(libIncludeSubdir jkqtplotter)
@@ -20,129 +20,185 @@ endif(JKQtPlotter_BUILD_STATIC_LIBS)
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
 # Set up source files
-set(SOURCES
-    jkqtptools.cpp
-    jkqtpbaseelements.cpp
-    jkqtpbaseplotter.cpp
-    jkqtpdatastorage.cpp
-    jkqtpgraphsbase.cpp
-    jkqtpgraphsbaseerrors.cpp
-    jkqtpgraphsbasestylingmixins.cpp
-    jkqtplotter.cpp
-    jkqtplotterstyle.cpp
-    jkqtpkeystyle.cpp
-    jkqtpbaseplotterstyle.cpp
-    jkqtpcoordinateaxes.cpp
-    jkqtpcoordinateaxesstyle.cpp
-    jkqtpimagetools.cpp
-    jkqtpgraphsbasestyle.cpp
+set(SOURCES_BASE
+    ${CMAKE_CURRENT_LIST_DIR}/jkqtptools.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/jkqtpbaseelements.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/jkqtpbaseplotter.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/jkqtpdatastorage.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/jkqtpgraphsbase.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/jkqtpgraphsbaseerrors.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/jkqtpgraphsbasestylingmixins.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/jkqtplotter.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/jkqtplotterstyle.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/jkqtpkeystyle.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/jkqtpbaseplotterstyle.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/jkqtpcoordinateaxes.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/jkqtpcoordinateaxesstyle.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/jkqtpimagetools.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/jkqtpgraphsbasestyle.cpp
     )
 set(SOURCES_GRAPHS
-    graphs/jkqtpscatter.cpp
-    graphs/jkqtprange.cpp
-    graphs/jkqtpspecialline.cpp
-    graphs/jkqtpbarchartbase.cpp 
-    graphs/jkqtpbarchart.cpp 
-    graphs/jkqtpboxplot.cpp 
-    graphs/jkqtpboxplotbase.cpp 
-    graphs/jkqtpboxplotstylingmixins.cpp 
-    graphs/jkqtpevaluatedfunctionbase.cpp 
-    graphs/jkqtpevaluatedfunction.cpp 
-    graphs/jkqtpfilledcurve.cpp 
-    graphs/jkqtpgeometric.cpp 
-    graphs/jkqtpgeoannotations.cpp
-    graphs/jkqtpgeobase.cpp
-    graphs/jkqtpgeolines.cpp
-    graphs/jkqtpgeoshapes.cpp    
-    graphs/jkqtpimage.cpp
-    graphs/jkqtpimpulses.cpp 
-    graphs/jkqtpparsedfunction.cpp 
-    graphs/jkqtppeakstream.cpp 
-    graphs/jkqtpsinglecolumnsymbols.cpp 
-    graphs/jkqtpimageoverlays.cpp 
-    graphs/jkqtpcontour.cpp 
-    graphs/jkqtpimagergb.cpp
-    graphs/jkqtpviolinplot.cpp
-    graphs/jkqtpviolinplotstylingmixins.cpp
-    graphs/jkqtpstatisticsadaptors.cpp 
-    graphs/jkqtpevaluatedparametriccurve.cpp 
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpscatter.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtprange.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpspecialline.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpbarchartbase.cpp 
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpbarchart.cpp 
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpboxplot.cpp 
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpboxplotbase.cpp 
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpboxplotstylingmixins.cpp 
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpevaluatedfunctionbase.cpp 
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpevaluatedfunction.cpp 
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpfilledcurve.cpp 
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpgeometric.cpp 
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpgeoannotations.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpgeobase.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpgeolines.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpgeoshapes.cpp    
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpimage.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpimpulses.cpp 
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpparsedfunction.cpp 
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtppeakstream.cpp 
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpsinglecolumnsymbols.cpp 
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpimageoverlays.cpp 
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpcontour.cpp 
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpimagergb.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpviolinplot.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpviolinplotstylingmixins.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpstatisticsadaptors.cpp 
+    ${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpevaluatedparametriccurve.cpp 
     )
 set(SOURCES_GUI
-    gui/jkqtpcomboboxes.cpp
-    gui/jkqtpenhancedspinboxes.cpp
-    gui/jkqtpenhancedtableview.cpp
-    gui/jkqtpgraphsmodel.cpp
-    gui/jkvanishqtoolbar.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/gui/jkqtpcomboboxes.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/gui/jkqtpenhancedspinboxes.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/gui/jkqtpenhancedtableview.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/gui/jkqtpgraphsmodel.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/gui/jkvanishqtoolbar.cpp
 )
 
 
-set(HEADERS
-    jkqtptools.h
-    jkqtpbaseelements.h
-    jkqtpbaseplotter.h
-    jkqtpdatastorage.h
-    jkqtpgraphsbase.h
-    jkqtpgraphsbaseerrors.h
-    jkqtpgraphsbasestylingmixins.h
-    jkqtplotter.h
-    jkqtplotterstyle.h
-    jkqtpkeystyle.h
-    jkqtpbaseplotterstyle.h
-    jkqtpcoordinateaxes.h
-    jkqtpcoordinateaxesstyle.h
-    jkqtpimagetools.h
-    jkqtpgraphsbasestyle.h
-    jkqtplotter_imexport.h
+set(HEADERS_BASE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtptools.h>
+    $<INSTALL_INTERFACE:jkqtptools.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpbaseelements.h>
+    $<INSTALL_INTERFACE:jkqtpbaseelements.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpbaseplotter.h>
+    $<INSTALL_INTERFACE:jkqtpbaseplotter.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpdatastorage.h>
+    $<INSTALL_INTERFACE:jkqtpdatastorage.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpgraphsbase.h>
+    $<INSTALL_INTERFACE:jkqtpgraphsbase.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpgraphsbaseerrors.h>
+    $<INSTALL_INTERFACE:jkqtpgraphsbaseerrors.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpgraphsbasestylingmixins.h>
+    $<INSTALL_INTERFACE:jkqtpgraphsbasestylingmixins.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtplotter.h>
+    $<INSTALL_INTERFACE:jkqtplotter.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtplotterstyle.h>
+    $<INSTALL_INTERFACE:jkqtplotterstyle.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpkeystyle.h>
+    $<INSTALL_INTERFACE:jkqtpkeystyle.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpbaseplotterstyle.h>
+    $<INSTALL_INTERFACE:jkqtpbaseplotterstyle.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpcoordinateaxes.h>
+    $<INSTALL_INTERFACE:jkqtpcoordinateaxes.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpcoordinateaxesstyle.h>
+    $<INSTALL_INTERFACE:jkqtpcoordinateaxesstyle.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpimagetools.h>
+    $<INSTALL_INTERFACE:jkqtpimagetools.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtpgraphsbasestyle.h>
+    $<INSTALL_INTERFACE:jkqtpgraphsbasestyle.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/jkqtplotter_imexport.h>
+    $<INSTALL_INTERFACE:jkqtplotter_imexport.h>
 )
 set(HEADERS_GRAPHS
-    graphs/jkqtpboxplot.h
-    graphs/jkqtpboxplotbase.h
-    graphs/jkqtpboxplotstylingmixins.h
-    graphs/jkqtpevaluatedfunctionbase.h
-    graphs/jkqtpevaluatedfunction.h
-    graphs/jkqtpfilledcurve.h
-    graphs/jkqtpgeometric.h
-    graphs/jkqtpgeoannotations.h
-    graphs/jkqtpgeobase.h
-    graphs/jkqtpgeolines.h
-    graphs/jkqtpgeoshapes.h
-    graphs/jkqtpimage.h
-    graphs/jkqtpimpulses.h
-    graphs/jkqtpparsedfunction.h
-    graphs/jkqtppeakstream.h
-    graphs/jkqtpsinglecolumnsymbols.h
-    graphs/jkqtpimageoverlays.h
-    graphs/jkqtpcontour.h
-    graphs/jkqtpimagergb.h
-    graphs/jkqtpviolinplot.h
-    graphs/jkqtpviolinplotstylingmixins.h
-    graphs/jkqtpstatisticsadaptors.h
-    graphs/jkqtpscatter.h
-    graphs/jkqtprange.h
-    graphs/jkqtpspecialline.h
-    graphs/jkqtpbarchartbase.h
-    graphs/jkqtpbarchart.h
-    graphs/jkqtpevaluatedparametriccurve.h
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpboxplot.h>
+    $<INSTALL_INTERFACE:graphs/jkqtpboxplot.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpboxplotbase.h>
+    $<INSTALL_INTERFACE:graphs/jkqtpboxplotbase.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpboxplotstylingmixins.h>
+    $<INSTALL_INTERFACE:graphs/jkqtpboxplotstylingmixins.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpevaluatedfunctionbase.h>
+    $<INSTALL_INTERFACE:graphs/jkqtpevaluatedfunctionbase.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpevaluatedfunction.h>
+    $<INSTALL_INTERFACE:graphs/jkqtpevaluatedfunction.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpfilledcurve.h>
+    $<INSTALL_INTERFACE:graphs/jkqtpfilledcurve.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpgeometric.h>
+    $<INSTALL_INTERFACE:graphs/jkqtpgeometric.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpgeoannotations.h>
+    $<INSTALL_INTERFACE:graphs/jkqtpgeoannotations.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpgeobase.h>
+    $<INSTALL_INTERFACE:graphs/jkqtpgeobase.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpgeolines.h>
+    $<INSTALL_INTERFACE:graphs/jkqtpgeolines.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpgeoshapes.h>
+    $<INSTALL_INTERFACE:graphs/jkqtpgeoshapes.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpimage.h>
+    $<INSTALL_INTERFACE:graphs/jkqtpimage.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpimpulses.h>
+    $<INSTALL_INTERFACE:graphs/jkqtpimpulses.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpparsedfunction.h>
+    $<INSTALL_INTERFACE:graphs/jkqtpparsedfunction.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtppeakstream.h>
+    $<INSTALL_INTERFACE:graphs/jkqtppeakstream.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpsinglecolumnsymbols.h>
+    $<INSTALL_INTERFACE:graphs/jkqtpsinglecolumnsymbols.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpimageoverlays.h>
+    $<INSTALL_INTERFACE:graphs/jkqtpimageoverlays.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpcontour.h>
+    $<INSTALL_INTERFACE:graphs/jkqtpcontour.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpimagergb.h>
+    $<INSTALL_INTERFACE:graphs/jkqtpimagergb.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpviolinplot.h>
+    $<INSTALL_INTERFACE:graphs/jkqtpviolinplot.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpviolinplotstylingmixins.h>
+    $<INSTALL_INTERFACE:graphs/jkqtpviolinplotstylingmixins.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpstatisticsadaptors.h>
+    $<INSTALL_INTERFACE:graphs/jkqtpstatisticsadaptors.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpscatter.h>
+    $<INSTALL_INTERFACE:graphs/jkqtpscatter.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtprange.h>
+    $<INSTALL_INTERFACE:graphs/jkqtprange.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpspecialline.h>
+    $<INSTALL_INTERFACE:graphs/jkqtpspecialline.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpbarchartbase.h>
+    $<INSTALL_INTERFACE:graphs/jkqtpbarchartbase.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpbarchart.h>
+    $<INSTALL_INTERFACE:graphs/jkqtpbarchart.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/graphs/jkqtpevaluatedparametriccurve.h>
+    $<INSTALL_INTERFACE:graphs/jkqtpevaluatedparametriccurve.h>
 )
 set(HEADERS_GUI
-    gui/jkqtpcomboboxes.h
-    gui/jkqtpenhancedspinboxes.h
-    gui/jkqtpenhancedtableview.h
-    gui/jkqtpgraphsmodel.h
-    gui/jkvanishqtoolbar.h
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/gui/jkqtpcomboboxes.h>
+    $<INSTALL_INTERFACE:gui/jkqtpcomboboxes.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/gui/jkqtpenhancedspinboxes.h>
+    $<INSTALL_INTERFACE:gui/jkqtpenhancedspinboxes.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/gui/jkqtpenhancedtableview.h>
+    $<INSTALL_INTERFACE:gui/jkqtpenhancedtableview.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/gui/jkqtpgraphsmodel.h>
+    $<INSTALL_INTERFACE:gui/jkqtpgraphsmodel.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/gui/jkvanishqtoolbar.h>
+    $<INSTALL_INTERFACE:gui/jkvanishqtoolbar.h>
 )
 
 set(RESOURCES
-  resources/jkqtpbaseplotter.qrc
-  resources/jkqtpstyles.qrc
+  ${CMAKE_CURRENT_LIST_DIR}/resources/jkqtpbaseplotter.qrc
+  ${CMAKE_CURRENT_LIST_DIR}/resources/jkqtpstyles.qrc
 )
 
 include(CMakePackageConfigHelpers)
 
 
 if(JKQtPlotter_BUILD_SHARED_LIBS)
-    add_library(${libsh_name} SHARED )
-    target_sources(${libsh_name} PRIVATE ${SOURCES} ${SOURCES_GRAPHS} ${SOURCES_GUI} ${RESOURCES} PUBLIC ${HEADERS} ${HEADERS_GRAPHS} ${HEADERS_GUI})
+    add_library(${libsh_name} SHARED
+          ${SOURCES_BASE}
+          ${SOURCES_GRAPHS}
+          ${SOURCES_GUI}
+          ${RESOURCES}
+          ${HEADERS_BASE}
+          ${HEADERS_GRAPHS}
+          ${HEADERS_GUI}
+    )
     set_property(TARGET ${libsh_name} PROPERTY VERSION "${PROJECT_VERSION}")
     set_property(TARGET ${libsh_name} PROPERTY OUTPUT_NAME  "${libsh_name_decorated}")
     target_link_libraries(${libsh_name} PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::Svg Qt5::Xml JKQTCommonSharedLib JKQTMathTextSharedLib)
@@ -160,7 +216,7 @@ if(JKQtPlotter_BUILD_SHARED_LIBS)
       target_compile_definitions(${libsh_name} PUBLIC NOMINMAX)
     endif()
     target_include_directories(${libsh_name} PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../>
         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>  
     )
     set_target_properties(${libsh_name} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS "ON")
@@ -170,8 +226,7 @@ if(JKQtPlotter_BUILD_SHARED_LIBS)
 endif()
 
 if(JKQtPlotter_BUILD_STATIC_LIBS)
-    add_library(${lib_name} STATIC )
-    target_sources(${libsh_name} PRIVATE ${SOURCES} ${SOURCES_GRAPHS} ${SOURCES_GUI} ${RESOURCES} PUBLIC ${HEADERS} ${HEADERS_GRAPHS} ${HEADERS_GUI})
+    add_library(${lib_name} STATIC ${SOURCES_BASE} ${SOURCES_GRAPHS} ${SOURCES_GUI} ${RESOURCES} ${HEADERS_BASE} ${HEADERS_GRAPHS} ${HEADERS_GUI})
     set_property(TARGET ${lib_name} PROPERTY VERSION "${PROJECT_VERSION}")
     set_property(TARGET ${lib_name} PROPERTY OUTPUT_NAME  "${lib_name_decorated}")
     set_property(TARGET ${lib_name} PROPERTY CXX_STANDARD 11)
@@ -186,7 +241,7 @@ if(JKQtPlotter_BUILD_STATIC_LIBS)
     endif()
     target_compile_features(${lib_name} PUBLIC cxx_std_11)
     target_include_directories(${lib_name} PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../>
         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>  
     )
     target_link_libraries(${lib_name} PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::Svg Qt5::Xml JKQTCommonLib JKQTMathTextLib)
@@ -240,7 +295,7 @@ if(JKQtPlotter_BUILD_STATIC_LIBS)
                                 DESTINATION lib/cmake  )
 endif(JKQtPlotter_BUILD_STATIC_LIBS)
 
-install(FILES ${HEADERS}
+install(FILES ${HEADERS_BASE}
 		DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${libIncludeSubdir}
 		COMPONENT Headers)