Visitar URL original
Conditional inclusion of TinyXML source files in the CLI CMake script… · cppcheck-opensource/cppcheck@796761d · GitHub
Skip to content

Commit 796761d

Browse files
committed
Conditional inclusion of TinyXML source files in the CLI CMake script (bug #2679, #2524)
The source files for the class library "TinyXML" will only be included into the build of the command line interface if the library "PCRE" was found before. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
1 parent a5540e8 commit 796761d

1 file changed

Lines changed: 13 additions & 10 deletions

File tree

‎cli/CMakeLists.txt‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,29 @@
11
# Minimal CMake build file to build cppcheck command line executable
22

3+
include_directories("${CPPCHECK_SOURCE_DIR}/lib")
4+
35
if(PCRE_FOUND)
46
add_definitions(-DHAVE_RULES)
5-
include_directories("${PCRE_INCLUDE_DIR}")
7+
set(TINYXML_INCLUDE_DIR "${CPPCHECK_SOURCE_DIR}/externals/tinyxml/")
8+
include_directories("${PCRE_INCLUDE_DIR}" "${TINYXML_INCLUDE_DIR}")
69
set(CHECK_LIBS ${PCRE_LIBRARIES})
710
endif()
811

9-
set(TINYXML_INCLUDE_DIR "${CPPCHECK_SOURCE_DIR}/externals/tinyxml/")
10-
1112
SET(CHECKCLI_SRCS
1213
cmdlineparser.cpp
1314
cppcheckexecutor.cpp
1415
filelister.cpp
1516
main.cpp
16-
threadexecutor.cpp
1717
pathmatch.cpp
18-
"${TINYXML_INCLUDE_DIR}tinystr.cpp"
19-
"${TINYXML_INCLUDE_DIR}tinyxml.cpp"
20-
"${TINYXML_INCLUDE_DIR}tinyxmlerror.cpp"
21-
"${TINYXML_INCLUDE_DIR}tinyxmlparser.cpp")
18+
threadexecutor.cpp)
19+
20+
if(PCRE_FOUND)
21+
set(CHECKCLI_SRCS ${CHECKCLI_SRCS}
22+
"${TINYXML_INCLUDE_DIR}tinystr.cpp"
23+
"${TINYXML_INCLUDE_DIR}tinyxml.cpp"
24+
"${TINYXML_INCLUDE_DIR}tinyxmlerror.cpp"
25+
"${TINYXML_INCLUDE_DIR}tinyxmlparser.cpp")
26+
endif()
2227

2328
set(CPPCHECK_LIB_DIR "${CPPCHECK_SOURCE_DIR}/lib/")
2429
include("${CPPCHECK_LIB_DIR}library_sources.cmake")
@@ -37,7 +42,5 @@ if (CMAKE_COMPILER_IS_GNUCXX)
3742
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wshadow -Wno-long-long -Wfloat-equal -Wcast-qual")
3843
endif (CMAKE_COMPILER_IS_GNUCXX)
3944

40-
include_directories("${CPPCHECK_SOURCE_DIR}/lib"
41-
"${TINYXML_INCLUDE_DIR}")
4245
add_executable(cppcheck ${CHECKCLI_SRCS} ${CPPCHECK_LIB_SOURCES})
4346
TARGET_LINK_LIBRARIES(cppcheck ${CHECK_LIBS})

0 commit comments

Comments
 (0)