blob: b42ef8988a4c912dd4bd20c5579e31899753c951 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
--- taglib-1.11.1/cmake/modules/FindCppUnit.cmake 2017-05-20 10:28:07.926637100 +0200
+++ taglib-1.11.1/cmake/modules/FindCppUnit2.cmake 2016-10-24 05:03:23.000000000 +0200
@@ -11,7 +11,7 @@
SET(CPPUNIT_MIN_VERSION 1.12.0)
endif(NOT CPPUNIT_MIN_VERSION)
-FIND_PROGRAM(CPPUNIT_CONFIG_EXECUTABLE cppunit-config )
+FIND_PROGRAM(CPPUNIT_CONFIG_EXECUTABLE pkg-config )
IF(CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARIES)
@@ -24,9 +24,9 @@
SET(CPPUNIT_LIBRARIES)
IF(CPPUNIT_CONFIG_EXECUTABLE)
- EXEC_PROGRAM(${CPPUNIT_CONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_CFLAGS)
- EXEC_PROGRAM(${CPPUNIT_CONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_LIBRARIES)
- EXEC_PROGRAM(${CPPUNIT_CONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_INSTALLED_VERSION)
+ EXEC_PROGRAM(${CPPUNIT_CONFIG_EXECUTABLE} ARGS --cflags cppunit RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_CFLAGS)
+ EXEC_PROGRAM(${CPPUNIT_CONFIG_EXECUTABLE} ARGS --libs cppunit RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_LIBRARIES)
+ EXEC_PROGRAM(${CPPUNIT_CONFIG_EXECUTABLE} ARGS --modversion cppunit RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_INSTALLED_VERSION)
STRING(REGEX REPLACE "-I(.+)" "\\1" CPPUNIT_CFLAGS "${CPPUNIT_CFLAGS}")
ELSE(CPPUNIT_CONFIG_EXECUTABLE)
# in case win32 needs to find it the old way?
@@ -50,7 +50,7 @@
endif(NOT CppUnit_FIND_QUIETLY)
IF(CPPUNIT_CONFIG_EXECUTABLE)
- EXEC_PROGRAM(${CPPUNIT_CONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_INSTALLED_VERSION)
+ EXEC_PROGRAM(${CPPUNIT_CONFIG_EXECUTABLE} ARGS --modversion cppunit RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_INSTALLED_VERSION)
ENDIF(CPPUNIT_CONFIG_EXECUTABLE)
macro_ensure_version( ${CPPUNIT_MIN_VERSION} ${CPPUNIT_INSTALLED_VERSION} CPPUNIT_INSTALLED_VERSION_OK )
|