Changeset 3800

Timestamp:

May 4, 2019, 9:12:42 AM (4 years ago)

Author:

Peter

Message:

allow multiple arguments in yat-config. closes #911

Location:

trunk

Files:

• build_support/yat-config.in (modified) (6 diffs)
• test/yat_config_test.sh (modified) (1 diff)

trunk/build_support/yat-config.in

@@ -2 +2 @@
 
 # Copyright (C) 2008 Jari Häkkinen, Peter Johansson
-# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2017 Peter Johansson
+# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2019 Peter Johansson
 #
 # This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -97 +97 @@
 fi
 
-flags=""
+output=""
 
 while test $# -gt 0; do
     case "$1" in
     --prefix)
-    echo $prefix
-    exit 0
+    output="$output $prefix"
     ;;
     --bindir)
-    echo $bindir
-    exit 0
+    output="$output $bindir"
     ;;
     --includedir)
-    echo $includedir
-    exit 0
+    output="$output $includedir"
     ;;
     --libdir)
-    echo $libdir
-    exit 0
+    output="$output $libdir"
     ;;
     --cxx)
-    echo $CXX
-    exit 0
+    output="$output $CXX"
     ;;
     --cxxcpp)
-    echo $CXXCPP
-    exit 0
+    output="$output $CXXCPP"
     ;;
     --cppflags)
@@ -140 +134 @@
        fi
        if test x"$add_path" = x"yes"; then
-         flags="$flags -I$includedir"
+         output="$output -I$includedir"
        fi
     else
@@ -147 +141 @@
        # include generated files simply as "generated.h".
        if test "x$abs_top_builddir" != "x$abs_top_srcdir"; then
-          flags="$flags -I$abs_top_builddir"
-          flags="$flags -I$abs_top_builddir/yat/utility"
+          output="$output -I$abs_top_builddir"
+          output="$output -I$abs_top_builddir/yat/utility"
        fi
-       flags="$flags -I$abs_top_srcdir"
+       output="$output -I$abs_top_srcdir"
     fi
-    flags="$flags $YAT_CPPFLAGS $CPPFLAGS $YAT_CONFIG_CPPFLAGS"
+    output="$output $YAT_CPPFLAGS $CPPFLAGS $YAT_CONFIG_CPPFLAGS"
     ;;
     --cxxflags)
-    flags="$flags $YAT_CXXFLAGS $CXXFLAGS $YAT_CONFIG_CXXFLAGS"
+    output="$output $YAT_CXXFLAGS $CXXFLAGS $YAT_CONFIG_CXXFLAGS"
     ;;
     --libs)
-    flags="$flags -lyat $YAT_STATIC_LIBS $YAT_PRIMARY_LIBS $YAT_CBLAS_LIB $LIBM $LIBS"
+    output="$output -lyat $YAT_STATIC_LIBS $YAT_PRIMARY_LIBS $YAT_CBLAS_LIB $LIBM $LIBS"
     ;;
     --libs-without-cblas)
-    flags="$flags -lyat $YAT_STATIC_LIBS $YAT_PRIMARY_LIBS $LIBM $LIBS"
+    output="$output -lyat $YAT_STATIC_LIBS $YAT_PRIMARY_LIBS $LIBM $LIBS"
     ;;
     --ldflags)
@@ -170 +164 @@
       : # ignore '/usr/local/lib' if we use g++
     else
-      flags="$flags -L$libdir"
+      output="$output -L$libdir"
     fi
-    flags="$flags $YAT_LDFLAGS $LDFLAGS $YAT_CONFIG_LDFLAGS"
+    output="$output $YAT_LDFLAGS $LDFLAGS $YAT_CONFIG_LDFLAGS"
     ;;
     --link-libtool)
-    flags="$flags $LA_FILE $YAT_STATIC_LIBS $YAT_CBLAS_LIB"
+    output="$output $LA_FILE $YAT_STATIC_LIBS $YAT_CBLAS_LIB"
     ;;
     --yat-la-file)
-    flags="$flags $LA_FILE"
+    output="$output $LA_FILE"
     ;;
     --atleast-version=*)
@@ -243 +237 @@
 done
 
-echo $flags
+echo $output
 exit 0

trunk/test/yat_config_test.sh

@@ -48 +48 @@
 grep lgsl stdout || exit_fail
 
+sh $prog --cxx > expected.txt
+sh $prog --cppflags >> expected.txt
+sh $prog --cxxflags >> expected.txt
+cat expected.txt
+tr ' \t' '\n\n' < expected.txt | sort -u | grep '[a-z]' > expected2.txt
+cat expected2.txt
+run sh 0 $prog --cxx --cppflags --cxxflags
+tr ' \t' '\n\n' < stdout | sort -u | grep '[a-z]' > stdout2
+cat stdout2
+diff -u expected2.txt stdout2 || exit_fail
+
 exit_success