Commit Graph

42 Commits

Author SHA1 Message Date
jkriege2
b0df7a1fd7 NEW/BREAKING: provide general targets JKQTPlotter5/6::JKQTPlotter5/6, JKQTPlotter5/6::JKQTMathText5/6, ... which are independent of the type of build (shared/static)
NEW/BREAKING: refactor CMake-Code, so static/dynamic switch is done via <code>BUILD_SHARED_LIBS</code>, which retires <code>JKQtPlotter_BUILD_STATIC_LIBS</code>, <code>JKQtPlotter_BUILD_SHARED_LIBS</code> and removes the capability to build static and shared libraries in one location (fixes issue #104)
NEW: prepareed library for CMake's <a href="https://cmake.org/cmake/help/latest/module/FetchContent.html">FetchContent</a>-API
NEW: the different sub-libraries JKQTPlotter, JKQTFastPlotter (DEPRECATED), JKQTMath, JKQTMathText can be activated/deactivated with CMake options JKQtPlotter_BUILD_LIB_JKQTPLOTTER, JKQtPlotter_BUILD_LIB_JKQTFASTPLOTTER, JKQtPlotter_BUILD_LIB_JKQTMATHTEXT, JKQtPlotter_BUILD_LIB_JKQTMATH
2024-01-16 13:07:08 +01:00
jkriege2
843c0ac05b bump CMake version to 3.23 2024-01-16 13:07:07 +01:00
jkriege2
14a614225d require at least Qt5 in CMake build scripts 2024-01-16 13:07:06 +01:00
jkriege2
6666c8167f fix warning in FindCImg.cmake 2024-01-15 13:35:47 +01:00
jkriege2
fad34678f1 NEW: disallow in-source builds 2024-01-14 16:55:06 +01:00
jkriege2
3fee9609fb NEW: Added CMake option JKQtPlotter_BUILD_WITH_TIMING_INFO_OUTPUT, which activates several runtime-measurement guards of type JKQTPAutoOutputTimer (output via qDebug()) 2024-01-08 17:14:03 +01:00
jkriege2
6607432af0 bump required cmake version to 3.16 consistently 2024-01-06 15:37:59 +01:00
Alexander Neumann
e3cfac3f1d
Update FindCImg.cmake (#103)
* Update FindCImg.cmake

* Update FindCImg.cmake
2023-10-25 23:22:17 +02:00
jkriege2
f753b6e9b3 IMPROCED windeployqt-handling in CMake-scripts (works better for Qt6.5) 2023-06-18 15:15:36 +02:00
jkriege2
ddcc9ea462 BUGFIX: Error for PDBs when building STATIC libs on MSVC
BUGFIX: a variable in the ...Config.cmake-files was not set correctly
2022-10-06 11:54:18 +02:00
jkriege2
62f27ce9c1 NEW: When using a MSVC compiler, the generated PDB files are installed to CMAKE_INSTALL_PREFIX/bin/ 2022-10-05 21:52:19 +02:00
jkriege2
ce3f25e044 added new JKQTPCALabelType element JKQTPCALTformat for general formatting with a std::format-format string (available for C++>=20 only!!!) 2022-09-28 00:59:57 +02:00
jkriege2
6ebd8743ca JKQTMathText:
- NEW: Added the Fira Math fonts as sans-serif symbol font to the library (as a ressource) and added JKQTMathText::useFiraMath()
  - NEW: Added JKQTMathText::useGuiFonts()</li>
JKQTPlotter:
  - NEW: Using JKQTMathText::useGuiFonts() for FONT rendering by default
2022-09-01 14:36:34 +02:00
jkriege2
bd1afe2a0a NEW: added command line tool jkatmathtext_render that renders LaTeX into images, using it to generate the documentation images for JKQTMathText 2022-08-07 18:02:21 +02:00
jkriege2
cf628b38ab bugfixed OpenCV install for newer MSVC OpenCV-builds 2022-07-23 21:24:53 +02:00
jkriege2
c399959774 fixed several (pedantic) compiler warnings
fixed CMake problems
2022-07-23 16:05:13 +02:00
jkriege2
e923a9de7b improved CMake scripts: better output, less warnings 2022-07-23 13:59:23 +02:00
Jan W. Krieger
50cd0cd9a0
Update jkqtplotter_cmake_options.cmake 2022-07-23 08:21:31 +02:00
Jan W. Krieger
6080b8972e
Update jkqtplotter_cmake_options.cmake 2022-07-23 08:21:15 +02:00
jkriege2
ae3d3b479d better way to reuse PCH in examples, added CMake-Option to (de)activate PCH-usage 2022-07-22 21:44:16 +02:00
jkriege2
74c2e3edf1 improved CMAKE Library Export script 2022-07-19 14:42:41 +02:00
jkriege2
d8c1524f61 partly solve issue #81 by making print-support optional. In addition it can be switched off with the CMake-option JKQtPlotter_BUILD_FORCE_NO_PRINTER_SUPPORT=ON 2022-07-18 23:33:20 +02:00
jkriege2
687c23a654 bugfixes for QT5 build after QT6 modifications 2022-04-22 15:20:58 +02:00
jkriege2
0a5fa42470 more required changes for Qt6 compatibility 2022-04-22 13:27:31 +02:00
jkriege2
62adbd8036 Merge branch 'master' into add_qt6_compatibility 2022-04-21 12:15:15 +02:00
jkriege2
6ef984b5d2 minor changes (unneeded macdeploy, formatting) to jkqtplotter_deployqt.cmake 2022-04-21 11:04:21 +02:00
jkriege2
4ded1a2028 first round of Qt6 compatibility changes 2022-04-21 10:57:24 +02:00
jkriege2
8835febb96 modified CMakeLists.txt to match Qt6 2022-04-18 23:10:05 +02:00
jkriege2
2d44520b82 improved FindCImg.cmake: now also adds proper required link libs and compile options, generates TARGET CImg:CImg 2022-04-18 13:54:08 +02:00
Patrick Stewart
29e970ed6f Use PROJECT_SOURCE_DIR instead of CMAKE_SOURCE_DIR
This means that the project can be used with CMake fetchcontent / add_subdriectory
2020-10-02 14:40:47 +01:00
jkriege2
52d3349199 improvements in CMake setup:
- removed more global settings (these are now target-specific)
- exporting now Config.cmake, which contains find_package(Qt) and loads a separate Targets.cmake
2020-06-28 15:53:26 +02:00
jkriege2
56660e2f4b fixed several compiler warnings (mostly Visual Studio): clean-up of use of math constants M_PI ... and j0()/j1()/...-functions etc. 2019-11-24 10:42:44 +01:00
jkriege2
29b1c5aa37 solved link error with Visual Studio (upper/lower case mismatch in DEFINE was 'JKQtPlotter_LIB_...' but should be 'JKQTPLOTTER_LIB_...') 2019-11-24 10:42:23 +01:00
Jan W. Krieger
863b80385f
Merge pull request #29 from certik/rpath
Set the proper RPATH for installed libraries
2019-11-21 21:42:49 +01:00
jkriege2
4c9db88a2e some more fixes do MSVC build 2019-11-21 21:42:10 +01:00
Jan W. Krieger
265a36bf89
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS on) to hopefully fix MSVC build problems with examples 2019-11-21 18:34:09 +01:00
Ondřej Čertík
910d8641b5 Move the setting to a dedicated CMake file 2019-11-21 09:07:25 -07:00
jkriege2
6d8139e996 add missing compiler flag 2019-11-21 08:01:17 +01:00
jkriege2
f3fa587541 reworked CMake build system ... now JKQT...Config.cmake-files are written into the correct directory 2019-11-18 15:59:06 +01:00
jkriege2
57e8fb3362 added CImg interface (header-only) + examples
some corrections for OpenCV examples
2019-11-16 13:50:43 +01:00
jkriege2
e087f40870 documentation improvement for OpenCV + minor fixes 2019-11-16 11:35:59 +01:00
jkriege2
528f6fe537 - added post-build deploy for OpenCV and Qt-DLLs (on windows)
- checked OpenCV-examples and improved OpenCV-copy-tool (now copies as an image column, as appropriate!)
2019-11-10 15:35:07 +01:00