[poppler] 2 commits - CMakeLists.txt cpp/CMakeLists.txt

[Albert Astals Cid]

 CMakeLists.txt     |    2 ++
 cpp/CMakeLists.txt |    3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit e15a0df15b89e1c7ba98cd7bbbf8ef97e541d231
Author: Hannah von Reth <vonreth at kde.org>
Date:   Sun Aug 13 20:26:44 2017 +0200

    Remove old/wrong cmake code for MSVC

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index d7027774..67b5747c 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -25,9 +25,6 @@ set(poppler_cpp_SRCS
 add_library(poppler-cpp SHARED ${poppler_cpp_SRCS})
 set_target_properties(poppler-cpp PROPERTIES VERSION 0.3.0 SOVERSION 0)
 target_link_libraries(poppler-cpp poppler ${ICONV_LIBRARIES})
-if(MSVC)
-target_link_libraries(poppler-cpp LINK_PRIVATE ${poppler_LIBS})
-endif(MSVC)
 install(TARGETS poppler-cpp RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
 
 install(FILES
commit 236f4ff4f516cb68a2d102627b0a3da73578c67f
Author: Hannah von Reth <vonreth at kde.org>
Date:   Sun Aug 13 20:24:15 2017 +0200

    Use WIN32_LEAN_AND_MEAN on Windows

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 390a6b5f..03ef1db5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -519,6 +519,8 @@ if(USE_CMS)
   endif(LCMS2_FOUND)
 endif(USE_CMS)
 if(WIN32)
+  # use clean APIs
+  add_definitions(-DWIN32_LEAN_AND_MEAN)
   # gdi32 is needed under win32
   set(poppler_LIBS ${poppler_LIBS} gdi32)
 endif(WIN32)