25 lines
1.6 KiB
Diff
25 lines
1.6 KiB
Diff
--- taglib-1.9.1/cmake/modules/FindCppUnit.cmake.orig 2014-04-20 20:13:43.437000000 +0400
|
|
+++ taglib-1.9.1/cmake/modules/FindCppUnit.cmake 2014-04-20 20:23:51.369800000 +0400
|
|
@@ -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(pkg-config ARGS --cflags cppunit RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_CFLAGS)
|
|
+ EXEC_PROGRAM(pkg-config ARGS --libs cppunit RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_LIBRARIES)
|
|
+ EXEC_PROGRAM(pkg-config 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(pkg-config 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 )
|