Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
b300d6a7
Commit
b300d6a7
authored
Apr 10, 2020
by
Laurent Montel
😁
Browse files
Fix compile with -Werror=missing-include-dirs
parent
454db638
Pipeline
#18093
passed with stage
in 33 minutes and 48 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
b300d6a7
...
...
@@ -157,8 +157,6 @@ if(BUILD_TESTING)
${
CMAKE_BINARY_DIR
}
/src
${
MLT_INCLUDE_DIR
}
${
MLTPP_INCLUDE_DIR
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/lib/external
${
CMAKE_CURRENT_SOURCE_DIR
}
/lib
src
)
add_executable
(
runTests
${
Tests_SRCS
}
)
set_property
(
TARGET runTests PROPERTY CXX_STANDARD 14
)
...
...
src/CMakeLists.txt
View file @
b300d6a7
...
...
@@ -94,7 +94,9 @@ ecm_add_app_icon(kdenlive ICONS ${ICONS_SRCS}) # icon name = variable name
add_executable
(
kdenlive main.cpp
${
kdenlive_extra_SRCS
}
${
kdenlive
}
)
target_include_directories
(
kdenlive
PRIVATE
${
CMAKE_BINARY_DIR
}
SYSTEM
${
MLT_INCLUDE_DIR
}
${
MLTPP_INCLUDE_DIR
}
)
)
target_include_directories
(
kdenlive
SYSTEM PRIVATE
${
MLT_INCLUDE_DIR
}
${
MLTPP_INCLUDE_DIR
}
)
target_link_libraries
(
kdenlive kdenliveLib
)
install
(
TARGETS kdenlive DESTINATION
${
BIN_INSTALL_DIR
}
)
...
...
@@ -106,7 +108,9 @@ target_include_directories(kdenliveLib
${
CMAKE_CURRENT_SOURCE_DIR
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/lib/external
${
CMAKE_CURRENT_SOURCE_DIR
}
/lib
SYSTEM
${
MLT_INCLUDE_DIR
}
${
MLTPP_INCLUDE_DIR
}
)
)
target_include_directories
(
kdenliveLib
SYSTEM PRIVATE
${
MLT_INCLUDE_DIR
}
${
MLTPP_INCLUDE_DIR
}
)
# Adds Qt definitions and include directories, and sets QT_LIBRARIES according
# to the components requested in find_package().
# KDE definitions and include directories *must* always come first, Qt follows
...
...
@@ -172,7 +176,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --std=c99")
# Optional deps
if
(
DRMINGW_FOUND
)
target_compile_definitions
(
kdenlive PRIVATE -DUSE_DRMINGW
)
target_include_directories
(
kdenlive PRIVATE
SYSTEM
${
DRMINGW_INCLUDE_DIR
}
)
target_include_directories
(
kdenlive
SYSTEM
PRIVATE
${
DRMINGW_INCLUDE_DIR
}
)
target_link_libraries
(
kdenlive
${
DRMINGW_LIBRARY
}
)
elseif
(
KF5Crash_FOUND
)
target_compile_definitions
(
kdenlive PRIVATE -DKF5_USE_CRASH
)
...
...
@@ -198,7 +202,7 @@ else()
endif
()
if
(
Q_WS_X11
)
target_include_directories
(
kdenliveLib PRIVATE
SYSTEM
${
X11_Xlib_INCLUDE_PATH
}
)
target_include_directories
(
kdenliveLib
SYSTEM
PRIVATE
${
X11_Xlib_INCLUDE_PATH
}
)
target_link_libraries
(
kdenliveLib
${
X11_LIBRARIES
}
)
endif
()
...
...
@@ -209,7 +213,7 @@ elseif(SDL_FOUND)
endif
()
if
(
LIBV4L2_FOUND
)
target_include_directories
(
kdenliveLib PRIVATE
SYSTEM
${
LIBV4L2_INCLUDE_DIR
}
)
target_include_directories
(
kdenliveLib
SYSTEM
PRIVATE
${
LIBV4L2_INCLUDE_DIR
}
)
target_link_libraries
(
kdenliveLib
${
LIBV4L2_LIBRARY
}
)
target_compile_definitions
(
kdenliveLib PRIVATE -DUSE_V4L
)
endif
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment