Attachment 128834 Details for Bug 99331 – A try to fix the link issues.

[patch] A try to fix the link issues.

poppler-0.50-fix-nss3-link-issues.patch (text/plain), 1.86 KB, created by Nadal Gonzalo García Zavala on 2017-01-09 15:31:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nadal Gonzalo García Zavala

Created: 2017-01-09 15:31:21 UTC

Size: 1.86 KB

patch

obsolete

>diff --git a/cpp/tests/CMakeLists.txt b/tmp/CMakeLists.txt
>index 6ea24a5..a256ae8 100644
>--- a/cpp/tests/CMakeLists.txt
>+++ b/tmp/CMakeLists.txt
>@@ -17,9 +17,14 @@ macro(CPP_ADD_SIMPLETEST exe)
>   endif(MSVC)
> endmacro(CPP_ADD_SIMPLETEST)
> 
>+set(common_libs poppler)
>+
>+if (ENABLE_NSS3)
>+  set(common_libs ${common_libs} ${NSS3_LDFLAGS})
>+endif (ENABLE_NSS3)
> 
> cpp_add_simpletest(poppler-dump poppler-dump.cpp ${CMAKE_SOURCE_DIR}/utils/parseargs.cc)
>-target_link_libraries(poppler-dump poppler)
>+target_link_libraries(poppler-dump ${common_libs})
> 
> cpp_add_simpletest(poppler-render poppler-render.cpp ${CMAKE_SOURCE_DIR}/utils/parseargs.cc)
>-target_link_libraries(poppler-render poppler)
>+target_link_libraries(poppler-render ${common_libs})
>diff --git a/utils/CMakeLists.txt b/tmp/CMakeLists.txt
>index af81161..e62b2a4 100644
>--- a/utils/CMakeLists.txt
>+++ b/tmp/CMakeLists.txt
>@@ -6,6 +6,10 @@ set(common_libs
>   poppler
> )
> 
>+if (ENABLE_NSS3)
>+  set(common_libs ${common_libs} ${NSS3_LDFLAGS})
>+endif (ENABLE_NSS3)
>+
> if (ENABLE_SPLASH)
>   # pdftoppm
>   set(pdftoppm_SOURCES ${common_srcs}
>diff --git a/test/CMakeLists.txt b/tmp/CMakeLists.txt
>index a89a4cf..7d747c3 100644
>--- a/test/CMakeLists.txt
>+++ b/tmp/CMakeLists.txt
>@@ -6,8 +6,12 @@ if (ENABLE_SPLASH)
>       perf-test.cc
>       perf-test-preview-dummy.cc
>     )
>+
>+    set(common_libs poppler)
>+    set(common_libs ${common_libs} ${NSS3_LDFLAGS})
>+
>     add_executable(perf-test ${perf_test_SRCS})
>-    target_link_libraries(perf-test poppler)
>+    target_link_libraries(perf-test ${common_libs})
>     if (LIB_RT_HAS_NANOSLEEP)
>       target_link_libraries(perf-test rt)
>     endif (LIB_RT_HAS_NANOSLEEP)
>@@ -47,6 +51,6 @@ set (pdf_fullrewrite_SRCS
>   ../utils/parseargs.cc
> )
> add_executable(pdf-fullrewrite ${pdf_fullrewrite_SRCS})
>-target_link_libraries(pdf-fullrewrite poppler)
>+target_link_libraries(pdf-fullrewrite ${common_libs})
> 
>

Actions: View | Splinter Review

Attachments on bug 99331: 128832 | 128833 | 128834

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.