Move X11EmbedContainer to submodule
This commit is contained in:
4
src/3rdparty/CMakeLists.txt
vendored
Normal file
4
src/3rdparty/CMakeLists.txt
vendored
Normal file
@@ -0,0 +1,4 @@
|
||||
include(ExternalProject)
|
||||
|
||||
set(BUILD_SHARED_LIBS OFF)
|
||||
add_subdirectory(qt5-x11embed)
|
||||
1
src/3rdparty/qt5-x11embed
vendored
Submodule
1
src/3rdparty/qt5-x11embed
vendored
Submodule
Submodule src/3rdparty/qt5-x11embed added at dad35c07cd
@@ -14,6 +14,7 @@ IF(LMMS_BUILD_APPLE)
|
||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
|
||||
ENDIF()
|
||||
|
||||
ADD_SUBDIRECTORY(3rdparty)
|
||||
ADD_SUBDIRECTORY(core)
|
||||
ADD_SUBDIRECTORY(gui)
|
||||
ADD_SUBDIRECTORY(tracks)
|
||||
|
||||
@@ -91,28 +91,6 @@ SET(LMMS_SRCS
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
IF(QT5 AND LMMS_BUILD_LINUX)
|
||||
INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include/")
|
||||
add_library(x11embedcontainer STATIC
|
||||
"${CMAKE_SOURCE_DIR}/src/gui/X11EmbedContainer.cpp"
|
||||
"${CMAKE_SOURCE_DIR}/include/X11EmbedContainer.h"
|
||||
)
|
||||
FIND_PACKAGE(Qt5Core COMPONENTS Private)
|
||||
FIND_PACKAGE(Qt5Widgets COMPONENTS Private)
|
||||
FIND_PACKAGE(Qt5X11Extras REQUIRED)
|
||||
|
||||
include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS})
|
||||
include_directories(${Qt5Widgets_PRIVATE_INCLUDE_DIRS})
|
||||
|
||||
target_link_Libraries(x11embedcontainer
|
||||
xcb xcb-util X11-xcb Qt5::X11Extras X11
|
||||
)
|
||||
|
||||
SET(LMMS_REQUIRED_LIBS ${LMMS_REQUIRED_LIBS} x11embedcontainer PARENT_SCOPE)
|
||||
ELSE()
|
||||
add_library(x11embedcontainer STATIC /dev/null)
|
||||
ENDIF()
|
||||
|
||||
set(LMMS_UIS
|
||||
${LMMS_UIS}
|
||||
gui/dialogs/about_dialog.ui
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user