diff --git a/3rdparty/jsoncpp-1.9.5/release/include/json/allocator.h b/3rdparty/jsoncpp-1.9.5/release/include/json/allocator.h old mode 100755 new mode 100644 index 95ef8a5..95ef8a5 --- a/3rdparty/jsoncpp-1.9.5/release/include/json/allocator.h +++ b/3rdparty/jsoncpp-1.9.5/release/include/json/allocator.h diff --git a/3rdparty/jsoncpp-1.9.5/release/include/json/assertions.h b/3rdparty/jsoncpp-1.9.5/release/include/json/assertions.h old mode 100755 new mode 100644 index 666fa7f..666fa7f --- a/3rdparty/jsoncpp-1.9.5/release/include/json/assertions.h +++ b/3rdparty/jsoncpp-1.9.5/release/include/json/assertions.h diff --git a/3rdparty/jsoncpp-1.9.5/release/include/json/config.h b/3rdparty/jsoncpp-1.9.5/release/include/json/config.h old mode 100755 new mode 100644 index 6359273..6359273 --- a/3rdparty/jsoncpp-1.9.5/release/include/json/config.h +++ b/3rdparty/jsoncpp-1.9.5/release/include/json/config.h diff --git a/3rdparty/jsoncpp-1.9.5/release/include/json/forwards.h b/3rdparty/jsoncpp-1.9.5/release/include/json/forwards.h old mode 100755 new mode 100644 index affe33a..affe33a --- a/3rdparty/jsoncpp-1.9.5/release/include/json/forwards.h +++ b/3rdparty/jsoncpp-1.9.5/release/include/json/forwards.h diff --git a/3rdparty/jsoncpp-1.9.5/release/include/json/json.h b/3rdparty/jsoncpp-1.9.5/release/include/json/json.h old mode 100755 new mode 100644 index 5c776a1..5c776a1 --- a/3rdparty/jsoncpp-1.9.5/release/include/json/json.h +++ b/3rdparty/jsoncpp-1.9.5/release/include/json/json.h diff --git a/3rdparty/jsoncpp-1.9.5/release/include/json/json_features.h b/3rdparty/jsoncpp-1.9.5/release/include/json/json_features.h old mode 100755 new mode 100644 index 7c7e9f5..7c7e9f5 --- a/3rdparty/jsoncpp-1.9.5/release/include/json/json_features.h +++ b/3rdparty/jsoncpp-1.9.5/release/include/json/json_features.h diff --git a/3rdparty/jsoncpp-1.9.5/release/include/json/reader.h b/3rdparty/jsoncpp-1.9.5/release/include/json/reader.h old mode 100755 new mode 100644 index be0d767..be0d767 --- a/3rdparty/jsoncpp-1.9.5/release/include/json/reader.h +++ b/3rdparty/jsoncpp-1.9.5/release/include/json/reader.h diff --git a/3rdparty/jsoncpp-1.9.5/release/include/json/value.h b/3rdparty/jsoncpp-1.9.5/release/include/json/value.h old mode 100755 new mode 100644 index 0edeb05..0edeb05 --- a/3rdparty/jsoncpp-1.9.5/release/include/json/value.h +++ b/3rdparty/jsoncpp-1.9.5/release/include/json/value.h diff --git a/3rdparty/jsoncpp-1.9.5/release/include/json/version.h b/3rdparty/jsoncpp-1.9.5/release/include/json/version.h old mode 100755 new mode 100644 index e931d03..e931d03 --- a/3rdparty/jsoncpp-1.9.5/release/include/json/version.h +++ b/3rdparty/jsoncpp-1.9.5/release/include/json/version.h diff --git a/3rdparty/jsoncpp-1.9.5/release/include/json/writer.h b/3rdparty/jsoncpp-1.9.5/release/include/json/writer.h old mode 100755 new mode 100644 index 88a3b12..88a3b12 --- a/3rdparty/jsoncpp-1.9.5/release/include/json/writer.h +++ b/3rdparty/jsoncpp-1.9.5/release/include/json/writer.h diff --git a/3rdparty/jsoncpp-1.9.5/release/lib/cmake/jsoncpp/jsoncpp-namespaced-targets.cmake b/3rdparty/jsoncpp-1.9.5/release/lib/cmake/jsoncpp/jsoncpp-namespaced-targets.cmake old mode 100755 new mode 100644 index ac1504e..ac1504e --- a/3rdparty/jsoncpp-1.9.5/release/lib/cmake/jsoncpp/jsoncpp-namespaced-targets.cmake +++ b/3rdparty/jsoncpp-1.9.5/release/lib/cmake/jsoncpp/jsoncpp-namespaced-targets.cmake diff --git a/3rdparty/jsoncpp-1.9.5/release/lib/cmake/jsoncpp/jsoncpp-targets-release.cmake b/3rdparty/jsoncpp-1.9.5/release/lib/cmake/jsoncpp/jsoncpp-targets-release.cmake old mode 100755 new mode 100644 index b74e3d8..b74e3d8 --- a/3rdparty/jsoncpp-1.9.5/release/lib/cmake/jsoncpp/jsoncpp-targets-release.cmake +++ b/3rdparty/jsoncpp-1.9.5/release/lib/cmake/jsoncpp/jsoncpp-targets-release.cmake diff --git a/3rdparty/jsoncpp-1.9.5/release/lib/cmake/jsoncpp/jsoncpp-targets.cmake b/3rdparty/jsoncpp-1.9.5/release/lib/cmake/jsoncpp/jsoncpp-targets.cmake old mode 100755 new mode 100644 index 5a43900..acf3f95 --- a/3rdparty/jsoncpp-1.9.5/release/lib/cmake/jsoncpp/jsoncpp-targets.cmake +++ b/3rdparty/jsoncpp-1.9.5/release/lib/cmake/jsoncpp/jsoncpp-targets.cmake @@ -1,10 +1,10 @@ # Generated by CMake -if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) +if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.6) message(FATAL_ERROR "CMake >= 2.6.0 required") endif() cmake_policy(PUSH) -cmake_policy(VERSION 2.6) +cmake_policy(VERSION 2.6...3.21) #---------------------------------------------------------------- # Generated CMake target import file. #---------------------------------------------------------------- diff --git a/3rdparty/jsoncpp-1.9.5/release/lib/cmake/jsoncpp/jsoncppConfig.cmake b/3rdparty/jsoncpp-1.9.5/release/lib/cmake/jsoncpp/jsoncppConfig.cmake old mode 100755 new mode 100644 index 359d679..359d679 --- a/3rdparty/jsoncpp-1.9.5/release/lib/cmake/jsoncpp/jsoncppConfig.cmake +++ b/3rdparty/jsoncpp-1.9.5/release/lib/cmake/jsoncpp/jsoncppConfig.cmake diff --git a/3rdparty/jsoncpp-1.9.5/release/lib/cmake/jsoncpp/jsoncppConfigVersion.cmake b/3rdparty/jsoncpp-1.9.5/release/lib/cmake/jsoncpp/jsoncppConfigVersion.cmake old mode 100755 new mode 100644 index be1ddad..66e18cd --- a/3rdparty/jsoncpp-1.9.5/release/lib/cmake/jsoncpp/jsoncppConfigVersion.cmake +++ b/3rdparty/jsoncpp-1.9.5/release/lib/cmake/jsoncpp/jsoncppConfigVersion.cmake @@ -17,18 +17,37 @@ else() if("1.9.5" 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 "1.9.5") endif() - if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR) - set(PACKAGE_VERSION_COMPATIBLE TRUE) + if(PACKAGE_FIND_VERSION_RANGE) + # both endpoints of the range must have the expected major version + math (EXPR CVF_VERSION_MAJOR_NEXT "${CVF_VERSION_MAJOR} + 1") + if (NOT PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR + OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX_MAJOR STREQUAL CVF_VERSION_MAJOR) + OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX VERSION_LESS_EQUAL CVF_VERSION_MAJOR_NEXT))) + set(PACKAGE_VERSION_COMPATIBLE FALSE) + elseif(PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR + AND ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS_EQUAL PACKAGE_FIND_VERSION_MAX) + OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MAX))) + set(PACKAGE_VERSION_COMPATIBLE TRUE) + else() + set(PACKAGE_VERSION_COMPATIBLE FALSE) + endif() else() - set(PACKAGE_VERSION_COMPATIBLE FALSE) - endif() + if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR) + set(PACKAGE_VERSION_COMPATIBLE TRUE) + else() + set(PACKAGE_VERSION_COMPATIBLE FALSE) + endif() - if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION) + if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION) set(PACKAGE_VERSION_EXACT TRUE) + endif() endif() endif() diff --git a/3rdparty/jsoncpp-1.9.5/release/lib/libjsoncpp.so.1.9.5 b/3rdparty/jsoncpp-1.9.5/release/lib/libjsoncpp.so.1.9.5 old mode 100755 new mode 100644 index 8f25384..4ecca34 --- a/3rdparty/jsoncpp-1.9.5/release/lib/libjsoncpp.so.1.9.5 +++ b/3rdparty/jsoncpp-1.9.5/release/lib/libjsoncpp.so.1.9.5 diff --git a/3rdparty/jsoncpp-1.9.5/release/lib/objects-Release/jsoncpp_object/json_reader.cpp.o b/3rdparty/jsoncpp-1.9.5/release/lib/objects-Release/jsoncpp_object/json_reader.cpp.o old mode 100755 new mode 100644 index d02ac9a..103a5e5 --- a/3rdparty/jsoncpp-1.9.5/release/lib/objects-Release/jsoncpp_object/json_reader.cpp.o +++ b/3rdparty/jsoncpp-1.9.5/release/lib/objects-Release/jsoncpp_object/json_reader.cpp.o diff --git a/3rdparty/jsoncpp-1.9.5/release/lib/objects-Release/jsoncpp_object/json_value.cpp.o b/3rdparty/jsoncpp-1.9.5/release/lib/objects-Release/jsoncpp_object/json_value.cpp.o old mode 100755 new mode 100644 index 69af24b..705c31b --- a/3rdparty/jsoncpp-1.9.5/release/lib/objects-Release/jsoncpp_object/json_value.cpp.o +++ b/3rdparty/jsoncpp-1.9.5/release/lib/objects-Release/jsoncpp_object/json_value.cpp.o diff --git a/3rdparty/jsoncpp-1.9.5/release/lib/objects-Release/jsoncpp_object/json_writer.cpp.o b/3rdparty/jsoncpp-1.9.5/release/lib/objects-Release/jsoncpp_object/json_writer.cpp.o old mode 100755 new mode 100644 index 6e543da..2c9c2ed --- a/3rdparty/jsoncpp-1.9.5/release/lib/objects-Release/jsoncpp_object/json_writer.cpp.o +++ b/3rdparty/jsoncpp-1.9.5/release/lib/objects-Release/jsoncpp_object/json_writer.cpp.o diff --git a/3rdparty/jsoncpp-1.9.5/release/lib/pkgconfig/jsoncpp.pc b/3rdparty/jsoncpp-1.9.5/release/lib/pkgconfig/jsoncpp.pc old mode 100755 new mode 100644 index f183f72..8b53ee3 --- a/3rdparty/jsoncpp-1.9.5/release/lib/pkgconfig/jsoncpp.pc +++ b/3rdparty/jsoncpp-1.9.5/release/lib/pkgconfig/jsoncpp.pc @@ -1,5 +1,5 @@ -prefix=/opt/cmhu/vpt_ascend/3rdparty/jsoncpp-1.9.5/release -exec_prefix=/opt/cmhu/vpt_ascend/3rdparty/jsoncpp-1.9.5/release +prefix=/home/cmhu/vpt_ascend_arm/3rdparty/jsoncpp-1.9.5/release +exec_prefix=/home/cmhu/vpt_ascend_arm/3rdparty/jsoncpp-1.9.5/release libdir=${exec_prefix}/lib includedir=${prefix}/include diff --git a/3rdparty/rabbitmq-c-0.11.0/release/include/amqp.h b/3rdparty/rabbitmq-c-0.11.0/release/include/amqp.h old mode 100755 new mode 100644 index 91784b6..91784b6 --- a/3rdparty/rabbitmq-c-0.11.0/release/include/amqp.h +++ b/3rdparty/rabbitmq-c-0.11.0/release/include/amqp.h diff --git a/3rdparty/rabbitmq-c-0.11.0/release/include/amqp_framing.h b/3rdparty/rabbitmq-c-0.11.0/release/include/amqp_framing.h old mode 100755 new mode 100644 index ad90433..ad90433 --- a/3rdparty/rabbitmq-c-0.11.0/release/include/amqp_framing.h +++ b/3rdparty/rabbitmq-c-0.11.0/release/include/amqp_framing.h diff --git a/3rdparty/rabbitmq-c-0.11.0/release/include/amqp_ssl_socket.h b/3rdparty/rabbitmq-c-0.11.0/release/include/amqp_ssl_socket.h old mode 100755 new mode 100644 index db3aa73..db3aa73 --- a/3rdparty/rabbitmq-c-0.11.0/release/include/amqp_ssl_socket.h +++ b/3rdparty/rabbitmq-c-0.11.0/release/include/amqp_ssl_socket.h diff --git a/3rdparty/rabbitmq-c-0.11.0/release/include/amqp_tcp_socket.h b/3rdparty/rabbitmq-c-0.11.0/release/include/amqp_tcp_socket.h old mode 100755 new mode 100644 index 3e9d82f..3e9d82f --- a/3rdparty/rabbitmq-c-0.11.0/release/include/amqp_tcp_socket.h +++ b/3rdparty/rabbitmq-c-0.11.0/release/include/amqp_tcp_socket.h diff --git a/3rdparty/rabbitmq-c-0.11.0/release/lib/aarch64-linux-gnu/cmake/rabbitmq-c/rabbitmq-c-config-version.cmake b/3rdparty/rabbitmq-c-0.11.0/release/lib/aarch64-linux-gnu/cmake/rabbitmq-c/rabbitmq-c-config-version.cmake old mode 100755 new mode 100644 index 9b84769..11c6c76 --- a/3rdparty/rabbitmq-c-0.11.0/release/lib/aarch64-linux-gnu/cmake/rabbitmq-c/rabbitmq-c-config-version.cmake +++ b/3rdparty/rabbitmq-c-0.11.0/release/lib/aarch64-linux-gnu/cmake/rabbitmq-c/rabbitmq-c-config-version.cmake @@ -9,12 +9,23 @@ set(PACKAGE_VERSION "4.5.0") -if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) - set(PACKAGE_VERSION_COMPATIBLE FALSE) +if (PACKAGE_FIND_VERSION_RANGE) + # Package version must be in the requested version range + if ((PACKAGE_FIND_VERSION_RANGE_MIN STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MIN) + OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_GREATER PACKAGE_FIND_VERSION_MAX) + OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_GREATER_EQUAL PACKAGE_FIND_VERSION_MAX))) + set(PACKAGE_VERSION_COMPATIBLE FALSE) + else() + set(PACKAGE_VERSION_COMPATIBLE TRUE) + endif() else() - set(PACKAGE_VERSION_COMPATIBLE TRUE) - if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION) - set(PACKAGE_VERSION_EXACT TRUE) + if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) + set(PACKAGE_VERSION_COMPATIBLE FALSE) + else() + set(PACKAGE_VERSION_COMPATIBLE TRUE) + if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION) + set(PACKAGE_VERSION_EXACT TRUE) + endif() endif() endif() diff --git a/3rdparty/rabbitmq-c-0.11.0/release/lib/aarch64-linux-gnu/cmake/rabbitmq-c/rabbitmq-c-config.cmake b/3rdparty/rabbitmq-c-0.11.0/release/lib/aarch64-linux-gnu/cmake/rabbitmq-c/rabbitmq-c-config.cmake old mode 100755 new mode 100644 index d1cb416..d1cb416 --- a/3rdparty/rabbitmq-c-0.11.0/release/lib/aarch64-linux-gnu/cmake/rabbitmq-c/rabbitmq-c-config.cmake +++ b/3rdparty/rabbitmq-c-0.11.0/release/lib/aarch64-linux-gnu/cmake/rabbitmq-c/rabbitmq-c-config.cmake diff --git a/3rdparty/rabbitmq-c-0.11.0/release/lib/aarch64-linux-gnu/cmake/rabbitmq-c/rabbitmq-targets-release.cmake b/3rdparty/rabbitmq-c-0.11.0/release/lib/aarch64-linux-gnu/cmake/rabbitmq-c/rabbitmq-targets-release.cmake old mode 100755 new mode 100644 index 71b8bb4..71b8bb4 --- a/3rdparty/rabbitmq-c-0.11.0/release/lib/aarch64-linux-gnu/cmake/rabbitmq-c/rabbitmq-targets-release.cmake +++ b/3rdparty/rabbitmq-c-0.11.0/release/lib/aarch64-linux-gnu/cmake/rabbitmq-c/rabbitmq-targets-release.cmake diff --git a/3rdparty/rabbitmq-c-0.11.0/release/lib/aarch64-linux-gnu/cmake/rabbitmq-c/rabbitmq-targets.cmake b/3rdparty/rabbitmq-c-0.11.0/release/lib/aarch64-linux-gnu/cmake/rabbitmq-c/rabbitmq-targets.cmake old mode 100755 new mode 100644 index 74ca805..7df984f --- a/3rdparty/rabbitmq-c-0.11.0/release/lib/aarch64-linux-gnu/cmake/rabbitmq-c/rabbitmq-targets.cmake +++ b/3rdparty/rabbitmq-c-0.11.0/release/lib/aarch64-linux-gnu/cmake/rabbitmq-c/rabbitmq-targets.cmake @@ -1,10 +1,10 @@ # Generated by CMake -if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) +if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.6) message(FATAL_ERROR "CMake >= 2.6.0 required") endif() cmake_policy(PUSH) -cmake_policy(VERSION 2.6) +cmake_policy(VERSION 2.6...3.21) #---------------------------------------------------------------- # Generated CMake target import file. #---------------------------------------------------------------- diff --git a/3rdparty/rabbitmq-c-0.11.0/release/lib/aarch64-linux-gnu/librabbitmq.a b/3rdparty/rabbitmq-c-0.11.0/release/lib/aarch64-linux-gnu/librabbitmq.a old mode 100755 new mode 100644 index e9346b1..2a02c3f --- a/3rdparty/rabbitmq-c-0.11.0/release/lib/aarch64-linux-gnu/librabbitmq.a +++ b/3rdparty/rabbitmq-c-0.11.0/release/lib/aarch64-linux-gnu/librabbitmq.a diff --git a/3rdparty/rabbitmq-c-0.11.0/release/lib/aarch64-linux-gnu/librabbitmq.so.4.5.0 b/3rdparty/rabbitmq-c-0.11.0/release/lib/aarch64-linux-gnu/librabbitmq.so.4.5.0 old mode 100755 new mode 100644 index db55110..b02d7c7 --- a/3rdparty/rabbitmq-c-0.11.0/release/lib/aarch64-linux-gnu/librabbitmq.so.4.5.0 +++ b/3rdparty/rabbitmq-c-0.11.0/release/lib/aarch64-linux-gnu/librabbitmq.so.4.5.0 diff --git a/3rdparty/spdlog-1.9.2/release/lib/cmake/spdlog/spdlogConfigTargets.cmake b/3rdparty/spdlog-1.9.2/release/lib/cmake/spdlog/spdlogConfigTargets.cmake index 029fb07..362e953 100644 --- a/3rdparty/spdlog-1.9.2/release/lib/cmake/spdlog/spdlogConfigTargets.cmake +++ b/3rdparty/spdlog-1.9.2/release/lib/cmake/spdlog/spdlogConfigTargets.cmake @@ -1,10 +1,10 @@ # Generated by CMake -if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) +if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.6) message(FATAL_ERROR "CMake >= 2.6.0 required") endif() cmake_policy(PUSH) -cmake_policy(VERSION 2.6) +cmake_policy(VERSION 2.6...3.21) #---------------------------------------------------------------- # Generated CMake target import file. #---------------------------------------------------------------- diff --git a/3rdparty/spdlog-1.9.2/release/lib/cmake/spdlog/spdlogConfigVersion.cmake b/3rdparty/spdlog-1.9.2/release/lib/cmake/spdlog/spdlogConfigVersion.cmake index d374d5e..fedb8bb 100644 --- a/3rdparty/spdlog-1.9.2/release/lib/cmake/spdlog/spdlogConfigVersion.cmake +++ b/3rdparty/spdlog-1.9.2/release/lib/cmake/spdlog/spdlogConfigVersion.cmake @@ -17,18 +17,37 @@ else() if("1.9.2" 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 "1.9.2") endif() - if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR) - set(PACKAGE_VERSION_COMPATIBLE TRUE) + if(PACKAGE_FIND_VERSION_RANGE) + # both endpoints of the range must have the expected major version + math (EXPR CVF_VERSION_MAJOR_NEXT "${CVF_VERSION_MAJOR} + 1") + if (NOT PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR + OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX_MAJOR STREQUAL CVF_VERSION_MAJOR) + OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX VERSION_LESS_EQUAL CVF_VERSION_MAJOR_NEXT))) + set(PACKAGE_VERSION_COMPATIBLE FALSE) + elseif(PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR + AND ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS_EQUAL PACKAGE_FIND_VERSION_MAX) + OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MAX))) + set(PACKAGE_VERSION_COMPATIBLE TRUE) + else() + set(PACKAGE_VERSION_COMPATIBLE FALSE) + endif() else() - set(PACKAGE_VERSION_COMPATIBLE FALSE) - endif() + if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR) + set(PACKAGE_VERSION_COMPATIBLE TRUE) + else() + set(PACKAGE_VERSION_COMPATIBLE FALSE) + endif() - if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION) + if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION) set(PACKAGE_VERSION_EXACT TRUE) + endif() endif() endif() diff --git a/3rdparty/spdlog-1.9.2/release/lib/pkgconfig/spdlog.pc b/3rdparty/spdlog-1.9.2/release/lib/pkgconfig/spdlog.pc index 30f9aed..ecee64b 100644 --- a/3rdparty/spdlog-1.9.2/release/lib/pkgconfig/spdlog.pc +++ b/3rdparty/spdlog-1.9.2/release/lib/pkgconfig/spdlog.pc @@ -1,4 +1,4 @@ -prefix=/opt/cmhu/vpt_ascend_arm/3rdparty/spdlog-1.9.2/release +prefix=/home/cmhu/vpt_ascend_arm/3rdparty/spdlog-1.9.2/release exec_prefix=${prefix} includedir=${prefix}/include libdir=${exec_prefix}/lib