diff --git a/library-vcpkg/CMakeLists.txt b/library-vcpkg/CMakeLists.txt index 3148b6163d..16df61f4f5 100644 --- a/library-vcpkg/CMakeLists.txt +++ b/library-vcpkg/CMakeLists.txt @@ -18,12 +18,7 @@ add_compile_definitions(HAVE_VOICE) -if (HAVE_VOICE) - file(GLOB THE_SOURCES "${DPP_ROOT_PATH}/src/dpp/events/*.cpp" "${modules_dir}/dpp/voice/enabled/*.cpp" "${DPP_ROOT_PATH}/dpp/dave/*.cpp" "${DPP_ROOT_PATH}/src/dpp/cluster/*.cpp" "${DPP_ROOT_PATH}/src/dpp/*.cpp" "${DPP_ROOT_PATH}/src/dpp/*.rc") -else() - file(GLOB THE_SOURCES "${DPP_ROOT_PATH}/src/dpp/events/*.cpp" "${modules_dir}/dpp/voice/stub/*.cpp" "${DPP_ROOT_PATH}/src/dpp/cluster/*.cpp" "${DPP_ROOT_PATH}/src/dpp/*.cpp" "${DPP_ROOT_PATH}/src/dpp/*.rc") -endif() - +file(GLOB THE_SOURCES "${DPP_ROOT_PATH}/src/dpp/events/*.cpp" "${modules_dir}/dpp/voice/enabled/*.cpp" "${DPP_ROOT_PATH}/dpp/dave/*.cpp" "${DPP_ROOT_PATH}/src/dpp/cluster/*.cpp" "${DPP_ROOT_PATH}/src/dpp/*.cpp" "${DPP_ROOT_PATH}/src/dpp/*.rc") set(LIB_NAME "${PROJECT_NAME}") @@ -87,12 +82,10 @@ target_include_directories( "$" ) -if (HAVE_VOICE) - add_subdirectory("${DPP_ROOT_PATH}/mlspp" "mlspp") - include_directories("${DPP_ROOT_PATH}/mlspp/include") - include_directories("${DPP_ROOT_PATH}/mlspp/lib/bytes/include") - include_directories("${DPP_ROOT_PATH}/mlspp/lib/hpke/include") -endif() +add_subdirectory("${DPP_ROOT_PATH}/mlspp" "mlspp") +include_directories("${DPP_ROOT_PATH}/mlspp/include") +include_directories("${DPP_ROOT_PATH}/mlspp/lib/bytes/include") +include_directories("${DPP_ROOT_PATH}/mlspp/lib/hpke/include") set_target_properties( "${LIB_NAME}" PROPERTIES @@ -120,17 +113,15 @@ target_link_libraries( $<$:Threads::Threads> ) -if (HAVE_VOICE) - # Private statically linked dependencies - target_link_libraries( - ${LIB_NAME} PRIVATE - mlspp - mls_vectors - bytes - tls_syntax - hpke - ) -endif() +# Private statically linked dependencies +target_link_libraries( + ${LIB_NAME} PRIVATE + mlspp + mls_vectors + bytes + tls_syntax + hpke +) set(CONFIG_FILE_NAME "${PROJECT_NAME}Config.cmake") set(EXPORTED_TARGETS_NAME "${PROJECT_NAME}Targets")