[ossim-plugins] 03/05: Add patch to use pkg-config for fftw3.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sat May 28 17:15:57 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository ossim-plugins.
commit d802f748f8e541bfffa0f3c2dd0876e30ab33802
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat May 28 17:52:40 2016 +0200
Add patch to use pkg-config for fftw3.
---
debian/patches/fftw3.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 46 insertions(+)
diff --git a/debian/patches/fftw3.patch b/debian/patches/fftw3.patch
new file mode 100644
index 0000000..077c90a
--- /dev/null
+++ b/debian/patches/fftw3.patch
@@ -0,0 +1,45 @@
+Description: Use pkg-config for fftw3.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/ossim_plugins/registration/CMakeLists.txt
++++ b/ossim_plugins/registration/CMakeLists.txt
+@@ -6,15 +6,18 @@ include(OssimVersion)
+ include(OssimCommonVariables)
+ include(OssimUtilities)
+
+-find_package(FFTW3)
++include(FindPkgConfig)
++pkg_search_module(FFTW3 fftw3)
++
++#find_package(FFTW3)
+ #find_package(TIFF)
+ #find_package(CURL)
+ #find_package(EXPAT)
+ #find_library(SQLITE_LIBRARY NAMES sqlite sqlite3)
+ #find_library(PROJ4_LIBRARY NAMES proj proj4)
+
+-MESSAGE( STATUS "FFTW3_LIBRARY = ${FFTW3_LIBRARY}" )
+-MESSAGE( STATUS "FFTW3_INCLUDE = ${FFTW3_INCLUDE_DIR}" )
++MESSAGE( STATUS "FFTW3_LIBRARY = ${FFTW3_LIBRARIES}" )
++MESSAGE( STATUS "FFTW3_INCLUDE = ${FFTW3_INCLUDE_DIRS}" )
+ #MESSAGE( STATUS "TIFF_LIBRARY = ${TIFF_LIBRARY}" )
+ #MESSAGE( STATUS "TIFF_INCLUDE = ${TIFF_INCLUDE_DIR}" )
+ #MESSAGE( STATUS "EXPAT_LIBRARY = ${EXPAT_LIBRARY}" )
+@@ -23,7 +26,7 @@ MESSAGE( STATUS "FFTW3_INCLUDE =
+
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+ INCLUDE_DIRECTORIES(${OPENTHREADS_INCLUDE_DIR})
+-INCLUDE_DIRECTORIES(${FFTW3_INCLUDE_DIR})
++INCLUDE_DIRECTORIES(${FFTW3_INCLUDE_DIRS})
+ #INCLUDE_DIRECTORIES(${GDAL_INCLUDE_DIR})
+ #INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR})
+
+@@ -45,7 +48,7 @@ endif(OSSIM_INSTALL_PLUGINS_WITH_VERSION
+
+ OSSIM_LINK_LIBRARY(${LIB_NAME}
+ COMPONENT_NAME ossim TYPE "${OSSIM_PLUGIN_LINK_TYPE}"
+- LIBRARIES ${OSSIM_LIBRARIES} ${OPENTHREADS_LIBRARY} ${FFTW3_LIBRARY}
++ LIBRARIES ${OSSIM_LIBRARIES} ${OPENTHREADS_LIBRARY} ${FFTW3_LIBRARIES}
+ HEADERS "${OSSIMPLUGIN_HEADERS}"
+ SOURCE_FILES "${OSSIMPLUGIN_SRCS}"
+ INSTALL_LIB)
diff --git a/debian/patches/series b/debian/patches/series
index de95b6a..dc26438 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
cmake.patch
sqlite.patch
libraw.patch
+fftw3.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ossim-plugins.git
More information about the Pkg-grass-devel
mailing list