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