[poppler] CMakeLists.txt cpp/tests qt5/src qt5/tests qt6/src qt6/tests

[GitLab Mirror]

 CMakeLists.txt           |    4 +---
 cpp/tests/CMakeLists.txt |    3 ---
 qt5/src/CMakeLists.txt   |    3 ---
 qt5/tests/CMakeLists.txt |    6 ------
 qt6/src/CMakeLists.txt   |    3 ---
 qt6/tests/CMakeLists.txt |    6 ------
 6 files changed, 1 insertion(+), 24 deletions(-)

New commits:
commit 5269ce104dc44fd06e1a4c54408a5fbcacf47fc9
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sat Mar 26 17:12:41 2022 +0100

    We don't need to force STATIC on MSVC anymore
    
    Also we don't need to link to the "wrong" library either

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7bec4189..7e7ff604 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -573,10 +573,8 @@ ADD_GPERF_FILE(ZapfDingbatsWidths)
 
 if(MSVC)
 add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-add_library(poppler STATIC ${poppler_SRCS})
-else()
-add_library(poppler ${poppler_SRCS})
 endif()
+add_library(poppler ${poppler_SRCS})
 generate_export_header(poppler BASE_NAME poppler-private EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler_private_export.h")
 set_target_properties(poppler PROPERTIES VERSION 119.0.0 SOVERSION 119)
 if(MINGW AND BUILD_SHARED_LIBS)
diff --git a/cpp/tests/CMakeLists.txt b/cpp/tests/CMakeLists.txt
index 10ac0b32..143af809 100644
--- a/cpp/tests/CMakeLists.txt
+++ b/cpp/tests/CMakeLists.txt
@@ -12,9 +12,6 @@ macro(CPP_ADD_SIMPLETEST exe)
   )
   poppler_add_test(${exe} BUILD_CPP_TESTS ${${test_name}_SOURCES})
   target_link_libraries(${exe} poppler-cpp poppler)
-  if(MSVC)
-    target_link_libraries(${exe} poppler ${poppler_LIBS})
-  endif()
 endmacro(CPP_ADD_SIMPLETEST)
 
 cpp_add_simpletest(poppler-dump poppler-dump.cpp ${CMAKE_SOURCE_DIR}/utils/parseargs.cc)
diff --git a/qt5/src/CMakeLists.txt b/qt5/src/CMakeLists.txt
index 55671715..638505e6 100644
--- a/qt5/src/CMakeLists.txt
+++ b/qt5/src/CMakeLists.txt
@@ -44,9 +44,6 @@ if(MINGW AND BUILD_SHARED_LIBS)
     set_target_properties(poppler-qt5 PROPERTIES SUFFIX "-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
 endif()
 target_link_libraries(poppler-qt5 poppler Qt5::Core Qt5::Gui Qt5::Xml Freetype::Freetype)
-if(MSVC)
-target_link_libraries(poppler-qt5 poppler ${poppler_LIBS})
-endif()
 if (ENABLE_NSS3)
     target_include_directories(poppler-qt5 SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS})
 endif()
diff --git a/qt5/tests/CMakeLists.txt b/qt5/tests/CMakeLists.txt
index 8293a3a1..baadd428 100644
--- a/qt5/tests/CMakeLists.txt
+++ b/qt5/tests/CMakeLists.txt
@@ -14,9 +14,6 @@ macro(QT5_ADD_SIMPLETEST exe source)
   )
   poppler_add_test(${exe} BUILD_QT5_TESTS ${${test_name}_SOURCES})
   target_link_libraries(${exe} poppler-qt5 Qt5::Widgets)
-  if(MSVC)
-    target_link_libraries(${exe} poppler ${poppler_LIBS})
-  endif()
 endmacro(QT5_ADD_SIMPLETEST)
 
 macro(QT5_ADD_QTEST exe source)
@@ -28,9 +25,6 @@ macro(QT5_ADD_QTEST exe source)
     poppler_add_test(${exe} BUILD_QT5_TESTS ${${test_name}_SOURCES})
     add_test(${exe} ${EXECUTABLE_OUTPUT_PATH}/${exe})
     target_link_libraries(${exe} poppler-qt5 Qt5::Widgets Qt5::Test Qt5::Core Qt5::Gui)
-    if(MSVC)
-      target_link_libraries(${exe} poppler ${poppler_LIBS})
-    endif()
   endif ()
 endmacro(QT5_ADD_QTEST)
 
diff --git a/qt6/src/CMakeLists.txt b/qt6/src/CMakeLists.txt
index 7ba61d12..7104924f 100644
--- a/qt6/src/CMakeLists.txt
+++ b/qt6/src/CMakeLists.txt
@@ -44,9 +44,6 @@ if(MINGW AND BUILD_SHARED_LIBS)
     set_target_properties(poppler-qt6 PROPERTIES SUFFIX "-${POPPLER_QT6_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
 endif()
 target_link_libraries(poppler-qt6 poppler Qt6::Core Qt6::Gui Freetype::Freetype)
-if(MSVC)
-target_link_libraries(poppler-qt6 poppler ${poppler_LIBS})
-endif()
 if (ENABLE_NSS3)
     target_include_directories(poppler-qt6 SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS})
 endif()
diff --git a/qt6/tests/CMakeLists.txt b/qt6/tests/CMakeLists.txt
index d72614f3..d5f7184f 100644
--- a/qt6/tests/CMakeLists.txt
+++ b/qt6/tests/CMakeLists.txt
@@ -14,9 +14,6 @@ macro(QT6_ADD_SIMPLETEST exe source)
   )
   poppler_add_test(${exe} BUILD_QT6_TESTS ${${test_name}_SOURCES})
   target_link_libraries(${exe} poppler-qt6 Qt6::Widgets)
-  if(MSVC)
-    target_link_libraries(${exe} poppler ${poppler_LIBS})
-  endif()
 endmacro()
 
 macro(QT6_ADD_QTEST exe source)
@@ -27,9 +24,6 @@ macro(QT6_ADD_QTEST exe source)
     poppler_add_test(${exe} BUILD_QT6_TESTS ${${test_name}_SOURCES})
     add_test(${exe} ${EXECUTABLE_OUTPUT_PATH}/${exe})
     target_link_libraries(${exe} poppler-qt6 Qt6::Widgets Qt6::Test Qt6::Gui)
-    if(MSVC)
-      target_link_libraries(${exe} poppler ${poppler_LIBS})
-    endif()
 endmacro()