pyrox.dev
Merge pull request #206364 from KiruyaMomochi/vulkan-tools-lunarg-cmake
vulkan-tools-lunarg: fix CMake include path
authored by Thiago Kenji Okada and committed by GitHub cd5e4374 c28d4da8
+2
pkgs/tools/graphics/vulkan-tools-lunarg/default.nix
+2
pkgs/tools/graphics/vulkan-tools-lunarg/default.nix
+34
pkgs/tools/graphics/vulkan-tools-lunarg/gtest.patch
+34
pkgs/tools/graphics/vulkan-tools-lunarg/gtest.patch
···
1
+
diff --git a/external/googletest/googlemock/CMakeLists.txt b/external/googletest/googlemock/CMakeLists.txt
2
+
index e7df8ec53d..869bfcb716 100644
3
+
--- a/external/googletest/googlemock/CMakeLists.txt
4
+
+++ b/external/googletest/googlemock/CMakeLists.txt
5
+
@@ -111,10 +111,10 @@ endif()
6
+
if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
7
+
target_include_directories(gmock SYSTEM INTERFACE
8
+
"$<BUILD_INTERFACE:${gmock_build_include_dirs}>"
9
+
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
10
+
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>")
11
+
target_include_directories(gmock_main SYSTEM INTERFACE
12
+
"$<BUILD_INTERFACE:${gmock_build_include_dirs}>"
13
+
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
14
+
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>")
15
+
endif()
16
+
17
+
########################################################################
18
+
diff --git a/external/googletest/googletest/CMakeLists.txt b/external/googletest/googletest/CMakeLists.txt
19
+
index abdd98b79a..7ae174d566 100644
20
+
--- a/external/googletest/googletest/CMakeLists.txt
21
+
+++ b/external/googletest/googletest/CMakeLists.txt
22
+
@@ -138,10 +138,10 @@ set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
23
+
if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
24
+
target_include_directories(gtest SYSTEM INTERFACE
25
+
"$<BUILD_INTERFACE:${gtest_build_include_dirs}>"
26
+
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
27
+
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>")
28
+
target_include_directories(gtest_main SYSTEM INTERFACE
29
+
"$<BUILD_INTERFACE:${gtest_build_include_dirs}>"
30
+
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
31
+
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>")
32
+
endif()
33
+
target_link_libraries(gtest_main PUBLIC gtest)
34
+