Bug #2524: Addition of CMake build files - use of module "FindPCRE"

A few build scripts were updated for the use of the module "FindPCRE.cmake"
and corresponding variables so that the software can work with the programming
interface "Perl-compatible regular expressions".

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>

Author: elfring

cli/CMakeLists.txt

@@ -1,4 +1,5 @@
 # Minimal CMake build file to build cppcheck command line executable
+find_package(PCRE REQUIRED)
 
 SET(CHECKCLI_SRCS
   cppcheckexecutor.cpp

cmake/modules/FindPCRE.cmake

@@ -0,0 +1,44 @@
+# - Try to find the PCRE regular expression library
+# Once done this will define
+#
+#  PCRE_FOUND - system has the PCRE library
+#  PCRE_INCLUDE_DIR - the PCRE include directory
+#  PCRE_LIBRARIES - The libraries needed to use PCRE
+
+# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+if (PCRE_INCLUDE_DIR AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY)
+  # Already in cache, be silent
+  set(PCRE_FIND_QUIETLY TRUE)
+endif (PCRE_INCLUDE_DIR AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY)
+
+
+if (NOT WIN32)
+  # use pkg-config to get the directories and then use these values
+  # in the FIND_PATH() and FIND_LIBRARY() calls
+  find_package(PkgConfig)
+
+  pkg_check_modules(PC_PCRE QUIET libpcre)
+
+  set(PCRE_DEFINITIONS ${PC_PCRE_CFLAGS_OTHER})
+
+endif (NOT WIN32)
+
+find_path(PCRE_INCLUDE_DIR pcre.h
+          HINTS ${PC_PCRE_INCLUDEDIR} ${PC_PCRE_INCLUDE_DIRS}
+          PATH_SUFFIXES pcre)
+
+find_library(PCRE_PCRE_LIBRARY NAMES pcre pcred HINTS ${PC_PCRE_LIBDIR} ${PC_PCRE_LIBRARY_DIRS})
+
+find_library(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix pcreposixd HINTS ${PC_PCRE_LIBDIR} ${PC_PCRE_LIBRARY_DIRS})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(PCRE DEFAULT_MSG PCRE_INCLUDE_DIR PCRE_PCRE_LIBRARY PCRE_PCREPOSIX_LIBRARY )
+
+set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY})
+
+mark_as_advanced(PCRE_INCLUDE_DIR PCRE_LIBRARIES PCRE_PCREPOSIX_LIBRARY PCRE_PCRE_LIBRARY)

gui/CMakeLists.txt

@@ -1,4 +1,5 @@
 # Minimal CMake build file to build cppcheck Qt GUI
+find_package(PCRE REQUIRED)
 
 # find and setup Qt4 for this project
 find_package(Qt4)
@@ -10,9 +11,12 @@ set(QT_USE_QTMAIN TRUE)
 set(QT_USE_QTXML TRUE)
 include(${QT_USE_FILE})
 
-include_directories (${CPPCHECK_SOURCE_DIR}/lib)
+include_directories("${CPPCHECK_SOURCE_DIR}/lib"
 # Generated files (in build directory) need to know gui directory
-include_directories (${CPPCHECK_SOURCE_DIR}/gui)
+                    "${CPPCHECK_SOURCE_DIR}/gui"
+# Include binary directory where code from UI files gets created
+                    "${CMAKE_CURRENT_BINARY_DIR}"
+                    "${PCRE_INCLUDE_DIR}")
 
 # Header files - listed for mocking
 SET(CHECK_HEADERS
@@ -119,12 +123,9 @@ SOURCE_GROUP("Header Files" FILES ${CHECK_HEADERS})
 SOURCE_GROUP("Ui Files" ".ui$")
 SOURCE_GROUP("Moc Files" "moc_.*cxx$")
 
-# Include binary directory where code from UI files gets created
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
 ADD_EXECUTABLE(gui WIN32 ${CHECKGUI_SRCS} ${CHECK_MOC_SRCS} ${CHECK_HEADERS} 
   ${CHECK_UIS_H} ${CHECK_RCC_SRCS} ${LIB_SRCS})
-TARGET_LINK_LIBRARIES(gui ${CHECK_LIBS} ${QT_LIBRARIES})
+TARGET_LINK_LIBRARIES(gui ${CHECK_LIBS} ${PCRE_LIBRARIES} ${QT_LIBRARIES})
 
 ELSE(QT4_FOUND)
 message("GUI not built since QT4 not found.")

lib/CMakeLists.txt

@@ -3,6 +3,8 @@
 # - cli
 # - tests
 # - Qt GUI
+find_package(PCRE REQUIRED)
+include_directories("${PCRE_INCLUDE_DIR}")
 
 SET(CHECKLIB_SRCS
   checkautovariables.cpp
@@ -33,3 +35,4 @@ if (CMAKE_COMPILER_IS_GNUCXX)
 endif (CMAKE_COMPILER_IS_GNUCXX)
 
 ADD_LIBRARY(checklib STATIC ${CHECKLIB_SRCS})
+target_link_libraries(checklib ${PCRE_LIBRARIES})

test/CMakeLists.txt

@@ -1,4 +1,5 @@
 # Minimal CMake build file to build cppcheck test suite
+find_package(PCRE REQUIRED)
 
 SET(CHECKTEST_SRCS
   testmemleak.cpp
@@ -47,9 +48,9 @@ if (CMAKE_COMPILER_IS_GNUCXX)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wshadow -Wno-long-long -Wfloat-equal -Wcast-qual")
 endif (CMAKE_COMPILER_IS_GNUCXX)
 
-include_directories (${CPPCHECK_SOURCE_DIR}/lib)
+include_directories("${CPPCHECK_SOURCE_DIR}/lib" "${PCRE_INCLUDE_DIR}")
 ADD_EXECUTABLE(test ${CHECKTEST_SRCS} ${LIB_SRCS})
-TARGET_LINK_LIBRARIES(test ${CHECK_LIBS})
+TARGET_LINK_LIBRARIES(test ${CHECK_LIBS} ${PCRE_LIBRARIES})
 
 # Add custom 'make check' -target
 # It compiles and runs tests