diff --git a/resources/3rdparty/xercesc-3.1.2/Makefile b/resources/3rdparty/xercesc-3.1.2/Makefile index 669d11292..a8c30f2a3 100644 --- a/resources/3rdparty/xercesc-3.1.2/Makefile +++ b/resources/3rdparty/xercesc-3.1.2/Makefile @@ -86,8 +86,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-apple-darwin15.0.0 -host_triplet = x86_64-apple-darwin15.0.0 +build_triplet = x86_64-apple-darwin14.5.0 +host_triplet = x86_64-apple-darwin14.5.0 subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ @@ -264,14 +264,14 @@ distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print -ACLOCAL = ${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/missing aclocal-1.15 +ACLOCAL = ${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/missing aclocal-1.15 AMTAR = $${TAR-tar} AM_DEFAULT_VERBOSITY = 1 AR = ar AS = as -AUTOCONF = ${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/missing autoconf -AUTOHEADER = ${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/missing autoheader -AUTOMAKE = ${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/missing automake-1.15 +AUTOCONF = ${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/missing autoconf +AUTOHEADER = ${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/missing autoheader +AUTOMAKE = ${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/missing automake-1.15 AWK = awk BUILD_SHARED = yes BUILD_STATIC = yes @@ -293,8 +293,8 @@ DEPDIR = .deps DLLTOOL = dlltool DSYMUTIL = dsymutil DUMPBIN = -ECHO_C = \c -ECHO_N = +ECHO_C = +ECHO_N = -n ECHO_T = EGREP = /usr/bin/grep -E EXEEXT = @@ -320,10 +320,10 @@ LN_S = ln -s LTLIBOBJS = ${LIBOBJDIR}stricmp$U.lo ${LIBOBJDIR}strnicmp$U.lo LT_SYS_LIBRARY_PATH = MAINT = # -MAKEINFO = ${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/missing makeinfo +MAKEINFO = ${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/missing makeinfo MANIFEST_TOOL = : MKDIR_P = config/install-sh -c -d -NM = /usr/bin/nm +NM = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/nm NMEDIT = nmedit OBJDUMP = objdump OBJEXT = o @@ -347,10 +347,10 @@ SHELL = /bin/sh SHREXT = `test .$module = .yes && echo .so || echo .dylib` STRIP = strip VERSION = 3.1.2 -abs_builddir = /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2 -abs_srcdir = /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2 -abs_top_builddir = /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2 -abs_top_srcdir = /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2 +abs_builddir = /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2 +abs_srcdir = /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2 +abs_top_builddir = /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2 +abs_top_srcdir = /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2 ac_ct_AR = ar ac_ct_CC = gcc ac_ct_CXX = g++ @@ -362,10 +362,10 @@ am__quote = am__tar = tar --format=ustar -chf - "$$tardir" am__untar = tar -xf - bindir = ${exec_prefix}/bin -build = x86_64-apple-darwin15.0.0 +build = x86_64-apple-darwin14.5.0 build_alias = build_cpu = x86_64 -build_os = darwin15.0.0 +build_os = darwin14.5.0 build_vendor = apple builddir = . curl_config = /usr/bin/curl-config @@ -374,16 +374,16 @@ datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = x86_64-apple-darwin15.0.0 +host = x86_64-apple-darwin14.5.0 host_alias = host_cpu = x86_64 -host_os = darwin15.0.0 +host_os = darwin14.5.0 host_vendor = apple htmldir = ${docdir} icu_config = includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/install-sh +install_sh = ${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale @@ -393,7 +393,7 @@ mkdir_p = $(MKDIR_P) oldincludedir = /usr/include pdfdir = ${docdir} pkgconfigdir = ${libdir}/pkgconfig -prefix = /Users/sjunges/Library/Caches/clion11/cmake/generated/5b086923/5b086923/Debug/resources/3rdparty/xercesc-3.1.2 +prefix = /Users/chris/work/storm/build/resources/3rdparty/xercesc-3.1.2 program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin diff --git a/resources/3rdparty/xercesc-3.1.2/config.status b/resources/3rdparty/xercesc-3.1.2/config.status index 72e54a62b..73a31c968 100755 --- a/resources/3rdparty/xercesc-3.1.2/config.status +++ b/resources/3rdparty/xercesc-3.1.2/config.status @@ -427,17 +427,17 @@ $config_commands Report bugs to the package provider." -ac_cs_config="'--prefix=/Users/sjunges/Library/Caches/clion11/cmake/generated/5b086923/5b086923/Debug/resources/3rdparty/xercesc-3.1.2'" +ac_cs_config="'--prefix=/Users/chris/work/storm/build/resources/3rdparty/xercesc-3.1.2'" ac_cs_version="\ xerces-c config.status 3.1.2 -configured by /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/configure, generated by GNU Autoconf 2.69, +configured by /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/configure, generated by GNU Autoconf 2.69, with options \"$ac_cs_config\" Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -ac_pwd='/Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2' +ac_pwd='/Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2' srcdir='.' INSTALL='/usr/bin/install -c' MKDIR_P='config/install-sh -c -d' @@ -519,7 +519,7 @@ if $ac_cs_silent; then fi if $ac_cs_recheck; then - set X /bin/sh '/Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/configure' '--prefix=/Users/sjunges/Library/Caches/clion11/cmake/generated/5b086923/5b086923/Debug/resources/3rdparty/xercesc-3.1.2' $ac_configure_extra_args --no-create --no-recursion + set X /bin/sh '/Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/configure' '--prefix=/Users/chris/work/storm/build/resources/3rdparty/xercesc-3.1.2' $ac_configure_extra_args --no-create --no-recursion shift $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6 CONFIG_SHELL='/bin/sh' @@ -563,18 +563,18 @@ SHELL='/bin/sh' ECHO='printf %s\n' PATH_SEPARATOR=':' host_alias='' -host='x86_64-apple-darwin15.0.0' -host_os='darwin15.0.0' +host='x86_64-apple-darwin14.5.0' +host_os='darwin14.5.0' build_alias='' -build='x86_64-apple-darwin15.0.0' -build_os='darwin15.0.0' +build='x86_64-apple-darwin14.5.0' +build_os='darwin14.5.0' SED='/usr/bin/sed' Xsed='/usr/bin/sed -e 1s/^X//' GREP='/usr/bin/grep' EGREP='/usr/bin/grep -E' FGREP='/usr/bin/grep -F' LD='/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld' -NM='/usr/bin/nm' +NM='/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/nm' LN_S='ln -s' max_cmd_len='196608' ac_objext='o' @@ -926,8 +926,8 @@ S["XERCES_USE_MUTEXMGR_NOTHREAD_FALSE"]="" S["XERCES_USE_MUTEXMGR_NOTHREAD_TRUE"]="#" S["XERCES_PRETTY_MAKE_FALSE"]="#" S["XERCES_PRETTY_MAKE_TRUE"]="" -S["abs_top_builddir"]="/Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2" -S["abs_top_srcdir"]="/Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2" +S["abs_top_builddir"]="/Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2" +S["abs_top_srcdir"]="/Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2" S["LIBOBJS"]=" ${LIBOBJDIR}stricmp$U.o ${LIBOBJDIR}strnicmp$U.o" S["SHREXT"]="`test .$module = .yes && echo .so || echo .dylib`" S["PTHREAD_CFLAGS"]="-D_THREAD_SAFE " @@ -948,7 +948,7 @@ S["MANIFEST_TOOL"]=":" S["RANLIB"]="ranlib" S["ac_ct_AR"]="ar" S["AR"]="ar" -S["NM"]="/usr/bin/nm" +S["NM"]="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/nm" S["ac_ct_DUMPBIN"]="" S["DUMPBIN"]="" S["LD"]="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld" @@ -1001,12 +1001,12 @@ S["mkdir_p"]="$(MKDIR_P)" S["MKDIR_P"]="config/install-sh -c -d" S["INSTALL_STRIP_PROGRAM"]="$(install_sh) -c -s" S["STRIP"]="strip" -S["install_sh"]="${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/install-sh" -S["MAKEINFO"]="${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/missing makeinfo" -S["AUTOHEADER"]="${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/missing autoheader" -S["AUTOMAKE"]="${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/missing automake-1.15" -S["AUTOCONF"]="${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/missing autoconf" -S["ACLOCAL"]="${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/missing aclocal-1.15" +S["install_sh"]="${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/install-sh" +S["MAKEINFO"]="${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/missing makeinfo" +S["AUTOHEADER"]="${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/missing autoheader" +S["AUTOMAKE"]="${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/missing automake-1.15" +S["AUTOCONF"]="${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/missing autoconf" +S["ACLOCAL"]="${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/missing aclocal-1.15" S["VERSION"]="3.1.2" S["PACKAGE"]="xerces-c" S["CYGPATH_W"]="echo" @@ -1014,21 +1014,21 @@ S["am__isrc"]="" S["INSTALL_DATA"]="${INSTALL} -m 644" S["INSTALL_SCRIPT"]="${INSTALL}" S["INSTALL_PROGRAM"]="${INSTALL}" -S["host_os"]="darwin15.0.0" +S["host_os"]="darwin14.5.0" S["host_vendor"]="apple" S["host_cpu"]="x86_64" -S["host"]="x86_64-apple-darwin15.0.0" -S["build_os"]="darwin15.0.0" +S["host"]="x86_64-apple-darwin14.5.0" +S["build_os"]="darwin14.5.0" S["build_vendor"]="apple" S["build_cpu"]="x86_64" -S["build"]="x86_64-apple-darwin15.0.0" +S["build"]="x86_64-apple-darwin14.5.0" S["target_alias"]="" S["host_alias"]="" S["build_alias"]="" S["LIBS"]="-Wl,-framework -Wl,CoreServices -lpthread -lcurl" S["ECHO_T"]="" -S["ECHO_N"]="" -S["ECHO_C"]="\\c" +S["ECHO_N"]="-n" +S["ECHO_C"]="" S["DEFS"]="-DHAVE_CONFIG_H" S["mandir"]="${datarootdir}/man" S["localedir"]="${datarootdir}/locale" @@ -1050,7 +1050,7 @@ S["libexecdir"]="${exec_prefix}/libexec" S["sbindir"]="${exec_prefix}/sbin" S["bindir"]="${exec_prefix}/bin" S["program_transform_name"]="s,x,x," -S["prefix"]="/Users/sjunges/Library/Caches/clion11/cmake/generated/5b086923/5b086923/Debug/resources/3rdparty/xercesc-3.1.2" +S["prefix"]="/Users/chris/work/storm/build/resources/3rdparty/xercesc-3.1.2" S["exec_prefix"]="${prefix}" S["PACKAGE_URL"]="" S["PACKAGE_BUGREPORT"]="" diff --git a/resources/3rdparty/xercesc-3.1.2/libtool b/resources/3rdparty/xercesc-3.1.2/libtool index 1322eddb9..25fddabc4 100755 --- a/resources/3rdparty/xercesc-3.1.2/libtool +++ b/resources/3rdparty/xercesc-3.1.2/libtool @@ -1,6 +1,6 @@ #! /bin/sh # Generated automatically by config.status (xerces-c) 3.1.2 -# Libtool was configured on host perseus.informatik.rwth-aachen.de: +# Libtool was configured on host tartaros.informatik.rwth-aachen.de: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. @@ -76,13 +76,13 @@ PATH_SEPARATOR=":" # The host system. host_alias= -host=x86_64-apple-darwin15.0.0 -host_os=darwin15.0.0 +host=x86_64-apple-darwin14.5.0 +host_os=darwin14.5.0 # The build system. build_alias= -build=x86_64-apple-darwin15.0.0 -build_os=darwin15.0.0 +build=x86_64-apple-darwin14.5.0 +build_os=darwin14.5.0 # A sed program that does not truncate output. SED="/usr/bin/sed" @@ -100,7 +100,7 @@ EGREP="/usr/bin/grep -E" FGREP="/usr/bin/grep -F" # A BSD- or MS-compatible name lister. -NM="/usr/bin/nm" +NM="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/nm" # Whether we need soft or hard links. LN_S="ln -s" diff --git a/resources/3rdparty/xercesc-3.1.2/samples/CreateDOMDocument b/resources/3rdparty/xercesc-3.1.2/samples/CreateDOMDocument index 5626fd473..5d54613ce 100755 --- a/resources/3rdparty/xercesc-3.1.2/samples/CreateDOMDocument +++ b/resources/3rdparty/xercesc-3.1.2/samples/CreateDOMDocument @@ -188,7 +188,7 @@ func_exec_program () if test -f "$progdir/$program"; then # Add our own library path to DYLD_LIBRARY_PATH - DYLD_LIBRARY_PATH="/Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" + DYLD_LIBRARY_PATH="/Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" # Some systems cannot cope with colon-terminated DYLD_LIBRARY_PATH # The second colon is a workaround for a bug in BeOS R4 sed diff --git a/resources/3rdparty/xercesc-3.1.2/samples/DOMCount b/resources/3rdparty/xercesc-3.1.2/samples/DOMCount index 20884e64b..f4fe9dff3 100755 --- a/resources/3rdparty/xercesc-3.1.2/samples/DOMCount +++ b/resources/3rdparty/xercesc-3.1.2/samples/DOMCount @@ -188,7 +188,7 @@ func_exec_program () if test -f "$progdir/$program"; then # Add our own library path to DYLD_LIBRARY_PATH - DYLD_LIBRARY_PATH="/Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" + DYLD_LIBRARY_PATH="/Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" # Some systems cannot cope with colon-terminated DYLD_LIBRARY_PATH # The second colon is a workaround for a bug in BeOS R4 sed diff --git a/resources/3rdparty/xercesc-3.1.2/samples/DOMPrint b/resources/3rdparty/xercesc-3.1.2/samples/DOMPrint index 8e6931b31..3d9921650 100755 --- a/resources/3rdparty/xercesc-3.1.2/samples/DOMPrint +++ b/resources/3rdparty/xercesc-3.1.2/samples/DOMPrint @@ -188,7 +188,7 @@ func_exec_program () if test -f "$progdir/$program"; then # Add our own library path to DYLD_LIBRARY_PATH - DYLD_LIBRARY_PATH="/Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" + DYLD_LIBRARY_PATH="/Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" # Some systems cannot cope with colon-terminated DYLD_LIBRARY_PATH # The second colon is a workaround for a bug in BeOS R4 sed diff --git a/resources/3rdparty/xercesc-3.1.2/samples/EnumVal b/resources/3rdparty/xercesc-3.1.2/samples/EnumVal index 1fea142b3..3158c25ed 100755 --- a/resources/3rdparty/xercesc-3.1.2/samples/EnumVal +++ b/resources/3rdparty/xercesc-3.1.2/samples/EnumVal @@ -188,7 +188,7 @@ func_exec_program () if test -f "$progdir/$program"; then # Add our own library path to DYLD_LIBRARY_PATH - DYLD_LIBRARY_PATH="/Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" + DYLD_LIBRARY_PATH="/Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" # Some systems cannot cope with colon-terminated DYLD_LIBRARY_PATH # The second colon is a workaround for a bug in BeOS R4 sed diff --git a/resources/3rdparty/xercesc-3.1.2/samples/Makefile b/resources/3rdparty/xercesc-3.1.2/samples/Makefile index a36291b78..68ace49fb 100644 --- a/resources/3rdparty/xercesc-3.1.2/samples/Makefile +++ b/resources/3rdparty/xercesc-3.1.2/samples/Makefile @@ -107,8 +107,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-apple-darwin15.0.0 -host_triplet = x86_64-apple-darwin15.0.0 +build_triplet = x86_64-apple-darwin14.5.0 +host_triplet = x86_64-apple-darwin14.5.0 bin_PROGRAMS = $(am__EXEEXT_1) subdir = samples ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -317,14 +317,14 @@ ETAGS = etags CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/missing aclocal-1.15 +ACLOCAL = ${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/missing aclocal-1.15 AMTAR = $${TAR-tar} AM_DEFAULT_VERBOSITY = 1 AR = ar AS = as -AUTOCONF = ${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/missing autoconf -AUTOHEADER = ${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/missing autoheader -AUTOMAKE = ${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/missing automake-1.15 +AUTOCONF = ${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/missing autoconf +AUTOHEADER = ${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/missing autoheader +AUTOMAKE = ${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/missing automake-1.15 AWK = awk BUILD_SHARED = yes BUILD_STATIC = yes @@ -346,8 +346,8 @@ DEPDIR = .deps DLLTOOL = dlltool DSYMUTIL = dsymutil DUMPBIN = -ECHO_C = \c -ECHO_N = +ECHO_C = +ECHO_N = -n ECHO_T = EGREP = /usr/bin/grep -E EXEEXT = @@ -373,10 +373,10 @@ LN_S = ln -s LTLIBOBJS = ${LIBOBJDIR}stricmp$U.lo ${LIBOBJDIR}strnicmp$U.lo LT_SYS_LIBRARY_PATH = MAINT = # -MAKEINFO = ${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/missing makeinfo +MAKEINFO = ${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/missing makeinfo MANIFEST_TOOL = : MKDIR_P = ../config/install-sh -c -d -NM = /usr/bin/nm +NM = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/nm NMEDIT = nmedit OBJDUMP = objdump OBJEXT = o @@ -400,10 +400,10 @@ SHELL = /bin/sh SHREXT = `test .$module = .yes && echo .so || echo .dylib` STRIP = strip VERSION = 3.1.2 -abs_builddir = /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/samples -abs_srcdir = /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/samples -abs_top_builddir = /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2 -abs_top_srcdir = /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2 +abs_builddir = /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/samples +abs_srcdir = /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/samples +abs_top_builddir = /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2 +abs_top_srcdir = /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2 ac_ct_AR = ar ac_ct_CC = gcc ac_ct_CXX = g++ @@ -415,10 +415,10 @@ am__quote = am__tar = tar --format=ustar -chf - "$$tardir" am__untar = tar -xf - bindir = ${exec_prefix}/bin -build = x86_64-apple-darwin15.0.0 +build = x86_64-apple-darwin14.5.0 build_alias = build_cpu = x86_64 -build_os = darwin15.0.0 +build_os = darwin14.5.0 build_vendor = apple builddir = . curl_config = /usr/bin/curl-config @@ -427,16 +427,16 @@ datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = x86_64-apple-darwin15.0.0 +host = x86_64-apple-darwin14.5.0 host_alias = host_cpu = x86_64 -host_os = darwin15.0.0 +host_os = darwin14.5.0 host_vendor = apple htmldir = ${docdir} icu_config = includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/install-sh +install_sh = ${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale @@ -446,7 +446,7 @@ mkdir_p = $(MKDIR_P) oldincludedir = /usr/include pdfdir = ${docdir} pkgconfigdir = ${libdir}/pkgconfig -prefix = /Users/sjunges/Library/Caches/clion11/cmake/generated/5b086923/5b086923/Debug/resources/3rdparty/xercesc-3.1.2 +prefix = /Users/chris/work/storm/build/resources/3rdparty/xercesc-3.1.2 program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin diff --git a/resources/3rdparty/xercesc-3.1.2/samples/MemParse b/resources/3rdparty/xercesc-3.1.2/samples/MemParse index a611d25db..49de2b1b6 100755 --- a/resources/3rdparty/xercesc-3.1.2/samples/MemParse +++ b/resources/3rdparty/xercesc-3.1.2/samples/MemParse @@ -188,7 +188,7 @@ func_exec_program () if test -f "$progdir/$program"; then # Add our own library path to DYLD_LIBRARY_PATH - DYLD_LIBRARY_PATH="/Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" + DYLD_LIBRARY_PATH="/Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" # Some systems cannot cope with colon-terminated DYLD_LIBRARY_PATH # The second colon is a workaround for a bug in BeOS R4 sed diff --git a/resources/3rdparty/xercesc-3.1.2/samples/PParse b/resources/3rdparty/xercesc-3.1.2/samples/PParse index 98225e1ec..637548661 100755 --- a/resources/3rdparty/xercesc-3.1.2/samples/PParse +++ b/resources/3rdparty/xercesc-3.1.2/samples/PParse @@ -188,7 +188,7 @@ func_exec_program () if test -f "$progdir/$program"; then # Add our own library path to DYLD_LIBRARY_PATH - DYLD_LIBRARY_PATH="/Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" + DYLD_LIBRARY_PATH="/Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" # Some systems cannot cope with colon-terminated DYLD_LIBRARY_PATH # The second colon is a workaround for a bug in BeOS R4 sed diff --git a/resources/3rdparty/xercesc-3.1.2/samples/PSVIWriter b/resources/3rdparty/xercesc-3.1.2/samples/PSVIWriter index 630f0b170..f31e59a78 100755 --- a/resources/3rdparty/xercesc-3.1.2/samples/PSVIWriter +++ b/resources/3rdparty/xercesc-3.1.2/samples/PSVIWriter @@ -188,7 +188,7 @@ func_exec_program () if test -f "$progdir/$program"; then # Add our own library path to DYLD_LIBRARY_PATH - DYLD_LIBRARY_PATH="/Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" + DYLD_LIBRARY_PATH="/Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" # Some systems cannot cope with colon-terminated DYLD_LIBRARY_PATH # The second colon is a workaround for a bug in BeOS R4 sed diff --git a/resources/3rdparty/xercesc-3.1.2/samples/Redirect b/resources/3rdparty/xercesc-3.1.2/samples/Redirect index 23a383e96..fbe2c2553 100755 --- a/resources/3rdparty/xercesc-3.1.2/samples/Redirect +++ b/resources/3rdparty/xercesc-3.1.2/samples/Redirect @@ -188,7 +188,7 @@ func_exec_program () if test -f "$progdir/$program"; then # Add our own library path to DYLD_LIBRARY_PATH - DYLD_LIBRARY_PATH="/Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" + DYLD_LIBRARY_PATH="/Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" # Some systems cannot cope with colon-terminated DYLD_LIBRARY_PATH # The second colon is a workaround for a bug in BeOS R4 sed diff --git a/resources/3rdparty/xercesc-3.1.2/samples/SAX2Count b/resources/3rdparty/xercesc-3.1.2/samples/SAX2Count index 51b8c41d6..2a3855dd1 100755 --- a/resources/3rdparty/xercesc-3.1.2/samples/SAX2Count +++ b/resources/3rdparty/xercesc-3.1.2/samples/SAX2Count @@ -188,7 +188,7 @@ func_exec_program () if test -f "$progdir/$program"; then # Add our own library path to DYLD_LIBRARY_PATH - DYLD_LIBRARY_PATH="/Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" + DYLD_LIBRARY_PATH="/Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" # Some systems cannot cope with colon-terminated DYLD_LIBRARY_PATH # The second colon is a workaround for a bug in BeOS R4 sed diff --git a/resources/3rdparty/xercesc-3.1.2/samples/SAX2Print b/resources/3rdparty/xercesc-3.1.2/samples/SAX2Print index e405b57e1..ab9cfac6a 100755 --- a/resources/3rdparty/xercesc-3.1.2/samples/SAX2Print +++ b/resources/3rdparty/xercesc-3.1.2/samples/SAX2Print @@ -188,7 +188,7 @@ func_exec_program () if test -f "$progdir/$program"; then # Add our own library path to DYLD_LIBRARY_PATH - DYLD_LIBRARY_PATH="/Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" + DYLD_LIBRARY_PATH="/Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" # Some systems cannot cope with colon-terminated DYLD_LIBRARY_PATH # The second colon is a workaround for a bug in BeOS R4 sed diff --git a/resources/3rdparty/xercesc-3.1.2/samples/SAXCount b/resources/3rdparty/xercesc-3.1.2/samples/SAXCount index dbe991021..0ef3c2721 100755 --- a/resources/3rdparty/xercesc-3.1.2/samples/SAXCount +++ b/resources/3rdparty/xercesc-3.1.2/samples/SAXCount @@ -188,7 +188,7 @@ func_exec_program () if test -f "$progdir/$program"; then # Add our own library path to DYLD_LIBRARY_PATH - DYLD_LIBRARY_PATH="/Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" + DYLD_LIBRARY_PATH="/Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" # Some systems cannot cope with colon-terminated DYLD_LIBRARY_PATH # The second colon is a workaround for a bug in BeOS R4 sed diff --git a/resources/3rdparty/xercesc-3.1.2/samples/SAXPrint b/resources/3rdparty/xercesc-3.1.2/samples/SAXPrint index 82bbdda30..e089a2d08 100755 --- a/resources/3rdparty/xercesc-3.1.2/samples/SAXPrint +++ b/resources/3rdparty/xercesc-3.1.2/samples/SAXPrint @@ -188,7 +188,7 @@ func_exec_program () if test -f "$progdir/$program"; then # Add our own library path to DYLD_LIBRARY_PATH - DYLD_LIBRARY_PATH="/Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" + DYLD_LIBRARY_PATH="/Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" # Some systems cannot cope with colon-terminated DYLD_LIBRARY_PATH # The second colon is a workaround for a bug in BeOS R4 sed diff --git a/resources/3rdparty/xercesc-3.1.2/samples/SCMPrint b/resources/3rdparty/xercesc-3.1.2/samples/SCMPrint index 968878b73..56759688d 100755 --- a/resources/3rdparty/xercesc-3.1.2/samples/SCMPrint +++ b/resources/3rdparty/xercesc-3.1.2/samples/SCMPrint @@ -188,7 +188,7 @@ func_exec_program () if test -f "$progdir/$program"; then # Add our own library path to DYLD_LIBRARY_PATH - DYLD_LIBRARY_PATH="/Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" + DYLD_LIBRARY_PATH="/Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" # Some systems cannot cope with colon-terminated DYLD_LIBRARY_PATH # The second colon is a workaround for a bug in BeOS R4 sed diff --git a/resources/3rdparty/xercesc-3.1.2/samples/SEnumVal b/resources/3rdparty/xercesc-3.1.2/samples/SEnumVal index 02dbe7eb4..189965a98 100755 --- a/resources/3rdparty/xercesc-3.1.2/samples/SEnumVal +++ b/resources/3rdparty/xercesc-3.1.2/samples/SEnumVal @@ -188,7 +188,7 @@ func_exec_program () if test -f "$progdir/$program"; then # Add our own library path to DYLD_LIBRARY_PATH - DYLD_LIBRARY_PATH="/Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" + DYLD_LIBRARY_PATH="/Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" # Some systems cannot cope with colon-terminated DYLD_LIBRARY_PATH # The second colon is a workaround for a bug in BeOS R4 sed diff --git a/resources/3rdparty/xercesc-3.1.2/samples/StdInParse b/resources/3rdparty/xercesc-3.1.2/samples/StdInParse index 61144473e..921f324b6 100755 --- a/resources/3rdparty/xercesc-3.1.2/samples/StdInParse +++ b/resources/3rdparty/xercesc-3.1.2/samples/StdInParse @@ -188,7 +188,7 @@ func_exec_program () if test -f "$progdir/$program"; then # Add our own library path to DYLD_LIBRARY_PATH - DYLD_LIBRARY_PATH="/Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" + DYLD_LIBRARY_PATH="/Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" # Some systems cannot cope with colon-terminated DYLD_LIBRARY_PATH # The second colon is a workaround for a bug in BeOS R4 sed diff --git a/resources/3rdparty/xercesc-3.1.2/samples/XInclude b/resources/3rdparty/xercesc-3.1.2/samples/XInclude index 6b548ffdc..2a4009eef 100755 --- a/resources/3rdparty/xercesc-3.1.2/samples/XInclude +++ b/resources/3rdparty/xercesc-3.1.2/samples/XInclude @@ -188,7 +188,7 @@ func_exec_program () if test -f "$progdir/$program"; then # Add our own library path to DYLD_LIBRARY_PATH - DYLD_LIBRARY_PATH="/Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" + DYLD_LIBRARY_PATH="/Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/src/.libs:$DYLD_LIBRARY_PATH" # Some systems cannot cope with colon-terminated DYLD_LIBRARY_PATH # The second colon is a workaround for a bug in BeOS R4 sed diff --git a/resources/3rdparty/xercesc-3.1.2/src/Makefile b/resources/3rdparty/xercesc-3.1.2/src/Makefile index 595eb86d0..9481a077b 100644 --- a/resources/3rdparty/xercesc-3.1.2/src/Makefile +++ b/resources/3rdparty/xercesc-3.1.2/src/Makefile @@ -108,8 +108,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-apple-darwin15.0.0 -host_triplet = x86_64-apple-darwin15.0.0 +build_triplet = x86_64-apple-darwin14.5.0 +host_triplet = x86_64-apple-darwin14.5.0 # NetAccessors, conditionally built based on settings from configure # @@ -1385,14 +1385,14 @@ am__relativize = \ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" -ACLOCAL = ${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/missing aclocal-1.15 +ACLOCAL = ${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/missing aclocal-1.15 AMTAR = $${TAR-tar} AM_DEFAULT_VERBOSITY = 1 AR = ar AS = as -AUTOCONF = ${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/missing autoconf -AUTOHEADER = ${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/missing autoheader -AUTOMAKE = ${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/missing automake-1.15 +AUTOCONF = ${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/missing autoconf +AUTOHEADER = ${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/missing autoheader +AUTOMAKE = ${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/missing automake-1.15 AWK = awk BUILD_SHARED = yes BUILD_STATIC = yes @@ -1414,8 +1414,8 @@ DEPDIR = .deps DLLTOOL = dlltool DSYMUTIL = dsymutil DUMPBIN = -ECHO_C = \c -ECHO_N = +ECHO_C = +ECHO_N = -n ECHO_T = EGREP = /usr/bin/grep -E EXEEXT = @@ -1441,10 +1441,10 @@ LN_S = ln -s LTLIBOBJS = ${LIBOBJDIR}stricmp$U.lo ${LIBOBJDIR}strnicmp$U.lo LT_SYS_LIBRARY_PATH = MAINT = # -MAKEINFO = ${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/missing makeinfo +MAKEINFO = ${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/missing makeinfo MANIFEST_TOOL = : MKDIR_P = ../config/install-sh -c -d -NM = /usr/bin/nm +NM = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/nm NMEDIT = nmedit OBJDUMP = objdump OBJEXT = o @@ -1468,10 +1468,10 @@ SHELL = /bin/sh SHREXT = `test .$module = .yes && echo .so || echo .dylib` STRIP = strip VERSION = 3.1.2 -abs_builddir = /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/src -abs_srcdir = /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/src -abs_top_builddir = /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2 -abs_top_srcdir = /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2 +abs_builddir = /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/src +abs_srcdir = /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/src +abs_top_builddir = /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2 +abs_top_srcdir = /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2 ac_ct_AR = ar ac_ct_CC = gcc ac_ct_CXX = g++ @@ -1483,10 +1483,10 @@ am__quote = am__tar = tar --format=ustar -chf - "$$tardir" am__untar = tar -xf - bindir = ${exec_prefix}/bin -build = x86_64-apple-darwin15.0.0 +build = x86_64-apple-darwin14.5.0 build_alias = build_cpu = x86_64 -build_os = darwin15.0.0 +build_os = darwin14.5.0 build_vendor = apple builddir = . curl_config = /usr/bin/curl-config @@ -1495,16 +1495,16 @@ datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = x86_64-apple-darwin15.0.0 +host = x86_64-apple-darwin14.5.0 host_alias = host_cpu = x86_64 -host_os = darwin15.0.0 +host_os = darwin14.5.0 host_vendor = apple htmldir = ${docdir} icu_config = includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/install-sh +install_sh = ${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale @@ -1514,7 +1514,7 @@ mkdir_p = $(MKDIR_P) oldincludedir = /usr/include pdfdir = ${docdir} pkgconfigdir = ${libdir}/pkgconfig -prefix = /Users/sjunges/Library/Caches/clion11/cmake/generated/5b086923/5b086923/Debug/resources/3rdparty/xercesc-3.1.2 +prefix = /Users/chris/work/storm/build/resources/3rdparty/xercesc-3.1.2 program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin diff --git a/resources/3rdparty/xercesc-3.1.2/src/libxerces-c.la b/resources/3rdparty/xercesc-3.1.2/src/libxerces-c.la index fa6963f76..a0bd233b3 100644 --- a/resources/3rdparty/xercesc-3.1.2/src/libxerces-c.la +++ b/resources/3rdparty/xercesc-3.1.2/src/libxerces-c.la @@ -38,4 +38,4 @@ dlopen='' dlpreopen='' # Directory that this library needs to be installed in: -libdir='/Users/sjunges/i2/storm/build/resources/3rdparty/xercesc-3.1.2/lib' +libdir='/Users/chris/work/storm/build/resources/3rdparty/xercesc-3.1.2/lib' diff --git a/resources/3rdparty/xercesc-3.1.2/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile b/resources/3rdparty/xercesc-3.1.2/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile index 61f5eafbc..822dba81a 100644 --- a/resources/3rdparty/xercesc-3.1.2/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile +++ b/resources/3rdparty/xercesc-3.1.2/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile @@ -2,7 +2,7 @@ srcdir = . top_srcdir = ../../../../.. top_builddir = ../../../../.. -prefix = /Users/sjunges/Library/Caches/clion11/cmake/generated/5b086923/5b086923/Debug/resources/3rdparty/xercesc-3.1.2 +prefix = /Users/chris/work/storm/build/resources/3rdparty/xercesc-3.1.2 INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} mkdir_p = $(MKDIR_P) diff --git a/resources/3rdparty/xercesc-3.1.2/tests/Makefile b/resources/3rdparty/xercesc-3.1.2/tests/Makefile index 0218c066e..9f5b14af8 100644 --- a/resources/3rdparty/xercesc-3.1.2/tests/Makefile +++ b/resources/3rdparty/xercesc-3.1.2/tests/Makefile @@ -106,8 +106,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-apple-darwin15.0.0 -host_triplet = x86_64-apple-darwin15.0.0 +build_triplet = x86_64-apple-darwin14.5.0 +host_triplet = x86_64-apple-darwin14.5.0 check_PROGRAMS = $(am__EXEEXT_1) subdir = tests ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -301,14 +301,14 @@ ETAGS = etags CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/missing aclocal-1.15 +ACLOCAL = ${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/missing aclocal-1.15 AMTAR = $${TAR-tar} AM_DEFAULT_VERBOSITY = 1 AR = ar AS = as -AUTOCONF = ${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/missing autoconf -AUTOHEADER = ${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/missing autoheader -AUTOMAKE = ${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/missing automake-1.15 +AUTOCONF = ${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/missing autoconf +AUTOHEADER = ${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/missing autoheader +AUTOMAKE = ${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/missing automake-1.15 AWK = awk BUILD_SHARED = yes BUILD_STATIC = yes @@ -330,8 +330,8 @@ DEPDIR = .deps DLLTOOL = dlltool DSYMUTIL = dsymutil DUMPBIN = -ECHO_C = \c -ECHO_N = +ECHO_C = +ECHO_N = -n ECHO_T = EGREP = /usr/bin/grep -E EXEEXT = @@ -357,10 +357,10 @@ LN_S = ln -s LTLIBOBJS = ${LIBOBJDIR}stricmp$U.lo ${LIBOBJDIR}strnicmp$U.lo LT_SYS_LIBRARY_PATH = MAINT = # -MAKEINFO = ${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/missing makeinfo +MAKEINFO = ${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/missing makeinfo MANIFEST_TOOL = : MKDIR_P = ../config/install-sh -c -d -NM = /usr/bin/nm +NM = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/nm NMEDIT = nmedit OBJDUMP = objdump OBJEXT = o @@ -384,10 +384,10 @@ SHELL = /bin/sh SHREXT = `test .$module = .yes && echo .so || echo .dylib` STRIP = strip VERSION = 3.1.2 -abs_builddir = /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/tests -abs_srcdir = /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/tests -abs_top_builddir = /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2 -abs_top_srcdir = /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2 +abs_builddir = /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/tests +abs_srcdir = /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/tests +abs_top_builddir = /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2 +abs_top_srcdir = /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2 ac_ct_AR = ar ac_ct_CC = gcc ac_ct_CXX = g++ @@ -399,10 +399,10 @@ am__quote = am__tar = tar --format=ustar -chf - "$$tardir" am__untar = tar -xf - bindir = ${exec_prefix}/bin -build = x86_64-apple-darwin15.0.0 +build = x86_64-apple-darwin14.5.0 build_alias = build_cpu = x86_64 -build_os = darwin15.0.0 +build_os = darwin14.5.0 build_vendor = apple builddir = . curl_config = /usr/bin/curl-config @@ -411,16 +411,16 @@ datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = x86_64-apple-darwin15.0.0 +host = x86_64-apple-darwin14.5.0 host_alias = host_cpu = x86_64 -host_os = darwin15.0.0 +host_os = darwin14.5.0 host_vendor = apple htmldir = ${docdir} icu_config = includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /Users/sjunges/i2/storm/resources/3rdparty/xercesc-3.1.2/config/install-sh +install_sh = ${SHELL} /Users/chris/work/storm/resources/3rdparty/xercesc-3.1.2/config/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale @@ -430,7 +430,7 @@ mkdir_p = $(MKDIR_P) oldincludedir = /usr/include pdfdir = ${docdir} pkgconfigdir = ${libdir}/pkgconfig -prefix = /Users/sjunges/Library/Caches/clion11/cmake/generated/5b086923/5b086923/Debug/resources/3rdparty/xercesc-3.1.2 +prefix = /Users/chris/work/storm/build/resources/3rdparty/xercesc-3.1.2 program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin diff --git a/resources/3rdparty/xercesc-3.1.2/xerces-c.pc b/resources/3rdparty/xercesc-3.1.2/xerces-c.pc index dea473e2d..a3b01429a 100644 --- a/resources/3rdparty/xercesc-3.1.2/xerces-c.pc +++ b/resources/3rdparty/xercesc-3.1.2/xerces-c.pc @@ -1,4 +1,4 @@ -prefix=/Users/sjunges/Library/Caches/clion11/cmake/generated/5b086923/5b086923/Debug/resources/3rdparty/xercesc-3.1.2 +prefix=/Users/chris/work/storm/build/resources/3rdparty/xercesc-3.1.2 exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include diff --git a/src/solver/Z3SmtSolver.cpp b/src/solver/Z3SmtSolver.cpp index d2b050a1d..1c3495335 100644 --- a/src/solver/Z3SmtSolver.cpp +++ b/src/solver/Z3SmtSolver.cpp @@ -340,17 +340,25 @@ namespace storm { } bool Z3SmtSolver::setTimeout(uint_fast64_t milliseconds) { +#ifdef STORM_HAVE_Z3 z3::params paramObject(*context); paramObject.set(":timeout", static_cast(milliseconds)); solver->set(paramObject); return true; +#else + STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "StoRM is compiled without Z3 support."); +#endif } bool Z3SmtSolver::unsetTimeout() { +#ifdef STORM_HAVE_Z3 z3::params paramObject(*context); paramObject.set(":timeout", 0u); solver->set(paramObject); return true; +#else + STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "StoRM is compiled without Z3 support."); +#endif } }