Skip to content

Commit 03dafda

Browse files
authored
Merge pull request #22 from quantinuum-dev/push-zpzztrxovtkt
fix: Allow include directory to be found
2 parents 8eb7526 + 3a204e7 commit 03dafda

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

build.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ use std::env;
22
use std::path::PathBuf;
33

44
fn main() {
5-
let qulacs_path = PathBuf::from(env::var("LIBQULACS_PATH").unwrap());
5+
let qulacs_path = PathBuf::from(env::var("QULACS_PATH").unwrap());
6+
let mut qulacs_lib = qulacs_path.clone();
7+
qulacs_lib.push("/lib");
8+
9+
let mut qulacs_include = qulacs_path.clone();
10+
qulacs_include.push("/include");
611
println!(
712
"cargo:rustc-link-search={}",
813
qulacs_path
@@ -18,6 +23,7 @@ fn main() {
1823
let eigen = pkg_config::probe_library("eigen3").unwrap();
1924
cxx_build::bridge("src/lib.rs")
2025
.file("src/qulacs-bridge.cc")
26+
.include(qulacs_include)
2127
.includes(eigen.include_paths)
2228
.flag("-fext-numeric-literals")
2329
.flag("-fopenmp") // todo: better way to do this?

devenv.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"devenv": {
44
"locked": {
55
"dir": "src/modules",
6-
"lastModified": 1742147141,
6+
"lastModified": 1744588088,
77
"owner": "cachix",
88
"repo": "devenv",
9-
"rev": "e1eb23d427a3a0871c277268a28163898fd37266",
9+
"rev": "1e6c06a058dae3791c0303eb99636cee9605c8d9",
1010
"type": "github"
1111
},
1212
"original": {
@@ -40,10 +40,10 @@
4040
]
4141
},
4242
"locked": {
43-
"lastModified": 1742058297,
43+
"lastModified": 1742649964,
4444
"owner": "cachix",
4545
"repo": "git-hooks.nix",
46-
"rev": "59f17850021620cd348ad2e9c0c64f4e6325ce2a",
46+
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
4747
"type": "github"
4848
},
4949
"original": {
@@ -74,10 +74,10 @@
7474
},
7575
"nixpkgs": {
7676
"locked": {
77-
"lastModified": 1744157173,
77+
"lastModified": 1744536153,
7878
"owner": "NixOS",
7979
"repo": "nixpkgs",
80-
"rev": "6a39c6e495eefabc935d8ddf66aa45d85b85fa3f",
80+
"rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
8181
"type": "github"
8282
},
8383
"original": {

devenv.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ let
33
qulacs = pkgs.callPackage ./nix/qulacs.nix {};
44
in {
55
env = {
6-
LIBQULACS_PATH = "${qulacs}/lib";
6+
QULACS_PATH = qulacs;
77
LIBCLANG_PATH = "${pkgs.libclang.lib}/lib";
88
};
99

0 commit comments

Comments
 (0)