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)
4545 endif ()
4646endif ()
4747
48- set (CMAKE_INCLUDE_CURRENT_DIR ON )
49-
5048find_package (Python COMPONENTS Interpreter)
5149
5250if (NOT Python_Interpreter_FOUND)
Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ CheckOptions:
1616 QT_ADD_RESOURCES(resources "gui.qrc" )
1717 # TODO: passing "-no-obsolete" here breaks the translations
1818 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} )
2020 add_custom_target (gui-build -deps SOURCES ${cppcheck-gui-deps})
2121
2222 list (APPEND cppcheck-gui_SOURCES ${srcs} $<TARGET_OBJECTS:frontend_objs>)
@@ -34,7 +34,8 @@ CheckOptions:
3434 set_target_properties (cppcheck-gui PROPERTIES AUTOMOC ON )
3535 set_target_properties (cppcheck-gui PROPERTIES AUTOUIC ON )
3636 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 - TODO: is it possible to get rid of this?
38+ target_include_directories (cppcheck-gui PRIVATE ${PROJECT_SOURCE_DIR} /lib/ ${PROJECT_SOURCE_DIR} /frontend/ ${PROJECT_SOURCE_DIR} /gui/)
3839 if (USE_BUNDLED_TINYXML2)
3940 target_externals_include_directories(cppcheck-gui PRIVATE ${PROJECT_SOURCE_DIR} /externals/tinyxml2/)
4041 else ()
You can’t perform that action at this time.
0 commit comments