You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
47 lines
3.4 KiB
47 lines
3.4 KiB
--- i/CMakeLists.txt
|
|
+++ w/CMakeLists.txt
|
|
@@ -1210,7 +1210,7 @@ if(NOT VOLKGNSSSDR_FOUND)
|
|
BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build
|
|
CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}
|
|
-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>
|
|
- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
|
|
+ -DCMAKE_INSTALL_LIBDIR=lib
|
|
DOWNLOAD_COMMAND ""
|
|
UPDATE_COMMAND ""
|
|
PATCH_COMMAND ""
|
|
@@ -1248,7 +1248,7 @@ if(NOT VOLKGNSSSDR_FOUND)
|
|
)
|
|
set(VOLK_GNSSSDR_BUILD_BYPRODUCTS
|
|
${VOLK_GNSSSDR_BUILD_BYPRODUCTS}
|
|
- ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
|
|
+ ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
|
|
)
|
|
endif()
|
|
endif()
|
|
@@ -1261,7 +1261,7 @@ if(NOT VOLKGNSSSDR_FOUND)
|
|
BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build
|
|
CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}
|
|
-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>
|
|
- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
|
|
+ -DCMAKE_INSTALL_LIBDIR=lib
|
|
DOWNLOAD_COMMAND ""
|
|
UPDATE_COMMAND ""
|
|
PATCH_COMMAND ""
|
|
@@ -1280,7 +1280,7 @@ if(NOT VOLKGNSSSDR_FOUND)
|
|
BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build
|
|
CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}
|
|
-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>
|
|
- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
|
|
+ -DCMAKE_INSTALL_LIBDIR=lib
|
|
DOWNLOAD_COMMAND ""
|
|
UPDATE_COMMAND ""
|
|
PATCH_COMMAND ""
|
|
@@ -1319,7 +1319,7 @@ if(NOT VOLKGNSSSDR_FOUND)
|
|
if(CMAKE_VERSION VERSION_GREATER 3.0 AND SUPPORTED_CPU_FEATURES_ARCH)
|
|
if(NOT CPUFEATURES_FOUND AND ENABLE_CPUFEATURES)
|
|
set_target_properties(Volkgnsssdr::volkgnsssdr PROPERTIES
|
|
- INTERFACE_LINK_LIBRARIES ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
|
|
+ INTERFACE_LINK_LIBRARIES ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
|
|
)
|
|
endif()
|
|
endif()
|
|
|