8c2a95dbe2
* Mir starts up and is able to display system settings
* x86_64 only for now, because at least ubuntu-app-test did not build
on aarch64
Based on PureTryOut's work. Getting it to this stage was a huge effort
(as it shows in the package count: 111(!)). See the merge request for
details.
[skip ci]: this won't finish in CI; ollieparanoid made sure that
everything builds for x86_64.
208 lines
5.6 KiB
Diff
208 lines
5.6 KiB
Diff
From 35d1771d83879a0e6970682b1e75f83d9cb1d143 Mon Sep 17 00:00:00 2001
|
|
From: Luca Weiss <luca@z3ntu.xyz>
|
|
Date: Sat, 12 Jan 2019 14:14:45 +0100
|
|
Subject: [PATCH 3/3] Only use hybris if available
|
|
|
|
---
|
|
src/ubuntu/application/touch/CMakeLists.txt | 58 +++++++--------
|
|
.../application/touch/hybris/CMakeLists.txt | 30 ++++----
|
|
src/ubuntu/hardware/CMakeLists.txt | 70 ++++++++++---------
|
|
3 files changed, 82 insertions(+), 76 deletions(-)
|
|
|
|
diff --git a/src/ubuntu/application/touch/CMakeLists.txt b/src/ubuntu/application/touch/CMakeLists.txt
|
|
index b0272cd..fb4408d 100644
|
|
--- a/src/ubuntu/application/touch/CMakeLists.txt
|
|
+++ b/src/ubuntu/application/touch/CMakeLists.txt
|
|
@@ -1,35 +1,37 @@
|
|
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11")
|
|
+if(Hybris)
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11")
|
|
|
|
-add_subdirectory(hybris)
|
|
+ add_subdirectory(hybris)
|
|
|
|
-add_library(
|
|
- ubuntu_application_api_touch_mirclient SHARED
|
|
+ add_library(
|
|
+ ubuntu_application_api_touch_mirclient SHARED
|
|
|
|
- module.cpp
|
|
- module_version.h
|
|
-)
|
|
+ module.cpp
|
|
+ module_version.h
|
|
+ )
|
|
|
|
-target_link_libraries(
|
|
- ubuntu_application_api_touch_mirclient
|
|
+ target_link_libraries(
|
|
+ ubuntu_application_api_touch_mirclient
|
|
|
|
- "-Wl,--whole-archive"
|
|
- ubuntu_application_api_mirclient
|
|
- ubuntu_application_api_hybris
|
|
- ${UBUNTU_APPLICATION_API_LINK_LIBRARIES}
|
|
- "-Wl,--no-whole-archive"
|
|
- #TODO: Alarms
|
|
-)
|
|
+ "-Wl,--whole-archive"
|
|
+ ubuntu_application_api_mirclient
|
|
+ ubuntu_application_api_hybris
|
|
+ ${UBUNTU_APPLICATION_API_LINK_LIBRARIES}
|
|
+ "-Wl,--no-whole-archive"
|
|
+ #TODO: Alarms
|
|
+ )
|
|
|
|
-set_target_properties(
|
|
- ubuntu_application_api_touch_mirclient
|
|
- PROPERTIES
|
|
- VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH}
|
|
- SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}
|
|
-)
|
|
+ set_target_properties(
|
|
+ ubuntu_application_api_touch_mirclient
|
|
+ PROPERTIES
|
|
+ VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH}
|
|
+ SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}
|
|
+ )
|
|
|
|
-install(
|
|
- TARGETS ubuntu_application_api_touch_mirclient
|
|
- # this is not a development library to compile against, users should always
|
|
- # specify the SONAME; so don't build a *.so
|
|
- LIBRARY DESTINATION "${LIB_INSTALL_DIR}" NAMELINK_SKIP
|
|
-)
|
|
+ install(
|
|
+ TARGETS ubuntu_application_api_touch_mirclient
|
|
+ # this is not a development library to compile against, users should always
|
|
+ # specify the SONAME; so don't build a *.so
|
|
+ LIBRARY DESTINATION "${LIB_INSTALL_DIR}" NAMELINK_SKIP
|
|
+ )
|
|
+endif()
|
|
diff --git a/src/ubuntu/application/touch/hybris/CMakeLists.txt b/src/ubuntu/application/touch/hybris/CMakeLists.txt
|
|
index 26a1c59..2ce2912 100644
|
|
--- a/src/ubuntu/application/touch/hybris/CMakeLists.txt
|
|
+++ b/src/ubuntu/application/touch/hybris/CMakeLists.txt
|
|
@@ -1,17 +1,19 @@
|
|
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC")
|
|
+if(Hybris)
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC")
|
|
|
|
-add_library(
|
|
- ubuntu_application_api_hybris STATIC
|
|
-
|
|
- ubuntu_application_sensors_hybris.cpp
|
|
-)
|
|
+ add_library(
|
|
+ ubuntu_application_api_hybris STATIC
|
|
|
|
-include_directories(
|
|
- ${CMAKE_BINARY_DIR}/include
|
|
-)
|
|
+ ubuntu_application_sensors_hybris.cpp
|
|
+ )
|
|
|
|
-target_link_libraries(
|
|
- ubuntu_application_api_hybris
|
|
-
|
|
- ${Hybris}
|
|
-)
|
|
+ include_directories(
|
|
+ ${CMAKE_BINARY_DIR}/include
|
|
+ )
|
|
+
|
|
+ target_link_libraries(
|
|
+ ubuntu_application_api_hybris
|
|
+
|
|
+ ${Hybris}
|
|
+ )
|
|
+endif()
|
|
diff --git a/src/ubuntu/hardware/CMakeLists.txt b/src/ubuntu/hardware/CMakeLists.txt
|
|
index df1f0d2..b780f16 100644
|
|
--- a/src/ubuntu/hardware/CMakeLists.txt
|
|
+++ b/src/ubuntu/hardware/CMakeLists.txt
|
|
@@ -1,45 +1,47 @@
|
|
-set(
|
|
- UBUNTU_HARDWARE_API_LINK_LIBRARIES
|
|
-
|
|
- ubuntu_hardware_alarm
|
|
-)
|
|
+if(Hybris)
|
|
+ set(
|
|
+ UBUNTU_HARDWARE_API_LINK_LIBRARIES
|
|
|
|
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC")
|
|
+ ubuntu_hardware_alarm
|
|
+ )
|
|
|
|
-include_directories(
|
|
- ${CMAKE_BINARY_DIR}/include
|
|
-)
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC")
|
|
|
|
-include_directories(../../bridge)
|
|
+ include_directories(
|
|
+ ${CMAKE_BINARY_DIR}/include
|
|
+ )
|
|
|
|
-add_subdirectory(alarms/)
|
|
+ include_directories(../../bridge)
|
|
|
|
-add_library(
|
|
- ubuntu_platform_hardware_api SHARED
|
|
- ubuntu_platform_hardware_api.cpp
|
|
-)
|
|
+ add_subdirectory(alarms/)
|
|
|
|
-target_link_libraries(
|
|
- ubuntu_platform_hardware_api
|
|
+ add_library(
|
|
+ ubuntu_platform_hardware_api SHARED
|
|
+ ubuntu_platform_hardware_api.cpp
|
|
+ )
|
|
|
|
- "-Wl,--whole-archive"
|
|
- ${UBUNTU_HARDWARE_API_LINK_LIBRARIES}
|
|
- "-Wl,--no-whole-archive"
|
|
+ target_link_libraries(
|
|
+ ubuntu_platform_hardware_api
|
|
|
|
- dl
|
|
- ${Hybris}
|
|
-)
|
|
+ "-Wl,--whole-archive"
|
|
+ ${UBUNTU_HARDWARE_API_LINK_LIBRARIES}
|
|
+ "-Wl,--no-whole-archive"
|
|
|
|
-set_target_properties(
|
|
- ubuntu_platform_hardware_api
|
|
- PROPERTIES
|
|
- VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH}
|
|
- SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}
|
|
-)
|
|
+ dl
|
|
+ ${Hybris}
|
|
+ )
|
|
|
|
-install(
|
|
- TARGETS ubuntu_platform_hardware_api
|
|
- ${INSTALL_TARGETS_DEFAULT_ARGS}
|
|
-)
|
|
+ set_target_properties(
|
|
+ ubuntu_platform_hardware_api
|
|
+ PROPERTIES
|
|
+ VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH}
|
|
+ SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}
|
|
+ )
|
|
|
|
-add_subdirectory(tests/)
|
|
+ install(
|
|
+ TARGETS ubuntu_platform_hardware_api
|
|
+ ${INSTALL_TARGETS_DEFAULT_ARGS}
|
|
+ )
|
|
+
|
|
+ add_subdirectory(tests/)
|
|
+endif()
|
|
--
|
|
2.20.1
|
|
|