From fb88655df0098052d7c6d1b36418c31d4dc858d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ChangZhuo=20Chen=20=28=E9=99=B3=E6=98=8C=E5=80=AC=29?= Date: Thu, 22 May 2014 22:53:49 +0800 Subject: [PATCH] Remove CMake related files --- cmake_modules/FindCheck.cmake | 54 -------------------------------- cmake_modules/FindJemalloc.cmake | 44 -------------------------- cmake_modules/FindJudy.cmake | 37 ---------------------- cmake_modules/FindPCRE.cmake | 37 ---------------------- src/CMakeLists.txt | 17 ---------- tests/CMakeLists.txt | 24 -------------- 6 files changed, 213 deletions(-) delete mode 100644 cmake_modules/FindCheck.cmake delete mode 100644 cmake_modules/FindJemalloc.cmake delete mode 100644 cmake_modules/FindJudy.cmake delete mode 100644 cmake_modules/FindPCRE.cmake delete mode 100644 src/CMakeLists.txt delete mode 100644 tests/CMakeLists.txt diff --git a/cmake_modules/FindCheck.cmake b/cmake_modules/FindCheck.cmake deleted file mode 100644 index 8edcc91..0000000 --- a/cmake_modules/FindCheck.cmake +++ /dev/null @@ -1,54 +0,0 @@ -# - Try to find the CHECK libraries -# Once done this will define -# -# CHECK_FOUND - system has check -# CHECK_INCLUDE_DIRS - the check include directory -# CHECK_LIBRARIES - check library -# -# Copyright (c) 2007 Daniel Gollub -# Copyright (c) 2007-2009 Bjoern Ricks -# -# Redistribution and use is allowed according to the terms of the New -# BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - - -INCLUDE( FindPkgConfig ) - -IF ( Check_FIND_REQUIRED ) - SET( _pkgconfig_REQUIRED "REQUIRED" ) -ELSE( Check_FIND_REQUIRED ) - SET( _pkgconfig_REQUIRED "" ) -ENDIF ( Check_FIND_REQUIRED ) - -IF ( CHECK_MIN_VERSION ) - PKG_SEARCH_MODULE( CHECK ${_pkgconfig_REQUIRED} check>=${CHECK_MIN_VERSION} ) -ELSE ( CHECK_MIN_VERSION ) - PKG_SEARCH_MODULE( CHECK ${_pkgconfig_REQUIRED} check ) -ENDIF ( CHECK_MIN_VERSION ) - -# Look for CHECK include dir and libraries -IF( NOT CHECK_FOUND AND NOT PKG_CONFIG_FOUND ) - - FIND_PATH( CHECK_INCLUDE_DIRS check.h ) - - FIND_LIBRARY( CHECK_LIBRARIES NAMES check ) - - IF ( CHECK_INCLUDE_DIRS AND CHECK_LIBRARIES ) - SET( CHECK_FOUND 1 ) - IF ( NOT Check_FIND_QUIETLY ) - MESSAGE ( STATUS "Found CHECK: ${CHECK_LIBRARIES}" ) - ENDIF ( NOT Check_FIND_QUIETLY ) - ELSE ( CHECK_INCLUDE_DIRS AND CHECK_LIBRARIES ) - IF ( Check_FIND_REQUIRED ) - MESSAGE( FATAL_ERROR "Could NOT find CHECK" ) - ELSE ( Check_FIND_REQUIRED ) - IF ( NOT Check_FIND_QUIETLY ) - MESSAGE( STATUS "Could NOT find CHECK" ) - ENDIF ( NOT Check_FIND_QUIETLY ) - ENDIF ( Check_FIND_REQUIRED ) - ENDIF ( CHECK_INCLUDE_DIRS AND CHECK_LIBRARIES ) -ENDIF( NOT CHECK_FOUND AND NOT PKG_CONFIG_FOUND ) - -# Hide advanced variables from CMake GUIs -MARK_AS_ADVANCED( CHECK_INCLUDE_DIRS CHECK_LIBRARIES ) diff --git a/cmake_modules/FindJemalloc.cmake b/cmake_modules/FindJemalloc.cmake deleted file mode 100644 index c97bb1b..0000000 --- a/cmake_modules/FindJemalloc.cmake +++ /dev/null @@ -1,44 +0,0 @@ -# - Try to find jemalloc headers and libraries. -# -# Usage of this module as follows: -# -# find_package(JeMalloc) -# -# Variables used by this module, they can change the default behaviour and need -# to be set before calling find_package: -# -# JEMALLOC_ROOT_DIR Set this variable to the root installation of -# jemalloc if the module has problems finding -# the proper installation path. -# -# Variables defined by this module: -# -# JEMALLOC_FOUND System has jemalloc libs/headers -# JEMALLOC_LIBRARIES The jemalloc library/libraries -# JEMALLOC_INCLUDE_DIR The location of jemalloc headers - -find_path(JEMALLOC_ROOT_DIR - NAMES include/jemalloc/jemalloc.h -) - -find_library(JEMALLOC_LIBRARIES - NAMES jemalloc - HINTS ${JEMALLOC_ROOT_DIR}/lib -) - -find_path(JEMALLOC_INCLUDE_DIR - NAMES jemalloc/jemalloc.h - HINTS ${JEMALLOC_ROOT_DIR}/include -) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(JeMalloc DEFAULT_MSG - JEMALLOC_LIBRARIES - JEMALLOC_INCLUDE_DIR -) - -mark_as_advanced( - JEMALLOC_ROOT_DIR - JEMALLOC_LIBRARIES - JEMALLOC_INCLUDE_DIR -) diff --git a/cmake_modules/FindJudy.cmake b/cmake_modules/FindJudy.cmake deleted file mode 100644 index 1be69e1..0000000 --- a/cmake_modules/FindJudy.cmake +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (C) 2007-2009 LuaDist. -# Created by Peter Kapec -# Redistribution and use of this file is allowed according to the terms of the MIT license. -# For details see the COPYRIGHT file distributed with LuaDist. -# Note: -# Searching headers and libraries is very simple and is NOT as powerful as scripts -# distributed with CMake, because LuaDist defines directories to search for. -# Everyone is encouraged to contact the author with improvements. Maybe this file -# becomes part of CMake distribution sometimes. - -# - Find judy -# Find the native Judy headers and libraries. -# -# Judy_INCLUDE_DIRS - where to find judy.h, etc. -# Judy_LIBRARIES - List of libraries when using judy. -# Judy_FOUND - True if judy found. - -# Look for the header file. -FIND_PATH(Judy_INCLUDE_DIR NAMES Judy.h) - -# Look for the library. -FIND_LIBRARY(Judy_LIBRARY NAMES judy) - -# Handle the QUIETLY and REQUIRED arguments and set Judy_FOUND to TRUE if all listed variables are TRUE. -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Judy DEFAULT_MSG Judy_LIBRARY Judy_INCLUDE_DIR) - -# Copy the results to the output variables. -IF(Judy_FOUND) - SET(Judy_LIBRARIES ${Judy_LIBRARY}) - SET(Judy_INCLUDE_DIRS ${Judy_INCLUDE_DIR}) -ELSE(Judy_FOUND) - SET(Judy_LIBRARIES) - SET(Judy_INCLUDE_DIRS) -ENDIF(Judy_FOUND) - -MARK_AS_ADVANCED(Judy_INCLUDE_DIRS Judy_LIBRARIES) diff --git a/cmake_modules/FindPCRE.cmake b/cmake_modules/FindPCRE.cmake deleted file mode 100644 index dbbd60a..0000000 --- a/cmake_modules/FindPCRE.cmake +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (C) 2007-2009 LuaDist. -# Created by Peter Kapec -# Redistribution and use of this file is allowed according to the terms of the MIT license. -# For details see the COPYRIGHT file distributed with LuaDist. -# Note: -# Searching headers and libraries is very simple and is NOT as powerful as scripts -# distributed with CMake, because LuaDist defines directories to search for. -# Everyone is encouraged to contact the author with improvements. Maybe this file -# becomes part of CMake distribution sometimes. - -# - Find pcre -# Find the native PCRE headers and libraries. -# -# PCRE_INCLUDE_DIRS - where to find pcre.h, etc. -# PCRE_LIBRARIES - List of libraries when using pcre. -# PCRE_FOUND - True if pcre found. - -# Look for the header file. -FIND_PATH(PCRE_INCLUDE_DIR NAMES pcre.h) - -# Look for the library. -FIND_LIBRARY(PCRE_LIBRARY NAMES pcre) - -# Handle the QUIETLY and REQUIRED arguments and set PCRE_FOUND to TRUE if all listed variables are TRUE. -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE DEFAULT_MSG PCRE_LIBRARY PCRE_INCLUDE_DIR) - -# Copy the results to the output variables. -IF(PCRE_FOUND) - SET(PCRE_LIBRARIES ${PCRE_LIBRARY}) - SET(PCRE_INCLUDE_DIRS ${PCRE_INCLUDE_DIR}) -ELSE(PCRE_FOUND) - SET(PCRE_LIBRARIES) - SET(PCRE_INCLUDE_DIRS) -ENDIF(PCRE_FOUND) - -MARK_AS_ADVANCED(PCRE_INCLUDE_DIRS PCRE_LIBRARIES) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt deleted file mode 100644 index 3e0e268..0000000 --- a/src/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -cmake_minimum_required(VERSION 2.8) - -include_directories("${PROJECT_SOURCE_DIR}/include") -# install(TARGETS swiftnav-static DESTINATION lib${LIB_SUFFIX}) - -set(R3_SRCS node.c str.c list.c token.c edge.c zmalloc.c) -set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -pipe -g3 -funroll-loops -O0") - -# set(LIBS ${LIBS} ${PCRE_LIBRARIES} ${Judy_LIBRARIES} ${Jemalloc_LIBRARIES} r3) -set(LIBS ${LIBS} ${PCRE_LIBRARIES} ${Jemalloc_LIBRARIES} r3) - -# add_library(r3 SHARED ${R3_SRCS}) -add_library(r3 STATIC ${R3_SRCS}) -target_link_libraries(r3 ${LIBS}) -install (TARGETS r3 DESTINATION lib) -# target_link_libraries(r3 cblas) -# install(FILES ${libswiftnav_HEADERS} DESTINATION include/libswiftnav) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt deleted file mode 100644 index 7d8e226..0000000 --- a/tests/CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ -# set(TEST_LIBS ${TEST_LIBS} ${CHECK_LIBRARIES} judy libr3) -# set(TEST_LIBS ${TEST_LIBS} ${CHECK_LIBRARIES} judy libr3) -find_package(Check REQUIRED) -find_package(PCRE REQUIRED) -# find_package(Judy REQUIRED) - -if (NOT CHECK_FOUND) - message(STATUS "Skipping unit tests, Check library not found!") -else (NOT CHECK_FOUND) - set(TEST_LIBS ${LIBS} ${CHECK_LIBRARIES} ${PCRE_LIBRARIES} r3) - - include_directories(${CHECK_INCLUDE_DIRS}) - # include_directories("${PROJECT_SOURCE_DIR}/include/r2") - add_executable(test_r3 test_tree.c) - target_link_libraries(test_r3 ${TEST_LIBS}) - - add_custom_command( - TARGET test_r3 POST_BUILD - COMMENT "Running unit tests" - COMMAND test_r3 - ) -endif (NOT CHECK_FOUND) - -