mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-08 14:03:29 +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.
45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
From 89c7c160f897f64e17fb74efffccfd1fc16f8b7d Mon Sep 17 00:00:00 2001
|
|
From: Jappie Klooster <jappieklooster@hotmail.com>
|
|
Date: Fri, 2 Apr 2021 14:22:02 -0400
|
|
Subject: [PATCH] Add cmake install directives.
|
|
|
|
To make nix builds work, it expect a `make install` command to
|
|
be available.
|
|
Adding these directives seems to fix the build.
|
|
|
|
If it's no trouble to you, please add them.
|
|
|
|
Maybe don't need endian
|
|
---
|
|
CMakeLists.txt | 10 ++++++++++
|
|
1 file changed, 10 insertions(+)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 06e416f..8d6f489 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -6,6 +6,8 @@ set(CMAKE_CXX_STANDARD 17)
|
|
add_library(IODash INTERFACE)
|
|
target_include_directories(IODash INTERFACE .)
|
|
|
|
+include(GNUInstallDirs)
|
|
+
|
|
add_executable(IODash_Test test.cpp)
|
|
target_link_libraries(IODash_Test IODash)
|
|
|
|
@@ -20,3 +22,11 @@ if (DEFINED BUILD_BENCHMARKS AND (${BUILD_BENCHMARKS}))
|
|
target_link_libraries(boost_Benchmark_HTTP boost_system pthread)
|
|
endif()
|
|
|
|
+install(TARGETS IODash
|
|
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
+install(FILES IODash.hpp
|
|
+ DESTINATION include/)
|
|
+
|
|
+install(FILES
|
|
+ IODash/Buffer.hpp IODash/SocketAddress.hpp IODash/File.hpp IODash/Socket.hpp IODash/EventLoop.hpp IODash/Serial.hpp IODash/Timer.hpp
|
|
+ DESTINATION include/IODash)
|
|
--
|
|
2.29.2
|
|
|