[alglib] 01/01: Use config-file for cmake.

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository alglib.

commit 4606ae94a695ce83b735cafb7faa4de436ee6e80
Author: Anton Gladky <gladk at debian.org>
Date:   Tue Aug 11 17:58:20 2015 +0200

    Use config-file for cmake.
---
 debian/{FindALGLIB.cmake => ALGLIBConfig.cmake} | 9 ++++-----
 debian/libalglib-dev.install                    | 3 +--
 debian/patches/01_add_cmake.patch               | 3 ++-
 debian/patches/10_disable_minlm_test.patch      | 6 ++++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/FindALGLIB.cmake b/debian/ALGLIBConfig.cmake
similarity index 85%
rename from debian/FindALGLIB.cmake
rename to debian/ALGLIBConfig.cmake
index 190944e..7886159 100644
--- a/debian/FindALGLIB.cmake
+++ b/debian/ALGLIBConfig.cmake
@@ -1,17 +1,16 @@
-# - Try to find alglib 
+# - Try to find alglib
 # Once done this will define
 #  ALGLIB_INCLUDE_DIRS - The alglib include directory
 #  ALGLIB_LIB - The libraries needed to use alglib
 #  ALGLIB_FOUND -  True if ALGLIB found.
 
+set(ALGLIB_FOUND TRUE)
+
 find_path (ALGLIB_INCLUDE_DIRS 
   ap.h
   PATHS ${CMAKE_INSTALL_PREFIX}/include
   PATH_SUFFIXES libalglib)
-find_library (ALGLIB_LIB NAMES alglib)
 
+find_library (ALGLIB_LIB NAMES alglib)
 include (FindPackageHandleStandardArgs)
-
 find_package_handle_standard_args (ALGLIB DEFAULT_MSG ALGLIB_LIB ALGLIB_INCLUDE_DIRS)
-
-mark_as_advanced (ALGLIB_LIB ALGLIB_INCLUDE_DIRS)
diff --git a/debian/libalglib-dev.install b/debian/libalglib-dev.install
index 7b645b3..a36879c 100644
--- a/debian/libalglib-dev.install
+++ b/debian/libalglib-dev.install
@@ -1,4 +1,3 @@
 usr/include
 usr/lib/*/libalglib.so
-debian/FindALGLIB.cmake /usr/share/cmake-3.0/Modules
-debian/FindALGLIB.cmake /usr/share/cmake-3.2/Modules
+usr/lib/*/cmake/
diff --git a/debian/patches/01_add_cmake.patch b/debian/patches/01_add_cmake.patch
index 9f8f6b2..abbc1af 100644
--- a/debian/patches/01_add_cmake.patch
+++ b/debian/patches/01_add_cmake.patch
@@ -6,7 +6,7 @@ Index: alglib/CMakeLists.txt
 ===================================================================
 --- /dev/null
 +++ alglib/CMakeLists.txt
-@@ -0,0 +1,30 @@
+@@ -0,0 +1,31 @@
 +project(alglib CXX)
 +cmake_minimum_required(VERSION 2.8)
 +
@@ -24,6 +24,7 @@ Index: alglib/CMakeLists.txt
 +INSTALL(TARGETS alglib DESTINATION ${CMAKE_INSTALL_LIBDIR})
 +INSTALL(FILES ${ALGLIB_HDR_LIB} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libalglib)
 +
++INSTALL(FILES ${CMAKE_SOURCE_DIR}/debian/ALGLIBConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ALGLIB)
 +#===========================================================
 +ADD_EXECUTABLE(test_c tests/test_c.cpp)
 +TARGET_LINK_LIBRARIES(test_c alglib)
diff --git a/debian/patches/10_disable_minlm_test.patch b/debian/patches/10_disable_minlm_test.patch
index 34819c6..bc64967 100644
--- a/debian/patches/10_disable_minlm_test.patch
+++ b/debian/patches/10_disable_minlm_test.patch
@@ -2,8 +2,10 @@ Description: disable minlm test, because it fails sometimes on some platforms.
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-05-29
 
---- alglib-3.9.0.orig/tests/test_c.cpp
-+++ alglib-3.9.0/tests/test_c.cpp
+Index: alglib/tests/test_c.cpp
+===================================================================
+--- alglib.orig/tests/test_c.cpp
++++ alglib/tests/test_c.cpp
 @@ -91496,7 +91496,6 @@ _s_testrecord unittests[] =
      {"spline1d",testspline1d,_pexec_testspline1d},
      {"normestimator",testnormestimator,_pexec_testnormestimator},

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/alglib.git