69 lines
2.0 KiB
Plaintext
69 lines
2.0 KiB
Plaintext
From 1e60d382b985276760bf889cc08142d95fee9d8e Mon Sep 17 00:00:00 2001
|
|
From: begasus <begasus@gmail.com>
|
|
Date: Sun, 7 Nov 2021 20:05:21 +0000
|
|
Subject: pkg-config patch
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index b230b9e..c5c2457 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -148,13 +148,13 @@ if (YAML_CPP_INSTALL)
|
|
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
|
FILES_MATCHING PATTERN "*.h")
|
|
install(EXPORT yaml-cpp-targets
|
|
- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
|
|
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/yaml-cpp")
|
|
install(FILES
|
|
"${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake"
|
|
"${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
|
|
- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
|
|
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/yaml-cpp")
|
|
install(FILES "${PROJECT_BINARY_DIR}/yaml-cpp.pc"
|
|
- DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig)
|
|
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
|
|
endif()
|
|
|
|
if(YAML_CPP_BUILD_TESTS)
|
|
--
|
|
2.30.2
|
|
|
|
|
|
From c40ddb0ecf2ded11913a598c31e3aef281534832 Mon Sep 17 00:00:00 2001
|
|
From: begasus <begasus@gmail.com>
|
|
Date: Sun, 7 Nov 2021 20:06:24 +0000
|
|
Subject: gtest patch
|
|
|
|
|
|
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
|
|
index 5ebc1a6..f02c2bb 100644
|
|
--- a/test/CMakeLists.txt
|
|
+++ b/test/CMakeLists.txt
|
|
@@ -1,13 +1,10 @@
|
|
find_package(Threads REQUIRED)
|
|
+find_package(GTest REQUIRED CONFIG)
|
|
|
|
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
|
|
set(BUILD_MOCK ON CACHE BOOL "" FORCE)
|
|
set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
|
|
|
|
-add_subdirectory(
|
|
- "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.10.0"
|
|
- "${CMAKE_CURRENT_BINARY_DIR}/prefix")
|
|
-
|
|
include_directories(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.10.0/googletest/include")
|
|
|
|
set(test-new-api-pattern "new-api/*.cpp")
|
|
@@ -38,7 +35,7 @@ target_link_libraries(yaml-cpp-tests
|
|
PRIVATE
|
|
Threads::Threads
|
|
yaml-cpp
|
|
- gmock)
|
|
+ GTest::gmock)
|
|
|
|
set_property(TARGET yaml-cpp-tests PROPERTY CXX_STANDARD_REQUIRED ON)
|
|
if (NOT DEFINED CMAKE_CXX_STANDARD)
|
|
--
|
|
2.30.2
|
|
|