mirror of https://github.com/oxen-io/oxen-core.git
Remove dead DEPENDS code
We dropped the contrib/depends build system quite a while ago (because it was nasty), but there are still various DEPENDS checks scattered through cmake that are just dead code now. This removes them.
This commit is contained in:
parent
6d13152f4e
commit
c789fd5d77
|
@ -697,10 +697,6 @@ else()
|
||||||
message(STATUS "Selecting VFP for ARMv6")
|
message(STATUS "Selecting VFP for ARMv6")
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=vfp")
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=vfp")
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=vfp")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=vfp")
|
||||||
if(DEPENDS)
|
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -marm")
|
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -marm")
|
|
||||||
endif()
|
|
||||||
endif(ARM6)
|
endif(ARM6)
|
||||||
|
|
||||||
if(ARM7)
|
if(ARM7)
|
||||||
|
@ -830,11 +826,7 @@ add_library(icu INTERFACE)
|
||||||
if(MINGW)
|
if(MINGW)
|
||||||
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wa,-mbig-obj")
|
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wa,-mbig-obj")
|
||||||
target_link_libraries(extra INTERFACE mswsock ws2_32 iphlpapi crypt32 bcrypt)
|
target_link_libraries(extra INTERFACE mswsock ws2_32 iphlpapi crypt32 bcrypt)
|
||||||
if(DEPENDS)
|
link_dep_libs(icu INTERFACE "" icuio icuin icuuc icudt icutu iconv)
|
||||||
link_dep_libs(icu INTERFACE "" icuio icui18n icuuc icudata icutu iconv)
|
|
||||||
else()
|
|
||||||
link_dep_libs(icu INTERFACE "" icuio icuin icuuc icudt icutu iconv)
|
|
||||||
endif()
|
|
||||||
elseif(FREEBSD)
|
elseif(FREEBSD)
|
||||||
target_link_libraries(extra INTERFACE execinfo)
|
target_link_libraries(extra INTERFACE execinfo)
|
||||||
elseif(DRAGONFLY)
|
elseif(DRAGONFLY)
|
||||||
|
@ -843,14 +835,10 @@ elseif(DRAGONFLY)
|
||||||
elseif(CMAKE_SYSTEM_NAME MATCHES "(SunOS|Solaris)")
|
elseif(CMAKE_SYSTEM_NAME MATCHES "(SunOS|Solaris)")
|
||||||
target_link_libraries(extra INTERFACE socket nsl resolv)
|
target_link_libraries(extra INTERFACE socket nsl resolv)
|
||||||
elseif(APPLE)
|
elseif(APPLE)
|
||||||
if(DEPENDS)
|
find_library(COREFOUNDATION CoreFoundation)
|
||||||
target_link_libraries(extra INTERFACE "-framework Foundation" "-framework IOKit" "-framework AppKit" "-framework IOKit")
|
find_library(IOKIT IOKit)
|
||||||
else()
|
target_link_libraries(extra INTERFACE ${IOKIT} ${COREFOUNDATION})
|
||||||
find_library(COREFOUNDATION CoreFoundation)
|
elseif(NOT (MSVC OR APPLE OR OPENBSD OR ANDROID))
|
||||||
find_library(IOKIT IOKit)
|
|
||||||
target_link_libraries(extra INTERFACE ${IOKIT} ${COREFOUNDATION})
|
|
||||||
endif()
|
|
||||||
elseif(NOT (MSVC OR DEPENDS OR APPLE OR OPENBSD OR ANDROID))
|
|
||||||
find_library(RT rt)
|
find_library(RT rt)
|
||||||
target_link_libraries(extra INTERFACE rt)
|
target_link_libraries(extra INTERFACE rt)
|
||||||
endif()
|
endif()
|
||||||
|
@ -865,7 +853,7 @@ else()
|
||||||
option(USE_READLINE "Build with GNU readline support." ON)
|
option(USE_READLINE "Build with GNU readline support." ON)
|
||||||
if(USE_READLINE AND BUILD_STATIC_DEPS)
|
if(USE_READLINE AND BUILD_STATIC_DEPS)
|
||||||
# readline target already set up
|
# readline target already set up
|
||||||
elseif(USE_READLINE AND NOT DEPENDS)
|
elseif(USE_READLINE)
|
||||||
find_package(Readline)
|
find_package(Readline)
|
||||||
if(READLINE_FOUND AND GNU_READLINE_FOUND)
|
if(READLINE_FOUND AND GNU_READLINE_FOUND)
|
||||||
add_library(readline INTERFACE)
|
add_library(readline INTERFACE)
|
||||||
|
@ -876,14 +864,6 @@ else()
|
||||||
else()
|
else()
|
||||||
message(STATUS "Could not find GNU readline library so building without readline support")
|
message(STATUS "Could not find GNU readline library so building without readline support")
|
||||||
endif()
|
endif()
|
||||||
elseif(USE_READLINE AND DEPENDS AND NOT MINGW)
|
|
||||||
find_path(Readline_INCLUDE_PATH readline/readline.h)
|
|
||||||
find_library(Readline_LIBRARY readline)
|
|
||||||
find_library(Terminfo_LIBRARY tinfo)
|
|
||||||
add_library(readline INTERFACE)
|
|
||||||
target_link_libraries(readline INTERFACE ${Readline_LIBRARY} ${Terminfo_LIBRARY})
|
|
||||||
target_include_directories(readline INTERFACE ${Readline_INCLUDE_PATH})
|
|
||||||
target_compile_definitions(readline INTERFACE HAVE_READLINE)
|
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
|
@ -74,14 +74,6 @@ endif()
|
||||||
|
|
||||||
if(NOT LOKIMQ_FOUND)
|
if(NOT LOKIMQ_FOUND)
|
||||||
message(STATUS "Using in-tree oxenmq")
|
message(STATUS "Using in-tree oxenmq")
|
||||||
if (DEPENDS)
|
|
||||||
# The depends system builds a static libzmq so set up a target loki-mq can use to avoid building
|
|
||||||
add_library(libzmq STATIC IMPORTED GLOBAL)
|
|
||||||
set_target_properties(libzmq PROPERTIES IMPORTED_LOCATION ${ZMQ_LIBRARIES})
|
|
||||||
target_link_libraries(libzmq INTERFACE sodium)
|
|
||||||
target_include_directories(libzmq INTERFACE ${ZMQ_INCLUDE_DIRS})
|
|
||||||
message(STATUS "${ZMQ_INCLUDE_DIRS} ${ZMQ_LIBRARIES}")
|
|
||||||
endif()
|
|
||||||
add_subdirectory(loki-mq)
|
add_subdirectory(loki-mq)
|
||||||
else()
|
else()
|
||||||
add_library(oxenmq INTERFACE)
|
add_library(oxenmq INTERFACE)
|
||||||
|
|
|
@ -86,7 +86,6 @@ if(STACK_TRACE)
|
||||||
# On ARM, having libunwind package (with .so's only) installed breaks static link.
|
# On ARM, having libunwind package (with .so's only) installed breaks static link.
|
||||||
# When possible, avoid stack tracing using libunwind in favor of using easylogging++.
|
# When possible, avoid stack tracing using libunwind in favor of using easylogging++.
|
||||||
if (APPLE)
|
if (APPLE)
|
||||||
elseif (DEPENDS AND NOT LINUX)
|
|
||||||
elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT MINGW)
|
elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT MINGW)
|
||||||
target_link_libraries(common PRIVATE easylogging) # for diag output only
|
target_link_libraries(common PRIVATE easylogging) # for diag output only
|
||||||
elseif (ARM AND STATIC)
|
elseif (ARM AND STATIC)
|
||||||
|
|
Loading…
Reference in New Issue