reworked CMake build system ... now JKQT...Config.cmake-files are written into the correct directory

.gitignore

@@ -95,3 +95,4 @@ Sicherungskopie_*
 /examples/simpletest_rgbimageplot_opencv/opencv
 /build
 /*.10-pre1
+/install

CMakeLists.txt

@@ -1,111 +1,32 @@
 cmake_minimum_required(VERSION 3.0)
+
+# set search path for CMake files
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-
-
-
-project(JKQTPlotter LANGUAGES CXX VERSION 2019.06)
-
-
-
-if(NOT DEFINED BUILD_SHARED_LIBS)
-    option(BUILD_SHARED_LIBS "Build as shared library" ON)
-endif()
-if(NOT DEFINED BUILD_STATIC_LIBS)
-    option(BUILD_STATIC_LIBS "Build as static library" ON)
-endif()
-if(NOT DEFINED BUILD_INCLUDE_XITS_FONTS)
-    option(BUILD_INCLUDE_XITS_FONTS "Include XITS fonts as resources in library" ON)
-endif()
-if(NOT DEFINED BUILD_DECORATE_LIBNAMES_WITH_BUILDTYPE)
-    option(BUILD_DECORATE_LIBNAMES_WITH_BUILDTYPE "If set, the build-type is appended to the library name" ON)
-endif()
-if(NOT DEFINED BUILD_HIGH_COMPILE_WARNING_LEVEL)
-    option(BUILD_HIGH_COMPILE_WARNING_LEVEL "Set Compiler Warning level to high" OFF)
-endif()
-if(NOT DEFINED BUILD_EXAMPLES)
-    option(BUILD_EXAMPLES "Build examples" ON)
-endif()
-if(NOT DEFINED LIB_INSTALL)
-    option(LIB_INSTALL "Install library" ON)
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_PREFIX)
-    option(CMAKE_INSTALL_PREFIX "Install directory" ${CMAKE_CURRENT_SOURCE_DIR}/install)
-endif()
-
-
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
-
-include(jkqtplotter_deployqt)
-include(jkqtplotter_deployopencv)
-include(CheckCXXCompilerFlag)
-if (NOT WIN32)
-    include(GNUInstallDirs)
-endif(NOT WIN32)
-
-# Instruct CMake to run moc+rcc+uic automatically when needed.
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
-
 # Find includes in the build directories
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
+# Common Includes for JKQtPlotter
+include(jkqtplotter_common_include)
 
+# Project Name and Version
+include(JKQtPlotter_LIB_properties)
 
-if (NOT CMAKE_INSTALL_LIBDIR)
-    set(CMAKE_INSTALL_LIBDIR "lib")
-endif()
+# CMake options with default values and description texts
+include(jkqtplotter_cmake_options)
 
-if (NOT CMAKE_INSTALL_BINDIR)
-    set(CMAKE_INSTALL_BINDIR "bin")
-endif()
+# compiler settings for this lib
+include(jkqtplotter_common_compilersettings)
 
-if (NOT CMAKE_INSTALL_INCLUDEDIR)
-    set(CMAKE_INSTALL_INCLUDEDIR "include")
-endif()
-
-
-find_package(Qt5 5.0 REQUIRED Core Gui Widgets PrintSupport Svg Xml OpenGL)
-
-
-
-set (CMAKE_CXX_STANDARD 11)
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-
-if(MSVC)
-    add_compile_options(/EHsc)
-    # To enable M_PI, M_E,...
-    add_definitions(/D_USE_MATH_DEFINES)
-    # To Prevent Errors with min() and max()
-    add_definitions(/DNOMINMAX)
-    # To fix error: C2338: va_start argument must not
-    # have reference type and must not be parenthesized
-    add_definitions(/D_CRT_NO_VA_START_VALIDATION)
-    set(CMAKE_MSVCIDE_RUN_PATH ${CMAKE_PREFIX_PATH};${Qt5_DIR}/bin)
-else()
-    add_compile_options(-fexceptions)
-    if(BUILD_HIGH_COMPILE_WARNING_LEVEL)
-        add_compile_options(-Wall -Wextra) # -Wimplicit-fallthrough -Wuninitialized -Wmaybe-uninitialized) # -Wmisleading-indentation -Weffc++)
-    endif(BUILD_HIGH_COMPILE_WARNING_LEVEL)
-endif()
-
-if(BUILD_DECORATE_LIBNAMES_WITH_BUILDTYPE)
-    set(LIBNAME_ADDITION "_$<CONFIG>") #"_${CMAKE_BUILD_TYPE}")
-else()
-    set(LIBNAME_ADDITION )
-endif()
-
-
-
-# place all DLLs and EXEs in the subdirectory output of the top level directory of the build tree
-set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output)
-set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output)
+# include Qt with appropriate options to build this lib
+include(jkqtplotter_common_qtsettings)
 
 
 
+# now add subdirectories with the library code ...
 add_subdirectory(lib)
-if(BUILD_EXAMPLES)
+# ... and optionally the examples
+if(JKQtPlotter_BUILD_EXAMPLES)
     add_subdirectory(examples)
 endif()
 

cmake/jkqtplotter_cmake_options.cmake

@@ -0,0 +1,43 @@
+if(NOT DEFINED JKQtPlotter_BUILD_SHARED_LIBS)
+    option(JKQtPlotter_BUILD_SHARED_LIBS "Build as shared library" ON)
+endif()
+if(NOT DEFINED JKQtPlotter_BUILD_STATIC_LIBS)
+    option(JKQtPlotter_BUILD_STATIC_LIBS "Build as static library" OFF)
+endif()
+if(NOT DEFINED JKQtPlotter_BUILD_INCLUDE_XITS_FONTS)
+    option(JKQtPlotter_BUILD_INCLUDE_XITS_FONTS "Include XITS fonts (SIL OPEN FONT LICENSE Version 1.1) as resources in library" ON)
+endif()
+if(NOT DEFINED JKQtPlotter_BUILD_DECORATE_LIBNAMES_WITH_BUILDTYPE)
+    option(JKQtPlotter_BUILD_DECORATE_LIBNAMES_WITH_BUILDTYPE "If set, the build-type (debug/release/...) is appended to the library name" ON)
+endif()
+if(NOT DEFINED JKQtPlotter_BUILD_EXAMPLES)
+    option(JKQtPlotter_BUILD_EXAMPLES "Build the examples examples" ON)
+endif()
+if(NOT DEFINED CMAKE_INSTALL_PREFIX)
+    option(CMAKE_INSTALL_PREFIX "Install directory" ${CMAKE_CURRENT_SOURCE_DIR}/install)
+endif()
+
+
+#evaluate the settings above
+if (NOT CMAKE_INSTALL_LIBDIR)
+    set(CMAKE_INSTALL_LIBDIR "lib")
+endif()
+
+if (NOT CMAKE_INSTALL_BINDIR)
+    set(CMAKE_INSTALL_BINDIR "bin")
+endif()
+
+if (NOT CMAKE_INSTALL_INCLUDEDIR)
+    set(CMAKE_INSTALL_INCLUDEDIR "include")
+endif()
+
+# place all DLLs and EXEs in the subdirectory output of the top level directory of the build tree
+set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output)
+set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output)
+
+
+if(JKQtPlotter_BUILD_DECORATE_LIBNAMES_WITH_BUILDTYPE)
+    set(JKQtPlotter_LIBNAME_ADDITION "_$<CONFIG>") #"_${CMAKE_BUILD_TYPE}")
+else()
+    set(JKQtPlotter_LIBNAME_ADDITION )
+endif()

cmake/jkqtplotter_common_include.cmake

@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1)
+
+include(jkqtplotter_deployqt)
+include(jkqtplotter_deployopencv)

cmake/jkqtplotter_common_qtsettings.cmake

@@ -0,0 +1,7 @@
+
+# Instruct CMake to run moc+rcc+uic automatically when needed.
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+find_package(Qt5 5.0 REQUIRED Core Gui Widgets PrintSupport Svg Xml OpenGL)

cmake/jkqtplotter_dumpallvariables.cmake

@@ -0,0 +1,14 @@
+function(jkqtplotter_dumpallvariables)
+    get_cmake_property(_variableNames VARIABLES)
+    list (SORT _variableNames)
+    foreach (_variableName ${_variableNames})
+        if (ARGV0)
+            unset(MATCHED)
+            string(REGEX MATCH ${ARGV0} MATCHED ${_variableName})
+            if (NOT MATCHED)
+                continue()
+            endif()
+        endif()
+        message(STATUS "${_variableName}=${${_variableName}}")
+    endforeach()
+endfunction(jkqtplotter_dumpallvariables)

cmake/jkqtplotter_lib_properties.cmake

@@ -0,0 +1,2 @@
+# Project Name and Version
+project(JKQTPlotter LANGUAGES CXX VERSION 2019.11)

common_include.cmake

@@ -1 +0,0 @@
-cmake_minimum_required(VERSION 3.1)

doc/dox/buildinstructions.dox

@@ -48,14 +48,11 @@ Afterwards you can install the library by
 
 The CMake build system offers several configuration variables that you may set/change to modify the outcome of the build:
   - \c CMAKE_PREFIX_PATH : add the path to your Qt installatrion to this variable, so the \c find_package(Qt5...) commands find the libraries you want to use
-  - \c BUILD_SHARED_LIBS : Build as shared library (default: \c ON )
-  - \c BUILD_STATIC_LIBS : Build as static library (default: \c ON )
-  - \c BUILD_INCLUDE_XITS_FONTS : Include XITS fonts as resources in library (default: \c ON )
-  - \c BUILD_DECORATE_LIBNAMES_WITH_BUILDTYPE : If set, the build-type is appended to the library name (default: \c ON )
-  - \c BUILD_HIGH_COMPILE_WARNING_LEVEL : Set Compiler Warning level to high (default: \c OFF )
-  - \c BUILD_EXAMPLES : Build examples (default: \c ON )
-  - \c BUILD_HAS_OPENCV : OpenCV available? If yes, OpenCV examples are built when BUILD_EXAMPLES=ON (default: \c OFF )
-  - \c LIB_INSTALL : Install library (default: \c ON )
+  - \c JKQtPlotter_BUILD_SHARED_LIBS : Build as shared library (default: \c ON )
+  - \c JKQtPlotter_BUILD_STATIC_LIBS : Build as static library (default: \c ON )
+  - \c JKQtPlotter_BUILD_INCLUDE_XITS_FONTS : Include XITS fonts as resources in library (default: \c ON )
+  - \c JKQtPlotter_BUILD_DECORATE_LIBNAMES_WITH_BUILDTYPE : If set, the build-type is appended to the library name (default: \c ON )
+  - \c JKQtPlotter_BUILD_EXAMPLES : Build examples (default: \c ON )
   - \c CMAKE_INSTALL_PREFIX : Install directory for the library
 .
 
@@ -77,7 +74,7 @@ Here is the \c CMakeLists.txt from that directory:
 
 \code
 	# set minimum required CMake-Version
-    cmake_minimum_required(VERSION 3.0)
+	cmake_minimum_required(VERSION 3.10)
 
 	# set Project name
 	set(EXAMPLE_NAME simpletest)
@@ -86,19 +83,17 @@ Here is the \c CMakeLists.txt from that directory:
 
 	# some basic configurations
 	set(CMAKE_AUTOMOC ON)
-    set(CMAKE_AUTORCC ON)
-    set(CMAKE_AUTOUIC ON)
 	set(CMAKE_INCLUDE_CURRENT_DIR ON)
 	set(CMAKE_CXX_STANDARD 11)
-    set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+	#set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
 	# Configure project for usage of Qt5
-    find_package(Qt5 5.12 REQUIRED Core Gui Widgets PrintSupport Svg Xml OpenGl)
+	find_package(Qt5 COMPONENTS Core Gui Widgets PrintSupport Svg Xml OpenGl REQUIRED)
 
 	# include JKQTPlotter
-    find_package(JKQTCommonLib)
-    find_package(JKQTMathTextLib)
-    find_package(JKQTPlotterLib)
+	find_package(JKQTCommonLib REQUIRED)
+	find_package(JKQTMathTextLib REQUIRED)
+	find_package(JKQTPlotterLib REQUIRED)
 
 	# For Visual Studio, we need to set some additional compiler options
 	if(MSVC)
@@ -114,10 +109,13 @@ Here is the \c CMakeLists.txt from that directory:
 
 	# add the example executable 
 	add_executable(${EXENAME} WIN32 simpletest.cpp)
-    # ... and link against JKQTPlotterLib 
+	# ... link against Qt5 and JKQTPlotterLib
 	#    (you could use JKQTPlotterSharedLib if you don't want to link againast the 
 	#     static version, but against the shared/DLL version).
-    target_link_libraries(${EXENAME} JKQTPlotterLib)
+	target_link_libraries(${EXENAME} Qt5::Core Qt5::Widgets Qt5::Gui Qt5::PrintSupport Qt5::Svg Qt5::Xml JKQTPlotterLib)
+
+	# Installation
+	install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 \endcode
 
 

examples/advplotstyling/CMakeLists.txt

@@ -14,15 +14,14 @@ set(UIS advplotstyling.qrc )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/barchart/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/boxplot/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/cmake_link_example/CMakeLists.txt

@@ -1,5 +1,5 @@
 # set minimum required CMake-Version
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.10)
 
 # set Project name
 set(EXAMPLE_NAME simpletest)
@@ -8,19 +8,17 @@ project(${EXAMPLE_NAME} LANGUAGES CXX)
 
 # some basic configurations
 set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+#set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
 # Configure project for usage of Qt5
-find_package(Qt5 5.12 REQUIRED Core Gui Widgets PrintSupport Svg Xml OpenGl)
+find_package(Qt5 COMPONENTS Core Gui Widgets PrintSupport Svg Xml OpenGl REQUIRED)
 
 # include JKQTPlotter
-find_package(JKQTCommonLib)
-find_package(JKQTMathTextLib)
-find_package(JKQTPlotterLib)
+find_package(JKQTCommonLib REQUIRED)
+find_package(JKQTMathTextLib REQUIRED)
+find_package(JKQTPlotterLib REQUIRED)
 
 # For Visual Studio, we need to set some additional compiler options
 if(MSVC)
@@ -36,7 +34,14 @@ endif()
 
 # add the example executable 
 add_executable(${EXENAME} WIN32 simpletest.cpp)
-# ... and link against JKQTPlotterLib 
+# ... link against Qt5 and JKQTPlotterLib
 #    (you could use JKQTPlotterSharedLib if you don't want to link againast the 
 #     static version, but against the shared/DLL version).
-target_link_libraries(${EXENAME} JKQTPlotterLib)
+target_link_libraries(${EXENAME} Qt5::Core Qt5::Widgets Qt5::Gui Qt5::PrintSupport Qt5::Svg Qt5::Xml JKQTPlotterLib)
+
+# Installation
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+#Installation of Qt DLLs on Windows
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/jkqtplotter_deployqt.cmake)
+jkqtplotter_deployqt(${EXENAME})

examples/cmake_link_example/README.md

@@ -5,7 +5,7 @@ This project (see [`cmake_link_example`](https://github.com/jkriege2/JKQtPlotter
 This example uses very simple code, which simply displays a plotter and shows some data. The important part of this example is the ´CMakeLists.txt`-file:
 ```
 	# set minimum required CMake-Version
-    cmake_minimum_required(VERSION 3.0)
+	cmake_minimum_required(VERSION 3.10)
 
 	# set Project name
 	set(EXAMPLE_NAME simpletest)
@@ -14,19 +14,17 @@ This example uses very simple code, which simply displays a plotter and shows so
 
 	# some basic configurations
 	set(CMAKE_AUTOMOC ON)
-    set(CMAKE_AUTORCC ON)
-    set(CMAKE_AUTOUIC ON)
 	set(CMAKE_INCLUDE_CURRENT_DIR ON)
 	set(CMAKE_CXX_STANDARD 11)
-    set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+	#set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
 	# Configure project for usage of Qt5
-    find_package(Qt5 5.12 REQUIRED Core Gui Widgets PrintSupport Svg Xml OpenGl)
+	find_package(Qt5 COMPONENTS Core Gui Widgets PrintSupport Svg Xml OpenGl REQUIRED)
 
 	# include JKQTPlotter
-    find_package(JKQTCommonLib)
-    find_package(JKQTMathTextLib)
-    find_package(JKQTPlotterLib)
+	find_package(JKQTCommonLib REQUIRED)
+	find_package(JKQTMathTextLib REQUIRED)
+	find_package(JKQTPlotterLib REQUIRED)
 
 	# For Visual Studio, we need to set some additional compiler options
 	if(MSVC)
@@ -42,10 +40,18 @@ This example uses very simple code, which simply displays a plotter and shows so
 
 	# add the example executable 
 	add_executable(${EXENAME} WIN32 simpletest.cpp)
-    # ... and link against JKQTPlotterLib 
+	# ... link against Qt5 and JKQTPlotterLib
 	#    (you could use JKQTPlotterSharedLib if you don't want to link againast the 
 	#     static version, but against the shared/DLL version).
-    target_link_libraries(${EXENAME} JKQTPlotterLib)
+	target_link_libraries(${EXENAME} Qt5::Core Qt5::Widgets Qt5::Gui Qt5::PrintSupport Qt5::Svg Qt5::Xml JKQTPlotterLib)
+
+	# Installation
+	install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+	#Installation of Qt DLLs on Windows
+	include(${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/jkqtplotter_deployqt.cmake)
+	jkqtplotter_deployqt(${EXENAME})
+
 ```
 
 To build this example, you first need to make a subdirectory `build` and then call CMake form that subdirectory:

examples/contourplot/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/datastore/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/datastore_groupedstat/CMakeLists.txt

@@ -14,17 +14,15 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/datastore_iterators/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/datastore_regression/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/datastore_statistics/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/datastore_statistics_2d/CMakeLists.txt

@@ -14,17 +14,15 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/dateaxes/CMakeLists.txt

@@ -14,17 +14,15 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/distributionplot/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/errorbarstyles/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/filledgraphs/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/functionplot/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/geometric/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/imageplot/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/imageplot_cimg/CMakeLists.txt

@@ -15,17 +15,15 @@ if(CImg_FOUND)
 
     add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
     target_include_directories(${EXENAME} PRIVATE ../../lib)
-    if(BUILD_STATIC_LIBS)
+    if(JKQtPlotter_BUILD_STATIC_LIBS)
         target_link_libraries(${EXENAME} JKQTPlotterLib)
-    elseif(BUILD_SHARED_LIBS)
+    elseif(JKQtPlotter_BUILD_SHARED_LIBS)
         target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
     endif()
     include_directories(${EXENAME}  ${CIMG_INCLUDE_DIR} )
 
     # Installation
-    if(LIB_INSTALL)
     install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-    endif(LIB_INSTALL)
 
     #Installation of Qt DLLs on Windows
     jkqtplotter_deployqt(${EXENAME})

examples/imageplot_modifier/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/imageplot_nodatastore/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/imageplot_opencv/CMakeLists.txt

@@ -15,18 +15,17 @@ if(OpenCV_FOUND)
 
     add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
     target_include_directories(${EXENAME} PRIVATE ../../lib)
-    if(BUILD_STATIC_LIBS)
+    if(JKQtPlotter_BUILD_STATIC_LIBS)
         target_link_libraries(${EXENAME} JKQTPlotterLib)
-    elseif(BUILD_SHARED_LIBS)
+    elseif(JKQtPlotter_BUILD_SHARED_LIBS)
         target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
     endif()
     include_directories(${EXENAME}  ${OpenCV_INCLUDE_DIRS} )
     target_link_libraries(${EXENAME} ${OpenCV_LIBS} )
 
     # Installation
-    if(LIB_INSTALL)
     install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-    endif(LIB_INSTALL)
+    
 
     #Installation of Qt DLLs on Windows
     jkqtplotter_deployqt(${EXENAME})

examples/imageplot_userpal/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/impulsesplot/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/jkqtfastplotter_test/CMakeLists.txt

@@ -17,17 +17,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTFastPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTFastPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/jkqtmathtext_simpletest/CMakeLists.txt

@@ -16,17 +16,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTMathTextLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTMathTextSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/jkqtmathtext_test/CMakeLists.txt

@@ -17,17 +17,16 @@ set(UIS testform.ui )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTMathTextLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTMathTextSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/jkqtplot_test/CMakeLists.txt

@@ -24,17 +24,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES}  ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/logaxes/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/multiplot/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS test_multiplot_ui.ui )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/parametriccurve/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/paramscatterplot/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/paramscatterplot_image/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/parsedfunctionplot/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/rgbimageplot/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/rgbimageplot_cimg/CMakeLists.txt

@@ -15,17 +15,15 @@ if(CImg_FOUND)
 
     add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
     target_include_directories(${EXENAME} PRIVATE ../../lib)
-    if(BUILD_STATIC_LIBS)
+    if(JKQtPlotter_BUILD_STATIC_LIBS)
         target_link_libraries(${EXENAME} JKQTPlotterLib)
-    elseif(BUILD_SHARED_LIBS)
+    elseif(JKQtPlotter_BUILD_SHARED_LIBS)
         target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
     endif()
     include_directories(${EXENAME}  ${CIMG_INCLUDE_DIR} )
 
     # Installation
-    if(LIB_INSTALL)
     install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-    endif(LIB_INSTALL)
  
     #Installation of Qt DLLs on Windows
     jkqtplotter_deployqt(${EXENAME})

examples/rgbimageplot_opencv/CMakeLists.txt

@@ -15,9 +15,9 @@ if (OpenCV_FOUND)
 
         add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
         target_include_directories(${EXENAME} PRIVATE ../../lib)
-        if(BUILD_STATIC_LIBS)
+        if(JKQtPlotter_BUILD_STATIC_LIBS)
             target_link_libraries(${EXENAME} JKQTPlotterLib)
-        elseif(BUILD_SHARED_LIBS)
+        elseif(JKQtPlotter_BUILD_SHARED_LIBS)
             target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
         endif()
         include_directories(${EXENAME} ${OpenCV_INCLUDE_DIRS} )
@@ -25,9 +25,7 @@ if (OpenCV_FOUND)
 
 
         # Installation
-        if(LIB_INSTALL)
         install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-        endif(LIB_INSTALL)
         #Installation of Qt DLLs on Windows
         jkqtplotter_deployqt(${EXENAME})
         #Installation of OpenCV DLLs on Windows

examples/rgbimageplot_qt/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/simpletest/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/speed/CMakeLists.txt

@@ -14,17 +14,15 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/stackedbars/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/stepplots/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/styledboxplot/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/styling/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS test_styling.ui )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/symbols_and_errors/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/symbols_and_styles/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/ui/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS formwithjkqtplotter.ui )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/user_interaction/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

examples/violinplot/CMakeLists.txt

@@ -14,17 +14,16 @@ set(UIS  )
 
 add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
 target_include_directories(${EXENAME} PRIVATE ../../lib)
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterLib)
-elseif(BUILD_SHARED_LIBS)
+elseif(JKQtPlotter_BUILD_SHARED_LIBS)
     target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
 endif()
 
 
 
 # Installation
-if(LIB_INSTALL)
-    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(LIB_INSTALL)
+install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 #Installation of Qt DLLs on Windows
 jkqtplotter_deployqt(${EXENAME})

lib/CMakeLists.txt

@@ -11,11 +11,14 @@ if (CMAKE_BUILD_TYPE)
     message( STATUS "Build type:        ${CMAKE_BUILD_TYPE}")
 endif(CMAKE_BUILD_TYPE)
 message( STATUS "Using compiler:    ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}" )
+message( STATUS "Architecture:      ${CMAKE_CXX_LIBRARY_ARCHITECTURE} / ${CMAKE_LIBRARY_ARCHITECTURE}" )
+message( STATUS "System Name:       ${CMAKE_SYSTEM_NAME}" )
+message( STATUS "Processor Name:    ${CMAKE_SYSTEM_PROCESSOR}" )
 message( STATUS "Using Qt:          ${Qt5_VERSION}" )
 message( STATUS "                     [at ${Qt5_DIR}]" )
-if(BUILD_INCLUDE_XITS_FONTS)
+if(JKQtPlotter_BUILD_INCLUDE_XITS_FONTS)
     message( STATUS "Using XITS fonts" )
-endif(BUILD_INCLUDE_XITS_FONTS)
+endif(JKQtPlotter_BUILD_INCLUDE_XITS_FONTS)
 message( STATUS "Installing to:     ${CMAKE_INSTALL_PREFIX}" )
 message( STATUS "=============================================================================" )
 message( STATUS )

lib/jkqtcommon/CMakeLists.txt

@@ -3,21 +3,21 @@ cmake_minimum_required(VERSION 3.0)
 set(libBasename JKQTCommon)
 set(libIncludeSubdir jkqtcommon)
 
-if(BUILD_SHARED_LIBS)
+if(JKQtPlotter_BUILD_SHARED_LIBS)
     set(libsh_name ${libBasename}SharedLib)
-    set(libsh_name_decorated ${libsh_name}${LIBNAME_ADDITION})
+    set(libsh_name_decorated ${libsh_name}${JKQtPlotter_LIBNAME_ADDITION})
     set(${libBasename}_SHARED_LIBRARY ${libsh_name_decorated}  CACHE STRING "name of static library for ${libBasename}" FORCE)
     message( STATUS "-- Building ${libsh_name}" )
-endif(BUILD_SHARED_LIBS)
+endif(JKQtPlotter_BUILD_SHARED_LIBS)
 
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     set(lib_name ${libBasename}Lib)
-    set(lib_name_decorated ${lib_name}${LIBNAME_ADDITION})
+    set(lib_name_decorated ${lib_name}${JKQtPlotter_LIBNAME_ADDITION})
     set(${libBasename}_STATIC_LIBRARY ${lib_name_decorated}  CACHE STRING "name of static library for ${libBasename}" FORCE)
     message( STATUS "-- Building ${lib_name}" )
-endif(BUILD_STATIC_LIBS)
-
+endif(JKQtPlotter_BUILD_STATIC_LIBS)
 
+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
 # Set up source files
 set(SOURCES
@@ -69,24 +69,34 @@ set(HEADERS
 include(CMakePackageConfigHelpers)
 
 
-if(BUILD_SHARED_LIBS)
+if(JKQtPlotter_BUILD_SHARED_LIBS)
     add_library(${libsh_name} SHARED  ${SOURCES} ${HEADERS})
+	target_compile_features(${libsh_name} PUBLIC cxx_std_11)
     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} Qt5::Core Qt5::Gui Qt5::Xml Qt5::Widgets Qt5::PrintSupport)
+    target_link_libraries(${libsh_name} PUBLIC Qt5::Core Qt5::Gui Qt5::Xml Qt5::Widgets Qt5::PrintSupport)
     target_compile_definitions(${libsh_name} PUBLIC JKQTCOMMON_LIB_IN_DLL)
     target_compile_definitions(${libsh_name} PRIVATE JKQTCOMMON_LIB_EXPORT_LIBRARY)
+	target_include_directories(${libsh_name} PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>  
+    )
     set_property(TARGET ${libsh_name} PROPERTY WINDOWS_EXPORT_ALL_SYMBOLS "ON")
     write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${libsh_name}Version.cmake 
                                      VERSION ${PROJECT_VERSION} 
                                      COMPATIBILITY AnyNewerVersion )    
 endif()
 
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     add_library(${lib_name} STATIC  ${SOURCES} ${HEADERS})
+	target_compile_features(${lib_name} PUBLIC cxx_std_11)
     set_property(TARGET ${lib_name} PROPERTY VERSION "${PROJECT_VERSION}")
     set_property(TARGET ${lib_name} PROPERTY OUTPUT_NAME  "${lib_name_decorated}")
-    target_link_libraries(${lib_name} Qt5::Core Qt5::Gui Qt5::Xml Qt5::Widgets Qt5::PrintSupport)
+	target_include_directories(${lib_name} PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>  
+    )
+    target_link_libraries(${lib_name} PUBLIC Qt5::Core Qt5::Gui Qt5::Xml Qt5::Widgets Qt5::PrintSupport)
     write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${lib_name}Version.cmake
                                      VERSION ${PROJECT_VERSION} 
                                      COMPATIBILITY AnyNewerVersion )    
@@ -95,9 +105,7 @@ endif()
 
 
 # Installation
-if(LIB_INSTALL)
-
-    if(BUILD_SHARED_LIBS)
+if(JKQtPlotter_BUILD_SHARED_LIBS)
         install(TARGETS ${libsh_name} EXPORT ${libsh_name}_TARGETS
             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -106,12 +114,13 @@ if(LIB_INSTALL)
         )
         install(EXPORT ${libsh_name}_TARGETS
             FILE ${libsh_name}Config.cmake 
-            DESTINATION lib/cmake
+            DESTINATION lib/cmake/${libsh_name}
         )
-        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${libsh_name}Version.cmake" DESTINATION lib/cmake  )
-    endif(BUILD_SHARED_LIBS)
+        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${libsh_name}Version.cmake" 
+		        DESTINATION lib/cmake/${libsh_name}  )
+    endif(JKQtPlotter_BUILD_SHARED_LIBS)
 
-    if(BUILD_STATIC_LIBS)
+    if(JKQtPlotter_BUILD_STATIC_LIBS)
         install(TARGETS ${lib_name} EXPORT ${lib_name}_TARGETS
             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -120,10 +129,11 @@ if(LIB_INSTALL)
         )
         install(EXPORT ${lib_name}_TARGETS
             FILE ${lib_name}Config.cmake 
-            DESTINATION lib/cmake
+            DESTINATION lib/cmake/${lib_name}
         )
-        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${lib_name}Version.cmake" DESTINATION lib/cmake  )
-    endif(BUILD_STATIC_LIBS)
+        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${lib_name}Version.cmake" 
+		        DESTINATION lib/cmake/${lib_name}  )
+    endif(JKQtPlotter_BUILD_STATIC_LIBS)
 
     install(FILES ${HEADERS}
             DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${libIncludeSubdir}
@@ -132,4 +142,4 @@ if(LIB_INSTALL)
     configure_file(${CMAKE_SOURCE_DIR}/readme.txt.in ${CMAKE_CURRENT_BINARY_DIR}/${lib_name}_Readme.txt @ONLY)
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${lib_name}_Readme.txt" DESTINATION doc/ )
     install(FILES "${CMAKE_SOURCE_DIR}/LICENSE" DESTINATION doc/ RENAME "${lib_name}_LICENSE.txt" )
-endif(LIB_INSTALL)
+

lib/jkqtfastplotter/CMakeLists.txt

@@ -3,20 +3,21 @@ cmake_minimum_required(VERSION 3.0)
 set(libBasename JKQTFastPlotter)
 set(libIncludeSubdir jkqtfastplotter)
 
-if(BUILD_SHARED_LIBS)
+if(JKQtPlotter_BUILD_SHARED_LIBS)
     set(libsh_name ${libBasename}SharedLib)
-    set(libsh_name_decorated ${libsh_name}${LIBNAME_ADDITION})
+    set(libsh_name_decorated ${libsh_name}${JKQtPlotter_LIBNAME_ADDITION})
     set(${libBasename}_SHARED_LIBRARY ${libsh_name_decorated}  CACHE STRING "name of static library for ${libBasename}" FORCE)
     message( STATUS "-- Building ${libsh_name}" )
-endif(BUILD_SHARED_LIBS)
+endif(JKQtPlotter_BUILD_SHARED_LIBS)
 
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     set(lib_name ${libBasename}Lib)
-    set(lib_name_decorated ${lib_name}${LIBNAME_ADDITION})
+    set(lib_name_decorated ${lib_name}${JKQtPlotter_LIBNAME_ADDITION})
     set(${libBasename}_STATIC_LIBRARY ${lib_name_decorated}  CACHE STRING "name of static library for ${libBasename}" FORCE)
     message( STATUS "-- Building ${lib_name}" )
-endif(BUILD_STATIC_LIBS)
+endif(JKQtPlotter_BUILD_STATIC_LIBS)
 
+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
 # Set up source files
 set(SOURCES
@@ -32,24 +33,34 @@ set(HEADERS
 include(CMakePackageConfigHelpers)
 
 
-if(BUILD_SHARED_LIBS)
+if(JKQtPlotter_BUILD_SHARED_LIBS)
     add_library(${libsh_name} SHARED  ${SOURCES} ${HEADERS} ${RESOURCES})
+	target_compile_features(${libsh_name} PUBLIC cxx_std_11)
     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} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::OpenGL JKQTCommonSharedLib)
+    target_link_libraries(${libsh_name} PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::OpenGL JKQTCommonSharedLib)
     target_compile_definitions(${libsh_name} PUBLIC JKQTFASTPLOTTER_LIB_IN_DLL)
     target_compile_definitions(${libsh_name} PRIVATE JKQTFASTPLOTTER_LIB_EXPORT_LIBRARY)
+	target_include_directories(${libsh_name} PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>  
+    )
     set_property(TARGET ${libsh_name} PROPERTY WINDOWS_EXPORT_ALL_SYMBOLS "ON")
     write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${libsh_name}Version.cmake 
                                      VERSION ${PROJECT_VERSION} 
                                      COMPATIBILITY AnyNewerVersion )    
 endif()
 
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     add_library(${lib_name} STATIC  ${SOURCES} ${HEADERS} ${RESOURCES})
+	target_compile_features(${lib_name} PUBLIC cxx_std_11)
     set_property(TARGET ${lib_name} PROPERTY VERSION "${PROJECT_VERSION}")
     set_property(TARGET ${lib_name} PROPERTY OUTPUT_NAME  "${lib_name_decorated}")
-    target_link_libraries(${lib_name} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::OpenGL JKQTCommonLib)
+    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}/../>
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>  
+    )
     write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${lib_name}Version.cmake
                                      VERSION ${PROJECT_VERSION} 
                                      COMPATIBILITY AnyNewerVersion )    
@@ -58,9 +69,7 @@ endif()
 
 
 # Installation
-if(LIB_INSTALL)
-
-    if(BUILD_SHARED_LIBS)
+if(JKQtPlotter_BUILD_SHARED_LIBS)
 	install(TARGETS ${libsh_name} EXPORT ${libsh_name}_TARGETS
 		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -69,12 +78,13 @@ if(LIB_INSTALL)
 	)
 	install(EXPORT ${libsh_name}_TARGETS
 		FILE ${libsh_name}Config.cmake 
-            DESTINATION lib/cmake
+		DESTINATION lib/cmake/${libsh_name}
 	)
-        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${libsh_name}Version.cmake" DESTINATION lib/cmake  )
-    endif(BUILD_SHARED_LIBS)
+	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${libsh_name}Version.cmake" 
+	        DESTINATION lib/cmake/${libsh_name}  )
+endif(JKQtPlotter_BUILD_SHARED_LIBS)
 
-    if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
 	install(TARGETS ${lib_name} EXPORT ${lib_name}_TARGETS
 		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -83,17 +93,17 @@ if(LIB_INSTALL)
 	)
 	install(EXPORT ${lib_name}_TARGETS
 		FILE ${lib_name}Config.cmake 
-            DESTINATION lib/cmake
+		DESTINATION lib/cmake/${lib_name}
 	)
-        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${lib_name}Version.cmake" DESTINATION lib/cmake  )
-    endif(BUILD_STATIC_LIBS)
+	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${lib_name}Version.cmake" 
+	        DESTINATION lib/cmake/${lib_name}  )
+endif(JKQtPlotter_BUILD_STATIC_LIBS)
 
-    install(FILES ${HEADERS}
+install(FILES ${HEADERS}
 		DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${libIncludeSubdir}
 		COMPONENT Headers)
 
-    configure_file(${CMAKE_SOURCE_DIR}/readme.txt.in ${CMAKE_CURRENT_BINARY_DIR}/${lib_name}_Readme.txt @ONLY)
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${lib_name}_Readme.txt" DESTINATION doc/ )
-    install(FILES "${CMAKE_SOURCE_DIR}/LICENSE" DESTINATION doc/ RENAME "${lib_name}_LICENSE.txt" )
+configure_file(${CMAKE_SOURCE_DIR}/readme.txt.in ${CMAKE_CURRENT_BINARY_DIR}/${lib_name}_Readme.txt @ONLY)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${lib_name}_Readme.txt" DESTINATION doc/ )
+install(FILES "${CMAKE_SOURCE_DIR}/LICENSE" DESTINATION doc/ RENAME "${lib_name}_LICENSE.txt" )
 
-endif(LIB_INSTALL)

lib/jkqtmathtext/CMakeLists.txt

@@ -3,21 +3,21 @@ cmake_minimum_required(VERSION 3.0)
 set(libBasename JKQTMathText)
 set(libIncludeSubdir jkqtmathtext)
 
-if(BUILD_SHARED_LIBS)
+if(JKQtPlotter_BUILD_SHARED_LIBS)
     set(libsh_name ${libBasename}SharedLib)
-    set(libsh_name_decorated ${libsh_name}${LIBNAME_ADDITION})
+    set(libsh_name_decorated ${libsh_name}${JKQtPlotter_LIBNAME_ADDITION})
     set(${libBasename}_SHARED_LIBRARY ${libsh_name_decorated}  CACHE STRING "name of static library for ${libBasename}" FORCE)
     message( STATUS "-- Building ${libsh_name}" )
-endif(BUILD_SHARED_LIBS)
+endif(JKQtPlotter_BUILD_SHARED_LIBS)
 
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     set(lib_name ${libBasename}Lib)
-    set(lib_name_decorated ${lib_name}${LIBNAME_ADDITION})
+    set(lib_name_decorated ${lib_name}${JKQtPlotter_LIBNAME_ADDITION})
     set(${libBasename}_STATIC_LIBRARY ${lib_name_decorated}  CACHE STRING "name of static library for ${libBasename}" FORCE)
     message( STATUS "-- Building ${lib_name}" )
-endif(BUILD_STATIC_LIBS)
-
+endif(JKQtPlotter_BUILD_STATIC_LIBS)
 
+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
 # Set up source files
 set(SOURCES
@@ -29,33 +29,43 @@ set(HEADERS
   jkqtmathtext_imexport.h
 )
 
-if(BUILD_INCLUDE_XITS_FONTS)
+if(JKQtPlotter_BUILD_INCLUDE_XITS_FONTS)
     set(RESOURCES
       resources/xits.qrc
     )
-endif(BUILD_INCLUDE_XITS_FONTS)
+endif(JKQtPlotter_BUILD_INCLUDE_XITS_FONTS)
 
 
 include(CMakePackageConfigHelpers)
 
-if(BUILD_SHARED_LIBS)
+if(JKQtPlotter_BUILD_SHARED_LIBS)
     add_library(${libsh_name} SHARED  ${SOURCES} ${HEADERS} ${RESOURCES})
+	target_compile_features(${libsh_name} PUBLIC cxx_std_11)
     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} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport JKQTCommonSharedLib)
+    target_link_libraries(${libsh_name} PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport JKQTCommonSharedLib)
     target_compile_definitions(${libsh_name} PUBLIC JKQTMATHTEXT_LIB_IN_DLL)
     target_compile_definitions(${libsh_name} PRIVATE JKQTMATHTEXT_LIB_EXPORT_LIBRARY)
+	target_include_directories(${libsh_name} PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>  
+    )
     set_property(TARGET ${libsh_name} PROPERTY WINDOWS_EXPORT_ALL_SYMBOLS "ON")
     write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${libsh_name}Version.cmake 
                                      VERSION ${PROJECT_VERSION} 
                                      COMPATIBILITY AnyNewerVersion )    
 endif()
 
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     add_library(${lib_name} STATIC  ${SOURCES} ${HEADERS} ${RESOURCES})
+	target_compile_features(${lib_name} PUBLIC cxx_std_11)
     set_property(TARGET ${lib_name} PROPERTY VERSION "${PROJECT_VERSION}")
     set_property(TARGET ${lib_name} PROPERTY OUTPUT_NAME  "${lib_name_decorated}")
-    target_link_libraries(${lib_name} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport JKQTCommonLib)
+    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}/../>
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>  
+    )
     write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${lib_name}Version.cmake
                                      VERSION ${PROJECT_VERSION} 
                                      COMPATIBILITY AnyNewerVersion )    
@@ -64,9 +74,7 @@ endif()
 
 
 # Installation
-if(LIB_INSTALL)
-
-    if(BUILD_SHARED_LIBS)
+if(JKQtPlotter_BUILD_SHARED_LIBS)
 	install(TARGETS ${libsh_name} EXPORT ${libsh_name}_TARGETS
 		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -75,12 +83,13 @@ if(LIB_INSTALL)
 	)
 	install(EXPORT ${libsh_name}_TARGETS
 		FILE ${libsh_name}Config.cmake 
-            DESTINATION lib/cmake
+		DESTINATION lib/cmake/${libsh_name}
 	)
-        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${libsh_name}Version.cmake" DESTINATION lib/cmake  )
-    endif(BUILD_SHARED_LIBS)
+	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${libsh_name}Version.cmake" 
+	        DESTINATION lib/cmake/${libsh_name}  )
+endif(JKQtPlotter_BUILD_SHARED_LIBS)
 
-    if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
 	install(TARGETS ${lib_name} EXPORT ${lib_name}_TARGETS
 		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -89,19 +98,19 @@ if(LIB_INSTALL)
 	)
 	install(EXPORT ${lib_name}_TARGETS
 		FILE ${lib_name}Config.cmake 
-            DESTINATION lib/cmake
+		DESTINATION lib/cmake/${lib_name}
 	)
-        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${lib_name}Version.cmake" DESTINATION lib/cmake  )
-    endif(BUILD_STATIC_LIBS)
+	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${lib_name}Version.cmake" 
+	        DESTINATION lib/cmake/${lib_name}  )
+endif(JKQtPlotter_BUILD_STATIC_LIBS)
 
-    install(FILES ${HEADERS}
+install(FILES ${HEADERS}
 		DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${libIncludeSubdir}
 		COMPONENT Headers)
 
-    configure_file(${CMAKE_SOURCE_DIR}/readme.txt.in ${CMAKE_CURRENT_BINARY_DIR}/${lib_name}_Readme.txt @ONLY)
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${lib_name}_Readme.txt" DESTINATION doc/ )
-    install(FILES "${CMAKE_SOURCE_DIR}/LICENSE" DESTINATION doc/ RENAME "${lib_name}_LICENSE.txt" )
-    install(FILES "${CMAKE_SOURCE_DIR}/lib/jkqtmathtext/resources/xits/OFL.txt" DESTINATION doc/ RENAME "${lib_name}_XITS_LICENSE.txt" )
-    install(FILES "${CMAKE_SOURCE_DIR}/lib/jkqtmathtext/resources/xits/README.md" DESTINATION doc/ RENAME "${lib_name}_XITS_README.md" )
+configure_file(${CMAKE_SOURCE_DIR}/readme.txt.in ${CMAKE_CURRENT_BINARY_DIR}/${lib_name}_Readme.txt @ONLY)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${lib_name}_Readme.txt" DESTINATION doc/ )
+install(FILES "${CMAKE_SOURCE_DIR}/LICENSE" DESTINATION doc/ RENAME "${lib_name}_LICENSE.txt" )
+install(FILES "${CMAKE_SOURCE_DIR}/lib/jkqtmathtext/resources/xits/OFL.txt" DESTINATION doc/ RENAME "${lib_name}_XITS_LICENSE.txt" )
+install(FILES "${CMAKE_SOURCE_DIR}/lib/jkqtmathtext/resources/xits/README.md" DESTINATION doc/ RENAME "${lib_name}_XITS_README.md" )
 
-endif(LIB_INSTALL)

lib/jkqtplotter/CMakeLists.txt

@@ -3,19 +3,21 @@ cmake_minimum_required(VERSION 3.0)
 set(libBasename JKQTPlotter)
 set(libIncludeSubdir jkqtplotter)
 
-if(BUILD_SHARED_LIBS)
+if(JKQtPlotter_BUILD_SHARED_LIBS)
     set(libsh_name ${libBasename}SharedLib)
-    set(libsh_name_decorated ${libsh_name}${LIBNAME_ADDITION})
+    set(libsh_name_decorated ${libsh_name}${JKQtPlotter_LIBNAME_ADDITION})
     set(${libBasename}_SHARED_LIBRARY ${libsh_name_decorated}  CACHE STRING "name of static library for ${libBasename}" FORCE)
     message( STATUS "-- Building ${libsh_name}" )
-endif(BUILD_SHARED_LIBS)
+endif(JKQtPlotter_BUILD_SHARED_LIBS)
 
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     set(lib_name ${libBasename}Lib)
-    set(lib_name_decorated ${lib_name}${LIBNAME_ADDITION})
+    set(lib_name_decorated ${lib_name}${JKQtPlotter_LIBNAME_ADDITION})
     set(${libBasename}_STATIC_LIBRARY ${lib_name_decorated} CACHE STRING "name of static library for ${libBasename}" FORCE)
     message( STATUS "-- Building ${lib_name}" )
-endif(BUILD_STATIC_LIBS)
+endif(JKQtPlotter_BUILD_STATIC_LIBS)
+
+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
 # Set up source files
 set(SOURCES
@@ -128,24 +130,34 @@ set(RESOURCES
 include(CMakePackageConfigHelpers)
 
 
-if(BUILD_SHARED_LIBS)
+if(JKQtPlotter_BUILD_SHARED_LIBS)
     add_library(${libsh_name} SHARED  ${SOURCES} ${SOURCES_GRAPHS} ${SOURCES_GUI} ${SOURCES_OVERLAYS} ${HEADERS} ${HEADERS_GRAPHS} ${HEADERS_GUI} ${HEADERS_OVERLAYS} ${RESOURCES})
+	target_compile_features(${libsh_name} PUBLIC cxx_std_11)
     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} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::Svg Qt5::Xml JKQTCommonSharedLib JKQTMathTextSharedLib)
-    target_compile_definitions(${libsh_name} PUBLIC JKQTPLOTTER_LIB_IN_DLL)
-    target_compile_definitions(${libsh_name} PRIVATE JKQTPLOTTER_LIB_EXPORT_LIBRARY)
+    target_link_libraries(${libsh_name} PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::Svg Qt5::Xml JKQTCommonSharedLib JKQTMathTextSharedLib)
+    target_compile_definitions(${libsh_name} PUBLIC JKQtPlotter_LIB_IN_DLL)
+    target_compile_definitions(${libsh_name} PRIVATE JKQtPlotter_LIB_EXPORT_LIBRARY)
+	target_include_directories(${libsh_name} PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>  
+    )
     set_property(TARGET ${libsh_name} PROPERTY WINDOWS_EXPORT_ALL_SYMBOLS "ON")
     write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${libsh_name}Version.cmake
                                      VERSION ${PROJECT_VERSION} 
                                      COMPATIBILITY AnyNewerVersion )    
 endif()
 
-if(BUILD_STATIC_LIBS)
+if(JKQtPlotter_BUILD_STATIC_LIBS)
     add_library(${lib_name} STATIC   ${SOURCES} ${SOURCES_GRAPHS} ${SOURCES_GUI} ${SOURCES_OVERLAYS} ${HEADERS} ${HEADERS_GRAPHS} ${HEADERS_GUI} ${HEADERS_OVERLAYS} ${RESOURCES})
+	target_compile_features(${lib_name} PUBLIC cxx_std_11)
     set_property(TARGET ${lib_name} PROPERTY VERSION "${PROJECT_VERSION}")
     set_property(TARGET ${lib_name} PROPERTY OUTPUT_NAME  "${lib_name_decorated}")
-    target_link_libraries(${lib_name} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::Svg Qt5::Xml JKQTCommonLib JKQTMathTextLib)
+	target_include_directories(${lib_name} PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_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)
     write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${lib_name}Version.cmake
                                      VERSION ${PROJECT_VERSION} 
                                      COMPATIBILITY AnyNewerVersion )    
@@ -154,9 +166,7 @@ endif()
 
 
 # Installation
-if(LIB_INSTALL)
-
-    if(BUILD_SHARED_LIBS)
+if(JKQtPlotter_BUILD_SHARED_LIBS)
         install(TARGETS ${libsh_name} EXPORT ${libsh_name}_TARGETS
             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -165,12 +175,13 @@ if(LIB_INSTALL)
         )
         install(EXPORT ${libsh_name}_TARGETS
             FILE ${libsh_name}Config.cmake 
-            DESTINATION lib/cmake
+            DESTINATION lib/cmake/${libsh_name}
         )
-        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${libsh_name}Version.cmake" DESTINATION lib/cmake  )
-    endif(BUILD_SHARED_LIBS)
+        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${libsh_name}Version.cmake" 
+		        DESTINATION lib/cmake/${libsh_name}  )
+    endif(JKQtPlotter_BUILD_SHARED_LIBS)
 
-    if(BUILD_STATIC_LIBS)
+    if(JKQtPlotter_BUILD_STATIC_LIBS)
         install(TARGETS ${lib_name} EXPORT ${lib_name}_TARGETS
             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -179,10 +190,11 @@ if(LIB_INSTALL)
         )
         install(EXPORT ${lib_name}_TARGETS
             FILE ${lib_name}Config.cmake 
-            DESTINATION lib/cmake
+            DESTINATION lib/cmake/${lib_name}
         )
-        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${lib_name}Version.cmake" DESTINATION lib/cmake  )
-    endif(BUILD_STATIC_LIBS)
+        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${lib_name}Version.cmake" 
+		        DESTINATION lib/cmake/${lib_name}  )
+    endif(JKQtPlotter_BUILD_STATIC_LIBS)
 
     install(FILES ${HEADERS}
             DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${libIncludeSubdir}
@@ -204,4 +216,4 @@ if(LIB_INSTALL)
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${lib_name}_Readme.txt" DESTINATION doc/ )
     install(FILES "${CMAKE_SOURCE_DIR}/LICENSE" DESTINATION doc/ RENAME "${lib_name}_LICENSE.txt" )
 
-endif(LIB_INSTALL)
+