cunit: deprecate cunit
authorBernhard Miklautz <bmiklautz@thinstuff.at>
Thu, 25 Oct 2012 11:41:28 +0000 (13:41 +0200)
committerBernhard Miklautz <bmiklautz@thinstuff.at>
Thu, 25 Oct 2012 11:43:33 +0000 (13:43 +0200)
cunit is not used anymore. Testing is now done with ctest.

CMakeLists.txt
cmake/FindCUnit.cmake [deleted file]

index a8d6bee..28f501e 100644 (file)
@@ -269,11 +269,9 @@ endif()
 # Intel Performance Primitives
 #find_optional_package(IPP)
 
-# Build CUnit
-
-find_optional_package(CUnit)
 if(WITH_CUNIT)
-       add_subdirectory(cunit)
+       message(FATAL_ERROR "cunit (WITH_CUNIT) is deprecated please use BUILD_TESTING to build ctest tests.
+The cunit directory contains the old tests and is kept until all tests are converted.")
 endif()
 
 # Sub-directories
diff --git a/cmake/FindCUnit.cmake b/cmake/FindCUnit.cmake
deleted file mode 100644 (file)
index 9abfd12..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-# - Find CUnit
-# Find the CUnit libraries
-#
-#  This module defines the following variables:
-#     CUNIT_FOUND        - true if CUNIT_INCLUDE_DIR & CUNIT_LIBRARY are found
-#     CUNIT_LIBRARIES    - Set when CUNIT_LIBRARY is found
-#     CUNIT_INCLUDE_DIRS - Set when CUNIT_INCLUDE_DIR is found
-#
-#     CUNIT_INCLUDE_DIR  - where to find CUnit.h, etc.
-#     CUNIT_LIBRARY      - the cunit library
-#
-
-#=============================================================================
-# Copyright 2011 O.S. Systems Software Ltda.
-# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#=============================================================================
-
-if(WIN32)
-set(_CUNIT_ROOT_HINTS
-       $ENV{CUNIT_ROOT_DIR}
-       ${CUNIT_ROOT_DIR})
-
-set(_CUNIT_ROOT_PATHS
-       "$ENV{PROGRAMFILES}/CUnit"
-       "$ENV{SYSTEMDRIVE}/CUnit")
-
-set(_CUNIT_ROOT_HINTS_AND_PATHS
-       HINTS ${_CUNIT_ROOT_HINTS}
-       PATHS ${_CUNIT_ROOT_PATHS})
-endif(WIN32)
-
-find_path(CUNIT_INCLUDE_DIR
-       NAMES CUnit.h
-       HINTS ${_CUNIT_ROOT_HINTS_AND_PATHS}
-       PATH_SUFFIXES CUnit include
-       DOC "The CUnit include directory"
-)
-
-find_library(CUNIT_LIBRARY
-       NAMES cunit
-       HINTS ${_CUNIT_ROOT_HINTS_AND_PATHS}
-       PATH_SUFFIXES lib
-       DOC "The CUnit library"
-)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(CUnit DEFAULT_MSG CUNIT_LIBRARY CUNIT_INCLUDE_DIR)
-
-if(CUNIT_FOUND)
-               set(CUNIT_LIBRARIES ${CUNIT_LIBRARY})
-               set(CUNIT_INCLUDE_DIRS ${CUNIT_INCLUDE_DIR})
-endif()
-
-mark_as_advanced(CUNIT_INCLUDE_DIR CUNIT_LIBRARY)