From 4693f313cd4baca91dd04a4595ebf8a6378944ec Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Fri, 13 Apr 2012 21:48:39 +0200 Subject: [PATCH] cmake: Removed obsolete FindArgp module. Signed-off-by: Andreas Schneider --- ConfigureChecks.cmake | 5 +-- cmake/Modules/FindArgp.cmake | 60 ------------------------------------ 2 files changed, 1 insertion(+), 64 deletions(-) delete mode 100644 cmake/Modules/FindArgp.cmake diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index cd4dc5aaa..b58992083 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -16,16 +16,13 @@ set(BINARYDIR ${CMAKE_BINARY_DIR}) set(SOURCEDIR ${CMAKE_SOURCE_DIR}) # HEADER FILES -check_include_file(argp.h HAVE_ARGP_H) # FUNCTIONS if (NOT LINUX) # librt check_library_exists(rt nanosleep "" HAVE_LIBRT) - # argp - find_package(Argp REQUIRED) - set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ARGP_LIBRARY}) + set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ) endif (NOT LINUX) check_library_exists(rt clock_gettime "" HAVE_CLOCK_GETTIME) diff --git a/cmake/Modules/FindArgp.cmake b/cmake/Modules/FindArgp.cmake deleted file mode 100644 index aa228557b..000000000 --- a/cmake/Modules/FindArgp.cmake +++ /dev/null @@ -1,60 +0,0 @@ -# - Try to find Argp -# Once done this will define -# -# ARGP_FOUND - system has Argp -# ARGP_INCLUDE_DIRS - the Argp include directory -# ARGP_LIBRARIES - Link these to use Argp -# ARGP_DEFINITIONS - Compiler switches required for using Argp -# -# Copyright (c) 2010 Andreas Schneider -# -# Redistribution and use is allowed according to the terms of the New -# BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -# - - -if (ARGP_LIBRARIES AND ARGP_INCLUDE_DIRS) - # in cache already - set(ARGP_FOUND TRUE) -else (ARGP_LIBRARIES AND ARGP_INCLUDE_DIRS) - - find_path(ARGP_INCLUDE_DIR - NAMES - argp.h - PATHS - /usr/include - /usr/local/include - /opt/local/include - /sw/include - ) - - find_library(ARGP_LIBRARY - NAMES - argp - PATHS - /usr/lib - /usr/local/lib - /opt/local/lib - /sw/lib - ) - - set(ARGP_INCLUDE_DIRS - ${ARGP_INCLUDE_DIR} - ) - - if (ARGP_LIBRARY) - set(ARGP_LIBRARIES - ${ARGP_LIBRARIES} - ${ARGP_LIBRARY} - ) - endif (ARGP_LIBRARY) - - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(Argp DEFAULT_MSG ARGP_LIBRARIES ARGP_INCLUDE_DIRS) - - # show the ARGP_INCLUDE_DIRS and ARGP_LIBRARIES variables only in the advanced view - mark_as_advanced(ARGP_INCLUDE_DIRS ARGP_LIBRARIES) - -endif (ARGP_LIBRARIES AND ARGP_INCLUDE_DIRS) -