File tree Expand file tree Collapse file tree 2 files changed +11
-4
lines changed Expand file tree Collapse file tree 2 files changed +11
-4
lines changed Original file line number Diff line number Diff line change 1
1
lib_LTLIBRARIES = UnitTest++/libUnitTest++.la
2
- pkgincludedir = $(includedir ) /UnitTest++/
2
+ pkgincludedir = $(includedir )
3
+
3
4
nobase_pkginclude_HEADERS = UnitTest++/AssertException.h UnitTest++/CheckMacros.h UnitTest++/Checks.h UnitTest++/CompositeTestReporter.h UnitTest++/Config.h UnitTest++/CurrentTest.h UnitTest++/DeferredTestReporter.h UnitTest++/DeferredTestResult.h UnitTest++/ExceptionMacros.h UnitTest++/ExecuteTest.h UnitTest++/HelperMacros.h UnitTest++/MemoryOutStream.h UnitTest++/ReportAssert.h UnitTest++/ReportAssertImpl.h UnitTest++/RequireMacros.h UnitTest++/RequiredCheckException.h UnitTest++/RequiredCheckTestReporter.h UnitTest++/Test.h UnitTest++/TestDetails.h UnitTest++/TestList.h UnitTest++/TestMacros.h UnitTest++/TestReporter.h UnitTest++/TestReporterStdout.h UnitTest++/TestResults.h UnitTest++/TestRunner.h UnitTest++/TestSuite.h UnitTest++/ThrowingTestReporter.h UnitTest++/TimeConstraint.h UnitTest++/TimeHelpers.h UnitTest++/UnitTest++.h UnitTest++/UnitTestPP.h UnitTest++/XmlTestReporter.h
4
5
UnitTest___libUnitTest___la_SOURCES = UnitTest++/AssertException.cpp UnitTest++/Checks.cpp UnitTest++/CompositeTestReporter.cpp UnitTest++/CurrentTest.cpp UnitTest++/DeferredTestReporter.cpp UnitTest++/DeferredTestResult.cpp UnitTest++/MemoryOutStream.cpp UnitTest++/ReportAssert.cpp UnitTest++/RequiredCheckException.cpp UnitTest++/RequiredCheckTestReporter.cpp UnitTest++/Test.cpp UnitTest++/TestDetails.cpp UnitTest++/TestList.cpp UnitTest++/TestReporter.cpp UnitTest++/TestReporterStdout.cpp UnitTest++/TestResults.cpp UnitTest++/TestRunner.cpp UnitTest++/ThrowingTestReporter.cpp UnitTest++/TimeConstraint.cpp UnitTest++/XmlTestReporter.cpp
5
6
6
- if WINDOWS
7
+ if WINDOWS
7
8
nobase_pkginclude_HEADERS += UnitTest++/Win32/TimeHelpers.h
8
9
UnitTest___libUnitTest___la_SOURCES += UnitTest++/Win32/TimeHelpers.cpp
9
- else
10
+ else
10
11
nobase_pkginclude_HEADERS += UnitTest++/Posix/SignalTranslator.h UnitTest++/Posix/TimeHelpers.h
11
12
UnitTest___libUnitTest___la_SOURCES += UnitTest++/Posix/SignalTranslator.cpp UnitTest++/Posix/TimeHelpers.cpp
12
13
endif
Original file line number Diff line number Diff line change @@ -9,8 +9,14 @@ AC_CONFIG_HEADERS([config.h])
9
9
AC_CONFIG_FILES ( [ UnitTest++.pc] )
10
10
11
11
AM_INIT_AUTOMAKE ( [ foreign subdir-objects] )
12
+ AM_SILENT_RULES ([ yes] )
13
+
14
+ AC_CANONICAL_HOST
15
+
16
+ dnl Detect Windows, as it doesn't implement UNIX signals and requires special code
12
17
AM_CONDITIONAL([ WINDOWS] ,
13
- [ test "${host#*mingw}" != "${host}" -o "${host#*msvc}" != "${host}"] )
18
+ [ test "${host//mingw/}" != "${host}" -o "${host//msvc/}" != "${host}"] )
19
+
14
20
LT_INIT()
15
21
16
22
AC_SUBST ( [ LIBUNITTEST_SO_VERSION] , [ 1:6:0] )
You can’t perform that action at this time.
0 commit comments