Merge branch 'develop' for release v3.51.1
This commit is contained in:
+3
-1
@@ -5,7 +5,9 @@ HeaderFilterRegex: ''
|
||||
AnalyzeTemporaryDtors: false
|
||||
FormatStyle: none
|
||||
User: ''
|
||||
CheckOptions:
|
||||
CheckOptions:
|
||||
- key: misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
|
||||
value: '1'
|
||||
- key: readability-identifier-naming.IgnoreClassesWithAllMemberVariablesBeingPublic
|
||||
value: '1'
|
||||
- key: cppcoreguidelines-avoid-do-while.IgnoreMacros
|
||||
|
||||
@@ -82,6 +82,10 @@ if (BUILD_BENCHMARKS)
|
||||
message(STATUS "Building benchmarks")
|
||||
endif()
|
||||
|
||||
if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||
add_definitions(-DNDEBUG)
|
||||
endif()
|
||||
|
||||
add_subdirectory(src)
|
||||
|
||||
install(DIRECTORY approot DESTINATION share/lms)
|
||||
|
||||
@@ -38,7 +38,7 @@ target_link_libraries(lmscore PUBLIC
|
||||
Wt::Wt
|
||||
)
|
||||
|
||||
install(TARGETS lmscore DESTINATION lib ${CMAKE_INSTALL_LIBDIR})
|
||||
install(TARGETS lmscore DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
|
||||
if(BUILD_TESTING)
|
||||
add_subdirectory(test)
|
||||
|
||||
@@ -23,8 +23,8 @@ add_library(lmsdatabase SHARED
|
||||
impl/Utils.cpp
|
||||
)
|
||||
|
||||
if (CMAKE_BUILD_TYPE MATCHES "Debug")
|
||||
target_sources(lmsdatabase PRIVATE impl/TransactionChecker.cpp)
|
||||
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||
target_sources(lmsdatabase PRIVATE impl/TransactionChecker.cpp)
|
||||
endif()
|
||||
|
||||
target_include_directories(lmsdatabase INTERFACE
|
||||
|
||||
Reference in New Issue
Block a user