mirror of
https://github.com/silverqx/TinyORM.git
synced 2026-05-04 07:29:30 -05:00
removed QT_NO_DEBUG_OUTPUT from common library
- also rename TinyQtCommon to TinyCommon
This commit is contained in:
+2
-2
@@ -234,8 +234,8 @@ tiny_resource_and_manifest(${TinyOrm_target}
|
||||
# ---
|
||||
|
||||
# Common configuration as interface library
|
||||
include(TinyQtCommon)
|
||||
tiny_qt_common(${CommonConfig_target}
|
||||
include(TinyCommon)
|
||||
tiny_common(${CommonConfig_target}
|
||||
NAMESPACE ${TinyOrm_ns}
|
||||
EXPORT NAME ${CommonConfig_target}
|
||||
)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# Set common variables and create interface-only library target so all other targets
|
||||
# will be able to link to, either directly or transitively, to consume common compile
|
||||
# options/definitions
|
||||
function(tiny_qt_common target)
|
||||
function(tiny_common target)
|
||||
|
||||
set(options EXPORT)
|
||||
set(oneValueArgs NAMESPACE NAME)
|
||||
@@ -39,9 +39,6 @@ ${TINY_UNPARSED_ARGUMENTS}")
|
||||
QT_NO_CAST_FROM_BYTEARRAY
|
||||
QT_USE_QSTRINGBUILDER
|
||||
QT_STRICT_ITERATORS
|
||||
|
||||
# Disable debug output in release mode
|
||||
$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG_OUTPUT>
|
||||
)
|
||||
|
||||
# Platform specific configurations
|
||||
@@ -46,6 +46,8 @@ ${TINY_UNPARSED_ARGUMENTS}")
|
||||
PRIVATE
|
||||
PROJECT_TINYORM_TEST
|
||||
TINYORM_TESTS_CODE
|
||||
# Disable debug output in release mode
|
||||
$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG_OUTPUT>
|
||||
)
|
||||
|
||||
target_include_directories(${name} PRIVATE
|
||||
|
||||
@@ -106,7 +106,6 @@ namespace Relations {
|
||||
// BUG cmake MinGW UCRT64 clang static build builds, but cause problem with inline_constants ; shared build with inline_constants cause crashes of 50% of tests, like bug above, this will be MinGW clang or clang bug, on unix it works without problems silverqx
|
||||
// FUTURE linux, add linker version script https://github.com/sailfishos/qtbase/commit/72ba0079c3967bdfa26acdce78ce6cb98b30c27b?view=parallel https://www.gnu.org/software/gnulib/manual/html_node/Exported-Symbols-of-Shared-Libraries.html https://stackoverflow.com/questions/41061220/where-do-object-file-version-references-come-from silverqx
|
||||
// TODO Visual Studio memory analyzer https://docs.microsoft.com/en-us/visualstudio/profiling/memory-usage-without-debugging2?view=vs-2019 silverqx
|
||||
// CUR cmake rename TinyQtCommon to TinyCommon silverqx
|
||||
/*! Base model class. */
|
||||
template<typename Derived, AllRelationsConcept ...AllRelations>
|
||||
class Model :
|
||||
|
||||
@@ -68,6 +68,12 @@ target_include_directories(${TinyUtils_target} PUBLIC
|
||||
# TinyUtils defines
|
||||
# ---
|
||||
|
||||
target_compile_definitions(${TinyUtils_target}
|
||||
PRIVATE
|
||||
# Disable debug output in release mode
|
||||
$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG_OUTPUT>
|
||||
)
|
||||
|
||||
if(BUILD_SHARED_LIBS)
|
||||
target_compile_definitions(${TinyUtils_target}
|
||||
PRIVATE
|
||||
|
||||
Reference in New Issue
Block a user