Skip to content
Snippets Groups Projects
Commit fa0c59da authored by dmitriy.gerasimov's avatar dmitriy.gerasimov
Browse files

Merge branch 'features-2564' into 'master'

Features 2564 - Updated submodules

See merge request libdap-server-core-python!5
parents f6f20418 2e0519f3
No related branches found
No related tags found
1 merge request!26Support 3689
......@@ -22,9 +22,15 @@ if(NOT (${SUBMODULES_NO_BUILD} MATCHES ON))
"-fpic"
)
endif()
if (NOT (TARGET dap-server-core))
add_subdirectory(libdap-server-core)
target_compile_options(
dap_server_core PRIVATE
"-fpic"
)
endif()
endif()
add_subdirectory(libdap-server-core)
file(GLOB SERVER_CORE_PYTHON_SRCS src/*.c)
......@@ -38,10 +44,6 @@ add_library(${PROJECT_NAME} STATIC ${SERVER_CORE_PYTHON_SRCS} ${SERVER_CORE_PYTH
target_link_libraries(${PROJECT_NAME})
target_compile_options(
dap_server_core PRIVATE
"-fpic"
)
target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_server_core)
......
Subproject commit f91fb3b3b6a69ef53531c8fd729592cdff4ec442
Subproject commit 1c0614797a3a2a2f4c179630025600e177637a65
Subproject commit 4d764dfacaaa6aa1d8e5ba3c8242d8466e4faf10
Subproject commit d9337dda7db1b3430d17914b4e290b9a200045a2
Subproject commit 73dfe6c2616ef8a805231560051de3c407d7cd89
Subproject commit 73a86ef8202ee67a05098d186aac2deacb207f63
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment