Skip to content

Commit 497c494

Browse files
committed
Added poppler-data to license
Changed removed all absolute paths
1 parent 1f0bce2 commit 497c494

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

cmake/external_libraries.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ if(UseQtFive)
5454
${WINDOWS_PRECOMPILED_STATIC_LIBRARIES}
5555
)
5656
set(POPPLER_INCLUDE_DIRS
57-
"D:/MSVC/ThirdParty/compiled/poppler/include/poppler/qt5"
57+
"${CMAKE_SOURCE_DIR}/../ThirdParty/compiled/poppler/include/poppler/qt5"
5858
)
5959
else() # MSVC, but not statically linking
6060
message(FATAL_ERROR "Please provide dynamic libraries")
6161
set(POPPLER_LIBRARIES
6262
${WINDOWS_PRECOMPILED_DYNAMIC_LIBRARIES}
6363
)
6464
set(POPPLER_INCLUDE_DIRS
65-
"C:/dspdf/popplerDyn/poppler/include/poppler/qt5"
65+
"${CMAKE_SOURCE_DIR}/../ThirdParty/compiled/popplerDyn/poppler/include/poppler/qt5"
6666
)
6767
endif()
6868
else()

docs/Windows/license.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ <h2>Licenses</h2>
2424
<li>OpenJPEG 2.2.0 &mdash; <a href="http://www.openjpeg.org/" target="_blank">Homepage</a> &bull; License: <tt>openjpeg.txt</tt></li>
2525
<li>pixman 0.34.0 &mdash; <a href="http://cairographics.org" target="_blank">Homepage</a> &bull; License: <tt>pixman.txt</tt></li>
2626
<li>poppler 0.57.0 &mdash; <a href="http://poppler.freedesktop.org/" target="_blank">Homepage</a> &bull; License: <tt>GPLv2.txt</tt></li>
27+
<li>poppler-data 0.4.8 &mdash; <a href="http://poppler.freedesktop.org/" target="_blank">Homepage</a> &bull; License: <tt>adobe.txt</tt> (cMap) and <tt>GPLv2.txt</tt> (cidToUnicode, nameToUnicode, unicodeMap)</li>
2728
<li>Qt 5.7.1 &mdash; <a href="http://www.qt.io" target="_blank">Homepage</a> &bull; License: <tt>GPLv2.txt</tt></li>
2829
<li>Xz Utils liblzma 5.2.3 &mdash; <a href="http://tukaani.org/xz/" target="_blank">Homepage</a> &bull; License: public domain</li>
2930
<li>zlib 1.2.11 &mdash; <a href="http://www.zlib.net/" target="_blank">Homepage</a> &bull; License: <tt>zlib.txt</tt></li>

0 commit comments

Comments
 (0)