mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-15 17:34:04 +00:00
571c71e6f7
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
35 lines
1.6 KiB
Diff
35 lines
1.6 KiB
Diff
diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
|
|
index 99b2411f..33ec9636 100644
|
|
--- a/googlemock/CMakeLists.txt
|
|
+++ b/googlemock/CMakeLists.txt
|
|
@@ -105,10 +105,10 @@ endif()
|
|
string(REPLACE ";" "$<SEMICOLON>" dirs "${gmock_build_include_dirs}")
|
|
target_include_directories(gmock SYSTEM INTERFACE
|
|
"$<BUILD_INTERFACE:${dirs}>"
|
|
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
|
|
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
|
|
target_include_directories(gmock_main SYSTEM INTERFACE
|
|
"$<BUILD_INTERFACE:${dirs}>"
|
|
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
|
|
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
|
|
|
|
########################################################################
|
|
#
|
|
diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
|
|
index dce6a7c9..f1da42ff 100644
|
|
--- a/googletest/CMakeLists.txt
|
|
+++ b/googletest/CMakeLists.txt
|
|
@@ -143,10 +143,10 @@ set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
|
|
string(REPLACE ";" "$<SEMICOLON>" dirs "${gtest_build_include_dirs}")
|
|
target_include_directories(gtest SYSTEM INTERFACE
|
|
"$<BUILD_INTERFACE:${dirs}>"
|
|
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
|
|
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
|
|
target_include_directories(gtest_main SYSTEM INTERFACE
|
|
"$<BUILD_INTERFACE:${dirs}>"
|
|
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
|
|
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
|
|
if(CMAKE_SYSTEM_NAME MATCHES "QNX" AND CMAKE_SYSTEM_VERSION VERSION_GREATER_EQUAL 7.1)
|
|
target_link_libraries(gtest PUBLIC regex)
|
|
endif()
|