File tree Expand file tree Collapse file tree 4 files changed +109
-1
lines changed
Expand file tree Collapse file tree 4 files changed +109
-1
lines changed Original file line number Diff line number Diff line change 1+ before_install : if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
2+ echo;
3+ else
4+ sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test;
5+ sudo add-apt-repository --yes ppa:kalakris/cmake;
6+ sudo apt-get update -qq;
7+ sudo apt-get install -y gcc-4.8 g++-4.8 cmake libxml-security-c-dev libssl-dev;
8+ sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90;
9+ wget http://www.codesynthesis.com/download/xsd/4.0/linux-gnu/x86_64/xsd_4.0.0-1_amd64.deb;
10+ sudo dpkg -i xsd_4.0.0-1_amd64.deb;
11+ fi
12+ script :
13+ - mkdir build
14+ - cd build
15+ - cmake ..
16+ - make
17+
18+ os :
19+ - linux
20+ - osx
21+
22+ env :
23+ global :
24+ # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
25+ # via the "travis encrypt" command using the project repo's public key
26+ - secure : " VTpLjRFkVZeqSiP/tea7b5WiMU+PjQJlpny8/QEYazRNhn/uie69aT8VvEdkpsUM1AEx8yPnNmVGShvoNNaOi/AoqynTIKgeGPCj44h6lCnPpByGVur0avc5WrRj2xBbPBBUw1rsL65wZ13MufmRLUwnmmVYQZ3qDBdpgZvCEhA="
27+
28+ addons :
29+ coverity_scan :
30+ project :
31+ name : " open-eid/libdigidocpp"
32+ description : " Build submitted via Travis CI"
33+ notification_email : raul@metsma.ee
34+ build_command_prepend : " mkdir coverity; cd coverity; cmake .."
35+ build_command : make
36+ branch_pattern : coverity_scan
Original file line number Diff line number Diff line change 1+ Please read the [ common contributing guidelines] ( https://github.com/open-eid/org/blob/master/CONTRIBUTING.md ) before you continue!
Original file line number Diff line number Diff line change 1+ # libdigidocpp
2+
3+ * License: LGPL 2.1
4+ * © ; Estonian Information System Authority
5+
6+ ## Building
7+ [ ![ Build Status] ( https://travis-ci.org/open-eid/libdigidocpp.svg?branch=master )] ( https://travis-ci.org/open-eid/libdigidocpp )
8+ [ ![ Coverity Scan Build Status] ( https://scan.coverity.com/projects/727/badge.svg )] ( https://scan.coverity.com/projects/727 )
9+
10+ ### Ubuntu
11+
12+ 1 . Install dependencies
13+
14+ sudo apt-get install cmake libxml-security-c-dev xsdcxx libssl-dev
15+
16+ 2 . Fetch the source
17+
18+ git clone --recursive https://github.com/open-eid/libdigidocpp
19+ cd libdigidocpp
20+
21+ 3 . Configure
22+
23+ mkdir build
24+ cd build
25+ cmake ..
26+
27+ 4 . Build
28+
29+ make
30+
31+ 5 . Install
32+
33+ sudo make install
34+
35+ 6 . Execute
36+
37+ /usr/local/bin/digidoc-tool
38+
39+ ### OSX
40+
41+ 1 . Install dependencies from [ http://www.cmake.org ] ( http://www.cmake.org )
42+
43+ sh prepare_osx_build_environment.sh all
44+
45+ 2 . Fetch the source
46+
47+ git clone --recursive https://github.com/open-eid/libdigidocpp
48+ cd libdigidocpp
49+
50+ 3 . Configure
51+
52+ mkdir build
53+ cd build
54+ cmake ..
55+
56+ 4 . Build
57+
58+ make
59+
60+ 5 . Install
61+
62+ sudo make install
63+
64+ 6 . Execute
65+
66+ /usr/local/bin/digidoc-tool
67+
68+ ## Support
69+ Official builds are provided through official distribution point [ installer.id.ee] ( https://installer.id.ee ) . If you want support, you need to be using official builds.
70+
71+ Source code is provided on "as is" terms with no warranty (see license for more information). Do not file Github issues with generic support requests.
Original file line number Diff line number Diff line change @@ -26,6 +26,7 @@ endif()
2626
2727if ( LIBDIGIDOC_FOUND )
2828 list ( APPEND digidocpp_SRCS DDoc.cpp )
29+ include_directories ( ${LIBDIGIDOC_INCLUDE_DIR} )
2930 if ( LIBDIGIDOC_LINKED )
3031 list ( APPEND digidocpp_DEFS LINKED_LIBDIGIDOC )
3132 list ( APPEND TARGET_LIBRARIES ${LIBDIGIDOC_LIBRARY} )
@@ -165,7 +166,6 @@ include_directories(
165166 ${CMAKE_CURRENT_SOURCE_DIR}
166167 ${CMAKE_CURRENT_BINARY_DIR}
167168 ${OPENSSL_INCLUDE_DIR}
168- ${LIBDIGIDOC_INCLUDE_DIR}
169169 ${XERCESC_INCLUDE_DIR}
170170 ${XMLSECURITYC_INCLUDE_DIRS}
171171 ${XSD_INCLUDE_DIR}
You can’t perform that action at this time.
0 commit comments