QT/QXlsx
1
0
Fork 0
mirror of https://github.com/QtExcel/QXlsx.git synced 2025-02-06 05:08:22 +08:00
Code Issues Projects Releases Wiki Activity

Define cpp standard only if not defined (#226)

Browse Source 
* Define cpp standard only if not defined

* Add Paul Harris recommandations

* Use c++17 only for qt6

* Whitespace formatting
This commit is contained in:
Martin Delille 2022-07-22 20:11:29 +02:00 committed by GitHub
parent e53efc5353
commit 38c1ec8104
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
QXlsx/CMakeLists.txt
View File

@ -17,9 +17,9 @@ find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Gui REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui REQUIRED) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui REQUIRED)
if (QT_MAJOR_VERSION EQUAL 6) if (QT_MAJOR_VERSION EQUAL 6)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17 CACHE STRING "")
else() else()
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11 CACHE STRING "")
endif() endif()
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
@ -42,19 +42,6 @@ message(${QXLSX_PARENTPATH})
message(${QXLSX_HEADERPATH}) message(${QXLSX_HEADERPATH})
message(${QXLSX_SOURCEPATH}) message(${QXLSX_SOURCEPATH})
add_definitions(
-DQT_NO_KEYWORDS
-DQT_NO_CAST_TO_ASCII
-DQT_NO_CAST_FROM_ASCII
-DQT_STRICT_ITERATORS
-DQT_NO_URL_CAST_FROM_STRING
-DQT_NO_CAST_FROM_BYTEARRAY
-DQT_USE_QSTRINGBUILDER
-DQT_NO_SIGNALS_SLOTS_KEYWORDS
-DQT_USE_FAST_OPERATOR_PLUS
-DQT_DISABLE_DEPRECATED_BEFORE=0x050F00
)
# Due historical reasons this value is kept off # Due historical reasons this value is kept off
option(BUILD_SHARED_LIBS "Build in shared lib mode" OFF) option(BUILD_SHARED_LIBS "Build in shared lib mode" OFF)
@ -152,6 +139,22 @@ add_library(QXlsx
) )
add_library(QXlsx::QXlsx ALIAS QXlsx) add_library(QXlsx::QXlsx ALIAS QXlsx)
target_compile_definitions(QXlsx PUBLIC
-DQT_NO_KEYWORDS
-DQT_NO_CAST_TO_ASCII
-DQT_NO_CAST_FROM_ASCII
-DQT_STRICT_ITERATORS
-DQT_NO_URL_CAST_FROM_STRING
-DQT_NO_CAST_FROM_BYTEARRAY
-DQT_USE_QSTRINGBUILDER
-DQT_NO_SIGNALS_SLOTS_KEYWORDS
-DQT_USE_FAST_OPERATOR_PLUS
-DQT_DISABLE_DEPRECATED_BEFORE=0x050F00
)
target_compile_features(QXlsx INTERFACE cxx_std_11)
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
target_compile_definitions(QXlsx PUBLIC QXlsx_SHAREDLIB) target_compile_definitions(QXlsx PUBLIC QXlsx_SHAREDLIB)
endif() endif()