Fixes for Archlinux

This commit is contained in:
AlexandreRouma 2021-10-28 10:05:31 +02:00
parent a11b74a595
commit 312c80b355
2 changed files with 20 additions and 6 deletions

View File

@ -44,6 +44,9 @@ option(OPT_BUILD_FREQUENCY_MANAGER "Build the Frequency Manager module" ON)
option(OPT_BUILD_RECORDER "Audio and baseband recorder" ON) option(OPT_BUILD_RECORDER "Audio and baseband recorder" ON)
option(OPT_BUILD_RIGCTL_SERVER "Rigctl backend for controlling SDR++ with software like gpredict" ON) option(OPT_BUILD_RIGCTL_SERVER "Rigctl backend for controlling SDR++ with software like gpredict" ON)
# Other options
option(USE_INTERNAL_LIBCORRECT "Use an external version of libcorrect" ON)
# Core of SDR++ # Core of SDR++
add_subdirectory("core") add_subdirectory("core")

View File

@ -1,7 +1,9 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.13)
project(sdrpp_core) project(sdrpp_core)
add_subdirectory("libcorrect/") if (USE_INTERNAL_LIBCORRECT)
add_subdirectory("libcorrect/")
endif (USE_INTERNAL_LIBCORRECT)
# Main code # Main code
file(GLOB_RECURSE SRC "src/*.cpp" "src/*.c") file(GLOB_RECURSE SRC "src/*.cpp" "src/*.c")
@ -31,12 +33,14 @@ target_compile_definitions(sdrpp_core PUBLIC INSTALL_PREFIX="${CMAKE_INSTALL_PRE
target_include_directories(sdrpp_core PUBLIC "src/") target_include_directories(sdrpp_core PUBLIC "src/")
target_include_directories(sdrpp_core PUBLIC "src/imgui") target_include_directories(sdrpp_core PUBLIC "src/imgui")
# Link to linkcorrect # Link to libcorrect
target_include_directories(sdrpp_core PUBLIC "libcorrect/include") if (USE_INTERNAL_LIBCORRECT)
target_link_libraries(sdrpp_core PUBLIC correct_static) target_include_directories(sdrpp_core PUBLIC "libcorrect/include")
target_link_libraries(sdrpp_core PUBLIC correct_static)
endif (USE_INTERNAL_LIBCORRECT)
if (OPT_OVERRIDE_STD_FILESYSTEM) if (OPT_OVERRIDE_STD_FILESYSTEM)
target_include_directories(sdrpp_core PUBLIC "std_replacement") target_include_directories(sdrpp_core PUBLIC "std_replacement")
endif (OPT_OVERRIDE_STD_FILESYSTEM) endif (OPT_OVERRIDE_STD_FILESYSTEM)
if (MSVC) if (MSVC)
@ -79,7 +83,7 @@ else()
${GLFW3_INCLUDE_DIRS} ${GLFW3_INCLUDE_DIRS}
${VOLK_INCLUDE_DIRS} ${VOLK_INCLUDE_DIRS}
) )
target_link_directories(sdrpp_core PUBLIC target_link_directories(sdrpp_core PUBLIC
${GLEW_LIBRARY_DIRS} ${GLEW_LIBRARY_DIRS}
${FFTW3_LIBRARY_DIRS} ${FFTW3_LIBRARY_DIRS}
@ -95,6 +99,13 @@ else()
${VOLK_LIBRARIES} ${VOLK_LIBRARIES}
) )
if (NOT USE_INTERNAL_LIBCORRECT)
pkg_check_modules(CORRECT REQUIRED libcorrect)
target_include_directories(sdrpp_core PUBLIC ${CORRECT_INCLUDE_DIRS})
target_link_directories(sdrpp_core PUBLIC ${CORRECT_LIBRARY_DIRS})
target_link_libraries(sdrpp_core PUBLIC ${CORRECT_LIBRARIES})
endif (NOT USE_INTERNAL_LIBCORRECT)
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
target_link_libraries(sdrpp_core PUBLIC stdc++fs) target_link_libraries(sdrpp_core PUBLIC stdc++fs)
endif () endif ()