Merge pull request #206364 from KiruyaMomochi/vulkan-tools-lunarg-cmake
vulkan-tools-lunarg: fix CMake include path
This commit is contained in:
commit
cd5e437409
|
@ -81,6 +81,8 @@ stdenv.mkDerivation rec {
|
|||
done
|
||||
'';
|
||||
|
||||
patches = [ ./gtest.patch ];
|
||||
|
||||
# Same as vulkan-validation-layers
|
||||
dontPatchELF = true;
|
||||
|
||||
|
|
34
pkgs/tools/graphics/vulkan-tools-lunarg/gtest.patch
Normal file
34
pkgs/tools/graphics/vulkan-tools-lunarg/gtest.patch
Normal file
|
@ -0,0 +1,34 @@
|
|||
diff --git a/external/googletest/googlemock/CMakeLists.txt b/external/googletest/googlemock/CMakeLists.txt
|
||||
index e7df8ec53d..869bfcb716 100644
|
||||
--- a/external/googletest/googlemock/CMakeLists.txt
|
||||
+++ b/external/googletest/googlemock/CMakeLists.txt
|
||||
@@ -111,10 +111,10 @@ endif()
|
||||
if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
|
||||
target_include_directories(gmock SYSTEM INTERFACE
|
||||
"$<BUILD_INTERFACE:${gmock_build_include_dirs}>"
|
||||
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
|
||||
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>")
|
||||
target_include_directories(gmock_main SYSTEM INTERFACE
|
||||
"$<BUILD_INTERFACE:${gmock_build_include_dirs}>"
|
||||
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
|
||||
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>")
|
||||
endif()
|
||||
|
||||
########################################################################
|
||||
diff --git a/external/googletest/googletest/CMakeLists.txt b/external/googletest/googletest/CMakeLists.txt
|
||||
index abdd98b79a..7ae174d566 100644
|
||||
--- a/external/googletest/googletest/CMakeLists.txt
|
||||
+++ b/external/googletest/googletest/CMakeLists.txt
|
||||
@@ -138,10 +138,10 @@ set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
|
||||
if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
|
||||
target_include_directories(gtest SYSTEM INTERFACE
|
||||
"$<BUILD_INTERFACE:${gtest_build_include_dirs}>"
|
||||
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
|
||||
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>")
|
||||
target_include_directories(gtest_main SYSTEM INTERFACE
|
||||
"$<BUILD_INTERFACE:${gtest_build_include_dirs}>"
|
||||
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
|
||||
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>")
|
||||
endif()
|
||||
target_link_libraries(gtest_main PUBLIC gtest)
|
||||
|
Loading…
Reference in a new issue