Fix superbuild

lirios · Jan 18, 2024 · ae13243 · ae13243
1 parent a2cc7af
commit ae13243
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -45,8 +45,10 @@ if(NOT QML_IMPORT_PATH)
 endif()
 
 ## Shared macros and functions:
-find_package(LiriCMakeShared "2.0.99" REQUIRED NO_MODULE)
-list(APPEND CMAKE_MODULE_PATH "${LCS_MODULE_PATH}")
+if(NOT LIRI_LOCAL_ECM)
+    find_package(LiriCMakeShared "2.0.99" REQUIRED NO_MODULE)
+    list(APPEND CMAKE_MODULE_PATH "${LCS_MODULE_PATH}")
+endif()
 
 ## Add some paths to check for CMake modules:
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake;${CMAKE_CURRENT_SOURCE_DIR}/cmake/3rdparty")

diff --git a/features.cmake b/features.cmake
@@ -25,8 +25,10 @@ find_package(Qt6 "6.6.0"
         LinguistTools
 )
 
-## Find Aurora Scanner:
-find_package(AuroraScanner REQUIRED)
+if(NOT COMMAND aurora_generate_wayland_protocol_client_sources)
+    ## Find Aurora Scanner:
+    find_package(AuroraScanner REQUIRED)
+endif()
 
 #### Features