Permalink
Browse files

Problem: zproject out of date with zproject

Solution: regenerate
  • Loading branch information...
bluca committed Aug 27, 2016
1 parent 1fdb17e commit e282abcc5ad7eacdf02a040614cee86bfccc7b86
View
@@ -76,6 +76,15 @@ endif()
list(APPEND CMAKE_MODULE_PATH "${SOURCE_DIR}")
set(OPTIONAL_LIBRARIES)
########################################################################
# GSL dependency
########################################################################
find_package(gsl REQUIRED)
IF (GSL_FOUND)
ELSE (GSL_FOUND)
message( FATAL_ERROR "gsl not found." )
ENDIF (GSL_FOUND)
########################################################################
# includes
########################################################################
View
@@ -0,0 +1,24 @@
################################################################################
# THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY #
# Read the zproject/README.md for information about making permanent changes. #
################################################################################
find_program (
GSL_BIN
gsl
)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(
GSL
REQUIRED_VARS GSL_BIN
)
mark_as_advanced(
GSL_FOUND
)
################################################################################
# THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY #
# Read the zproject/README.md for information about making permanent changes. #
################################################################################
View
@@ -25,6 +25,7 @@ TESTS =
EXTRA_DIST = \
CMakeLists.txt \
Findgsl.cmake \
LICENSE \
README.txt \
README.md \
View
@@ -21,6 +21,19 @@ CMAKE_OPTS+=("-DCMAKE_LIBRARY_PATH:PATH=${BUILD_PREFIX}/lib")
CMAKE_OPTS+=("-DCMAKE_INCLUDE_PATH:PATH=${BUILD_PREFIX}/include")
# Clone and build dependencies
git clone --quiet --depth 1 https://github.com/imagix/gsl gsl
cd gsl
git --no-pager log --oneline -n1
if [ -e autogen.sh ]; then
./autogen.sh 2> /dev/null
fi
if [ -e buildconf ]; then
./buildconf 2> /dev/null
fi
./configure "${CONFIG_OPTS[@]}"
make -j4
make install
cd ..
# Build and check this project
cd ../..
View
@@ -71,6 +71,10 @@ fi
PREVIOUS_CFLAGS="${CFLAGS}"
PREVIOUS_LIBS="${LIBS}"
AC_CHECK_PROG(HAVE_GSL, gsl, yes)
if test x"$HAVE_GSL" != x"yes" ; then
AC_MSG_ERROR([Cannot find gsl])
fi
CFLAGS="${PREVIOUS_CFLAGS}"
LIBS="${PREVIOUS_LIBS}"
View
@@ -17,6 +17,7 @@ Standards-Version: 3.9.7
Build-Depends: debhelper (>= 9),
pkg-config,
dh-autoreconf,
generator-scripting-language,
Build-Depends-Indep: asciidoc,
xmlto
@@ -7,6 +7,7 @@ Architecture: any
Build-Depends: debhelper (>= 9),
pkg-config,
dh-autoreconf,
generator-scripting-language,
Build-Depends-Indep: asciidoc,
xmlto
@@ -29,6 +29,7 @@ BuildRequires: autoconf
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: xmlto
BuildRequires: generator-scripting-language
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
View
@@ -2,7 +2,7 @@
# THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY #
# Read the zproject/README.md for information about making permanent changes. #
################################################################################
program_libs =
program_libs = ${project_libs}
# Programs need to link the c++ runtime if everything was compiled statically.
if !ENABLE_SHARED

0 comments on commit e282abc

Please sign in to comment.