Move X11EmbedContainer.h to include

This commit is contained in:
Lukas W
2017-07-19 22:52:51 +02:00
parent 000fe2da7b
commit d9626e9e3b
3 changed files with 7 additions and 4 deletions

View File

@@ -132,7 +132,7 @@ IF(LMMS_BUILD_HAIKU)
SET(EXTRA_LIBRARIES "-lnetwork")
ENDIF()
SET(LMMS_REQUIRED_LIBS
SET(LMMS_REQUIRED_LIBS ${LMMS_REQUIRED_LIBS}
${CMAKE_THREAD_LIBS_INIT}
${QT_LIBRARIES}
${ASOUND_LIBRARY}

View File

@@ -92,8 +92,10 @@ SET(LMMS_SRCS
)
IF(QT5 AND LMMS_BUILD_LINUX)
INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include/")
add_library(x11embedcontainer STATIC
X11EmbedContainer
"${CMAKE_SOURCE_DIR}/src/gui/X11EmbedContainer.cpp"
"${CMAKE_SOURCE_DIR}/include/X11EmbedContainer.h"
)
FIND_PACKAGE(Qt5Core COMPONENTS Private)
FIND_PACKAGE(Qt5Widgets COMPONENTS Private)
@@ -102,10 +104,11 @@ IF(QT5 AND LMMS_BUILD_LINUX)
include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS})
include_directories(${Qt5Widgets_PRIVATE_INCLUDE_DIRS})
target_link_Libraries(x11embedcontainer
xcb xcb-util X11-xcb Qt5::X11Extras
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()