Prepare for super build

CMakeLists.txt

@@ -15,15 +15,17 @@ set(PROJECT_VERSION "0.8.1")
 set(PROJECT_VERSION_MAJOR 0)
 set(PROJECT_SOVERSION 0)
 
-# Set up packaging
-set(CPACK_PACKAGE_NAME "greenisland")
-set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
-set(CPACK_GENERATOR "TGZ")
-set(CPACK_SET_DESTDIR FALSE)
-set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
-set(CPACK_SOURCE_IGNORE_FILES "/build/;/.git;/.tx/;CMakeLists.txt.user;~$;${CPACK_SOURCE_IGNORE_FILES}")
-include(CPack)
-add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+if(NOT USE_SUPERBUILD)
+    # Set up packaging
+    set(CPACK_PACKAGE_NAME "greenisland")
+    set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
+    set(CPACK_GENERATOR "TGZ")
+    set(CPACK_SET_DESTDIR FALSE)
+    set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
+    set(CPACK_SOURCE_IGNORE_FILES "/build/;/.git;/.tx/;CMakeLists.txt.user;~$;${CPACK_SOURCE_IGNORE_FILES}")
+    include(CPack)
+    add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+endif()
 
 # Options
 option(ENABLE_XWAYLAND "Enables XWayland support" ON)
@@ -42,7 +44,11 @@ endif()
 
 # ECM setup
 find_package(ECM 1.4.0 REQUIRED NO_MODULE)
-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} "${CMAKE_SOURCE_DIR}/cmake")
+list(APPEND CMAKE_MODULE_PATH
+    "${ECM_MODULE_PATH}"
+    "${ECM_KDE_MODULE_DIR}"
+    "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
+)
 
 # Macros
 include(FeatureSummary)

shells/CMakeLists.txt

@@ -1,3 +1,3 @@
-include(${CMAKE_SOURCE_DIR}/src/server/GreenIslandServerMacros.cmake)
+include("${CMAKE_CURRENT_SOURCE_DIR}/../src/server/GreenIslandServerMacros.cmake")
 
 greenisland_install_shell(org.hawaiios.greenisland simple)

src/client/CMakeLists.txt

@@ -5,8 +5,8 @@ include_directories(
     ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
 )
 
-include(${CMAKE_SOURCE_DIR}/src/server/GreenIslandServerConfigExtrasLocal.cmake)
-include(${CMAKE_SOURCE_DIR}/src/server/GreenIslandServerMacros.cmake)
+include("${CMAKE_CURRENT_SOURCE_DIR}/../server/GreenIslandServerConfigExtrasLocal.cmake")
+include("${CMAKE_CURRENT_SOURCE_DIR}/../server/GreenIslandServerMacros.cmake")
 
 # Avoid warnings regarding wl_buffer being deprecated
 add_definitions(-Wno-deprecated-declarations)

src/hardwareintegration/xcomposite_share/CMakeLists.txt

@@ -1,5 +1,5 @@
-include(${CMAKE_SOURCE_DIR}/src/server/GreenIslandServerConfigExtrasLocal.cmake)
-include(${CMAKE_SOURCE_DIR}/src/server/GreenIslandServerMacros.cmake)
+include("${CMAKE_CURRENT_SOURCE_DIR}/../../server/GreenIslandServerConfigExtrasLocal.cmake")
+include("${CMAKE_CURRENT_SOURCE_DIR}/../../server/GreenIslandServerMacros.cmake")
 
 include_directories(
     ${CMAKE_SOURCE_DIR}/src

src/waylandcompositor/CMakeLists.txt

@@ -33,8 +33,8 @@ include_directories(
     ${xkbcommon_INCLUDE_DIRS}
 )
 
-include(${CMAKE_SOURCE_DIR}/src/server/GreenIslandServerConfigExtrasLocal.cmake)
-include(${CMAKE_SOURCE_DIR}/src/server/GreenIslandServerMacros.cmake)
+include("${CMAKE_CURRENT_SOURCE_DIR}/../server/GreenIslandServerConfigExtrasLocal.cmake")
+include("${CMAKE_CURRENT_SOURCE_DIR}/../server/GreenIslandServerMacros.cmake")
 
 set(SOURCES
     compositor_api/qwaylandbufferref.cpp