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

cmake: removed the non-working pcre. ticket: #2679

This commit is contained in:
Daniel Marjamaki 2011-03-26 19:01:41 +01:00
parent 139fbf57e0
commit c6b176014b
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/CMakeLists.txt
View File

@ -1,5 +1,4 @@
# Minimal CMake build file to build cppcheck command line executable # Minimal CMake build file to build cppcheck command line executable
find_package(PCRE REQUIRED)
set(TINYXML_INCLUDE_DIR "${CPPCHECK_SOURCE_DIR}/externals/tinyxml/") set(TINYXML_INCLUDE_DIR "${CPPCHECK_SOURCE_DIR}/externals/tinyxml/")
@ -33,7 +32,6 @@ if (CMAKE_COMPILER_IS_GNUCXX)
endif (CMAKE_COMPILER_IS_GNUCXX) endif (CMAKE_COMPILER_IS_GNUCXX)
include_directories("${CPPCHECK_SOURCE_DIR}/lib" include_directories("${CPPCHECK_SOURCE_DIR}/lib"
"${PCRE_INCLUDE_DIR}"
"${TINYXML_INCLUDE_DIR}") "${TINYXML_INCLUDE_DIR}")
add_executable(cppcheck ${CHECKCLI_SRCS} ${CPPCHECK_LIB_SOURCES}) add_executable(cppcheck ${CHECKCLI_SRCS} ${CPPCHECK_LIB_SOURCES})
TARGET_LINK_LIBRARIES(cppcheck ${CHECK_LIBS} ${PCRE_LIBRARIES}) TARGET_LINK_LIBRARIES(cppcheck ${CHECK_LIBS})

6
gui/CMakeLists.txt
View File

@ -1,5 +1,4 @@
# Minimal CMake build file to build cppcheck Qt GUI # Minimal CMake build file to build cppcheck Qt GUI
find_package(PCRE REQUIRED)
# find and setup Qt4 for this project # find and setup Qt4 for this project
find_package(Qt4) find_package(Qt4)
@ -16,8 +15,7 @@ include_directories("${CPPCHECK_SOURCE_DIR}/lib"
# Generated files (in build directory) need to know gui directory # Generated files (in build directory) need to know gui directory
"${CPPCHECK_SOURCE_DIR}/gui" "${CPPCHECK_SOURCE_DIR}/gui"
# Include binary directory where code from UI files gets created # Include binary directory where code from UI files gets created
"${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}")
"${PCRE_INCLUDE_DIR}")
# Header files - listed for mocking # Header files - listed for mocking
SET(CHECK_HEADERS SET(CHECK_HEADERS
@ -146,7 +144,7 @@ SOURCE_GROUP("Moc Files" "moc_.*cxx$")
ADD_EXECUTABLE(gui WIN32 ${CHECKGUI_SRCS} ${CHECK_MOC_SRCS} ${CHECK_HEADERS} ADD_EXECUTABLE(gui WIN32 ${CHECKGUI_SRCS} ${CHECK_MOC_SRCS} ${CHECK_HEADERS}
${CHECK_UIS_H} ${CHECK_RCC_SRCS} ${CPPCHECK_LIB_SOURCES}) ${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) ELSE(QT4_FOUND)
message("GUI not built since QT4 not found.") message("GUI not built since QT4 not found.")

4
test/CMakeLists.txt
View File

@ -1,5 +1,4 @@
# Minimal CMake build file to build cppcheck test suite # Minimal CMake build file to build cppcheck test suite
find_package(PCRE REQUIRED)
set(TINYXML_INCLUDE_DIR "${CPPCHECK_SOURCE_DIR}/externals/tinyxml/") set(TINYXML_INCLUDE_DIR "${CPPCHECK_SOURCE_DIR}/externals/tinyxml/")
@ -66,10 +65,9 @@ endif (CMAKE_COMPILER_IS_GNUCXX)
include_directories("${CPPCHECK_SOURCE_DIR}/lib" include_directories("${CPPCHECK_SOURCE_DIR}/lib"
"${CPPCHECK_SOURCE_DIR}/cli" "${CPPCHECK_SOURCE_DIR}/cli"
"${PCRE_INCLUDE_DIR}"
"${TINYXML_INCLUDE_DIR}") "${TINYXML_INCLUDE_DIR}")
add_executable(test ${CHECKTEST_SRCS} ${CPPCHECK_LIB_SOURCES}) 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 # Add custom 'make check' -target
# It compiles and runs tests # It compiles and runs tests