Code Review
/
apps
/
agl-service-windowmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix internal function name for consistency
[apps/agl-service-windowmanager.git]
/
src
/
CMakeLists.txt
diff --git
a/src/CMakeLists.txt
b/src/CMakeLists.txt
index
42b81b7
..
d8f1143
100644
(file)
--- a/
src/CMakeLists.txt
+++ b/
src/CMakeLists.txt
@@
-14,10
+14,9
@@
# limitations under the License.
#
# limitations under the License.
#
-wlproto(IVI_CON ivi-wm)
-
include(FindPkgConfig)
pkg_check_modules(AFB REQUIRED afb-daemon)
include(FindPkgConfig)
pkg_check_modules(AFB REQUIRED afb-daemon)
+pkg_check_modules(ILM REQUIRED ilmControl ilmCommon)
pkg_check_modules(SD REQUIRED libsystemd>=222)
# We do not want a prefix for our module
pkg_check_modules(SD REQUIRED libsystemd>=222)
# We do not want a prefix for our module
@@
-27,30
+26,33
@@
set(TARGETS_WM windowmanager-service)
add_library(${TARGETS_WM} MODULE
main.cpp
add_library(${TARGETS_WM} MODULE
main.cpp
- wayland_ivi_wm.cpp
util.cpp
util.cpp
- layout.cpp
- ${IVI_CON_PROTO}
json_helper.cpp
json_helper.cpp
+ applist.cpp
+ request.cpp
+ pm_wrapper.cpp
window_manager.cpp
window_manager.cpp
- layers.cpp
wm_client.cpp
wm_error.cpp
wm_client.cpp
wm_error.cpp
-
applist
.cpp
-
request
.cpp)
+
wm_layer
.cpp
+
wm_layer_control
.cpp)
target_include_directories(${TARGETS_WM}
PRIVATE
${AFB_INCLUDE_DIRS}
${SD_INCLUDE_DIRS}
target_include_directories(${TARGETS_WM}
PRIVATE
${AFB_INCLUDE_DIRS}
${SD_INCLUDE_DIRS}
+ ${ILM_INCLUDE_DIRS}
../include
../include
- ../src)
+ ../src
+ ../${PLUGIN_PM})
target_link_libraries(${TARGETS_WM}
PRIVATE
${AFB_LIBRARIES}
${WLC_LIBRARIES}
target_link_libraries(${TARGETS_WM}
PRIVATE
${AFB_LIBRARIES}
${WLC_LIBRARIES}
- ${SD_LIBRARIES})
+ ${ILM_LIBRARIES}
+ ${SD_LIBRARIES}
+ ${PLUGIN_PM})
target_compile_definitions(${TARGETS_WM}
PRIVATE
target_compile_definitions(${TARGETS_WM}
PRIVATE
@@
-82,12
+84,12
@@
set_target_properties(${TARGETS_WM}
C_STANDARD 99
C_STANDARD_REQUIRED ON
C_STANDARD 99
C_STANDARD_REQUIRED ON
- LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/../export.map")
+ LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/../export.map
-Wl,-rpath,'$ORIGIN'
")
if (LINK_LIBCXX)
set_target_properties(${TARGETS_WM}
PROPERTIES
if (LINK_LIBCXX)
set_target_properties(${TARGETS_WM}
PROPERTIES
- LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/../export.map -lc++")
+ LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/../export.map -lc++
-Wl,-rpath,'$ORIGIN'
")
endif()
if (NOT ${SANITIZER_MODE} STREQUAL "none" AND NOT ${SANITIZER_MODE} STREQUAL "")
endif()
if (NOT ${SANITIZER_MODE} STREQUAL "none" AND NOT ${SANITIZER_MODE} STREQUAL "")
@@
-115,5
+117,5
@@
add_custom_command(TARGET ${TARGETS_WM} POST_BUILD
)
add_custom_target(package DEPENDS ${PROJECT_BINARY_DIR}/package/root
)
add_custom_target(package DEPENDS ${PROJECT_BINARY_DIR}/package/root
- COMMAND wgtpkg-pack -f -o ${PROJECT_BINARY_DIR}/package/${TARGETS_WM}
-2017
.wgt ${PROJECT_BINARY_DIR}/package/root
+ COMMAND wgtpkg-pack -f -o ${PROJECT_BINARY_DIR}/package/${TARGETS_WM}.wgt ${PROJECT_BINARY_DIR}/package/root
)
)