Auto update
This commit is contained in:
parent
67a260f5bc
commit
96135a6fe7
57 changed files with 4865 additions and 4717 deletions
|
|
@ -9,19 +9,19 @@
|
|||
# The variable CVF_VERSION must be set before calling configure_file().
|
||||
|
||||
|
||||
set(PACKAGE_VERSION "0.6.0")
|
||||
set(PACKAGE_VERSION "0.7.0")
|
||||
|
||||
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
|
||||
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
||||
else()
|
||||
|
||||
if("0.6.0" MATCHES "^([0-9]+)\\.")
|
||||
if("0.7.0" MATCHES "^([0-9]+)\\.")
|
||||
set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
|
||||
if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
|
||||
string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
|
||||
endif()
|
||||
else()
|
||||
set(CVF_VERSION_MAJOR "0.6.0")
|
||||
set(CVF_VERSION_MAJOR "0.7.0")
|
||||
endif()
|
||||
|
||||
if(PACKAGE_FIND_VERSION_RANGE)
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@ endmacro()
|
|||
include (CMakeFindDependencyMacro)
|
||||
include (${CMAKE_CURRENT_LIST_DIR}/glog-modules.cmake)
|
||||
|
||||
find_dependency (Threads)
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -54,9 +54,10 @@ endif()
|
|||
add_library(glog::glog STATIC IMPORTED)
|
||||
|
||||
set_target_properties(glog::glog PROPERTIES
|
||||
INTERFACE_COMPILE_DEFINITIONS "GLOG_CUSTOM_PREFIX_SUPPORT"
|
||||
INTERFACE_COMPILE_DEFINITIONS "GLOG_USE_GLOG_EXPORT"
|
||||
INTERFACE_COMPILE_FEATURES "cxx_std_14"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
|
||||
INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:-pthread>;\$<LINK_ONLY:log>"
|
||||
INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:Threads::Threads>;\$<LINK_ONLY:log>"
|
||||
)
|
||||
|
||||
if(CMAKE_VERSION VERSION_LESS 2.8.12)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue