tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index 839744f3a..3639bc1c4 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -1314,7 +1314,7 @@ if(NOT VOLKGNSSSDR_FOUND)
6 BINARY_DIR ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/build
7 CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}
8 -DCMAKE_BUILD_TYPE=$<$<CONFIG:None>:None>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:NoOptWithASM>$<$<CONFIG:Coverage>:Coverage>$<$<CONFIG:O2WithASM>:O2WithASM>$<$<CONFIG:O3WithASM>:O3WithASM>$<$<CONFIG:ASAN>:ASAN>
9- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
10+ -DCMAKE_INSTALL_LIBDIR=lib
11 DOWNLOAD_COMMAND ""
12 UPDATE_COMMAND ""
13 PATCH_COMMAND ""
14@@ -1324,7 +1324,7 @@ if(NOT VOLKGNSSSDR_FOUND)
15 else()
16 if(SUPPORTED_CPU_FEATURES_ARCH)
17 set(VOLK_GNSSSDR_BUILD_BYPRODUCTS
18- ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}volk_gnsssdr${CMAKE_STATIC_LIBRARY_SUFFIX}
19+ ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}volk_gnsssdr${CMAKE_STATIC_LIBRARY_SUFFIX}
20 ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/bin/volk_gnsssdr_profile
21 )
22 if(ENABLE_CPUFEATURES)
23@@ -1355,7 +1355,7 @@ if(NOT VOLKGNSSSDR_FOUND)
24 )
25 set(VOLK_GNSSSDR_BUILD_BYPRODUCTS
26 ${VOLK_GNSSSDR_BUILD_BYPRODUCTS}
27- ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
28+ ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
29 )
30 endif()
31 endif()
32@@ -1368,7 +1368,7 @@ if(NOT VOLKGNSSSDR_FOUND)
33 BINARY_DIR ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/build
34 CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}
35 -DCMAKE_BUILD_TYPE=$<$<CONFIG:None>:None>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:NoOptWithASM>$<$<CONFIG:Coverage>:Coverage>$<$<CONFIG:O2WithASM>:O2WithASM>$<$<CONFIG:O3WithASM>:O3WithASM>$<$<CONFIG:ASAN>:ASAN>
36- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
37+ -DCMAKE_INSTALL_LIBDIR=lib
38 DOWNLOAD_COMMAND ""
39 UPDATE_COMMAND ""
40 PATCH_COMMAND ""
41@@ -1387,12 +1387,12 @@ if(NOT VOLKGNSSSDR_FOUND)
42 BINARY_DIR ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/build
43 CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}
44 -DCMAKE_BUILD_TYPE=$<$<CONFIG:None>:None>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:NoOptWithASM>$<$<CONFIG:Coverage>:Coverage>$<$<CONFIG:O2WithASM>:O2WithASM>$<$<CONFIG:O3WithASM>:O3WithASM>$<$<CONFIG:ASAN>:ASAN>
45- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
46+ -DCMAKE_INSTALL_LIBDIR=lib
47 DOWNLOAD_COMMAND ""
48 UPDATE_COMMAND ""
49 PATCH_COMMAND ""
50 BUILD_COMMAND ${VOLK_GNSSSDR_BUILD_COMMAND}
51- BUILD_BYPRODUCTS ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}volk_gnsssdr${CMAKE_STATIC_LIBRARY_SUFFIX}
52+ BUILD_BYPRODUCTS ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}volk_gnsssdr${CMAKE_STATIC_LIBRARY_SUFFIX}
53 ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/bin/volk_gnsssdr_profile
54 ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/bin/volk_gnsssdr-config-info
55 INSTALL_DIR ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install
56@@ -1406,7 +1406,7 @@ if(NOT VOLKGNSSSDR_FOUND)
57 endif()
58
59 add_library(volk_gnsssdr UNKNOWN IMPORTED)
60- set_property(TARGET volk_gnsssdr PROPERTY IMPORTED_LOCATION ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/libvolk_gnsssdr${CMAKE_STATIC_LIBRARY_SUFFIX})
61+ set_property(TARGET volk_gnsssdr PROPERTY IMPORTED_LOCATION ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/lib/libvolk_gnsssdr${CMAKE_STATIC_LIBRARY_SUFFIX})
62 set(VOLK_GNSSSDR_INCLUDE_DIRS "${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/build/include/;${GNSSSDR_SOURCE_DIR}/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include;${ORC_INCLUDE_DIRS}")
63 set(VOLK_GNSSSDR_LIBRARIES volk_gnsssdr ${ORC_LIBRARIES_STATIC})
64 if(CPUFEATURES_FOUND)
65@@ -1419,7 +1419,7 @@ if(NOT VOLKGNSSSDR_FOUND)
66 add_dependencies(Volkgnsssdr::volkgnsssdr volk_gnsssdr_module)
67 set_target_properties(Volkgnsssdr::volkgnsssdr PROPERTIES
68 IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
69- IMPORTED_LOCATION "${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/libvolk_gnsssdr${CMAKE_STATIC_LIBRARY_SUFFIX}"
70+ IMPORTED_LOCATION "${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/lib/libvolk_gnsssdr${CMAKE_STATIC_LIBRARY_SUFFIX}"
71 INCLUDE_DIRECTORIES "${VOLK_GNSSSDR_INCLUDE_DIRS}"
72 INTERFACE_INCLUDE_DIRECTORIES "${VOLK_GNSSSDR_INCLUDE_DIRS}"
73 INTERFACE_LINK_LIBRARIES "${VOLK_GNSSSDR_LIBRARIES}"
74@@ -1427,7 +1427,7 @@ if(NOT VOLKGNSSSDR_FOUND)
75 if(CMAKE_VERSION VERSION_GREATER 3.0 AND SUPPORTED_CPU_FEATURES_ARCH)
76 if(NOT CPUFEATURES_FOUND AND ENABLE_CPUFEATURES)
77 set_target_properties(Volkgnsssdr::volkgnsssdr PROPERTIES
78- INTERFACE_LINK_LIBRARIES ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
79+ INTERFACE_LINK_LIBRARIES ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
80 )
81 endif()
82 endif()