Skip to content

Commit e282abc

Browse files
committed
Problem: zproject out of date with zproject
Solution: regenerate
1 parent 1fdb17e commit e282abc

File tree

9 files changed

+55
-1
lines changed

9 files changed

+55
-1
lines changed

CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,15 @@ endif()
7676
list(APPEND CMAKE_MODULE_PATH "${SOURCE_DIR}")
7777
set(OPTIONAL_LIBRARIES)
7878

79+
########################################################################
80+
# GSL dependency
81+
########################################################################
82+
find_package(gsl REQUIRED)
83+
IF (GSL_FOUND)
84+
ELSE (GSL_FOUND)
85+
message( FATAL_ERROR "gsl not found." )
86+
ENDIF (GSL_FOUND)
87+
7988
########################################################################
8089
# includes
8190
########################################################################

Findgsl.cmake

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
################################################################################
2+
# THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY #
3+
# Read the zproject/README.md for information about making permanent changes. #
4+
################################################################################
5+
6+
find_program (
7+
GSL_BIN
8+
gsl
9+
)
10+
11+
include(FindPackageHandleStandardArgs)
12+
13+
find_package_handle_standard_args(
14+
GSL
15+
REQUIRED_VARS GSL_BIN
16+
)
17+
mark_as_advanced(
18+
GSL_FOUND
19+
)
20+
21+
################################################################################
22+
# THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY #
23+
# Read the zproject/README.md for information about making permanent changes. #
24+
################################################################################

Makefile.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ TESTS =
2525

2626
EXTRA_DIST = \
2727
CMakeLists.txt \
28+
Findgsl.cmake \
2829
LICENSE \
2930
README.txt \
3031
README.md \

builds/cmake/ci_build.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,19 @@ CMAKE_OPTS+=("-DCMAKE_LIBRARY_PATH:PATH=${BUILD_PREFIX}/lib")
2121
CMAKE_OPTS+=("-DCMAKE_INCLUDE_PATH:PATH=${BUILD_PREFIX}/include")
2222

2323
# Clone and build dependencies
24+
git clone --quiet --depth 1 https://github.com/imagix/gsl gsl
25+
cd gsl
26+
git --no-pager log --oneline -n1
27+
if [ -e autogen.sh ]; then
28+
./autogen.sh 2> /dev/null
29+
fi
30+
if [ -e buildconf ]; then
31+
./buildconf 2> /dev/null
32+
fi
33+
./configure "${CONFIG_OPTS[@]}"
34+
make -j4
35+
make install
36+
cd ..
2437

2538
# Build and check this project
2639
cd ../..

configure.ac

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ fi
7171
PREVIOUS_CFLAGS="${CFLAGS}"
7272
PREVIOUS_LIBS="${LIBS}"
7373

74+
AC_CHECK_PROG(HAVE_GSL, gsl, yes)
75+
if test x"$HAVE_GSL" != x"yes" ; then
76+
AC_MSG_ERROR([Cannot find gsl])
77+
fi
7478

7579
CFLAGS="${PREVIOUS_CFLAGS}"
7680
LIBS="${PREVIOUS_LIBS}"

packaging/debian/control

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Standards-Version: 3.9.7
1717
Build-Depends: debhelper (>= 9),
1818
pkg-config,
1919
dh-autoreconf,
20+
generator-scripting-language,
2021
Build-Depends-Indep: asciidoc,
2122
xmlto
2223

packaging/debian/zproject.dsc.obs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Architecture: any
77
Build-Depends: debhelper (>= 9),
88
pkg-config,
99
dh-autoreconf,
10+
generator-scripting-language,
1011
Build-Depends-Indep: asciidoc,
1112
xmlto
1213

packaging/redhat/zproject.spec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ BuildRequires: autoconf
2929
BuildRequires: libtool
3030
BuildRequires: pkgconfig
3131
BuildRequires: xmlto
32+
BuildRequires: generator-scripting-language
3233
BuildRoot: %{_tmppath}/%{name}-%{version}-build
3334

3435
%description

src/Makemodule.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY #
33
# Read the zproject/README.md for information about making permanent changes. #
44
################################################################################
5-
program_libs =
5+
program_libs = ${project_libs}
66

77
# Programs need to link the c++ runtime if everything was compiled statically.
88
if !ENABLE_SHARED

0 commit comments

Comments
 (0)