diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-06-23 21:35:45 -0700 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2018-06-25 15:17:41 +0200 |
| commit | 884b30809830bb6e5df04253533e9e7482e6047b (patch) | |
| tree | a9caa7bbdd0846205a1f3361f8cdb228e14eda48 | |
| parent | 35a981ff34ae7b598ce878400da90bf0e8bb9243 (diff) | |
Remove CppUnit dependency
| -rw-r--r-- | CMakeLists.txt | 17 | ||||
| -rw-r--r-- | cmake/Modules/FindCppUnit.cmake | 46 |
2 files changed, 1 insertions, 62 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 64bd1a17a2..f6e1448ec3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,6 @@ set(GR_CMAKE_MIN_VERSION "2.8.12") set(GR_MAKO_MIN_VERSION "0.4.2") set(GR_PYTHON_MIN_VERSION "2.7") #set(GR_PYTHON3_MIN_VERSION "3.x") # Py3k not yet supported -set(GR_CPPUNIT_MIN_VERSION "1.12.1") set(GCC_MIN_VERSION "4.4.0") set(CLANG_MIN_VERSION "3.3.0") set(APPLECLANG_MIN_VERSION "500") @@ -369,24 +368,10 @@ GR_REGISTER_COMPONENT("python-support" ENABLE_PYTHON SWIG_VERSION_CHECK ) -find_package(CppUnit ${GR_CPPUNIT_MIN_VERSION}) GR_REGISTER_COMPONENT("testing-support" ENABLE_TESTING - CPPUNIT_FOUND + Boost_FOUND ) -# check if CppUnit version is 1.14.0 or greater; requires c++11 ... - -if(CPPUNIT_FOUND AND NOT "${CPPUNIT_VERSION}" VERSION_LESS "1.14.0") - message(WARNING "\nWarning: CppUnit version is ${CPPUNIT_VERSION} which requires C++11 for building. Trying to set CMake internally to use C++11 ...") - SET(CMAKE_CXX_STANDARD 11) -endif() - -# if cmake version is < 3.1, explicitly set C++ standard to use. - -if(${CMAKE_VERSION} VERSION_LESS "3.1") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++${CMAKE_CXX_STANDARD}") -endif() - ######################################################################## # Add optional dlls specified in DLL_PATHS ######################################################################## diff --git a/cmake/Modules/FindCppUnit.cmake b/cmake/Modules/FindCppUnit.cmake deleted file mode 100644 index 4e9469f9f6..0000000000 --- a/cmake/Modules/FindCppUnit.cmake +++ /dev/null @@ -1,46 +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) - - -# set version to be useable by calling script - -IF(CPPUNIT_FOUND) - set(CPPUNIT_VERSION ${PC_CPPUNIT_VERSION} CACHE INTERNAL "CppUnit Version" FORCE) -ENDIF() |