CMake: Remove popt from dependencies

Not required anymore after 408cb49b5559a81ea803df64bf58457a5dd4bf16

5 files changed, 1 insertions, 99 deletions

diff --git a/CMakeScripts/ConfigCPack.cmake b/CMakeScripts/ConfigCPack.cmake
index b2b8f8f59..175816d52 100644
--- a/CMakeScripts/ConfigCPack.cmake
+++ b/CMakeScripts/ConfigCPack.cmake
@@ -41,7 +41,7 @@ endif (WIN32)
 
 ### DEB ###
 if(UNIX)
-    SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libaspell15 (>= 0.60.7~20110707), libatkmm-1.6-1v5 (>= 2.24.0), libc6 (>= 2.14), libcairo2 (>= 1.14.0), libcairomm-1.0-1v5 (>= 1.12.0), libcdr-0.1-1, libdbus-glib-1-2 (>= 0.88), libfontconfig1 (>= 2.12), libfreetype6 (>= 2.2.1), libgc1c2 (>= 1:7.2d), libgcc1 (>= 1:4.0), libgdk-pixbuf2.0-0 (>= 2.22.0), libgdl-3-5 (>= 3.8.1), libglib2.0-0 (>= 2.41.1), libglibmm-2.4-1v5 (>= 2.54.0), libgomp1 (>= 4.9), libgsl23, libgslcblas0, libgtk-3-0 (>= 3.21.5), libgtkmm-3.0-1v5 (>= 3.22.0), libgtkspell3-3-0, libharfbuzz0b (>= 1.2.6), libjpeg8 (>= 8c), liblcms2-2 (>= 2.2+git20110628), libmagick++-6.q16-7 (>= 8:6.9.6.8), libpango-1.0-0 (>= 1.37.2), libpangocairo-1.0-0 (>= 1.14.0), libpangoft2-1.0-0 (>= 1.37.2), libpangomm-1.4-1v5 (>= 2.40.0), libpng16-16 (>= 1.6.2-1), libpoppler-glib8 (>= 0.18.0), libpoppler68 (>= 0.57.0), libpopt0 (>= 1.14), libpotrace0, librevenge-0.0-0, libsigc++-2.0-0v5 (>= 2.8.0), libsoup2.4-1 (>= 2.41.90), libstdc++6 (>= 5.2), libvisio-0.1-1, libwpg-0.3-3, libx11-6, libxml2 (>= 2.7.4), libxslt1.1 (>= 1.1.25), zlib1g (>= 1:1.1.4)")
+    SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libaspell15 (>= 0.60.7~20110707), libatkmm-1.6-1v5 (>= 2.24.0), libc6 (>= 2.14), libcairo2 (>= 1.14.0), libcairomm-1.0-1v5 (>= 1.12.0), libcdr-0.1-1, libdbus-glib-1-2 (>= 0.88), libfontconfig1 (>= 2.12), libfreetype6 (>= 2.2.1), libgc1c2 (>= 1:7.2d), libgcc1 (>= 1:4.0), libgdk-pixbuf2.0-0 (>= 2.22.0), libgdl-3-5 (>= 3.8.1), libglib2.0-0 (>= 2.41.1), libglibmm-2.4-1v5 (>= 2.54.0), libgomp1 (>= 4.9), libgsl23, libgslcblas0, libgtk-3-0 (>= 3.21.5), libgtkmm-3.0-1v5 (>= 3.22.0), libgtkspell3-3-0, libharfbuzz0b (>= 1.2.6), libjpeg8 (>= 8c), liblcms2-2 (>= 2.2+git20110628), libmagick++-6.q16-7 (>= 8:6.9.6.8), libpango-1.0-0 (>= 1.37.2), libpangocairo-1.0-0 (>= 1.14.0), libpangoft2-1.0-0 (>= 1.37.2), libpangomm-1.4-1v5 (>= 2.40.0), libpng16-16 (>= 1.6.2-1), libpoppler-glib8 (>= 0.18.0), libpoppler68 (>= 0.57.0), libpotrace0, librevenge-0.0-0, libsigc++-2.0-0v5 (>= 2.8.0), libsoup2.4-1 (>= 2.41.90), libstdc++6 (>= 5.2), libvisio-0.1-1, libwpg-0.3-3, libx11-6, libxml2 (>= 2.7.4), libxslt1.1 (>= 1.1.25), zlib1g (>= 1:1.1.4)")
     IF(NOT CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
       FIND_PROGRAM(DPKG_CMD dpkg)
       IF(NOT DPKG_CMD)
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index c4b90b493..6663036e2 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -182,11 +182,6 @@ find_package(PNG REQUIRED)
 list(APPEND INKSCAPE_INCS_SYS ${PNG_PNG_INCLUDE_DIR})
 list(APPEND INKSCAPE_LIBS ${PNG_LIBRARY})
 
-find_package(Popt REQUIRED)
-list(APPEND INKSCAPE_INCS_SYS ${POPT_INCLUDE_DIR})
-list(APPEND INKSCAPE_LIBS ${POPT_LIBRARIES})
-add_definitions(${POPT_DEFINITIONS})
-
 find_package(Potrace)
 if(POTRACE_FOUND)
     list(APPEND INKSCAPE_INCS_SYS ${POTRACE_INCLUDE_DIRS})
diff --git a/CMakeScripts/Install.cmake b/CMakeScripts/Install.cmake
index beaf5aa0a..385375060 100644
--- a/CMakeScripts/Install.cmake
+++ b/CMakeScripts/Install.cmake
@@ -78,7 +78,6 @@ if(WIN32)
       ${DEVLIBS_BIN}/libpng16-16.dll
       ${DEVLIBS_BIN}/libpoppler-58.dll
       ${DEVLIBS_BIN}/libpoppler-glib-8.dll
-      ${DEVLIBS_BIN}/libpopt-0.dll
       ${DEVLIBS_BIN}/libpotrace-0.dll
       ${DEVLIBS_BIN}/librevenge-0.0.dll
       ${DEVLIBS_BIN}/librevenge-stream-0.0.dll
@@ -144,7 +143,6 @@ if(WIN32)
       ${DEVLIBS_BIN}/libpng14-14.dll
       ${DEVLIBS_BIN}/libpoppler-58.dll
       ${DEVLIBS_BIN}/libpoppler-glib-8.dll
-      ${DEVLIBS_BIN}/libpopt-0.dll
       ${DEVLIBS_BIN}/librevenge-0.0.dll
       ${DEVLIBS_BIN}/librevenge-stream-0.0.dll
       ${DEVLIBS_BIN}/libsigc-2.0-0.dll
diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake
index 9c17ba72f..07d535110 100644
--- a/CMakeScripts/InstallMSYS2.cmake
+++ b/CMakeScripts/InstallMSYS2.cmake
@@ -89,7 +89,6 @@ if(WIN32)
     ${MINGW_BIN}/libpng16-[0-9]*.dll

     ${MINGW_BIN}/libpoppler-[0-9]*.dll

     ${MINGW_BIN}/libpoppler-glib-[0-9]*.dll

-    ${MINGW_BIN}/libpopt-[0-9]*.dll

     ${MINGW_BIN}/libpotrace-[0-9]*.dll

     ${MINGW_BIN}/libpsl-[0-9]*.dll

     ${MINGW_BIN}/libquadmath-[0-9]*.dll

diff --git a/CMakeScripts/Modules/FindPopt.cmake b/CMakeScripts/Modules/FindPopt.cmake
deleted file mode 100644
index e1368be75..000000000
--- a/CMakeScripts/Modules/FindPopt.cmake
+++ /dev/null
@@ -1,90 +0,0 @@
-# - Try to find Popt
-# Once done this will define
-#
-#  POPT_FOUND - system has Popt
-#  POPT_INCLUDE_DIRS - the Popt include directory
-#  POPT_LIBRARIES - Link these to use Popt
-#  POPT_DEFINITIONS - Compiler switches required for using Popt
-#
-#  Copyright (c) 2008 Joshua L. Blocher <verbalshadow@gmail.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-
-if (POPT_LIBRARIES AND POPT_INCLUDE_DIRS)
-  # in cache already
-  set(POPT_FOUND TRUE)
-else (POPT_LIBRARIES AND POPT_INCLUDE_DIRS)
-  # use pkg-config to get the directories and then use these values
-  # in the FIND_PATH() and FIND_LIBRARY() calls
-  if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
-    include(UsePkgConfig)
-    pkgconfig(popt _POPT_INCLUDEDIR _POPT_LIBDIR _POPT_LDFLAGS _POPT_CFLAGS)
-  else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
-    find_package(PkgConfig)
-    if (PKG_CONFIG_FOUND)
-      pkg_check_modules(_POPT popt)
-    endif (PKG_CONFIG_FOUND)
-  endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
-  find_path(POPT_INCLUDE_DIR
-    NAMES
-      popt.h
-    PATHS
-      ${_POPT_INCLUDEDIR}
-      /usr/include
-      /usr/local/include
-      /opt/local/include
-      /sw/include
-      $ENV{DEVLIBS_PATH}//include//
-    PATH_SUFFIXES
-      popt
-  )
-
-  find_library(POPT_LIBRARY
-    NAMES
-      popt
-    PATHS
-      ${_POPT_LIBDIR}
-      /usr/lib
-      /usr/local/lib
-      /opt/local/lib
-      /sw/lib
-  )
-
-  if (POPT_LIBRARY)
-    set(POPT_FOUND TRUE)
-  endif (POPT_LIBRARY)
-
-  set(POPT_INCLUDE_DIRS
-    ${POPT_INCLUDE_DIR}
-  )
-
-  if (POPT_FOUND)
-    set(POPT_LIBRARIES
-      ${POPT_LIBRARIES}
-      ${POPT_LIBRARY}
-    )
-  endif (POPT_FOUND)
-
-  if (POPT_INCLUDE_DIRS AND POPT_LIBRARIES)
-     set(POPT_FOUND TRUE)
-  endif (POPT_INCLUDE_DIRS AND POPT_LIBRARIES)
-
-  if (POPT_FOUND)
-    if (NOT Popt_FIND_QUIETLY)
-      message(STATUS "Found Popt: ${POPT_LIBRARIES}")
-    endif (NOT Popt_FIND_QUIETLY)
-  else (POPT_FOUND)
-    if (Popt_FIND_REQUIRED)
-      message(FATAL_ERROR "Could not find Popt")
-    endif (Popt_FIND_REQUIRED)
-  endif (POPT_FOUND)
-
-  # show the POPT_INCLUDE_DIRS and POPT_LIBRARIES variables only in the advanced view
-  mark_as_advanced(POPT_INCLUDE_DIRS POPT_LIBRARIES)
-
-endif (POPT_LIBRARIES AND POPT_INCLUDE_DIRS)
-