From c6b176014b8d2540fcfe7433949bc4d7a7589c13 Mon Sep 17 00:00:00 2001 From: Daniel Marjamaki Date: Sat, 26 Mar 2011 19:01:41 +0100 Subject: [PATCH] cmake: removed the non-working pcre. ticket: #2679 --- cli/CMakeLists.txt | 4 +--- gui/CMakeLists.txt | 6 ++---- test/CMakeLists.txt | 4 +--- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt index c7112d38e..840d8a434 100644 --- a/cli/CMakeLists.txt +++ b/cli/CMakeLists.txt @@ -1,5 +1,4 @@ # Minimal CMake build file to build cppcheck command line executable -find_package(PCRE REQUIRED) set(TINYXML_INCLUDE_DIR "${CPPCHECK_SOURCE_DIR}/externals/tinyxml/") @@ -33,7 +32,6 @@ if (CMAKE_COMPILER_IS_GNUCXX) endif (CMAKE_COMPILER_IS_GNUCXX) include_directories("${CPPCHECK_SOURCE_DIR}/lib" - "${PCRE_INCLUDE_DIR}" "${TINYXML_INCLUDE_DIR}") add_executable(cppcheck ${CHECKCLI_SRCS} ${CPPCHECK_LIB_SOURCES}) -TARGET_LINK_LIBRARIES(cppcheck ${CHECK_LIBS} ${PCRE_LIBRARIES}) +TARGET_LINK_LIBRARIES(cppcheck ${CHECK_LIBS}) diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index a20822db1..7ac7f541c 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -1,5 +1,4 @@ # Minimal CMake build file to build cppcheck Qt GUI -find_package(PCRE REQUIRED) # find and setup Qt4 for this project find_package(Qt4) @@ -16,8 +15,7 @@ include_directories("${CPPCHECK_SOURCE_DIR}/lib" # Generated files (in build directory) need to know gui directory "${CPPCHECK_SOURCE_DIR}/gui" # Include binary directory where code from UI files gets created - "${CMAKE_CURRENT_BINARY_DIR}" - "${PCRE_INCLUDE_DIR}") + "${CMAKE_CURRENT_BINARY_DIR}") # Header files - listed for mocking SET(CHECK_HEADERS @@ -146,7 +144,7 @@ SOURCE_GROUP("Moc Files" "moc_.*cxx$") ADD_EXECUTABLE(gui WIN32 ${CHECKGUI_SRCS} ${CHECK_MOC_SRCS} ${CHECK_HEADERS} ${CHECK_UIS_H} ${CHECK_RCC_SRCS} ${CPPCHECK_LIB_SOURCES}) -TARGET_LINK_LIBRARIES(gui ${CHECK_LIBS} ${PCRE_LIBRARIES} ${QT_LIBRARIES}) +TARGET_LINK_LIBRARIES(gui ${CHECK_LIBS} ${QT_LIBRARIES}) ELSE(QT4_FOUND) message("GUI not built since QT4 not found.") diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 880dc24be..afbd62e88 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,5 +1,4 @@ # Minimal CMake build file to build cppcheck test suite -find_package(PCRE REQUIRED) set(TINYXML_INCLUDE_DIR "${CPPCHECK_SOURCE_DIR}/externals/tinyxml/") @@ -66,10 +65,9 @@ endif (CMAKE_COMPILER_IS_GNUCXX) include_directories("${CPPCHECK_SOURCE_DIR}/lib" "${CPPCHECK_SOURCE_DIR}/cli" - "${PCRE_INCLUDE_DIR}" "${TINYXML_INCLUDE_DIR}") add_executable(test ${CHECKTEST_SRCS} ${CPPCHECK_LIB_SOURCES}) -TARGET_LINK_LIBRARIES(test ${CHECK_LIBS} ${PCRE_LIBRARIES}) +TARGET_LINK_LIBRARIES(test ${CHECK_LIBS}) # Add custom 'make check' -target # It compiles and runs tests