mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2024-12-25 10:01:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

some bugfixes for VStudio NOMINMAX-problem ...

Browse Source
This commit is contained in:
jkriege2 2020-06-29 07:59:11 +02:00
parent 7a0d3a71df
commit eb7fd1d524
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/jkqtcommon/CMakeLists.txt
View File

@ -85,7 +85,7 @@ if(JKQtPlotter_BUILD_SHARED_LIBS)
elseif(MSVC) elseif(MSVC)
# COMPILER-SETTINGS FOR MS VISUAL C++ # COMPILER-SETTINGS FOR MS VISUAL C++
target_compile_options(${libsh_name} PUBLIC /EHsc) target_compile_options(${libsh_name} PUBLIC /EHsc)
target_compile_definitions(${libsh_name} PUBLIC /DNOMINMAX) target_compile_definitions(${libsh_name} PUBLIC NOMINMAX)
endif() endif()
target_include_directories(${libsh_name} PUBLIC target_include_directories(${libsh_name} PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>
@ -110,7 +110,7 @@ if(JKQtPlotter_BUILD_STATIC_LIBS)
elseif(MSVC) elseif(MSVC)
# COMPILER-SETTINGS FOR MS VISUAL C++ # COMPILER-SETTINGS FOR MS VISUAL C++
target_compile_options(${lib_name} PUBLIC /EHsc) target_compile_options(${lib_name} PUBLIC /EHsc)
target_compile_definitions(${lib_name} PUBLIC /DNOMINMAX) target_compile_definitions(${lib_name} PUBLIC NOMINMAX)
endif() endif()
target_include_directories(${lib_name} PUBLIC target_include_directories(${lib_name} PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>

4
lib/jkqtfastplotter/CMakeLists.txt
View File

@ -48,7 +48,7 @@ if(JKQtPlotter_BUILD_SHARED_LIBS)
elseif(MSVC) elseif(MSVC)
# COMPILER-SETTINGS FOR MS VISUAL C++ # COMPILER-SETTINGS FOR MS VISUAL C++
target_compile_options(${libsh_name} PUBLIC /EHsc) target_compile_options(${libsh_name} PUBLIC /EHsc)
target_compile_definitions(${libsh_name} PUBLIC /DNOMINMAX) target_compile_definitions(${libsh_name} PUBLIC NOMINMAX)
endif() endif()
target_compile_definitions(${libsh_name} PRIVATE JKQTFASTPLOTTER_LIB_EXPORT_LIBRARY) target_compile_definitions(${libsh_name} PRIVATE JKQTFASTPLOTTER_LIB_EXPORT_LIBRARY)
target_include_directories(${libsh_name} PUBLIC target_include_directories(${libsh_name} PUBLIC
@ -73,7 +73,7 @@ if(JKQtPlotter_BUILD_STATIC_LIBS)
elseif(MSVC) elseif(MSVC)
# COMPILER-SETTINGS FOR MS VISUAL C++ # COMPILER-SETTINGS FOR MS VISUAL C++
target_compile_options(${lib_name} PUBLIC /EHsc) target_compile_options(${lib_name} PUBLIC /EHsc)
target_compile_definitions(${lib_name} PUBLIC /DNOMINMAX) target_compile_definitions(${lib_name} PUBLIC NOMINMAX)
endif() endif()
target_compile_features(${lib_name} PUBLIC cxx_std_11) 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_link_libraries(${lib_name} PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::OpenGL JKQTCommonLib)

4
lib/jkqtmathtext/CMakeLists.txt
View File

@ -54,7 +54,7 @@ if(JKQtPlotter_BUILD_SHARED_LIBS)
elseif(MSVC) elseif(MSVC)
# COMPILER-SETTINGS FOR MS VISUAL C++ # COMPILER-SETTINGS FOR MS VISUAL C++
target_compile_options(${libsh_name} PUBLIC /EHsc) target_compile_options(${libsh_name} PUBLIC /EHsc)
target_compile_definitions(${libsh_name} PUBLIC /DNOMINMAX) target_compile_definitions(${libsh_name} PUBLIC NOMINMAX)
endif() endif()
target_include_directories(${libsh_name} PUBLIC target_include_directories(${libsh_name} PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>
@ -82,7 +82,7 @@ if(JKQtPlotter_BUILD_STATIC_LIBS)
elseif(MSVC) elseif(MSVC)
# COMPILER-SETTINGS FOR MS VISUAL C++ # COMPILER-SETTINGS FOR MS VISUAL C++
target_compile_options(${lib_name} PUBLIC /EHsc) target_compile_options(${lib_name} PUBLIC /EHsc)
target_compile_definitions(${lib_name} PUBLIC /DNOMINMAX) target_compile_definitions(${lib_name} PUBLIC NOMINMAX)
endif() endif()
if(JKQtPlotter_BUILD_INCLUDE_XITS_FONTS) if(JKQtPlotter_BUILD_INCLUDE_XITS_FONTS)
target_compile_definitions(${lib_name} PRIVATE JKQTMATHTEXT_COMPILED_WITH_XITS) target_compile_definitions(${lib_name} PRIVATE JKQTMATHTEXT_COMPILED_WITH_XITS)

4
lib/jkqtplotter/CMakeLists.txt
View File

@ -146,7 +146,7 @@ if(JKQtPlotter_BUILD_SHARED_LIBS)
elseif(MSVC) elseif(MSVC)
# COMPILER-SETTINGS FOR MS VISUAL C++ # COMPILER-SETTINGS FOR MS VISUAL C++
target_compile_options(${libsh_name} PUBLIC /EHsc) target_compile_options(${libsh_name} PUBLIC /EHsc)
target_compile_definitions(${libsh_name} PUBLIC /DNOMINMAX) target_compile_definitions(${libsh_name} PUBLIC NOMINMAX)
endif() endif()
target_include_directories(${libsh_name} PUBLIC target_include_directories(${libsh_name} PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>
@ -170,7 +170,7 @@ if(JKQtPlotter_BUILD_STATIC_LIBS)
elseif(MSVC) elseif(MSVC)
# COMPILER-SETTINGS FOR MS VISUAL C++ # COMPILER-SETTINGS FOR MS VISUAL C++
target_compile_options(${lib_name} PUBLIC /EHsc) target_compile_options(${lib_name} PUBLIC /EHsc)
target_compile_definitions(${lib_name} PUBLIC /DNOMINMAX) target_compile_definitions(${lib_name} PUBLIC NOMINMAX)
endif() endif()
target_compile_features(${lib_name} PUBLIC cxx_std_11) target_compile_features(${lib_name} PUBLIC cxx_std_11)
target_include_directories(${lib_name} PUBLIC target_include_directories(${lib_name} PUBLIC

2
lib/jkqtplotter/jkqtpdatastorage.h
View File

@ -1261,7 +1261,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPDatastore{
* *
* Pseudocode: * Pseudocode:
* \code * \code
* for (i=0; i<min(rows(otherColumnX), rows(otherColumnY)); i++) { * for (i=0; i<std::min(rows(otherColumnX), rows(otherColumnY)); i++) {
* newColumn.push_back(f(getValue(otherColumnX, i), getValue(otherColumnY, i)); * newColumn.push_back(f(getValue(otherColumnX, i), getValue(otherColumnY, i));
* } * }
* return newColumn; * return newColumn;