Changeset f01bb3


Ignore:
Timestamp:
Apr 23, 2021, 8:51:43 PM (5 years ago)
Author:
Frederik Heber <frederik.heber@…>
Branches:
Candidate_v1.7.0, stable
Children:
2b88eb
Parents:
c30959
git-author:
Frederik Heber <frederik.heber@…> (11/23/20 23:59:31)
git-committer:
Frederik Heber <frederik.heber@…> (04/23/21 20:51:43)
Message:

CppUnit detected by pkg-config as fallback.

  • ubunntu 18.04 no longer has cppunit-config but relies on pkg-config to detect compilation flags.
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • ThirdParty/CodePatterns/configure.ac

    rc30959 rf01bb3  
    1212
    1313# Checks for programs.
    14 AM_PATH_CPPUNIT(1.9.6)
     14AM_PATH_CPPUNIT(1.9.6,
     15        [AM_CONDITIONAL([CPPUNIT], [true])],
     16        [
     17            PKG_CHECK_MODULES(CPPUNIT, [cppunit >= 1.9.6],
     18                [AM_CONDITIONAL([CPPUNIT], [true])],
     19                [AM_CONDITIONAL([CPPUNIT], [false])]
     20            )
     21        ]
     22)
    1523AC_PROG_CXX
    1624AC_PROG_INSTALL

  • ThirdParty/JobMarket/configure.ac

    rc30959 rf01bb3  
    1515
    1616# Checks for programs.
    17 AM_PATH_CPPUNIT(1.9.6)
     17AM_PATH_CPPUNIT(1.9.6,
     18        [AM_CONDITIONAL([CPPUNIT], [true])],
     19        [
     20            PKG_CHECK_MODULES(CPPUNIT, [cppunit >= 1.9.6],
     21                [AM_CONDITIONAL([CPPUNIT], [true])],
     22                [AM_CONDITIONAL([CPPUNIT], [false])]
     23            )
     24        ]
     25)
    1826AC_PROG_CXX
    1927AC_PROG_CC

  • ThirdParty/LinearAlgebra/configure.ac

    rc30959 rf01bb3  
    2020
    2121# check for cppunit (taken from svn.apache.org/../xmlbeanscxx)
    22 AM_PATH_CPPUNIT(1.9.6)
     22AM_PATH_CPPUNIT(1.9.6,
     23        [AM_CONDITIONAL([CPPUNIT], [true])],
     24        [
     25            PKG_CHECK_MODULES(CPPUNIT, [cppunit >= 1.9.6],
     26                [AM_CONDITIONAL([CPPUNIT], [true])],
     27                [AM_CONDITIONAL([CPPUNIT], [false])]
     28            )
     29        ]
     30)
    2331AM_CONDITIONAL(CONDCPPUNIT, test "$CPPUNIT_LIBS")
    2432

  • configure.ac

    rc30959 rf01bb3  
    2121
    2222# check for cppunit (taken from svn.apache.org/../xmlbeanscxx)
    23 AM_PATH_CPPUNIT(1.9.6)
     23AM_PATH_CPPUNIT(1.9.6,
     24        [AM_CONDITIONAL([CPPUNIT], [true])],
     25        [
     26            PKG_CHECK_MODULES(CPPUNIT, [cppunit >= 1.9.6],
     27                [AM_CONDITIONAL([CPPUNIT], [true])],
     28                [AM_CONDITIONAL([CPPUNIT], [false])]
     29            )
     30        ]
     31)
    2432AM_CONDITIONAL(CONDCPPUNIT, test "$CPPUNIT_LIBS")
    2533
Note: See TracChangeset for help on using the changeset viewer.