| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame] | 1 | --- a/CMakeLists.txt |
| 2 | +++ b/CMakeLists.txt |
| 3 | @@ -367,9 +367,11 @@ set_target_properties(lib_gost_engine PR |
| 4 | COMPILE_DEFINITIONS "BUILDING_ENGINE_AS_LIBRARY" |
| 5 | PUBLIC_HEADER gost-engine.h |
| 6 | OUTPUT_NAME "gost") |
| 7 | -target_link_libraries(lib_gost_engine PRIVATE gost_core gost_err) |
| 8 | +#target_link_libraries(lib_gost_engine PRIVATE gost_core gost_err) |
| 9 | +target_link_libraries(lib_gost_engine PRIVATE gost_core) |
| 10 | endif() |
| 11 | |
| 12 | +if (0) |
| 13 | # The GOST provider uses this |
| 14 | add_subdirectory(libprov) |
| 15 | |
| 16 | @@ -394,6 +396,7 @@ set_target_properties(lib_gost_prov PROP |
| 17 | ) |
| 18 | target_link_libraries(lib_gost_prov PRIVATE gost_core libprov) |
| 19 | endif() |
| 20 | +endif() |
| 21 | |
| 22 | set(GOST_SUM_SOURCE_FILES |
| 23 | gostsum.c |
| 24 | @@ -434,15 +437,15 @@ install(FILES gostsum.1 gost12sum.1 DEST |
| 25 | install(TARGETS gost_engine EXPORT GostEngineConfig |
| 26 | LIBRARY DESTINATION ${OPENSSL_ENGINES_DIR} |
| 27 | RUNTIME DESTINATION ${OPENSSL_ENGINES_DIR}) |
| 28 | -install(TARGETS gost_prov EXPORT GostProviderConfig |
| 29 | - LIBRARY DESTINATION ${OPENSSL_MODULES_DIR} |
| 30 | - RUNTIME DESTINATION ${OPENSSL_MODULES_DIR}) |
| 31 | +#install(TARGETS gost_prov EXPORT GostProviderConfig |
| 32 | +# LIBRARY DESTINATION ${OPENSSL_MODULES_DIR} |
| 33 | +# RUNTIME DESTINATION ${OPENSSL_MODULES_DIR}) |
| 34 | if (NOT MSVC) |
| 35 | # install engine and provider in library form |
| 36 | install(TARGETS lib_gost_engine EXPORT GostEngineConfig |
| 37 | LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 38 | -install(TARGETS lib_gost_prov EXPORT GostProviderConfig |
| 39 | - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 40 | +#install(TARGETS lib_gost_prov EXPORT GostProviderConfig |
| 41 | +# LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 42 | endif() |
| 43 | |
| 44 | if (MSVC) |
| 45 | @@ -450,8 +453,8 @@ if (MSVC) |
| 46 | EXPORT GostEngineConfig DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL) |
| 47 | install(FILES $<TARGET_PDB_FILE:gost_engine> |
| 48 | EXPORT GostEngineConfig DESTINATION ${OPENSSL_ENGINES_DIR} OPTIONAL) |
| 49 | - install(FILES $<TARGET_PDB_FILE:gost_prov> |
| 50 | - EXPORT GostProviderConfig DESTINATION ${OPENSSL_MODULES_DIR} OPTIONAL) |
| 51 | +# install(FILES $<TARGET_PDB_FILE:gost_prov> |
| 52 | +# EXPORT GostProviderConfig DESTINATION ${OPENSSL_MODULES_DIR} OPTIONAL) |
| 53 | endif() |
| 54 | install(EXPORT GostEngineConfig DESTINATION share/cmake/GostEngine) |
| 55 | -install(EXPORT GostProviderConfig DESTINATION share/cmake/GostProvider) |
| 56 | +#install(EXPORT GostProviderConfig DESTINATION share/cmake/GostProvider) |