eddy/mountcontrol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix ASIO and cxxopts libraries compile/link errors

Browse Source
This commit is contained in:
Timur A. Fatkhullin 2025-10-31 11:02:52 +03:00
parent cb362c6e49
commit a1fa54c636
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
asibfm700/CMakeLists.txt
View File

@ -43,15 +43,18 @@ else()
include(ExternalProject) include(ExternalProject)
FetchContent_Declare(cxxopts_lib FetchContent_Declare(cxxopts_lib
SOURCE_DIR ${CMAKE_BINARY_DIR}/cxxopts_lib PREFIX ${CMAKE_BINARY_DIR}/cxxopts_lib
BINARY_DIR ${CMAKE_BINARY_DIR} # SOURCE_DIR ${CMAKE_BINARY_DIR}/cxxopts_lib
GIT_REPOSITORY "https://github.com/jarro2783/cxxopts.git" # BINARY_DIR ${CMAKE_BINARY_DIR}
GIT_TAG "v3.3.1" GIT_REPOSITORY "https://github.com/jarro2783/cxxopts.git"
GIT_SHALLOW TRUE GIT_TAG "v3.3.1"
GIT_SUBMODULES "" GIT_SHALLOW TRUE
GIT_PROGRESS TRUE GIT_SUBMODULES ""
GIT_PROGRESS TRUE
OVERRIDE_FIND_PACKAGE
) )
FetchContent_MakeAvailable(cxxopts_lib) FetchContent_MakeAvailable(cxxopts_lib)
find_package(cxxopts CONFIG)
endif() endif()
set(ASIBFM700_LIB_SRC asibfm700_common.h asibfm700_servocontroller.h asibfm700_servocontroller.cpp) set(ASIBFM700_LIB_SRC asibfm700_common.h asibfm700_servocontroller.h asibfm700_servocontroller.cpp)
@ -66,12 +69,13 @@ add_library(${ASIBFM700_LIB} STATIC ${ASIBFM700_LIB_SRC}
target_include_directories(${ASIBFM700_LIB} PUBLIC mcc spdlog ${ERFA_INCLUDE_DIR}) target_include_directories(${ASIBFM700_LIB} PUBLIC mcc spdlog ${ERFA_INCLUDE_DIR})
# target_link_libraries(${ASIBFM700_LIB} PUBLIC mcc spdlog ${ERFA_LIBFILE}) # target_link_libraries(${ASIBFM700_LIB} PUBLIC mcc spdlog ${ERFA_LIBFILE})
target_link_libraries(${ASIBFM700_LIB} PUBLIC mcc spdlog ERFA_LIB bsplines sidservo) target_link_libraries(${ASIBFM700_LIB} PUBLIC mcc ASIO::ASIO spdlog ERFA_LIB bsplines sidservo)
set(ASIBFM700_NETSERVER_APP asibfm700_netserver) set(ASIBFM700_NETSERVER_APP asibfm700_netserver)
add_executable(${ASIBFM700_NETSERVER_APP} asibfm700_netserver_main.cpp) add_executable(${ASIBFM700_NETSERVER_APP} asibfm700_netserver_main.cpp)
target_link_libraries(${ASIBFM700_NETSERVER_APP} PRIVATE mcc spdlog ${ASIBFM700_LIB}) # target_link_libraries(${ASIBFM700_NETSERVER_APP} PRIVATE mcc spdlog ${ASIBFM700_LIB})
target_link_libraries(${ASIBFM700_NETSERVER_APP} PRIVATE cxxopts ${ASIBFM700_LIB})
option(WITH_TESTS "Build tests" ON) option(WITH_TESTS "Build tests" ON)

4
mcc/CMakeLists.txt
View File

@ -38,8 +38,6 @@ if (NOT ${spdlog_FOUND})
find_package(spdlog CONFIG) find_package(spdlog CONFIG)
endif() endif()
message(STATUS "-----: " ${spdlog_FOUND})
# ******* ERFA LIBRARY ******* # ******* ERFA LIBRARY *******
ExternalProject_Add(erfalib ExternalProject_Add(erfalib
@ -65,8 +63,6 @@ set(ERFA_INCLUDE_DIR ${CMAKE_BINARY_DIR}/erfa_lib)
# set(ERFA_LIBFILE ${CMAKE_BINARY_DIR}/erfa_lib/liberfa.a PARENT_SCOPE) # set(ERFA_LIBFILE ${CMAKE_BINARY_DIR}/erfa_lib/liberfa.a PARENT_SCOPE)
# include_directories(${ERFA_INCLUDE_DIR}) # include_directories(${ERFA_INCLUDE_DIR})
message(STATUS ${ERFA_INCLUDE_DIR})
add_subdirectory(bsplines) add_subdirectory(bsplines)
message(STATUS "BSPLINES_INCLUDE_DIR: " ${BSPLINES_INCLUDE_DIR}) message(STATUS "BSPLINES_INCLUDE_DIR: " ${BSPLINES_INCLUDE_DIR})
include_directories(${BSPLINES_INCLUDE_DIR}) include_directories(${BSPLINES_INCLUDE_DIR})