sync cmake files with the master branch
This commit is contained in:
parent
79ddc41a18
commit
29b7d4b9c3
|
@ -9,6 +9,7 @@ SET(CHECKCLI_SRCS
|
|||
filelister.cpp
|
||||
main.cpp
|
||||
threadexecutor.cpp
|
||||
pathmatch.cpp
|
||||
"${TINYXML_INCLUDE_DIR}tinystr.cpp"
|
||||
"${TINYXML_INCLUDE_DIR}tinyxml.cpp"
|
||||
"${TINYXML_INCLUDE_DIR}tinyxmlerror.cpp"
|
||||
|
@ -19,15 +20,12 @@ include("${CPPCHECK_LIB_DIR}library_sources.cmake")
|
|||
|
||||
if(WIN32)
|
||||
# Add Windows resource file
|
||||
set(CHECKCLI_SRCS ${CHECKCLI_SRCS} filelister_win32.cpp
|
||||
cppcheck.rc)
|
||||
set(CHECKCLI_SRCS ${CHECKCLI_SRCS} cppcheck.rc)
|
||||
|
||||
if(NOT CYGWIN)
|
||||
# Windows needs additional shlwapi library.
|
||||
set(CHECK_LIBS ${CHECK_LIBS} shlwapi)
|
||||
endif()
|
||||
else()
|
||||
set(CHECKCLI_SRCS ${CHECKCLI_SRCS} filelister_unix.cpp)
|
||||
endif()
|
||||
|
||||
if (CMAKE_COMPILER_IS_GNUCXX)
|
||||
|
|
|
@ -47,6 +47,8 @@ SET(CHECK_HEADERS
|
|||
translationhandler.h
|
||||
txtreport.h
|
||||
xmlreport.h
|
||||
xmlreportv1.h
|
||||
xmlreportv2.h
|
||||
)
|
||||
|
||||
# Source files
|
||||
|
@ -77,6 +79,8 @@ SET(CHECKGUI_SRCS
|
|||
translationhandler.cpp
|
||||
txtreport.cpp
|
||||
xmlreport.cpp
|
||||
xmlreportv1.cpp
|
||||
xmlreportv2.cpp
|
||||
)
|
||||
|
||||
# UI files
|
||||
|
|
|
@ -8,6 +8,7 @@ SET(CHECKTEST_SRCS
|
|||
"${CPPCHECK_SOURCE_DIR}/cli/cppcheckexecutor.cpp"
|
||||
"${CPPCHECK_SOURCE_DIR}/cli/filelister.cpp"
|
||||
"${CPPCHECK_SOURCE_DIR}/cli/threadexecutor.cpp"
|
||||
"${CPPCHECK_SOURCE_DIR}/cli/pathmatch.cpp"
|
||||
options.cpp
|
||||
testautovariables.cpp
|
||||
testbufferoverrun.cpp
|
||||
|
@ -51,16 +52,12 @@ set(CPPCHECK_LIB_DIR "${CPPCHECK_SOURCE_DIR}/lib/")
|
|||
include("${CPPCHECK_LIB_DIR}library_sources.cmake")
|
||||
|
||||
if(WIN32)
|
||||
set(CHECKTEST_SRCS ${CHECKTEST_SRCS}
|
||||
"${CPPCHECK_SOURCE_DIR}/cli/filelister_win32.cpp")
|
||||
|
||||
if(NOT CYGWIN)
|
||||
# Windows needs additional shlwapi library.
|
||||
set(CHECK_LIBS ${CHECK_LIBS} shlwapi)
|
||||
endif()
|
||||
else()
|
||||
set(CHECKTEST_SRCS ${CHECKTEST_SRCS} testfilelister_unix.cpp
|
||||
"${CPPCHECK_SOURCE_DIR}/cli/filelister_unix.cpp")
|
||||
set(CHECKTEST_SRCS ${CHECKTEST_SRCS} testfilelister_unix.cpp)
|
||||
endif()
|
||||
|
||||
if (CMAKE_COMPILER_IS_GNUCXX)
|
||||
|
|
Loading…
Reference in New Issue