mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2025-01-24 06:32:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #47 from RFCreations/master

Browse Source 
Some minor build fixes
This commit is contained in:
Jan W. Krieger 2020-10-02 17:20:05 +02:00 committed by GitHub
commit 4c362fde62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/jkqtplotter_cmake_options.cmake
View File

@ -32,8 +32,8 @@ if (NOT CMAKE_INSTALL_INCLUDEDIR)
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)
set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/output)
set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/output)
if(JKQtPlotter_BUILD_DECORATE_LIBNAMES_WITH_BUILDTYPE)

3
examples/jkqtmathtext_test/testform.h
View File

@ -8,10 +8,11 @@
#include <QPainter>
#include <QTreeWidget>
QT_BEGIN_NAMESPACE
namespace Ui {
class TestForm;
}
QT_END_NAMESPACE
class TestForm : public QWidget
{

2
examples/mandelbrot/mandelbrotmainwindow.h
View File

@ -4,9 +4,11 @@
#include <QMainWindow>
#include "jkqtplotter/graphs/jkqtpimage.h"
QT_BEGIN_NAMESPACE
namespace Ui {
class MandelbrotMainWindow;
}
QT_END_NAMESPACE
class MandelbrotMainWindow : public QMainWindow
{

2
examples/multiplot/test_multiplot_ui.h
View File

@ -5,9 +5,11 @@
#include "jkqtplotter/jkqtplotter.h"
#include <QGridLayout>
QT_BEGIN_NAMESPACE
namespace Ui {
class TestMultiplotUI;
}
QT_END_NAMESPACE
class TestMultiplotUI : public QDialog
{

2
examples/styling/test_styling.h
View File

@ -4,9 +4,11 @@
#include <QMainWindow>
#include "jkqtplotter/jkqtplotter.h"
QT_BEGIN_NAMESPACE
namespace Ui {
class TestStyling;
}
QT_END_NAMESPACE
class TestStyling : public QMainWindow
{

2
examples/ui/formwithjkqtplotter.h
View File

@ -4,9 +4,11 @@
#include <QWidget>
#include "jkqtplotter/graphs/jkqtpparsedfunction.h"
QT_BEGIN_NAMESPACE
namespace Ui {
class FormWithJKQTPlotter;
}
QT_END_NAMESPACE
class FormWithJKQTPlotter : public QWidget
{

4
lib/jkqtcommon/CMakeLists.txt
View File

@ -173,7 +173,7 @@ 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)
configure_file(${PROJECT_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/JKQtPlotter )
install(FILES "${CMAKE_SOURCE_DIR}/LICENSE" DESTINATION doc/JKQtPlotter RENAME "${lib_name}_LICENSE.txt" )
install(FILES "${PROJECT_SOURCE_DIR}/LICENSE" DESTINATION doc/JKQtPlotter RENAME "${lib_name}_LICENSE.txt" )

1
lib/jkqtcommon/jkqtpdebuggingtools.h
View File

@ -24,6 +24,7 @@
#include "jkqtcommon/jkqtcommon_imexport.h"
#include <QString>
#include <QElapsedTimer>
#include <stdexcept>
#ifndef __WINDOWS__

4
lib/jkqtfastplotter/CMakeLists.txt
View File

@ -135,7 +135,7 @@ 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)
configure_file(${PROJECT_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/JKQtPlotter )
install(FILES "${CMAKE_SOURCE_DIR}/LICENSE" DESTINATION doc/JKQtPlotter RENAME "${lib_name}_LICENSE.txt" )
install(FILES "${PROJECT_SOURCE_DIR}/LICENSE" DESTINATION doc/JKQtPlotter RENAME "${lib_name}_LICENSE.txt" )

8
lib/jkqtmathtext/CMakeLists.txt
View File

@ -146,9 +146,9 @@ 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)
configure_file(${PROJECT_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/JKQtPlotter )
install(FILES "${CMAKE_SOURCE_DIR}/LICENSE" DESTINATION doc/JKQtPlotter RENAME "${lib_name}_LICENSE.txt" )
install(FILES "${CMAKE_SOURCE_DIR}/lib/jkqtmathtext/resources/xits/OFL.txt" DESTINATION doc/JKQtPlotter RENAME "${lib_name}_XITS_LICENSE.txt" )
install(FILES "${CMAKE_SOURCE_DIR}/lib/jkqtmathtext/resources/xits/README.md" DESTINATION doc/JKQtPlotter RENAME "${lib_name}_XITS_README.md" )
install(FILES "${PROJECT_SOURCE_DIR}/LICENSE" DESTINATION doc/JKQtPlotter RENAME "${lib_name}_LICENSE.txt" )
install(FILES "${PROJECT_SOURCE_DIR}/lib/jkqtmathtext/resources/xits/OFL.txt" DESTINATION doc/JKQtPlotter RENAME "${lib_name}_XITS_LICENSE.txt" )
install(FILES "${PROJECT_SOURCE_DIR}/lib/jkqtmathtext/resources/xits/README.md" DESTINATION doc/JKQtPlotter RENAME "${lib_name}_XITS_README.md" )

4
lib/jkqtplotter/CMakeLists.txt
View File

@ -250,8 +250,8 @@ install(FILES ${HEADERS_GUI}
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${libIncludeSubdir}/gui
COMPONENT Headers)
configure_file(${CMAKE_SOURCE_DIR}/readme.txt.in ${CMAKE_CURRENT_BINARY_DIR}/${lib_name}_Readme.txt @ONLY)
configure_file(${PROJECT_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/JKQtPlotter )
install(FILES "${CMAKE_SOURCE_DIR}/LICENSE" DESTINATION doc/JKQtPlotter RENAME "${lib_name}_LICENSE.txt" )
install(FILES "${PROJECT_SOURCE_DIR}/LICENSE" DESTINATION doc/JKQtPlotter RENAME "${lib_name}_LICENSE.txt" )

4
lib/jkqtplotter/jkqtplotter.h
View File

@ -1721,6 +1721,8 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPlotter: public QWidget {
};
QT_BEGIN_NAMESPACE
/** \brief qHash-variant used by JKQTPlotter
* \internal
* \ingroup jkqtpplottersupprt
@ -1748,4 +1750,6 @@ inline uint qHash(const Qt::KeyboardModifiers &key, uint /*seed*/ ) noexcept(noe
return static_cast<uint>(key);
}
QT_END_NAMESPACE
#endif // JKQTPLOTTER_H