Browse Source

Add check whether OpenEXR requires explicit specification of C++ standard.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/5/head
Slávek Banko 5 months ago
parent
commit
82895daec0
Signed by: SlavekB <slavek.banko@axis.cz> GPG Key ID: 608F5293A04BE668
2 changed files with 34 additions and 1 deletions
  1. +32
    -1
      configure.in.in
  2. +2
    -0
      filters/chalk/openexr/Makefile.am

+ 32
- 1
configure.in.in View File

@@ -288,6 +288,37 @@ fi
if test -n "$OPENEXR_LIBS"
then
AC_MSG_RESULT([yes])

AC_LANG_SAVE
AC_LANG_CPLUSPLUS
SAVED_CXXFLAGS="$CXXFLAGS"
for CXX_STD_TEST in "" 11 14 17; do
CXXFLAGS="$SAVED_CXXFLAGS"
if test "x$CXX_STD_TEST" = "x"; then
AC_MSG_CHECKING([OpenEXR build with default C++ standard])
OPENEXR_CXXFLAGS=""
else
AC_MSG_CHECKING([OpenEXR build with C++$CXX_STD_TEST])
OPENEXR_CXXFLAGS="-std=c++$CXX_STD_TEST"
fi
CXXFLAGS="$SAVED_CXXFLAGS $OPENEXR_CFLAGS $OPENEXR_CXXFLAGS"
AC_TRY_COMPILE([
#include <ImfRgbaFile.h>
],[ ],
openexr_cxx_std=yes,
openexr_cxx_std=no
)
if test "x$openexr_cxx_std" = "xyes"; then
AC_SUBST(OPENEXR_CXXFLAGS)
AC_MSG_RESULT(yes)
break
else
AC_MSG_RESULT(no)
fi
done
CXXFLAGS="$SAVED_CXXFLAGS"
AC_LANG_RESTORE

else
AC_MSG_RESULT([not found])
fi
@@ -296,6 +327,6 @@ AC_SUBST(OPENEXR_LIBS)
AC_SUBST(OPENEXR_CFLAGS)
AC_SUBST(OPENEXR_RPATH)

AM_CONDITIONAL(have_openexr, test -n "$OPENEXR_LIBS")
AM_CONDITIONAL(have_openexr, test "x$openexr_cxx_std" = "xyes")

# --- End of OpenEXR check ---

+ 2
- 0
filters/chalk/openexr/Makefile.am View File

@@ -13,6 +13,8 @@ AM_CPPFLAGS= \
$(OPENEXR_CFLAGS) \
$(all_includes)

CXXFLAGS += $(OPENEXR_CXXFLAGS)

kde_module_LTLIBRARIES = libchalk_openexr_import.la libchalk_openexr_export.la

libchalk_openexr_export_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts


Loading…
Cancel
Save