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

Merge branch 'features-2564' into 'master'

Features 2564

See merge request libdap-crypto-python!2
parents edd62ffc 1d4b05c7
No related branches found
No related tags found
1 merge request!26Support 3689
...@@ -15,8 +15,14 @@ if(NOT (${SUBMODULES_NO_BUILD} MATCHES ON)) ...@@ -15,8 +15,14 @@ if(NOT (${SUBMODULES_NO_BUILD} MATCHES ON))
"-fpic" "-fpic"
) )
endif() endif()
if (NOT (TARGET dap_crypto))
add_subdirectory(libdap-crypto)
target_compile_options(
dap_crypto PRIVATE
"-fpic"
)
endif()
endif() endif()
add_subdirectory(libdap-crypto)
file(GLOB CRYPTO_PYTHON_SRCS src/*.c) file(GLOB CRYPTO_PYTHON_SRCS src/*.c)
file(GLOB CRYPTO_PYTHON_HEADERS include/*.h) file(GLOB CRYPTO_PYTHON_HEADERS include/*.h)
...@@ -29,16 +35,6 @@ add_library(${PROJECT_NAME} STATIC ${CRYPTO_PYTHON_SRCS} ${CRYPTO_PYTHON_HEADERS ...@@ -29,16 +35,6 @@ add_library(${PROJECT_NAME} STATIC ${CRYPTO_PYTHON_SRCS} ${CRYPTO_PYTHON_HEADERS
target_link_libraries(${PROJECT_NAME}) target_link_libraries(${PROJECT_NAME})
target_compile_options(
dap_core PRIVATE
"-fpic"
)
target_compile_options(
dap_crypto PRIVATE
"-fpic"
)
target_link_libraries(${PROJECT_NAME} dap_core dap_crypto) target_link_libraries(${PROJECT_NAME} dap_core dap_crypto)
target_include_directories(${PROJECT_NAME} PUBLIC include/ ) target_include_directories(${PROJECT_NAME} PUBLIC include/ )
......
Subproject commit 4d764dfacaaa6aa1d8e5ba3c8242d8466e4faf10 Subproject commit bb48d2efb77ee770c6f36c296811688f2ad9c348
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