File tree Expand file tree Collapse file tree 2 files changed +3
-4
lines changed Expand file tree Collapse file tree 2 files changed +3
-4
lines changed Original file line number Diff line number Diff line change @@ -45,8 +45,6 @@ if(HAVE_RULES)
45
45
endif ()
46
46
endif ()
47
47
48
- set (CMAKE_INCLUDE_CURRENT_DIR ON )
49
-
50
48
find_package (Python COMPONENTS Interpreter)
51
49
52
50
if (NOT Python_Interpreter_FOUND)
Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ CheckOptions:
16
16
QT_ADD_RESOURCES(resources "gui.qrc" )
17
17
# TODO: passing "-no-obsolete" here breaks the translations
18
18
QT_CREATE_TRANSLATION(qms ${CMAKE_CURRENT_SOURCE_DIR} ${tss} )
19
- list (APPEND cppcheck-gui-deps ${hdrs} ${uis_hdrs } ${resources} ${qms} )
19
+ list (APPEND cppcheck-gui-deps ${hdrs} ${uis } ${resources} ${qms} )
20
20
add_custom_target (gui-build -deps SOURCES ${cppcheck-gui-deps})
21
21
22
22
list (APPEND cppcheck-gui_SOURCES ${srcs} $<TARGET_OBJECTS:frontend_objs>)
@@ -34,7 +34,8 @@ CheckOptions:
34
34
set_target_properties (cppcheck-gui PROPERTIES AUTOMOC ON )
35
35
set_target_properties (cppcheck-gui PROPERTIES AUTOUIC ON )
36
36
set_target_properties (cppcheck-gui PROPERTIES WIN32_EXECUTABLE ON )
37
- target_include_directories (cppcheck-gui PRIVATE ${PROJECT_SOURCE_DIR} /lib/ ${PROJECT_SOURCE_DIR} /frontend/)
37
+ # the GUI include is needed so the includes are found from the generated headers
38
+ target_include_directories (cppcheck-gui PRIVATE ${PROJECT_SOURCE_DIR} /lib/ ${PROJECT_SOURCE_DIR} /frontend/ ${PROJECT_SOURCE_DIR} /gui/)
38
39
if (USE_BUNDLED_TINYXML2)
39
40
target_externals_include_directories(cppcheck-gui PRIVATE ${PROJECT_SOURCE_DIR} /externals/tinyxml2/)
40
41
else ()
You can’t perform that action at this time.
0 commit comments