Remove libdigidoc support

IB-6688

Signed-off-by: Raul Metsma <[email protected]>

Author: metsma

CMakeLists.txt

@@ -27,7 +27,6 @@ set_env( TSL_CERTS
     CACHE FILEPATH "TSL trust list signing certificates" )
 set_env( TSA_URL "http://dd-at.ria.ee/tsa" CACHE STRING "Default TSA URL" )
 set_env( SIVA_URL "https://siva.eesti.ee/V3/validate" CACHE STRING "Default SiVa validation service URL" )
-set( LIBDIGIDOC_LINKED YES CACHE BOOL "Link with libdigidoc or load runtime with dlopen" )
 set( BUILD_TOOLS YES CACHE BOOL "Build digidoc-tool" )
 set( BUILD_SHARED_LIBS YES CACHE BOOL "Build library as SHARED or STATIC" )
 set( SIGNCERT "" CACHE STRING "Common name of certificate to used sign binaries, empty skip signing" )
@@ -38,7 +37,6 @@ if( APPLE )
 endif()
 
 find_package(Doxygen)
-find_package(LibDigiDoc)
 find_package(OpenSSL 1.0.2 REQUIRED)
 find_package(PKCS11)
 find_package(PoDoFo)

cmake

@@ -245,22 +245,6 @@ if(USE_KEYCHAIN)
     target_link_libraries(digidocpp PRIVATE "-framework Security")
 endif()
 
-if(LIBDIGIDOC_FOUND)
-    target_sources(digidocpp PRIVATE DDoc.cpp)
-    target_include_directories(digidocpp PRIVATE ${LIBDIGIDOC_INCLUDE_DIR})
-    if(LIBDIGIDOC_LINKED)
-        set_property(SOURCE Container.cpp DDoc.cpp APPEND PROPERTY COMPILE_DEFINITIONS LINKED_LIBDIGIDOC)
-        target_link_libraries(digidocpp PRIVATE ${LIBDIGIDOC_LIBRARY})
-        if(NOT ${BUILD_SHARED_LIBS})
-            find_package(Iconv)
-            find_package(LibXml2)
-            target_link_libraries(digidocpp PRIVATE ${ICONV_LIBRARIES} ${LIBXML2_LIBRARIES})
-        endif()
-    else()
-        set_property(SOURCE Container.cpp APPEND PROPERTY COMPILE_DEFINITIONS DYNAMIC_LIBDIGIDOC)
-    endif()
-endif()
-
 if(PODOFO_FOUND)
     target_sources(digidocpp PRIVATE PDF.cpp SignatureCAdES_B.cpp SignatureCAdES_T.cpp)
     target_include_directories(digidocpp PRIVATE ${PODOFO_INCLUDE_DIR})

src/CMakeLists.txt

@@ -22,7 +22,6 @@
 #include "ASiC_E.h"
 #include "ASiC_S.h"
 #include "DataFile.h"
-#include "DDoc.h"
 #include "Exception.h"
 #include "log.h"
 #include "PDF.h"
@@ -151,9 +150,6 @@ void digidoc::initialize(const string &appInfo, const string &userAgent, initCal
     if(!Conf::instance())
         Conf::init(new XmlConfCurrent);
 
-#if defined(DYNAMIC_LIBDIGIDOC) || defined(LINKED_LIBDIGIDOC)
-    Container::addContainerImplementation<DDoc>();
-#endif
 #ifdef PDF_SUPPORT
     Container::addContainerImplementation<PDF>();
 #endif