delete cpp unit
This commit is contained in:
@@ -102,11 +102,6 @@ if(NOT GNURADIO_RUNTIME_FOUND)
|
|||||||
message(FATAL_ERROR "GnuRadio Runtime required to compile foo")
|
message(FATAL_ERROR "GnuRadio Runtime required to compile foo")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
find_package(CppUnit)
|
|
||||||
if(NOT CPPUNIT_FOUND)
|
|
||||||
message(FATAL_ERROR "CppUnit required to compile foo")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
find_package(SWIG)
|
find_package(SWIG)
|
||||||
if(NOT SWIG_FOUND)
|
if(NOT SWIG_FOUND)
|
||||||
message(FATAL_ERROR "SWIG required to compile gr-foo")
|
message(FATAL_ERROR "SWIG required to compile gr-foo")
|
||||||
@@ -138,13 +133,11 @@ endif(APPLE)
|
|||||||
include_directories(
|
include_directories(
|
||||||
${CMAKE_SOURCE_DIR}/include
|
${CMAKE_SOURCE_DIR}/include
|
||||||
${Boost_INCLUDE_DIRS}
|
${Boost_INCLUDE_DIRS}
|
||||||
${CPPUNIT_INCLUDE_DIRS}
|
|
||||||
${GNURADIO_RUNTIME_INCLUDE_DIRS}
|
${GNURADIO_RUNTIME_INCLUDE_DIRS}
|
||||||
)
|
)
|
||||||
|
|
||||||
link_directories(
|
link_directories(
|
||||||
${Boost_LIBRARY_DIRS}
|
${Boost_LIBRARY_DIRS}
|
||||||
${CPPUNIT_LIBRARY_DIRS}
|
|
||||||
${GNURADIO_RUNTIME_LIBRARY_DIRS}
|
${GNURADIO_RUNTIME_LIBRARY_DIRS}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -1,39 +0,0 @@
|
|||||||
# http://www.cmake.org/pipermail/cmake/2006-October/011446.html
|
|
||||||
# Modified to use pkg config and use standard var names
|
|
||||||
|
|
||||||
#
|
|
||||||
# Find the CppUnit includes and library
|
|
||||||
#
|
|
||||||
# This module defines
|
|
||||||
# CPPUNIT_INCLUDE_DIR, where to find tiff.h, etc.
|
|
||||||
# CPPUNIT_LIBRARIES, the libraries to link against to use CppUnit.
|
|
||||||
# CPPUNIT_FOUND, If false, do not try to use CppUnit.
|
|
||||||
|
|
||||||
INCLUDE(FindPkgConfig)
|
|
||||||
PKG_CHECK_MODULES(PC_CPPUNIT "cppunit")
|
|
||||||
|
|
||||||
FIND_PATH(CPPUNIT_INCLUDE_DIRS
|
|
||||||
NAMES cppunit/TestCase.h
|
|
||||||
HINTS ${PC_CPPUNIT_INCLUDE_DIR}
|
|
||||||
${CMAKE_INSTALL_PREFIX}/include
|
|
||||||
PATHS
|
|
||||||
/usr/local/include
|
|
||||||
/usr/include
|
|
||||||
)
|
|
||||||
|
|
||||||
FIND_LIBRARY(CPPUNIT_LIBRARIES
|
|
||||||
NAMES cppunit
|
|
||||||
HINTS ${PC_CPPUNIT_LIBDIR}
|
|
||||||
${CMAKE_INSTALL_PREFIX}/lib
|
|
||||||
${CMAKE_INSTALL_PREFIX}/lib64
|
|
||||||
PATHS
|
|
||||||
${CPPUNIT_INCLUDE_DIRS}/../lib
|
|
||||||
/usr/local/lib
|
|
||||||
/usr/lib
|
|
||||||
)
|
|
||||||
|
|
||||||
LIST(APPEND CPPUNIT_LIBRARIES ${CMAKE_DL_LIBS})
|
|
||||||
|
|
||||||
INCLUDE(FindPackageHandleStandardArgs)
|
|
||||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(CPPUNIT DEFAULT_MSG CPPUNIT_LIBRARIES CPPUNIT_INCLUDE_DIRS)
|
|
||||||
MARK_AS_ADVANCED(CPPUNIT_LIBRARIES CPPUNIT_INCLUDE_DIRS)
|
|
||||||
Reference in New Issue
Block a user