walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge commit 'elfring/2679d'

This commit is contained in:
Daniel Marjamäki 2011-04-02 14:16:14 +02:00
parent ea57e10c7f 8cde24597f
commit 8a28a63e68
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -15,6 +15,12 @@ cmake_minimum_required (VERSION 2.6)
PROJECT(CPPCHECK) PROJECT(CPPCHECK)
set(CMAKE_MODULE_PATH "${CPPCHECK_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH}) set(CMAKE_MODULE_PATH "${CPPCHECK_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
find_package(PCRE)
if(NOT PCRE_FOUND)
message("User-defined rules are disabled since required PCRE libraries were not found.
If you want to enable the rules, then configure the PCRE paths for CMake.")
endif()
# Building lib as static library is disabled due to bug # Building lib as static library is disabled due to bug
# #1299 CMake: The CheckClass is not used # #1299 CMake: The CheckClass is not used

6
cli/CMakeLists.txt
View File

@ -1,5 +1,11 @@
# Minimal CMake build file to build cppcheck command line executable # Minimal CMake build file to build cppcheck command line executable
if(PCRE_FOUND)
add_definitions(-DHAVE_RULES)
include_directories("${PCRE_INCLUDE_DIR}")
set(CHECK_LIBS ${PCRE_LIBRARIES})
endif()
set(TINYXML_INCLUDE_DIR "${CPPCHECK_SOURCE_DIR}/externals/tinyxml/") set(TINYXML_INCLUDE_DIR "${CPPCHECK_SOURCE_DIR}/externals/tinyxml/")
SET(CHECKCLI_SRCS SET(CHECKCLI_SRCS

9
lib/CMakeLists.txt
View File

@ -4,6 +4,11 @@
# - tests # - tests
# - Qt GUI # - Qt GUI
if(PCRE_FOUND)
add_definitions(-DHAVE_RULES)
include_directories("${PCRE_INCLUDE_DIR}")
endif()
set(CPPCHECK_LIB_DIR "") set(CPPCHECK_LIB_DIR "")
include("library_sources.cmake") include("library_sources.cmake")
@ -12,3 +17,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
endif (CMAKE_COMPILER_IS_GNUCXX) endif (CMAKE_COMPILER_IS_GNUCXX)
add_library(checklib STATIC ${CPPCHECK_LIB_SOURCES}) add_library(checklib STATIC ${CPPCHECK_LIB_SOURCES})
if(PCRE_FOUND)
target_link_libraries(checklib ${PCRE_LIBRARIES})
endif()