diff options
| author | Inkyun Kil <inkyun.kil@samsung.com> | 2017-01-24 21:13:40 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2017-01-24 21:13:41 -0800 |
| commit | e7a36521ed67019b923b0ce0165394881c6dc15e (patch) | |
| tree | ebf678adb362f9a6d491ef8523b07c9138d4f103 /CMakeLists.txt | |
| parent | cb9c1c6ad7c001557a4902341fca57b3760bb465 (diff) | |
| parent | 94ef9ec5bdf3ca225ac231be586e0f5883dc4b84 (diff) | |
| download | app-core-e7a36521ed67019b923b0ce0165394881c6dc15e.tar.gz app-core-e7a36521ed67019b923b0ce0165394881c6dc15e.tar.bz2 app-core-e7a36521ed67019b923b0ce0165394881c6dc15e.zip | |
Merge "Remove conditional compilation associated with window manager" into tizen
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 099ca61..3ec39fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,26 +25,12 @@ SET(CMAKE_SKIP_BUILD_RPATH TRUE) SET(APPCORE_COMMON "appcore-common") SET(SRCS_common src/appcore.c src/appcore-i18n.c src/appcore-measure.c src/appcore-rotation.c) -IF(_WITH_WAYLAND) - ADD_DEFINITIONS("-DWAYLAND") -ENDIF(_WITH_WAYLAND) - -IF(_WITH_X11) - ADD_DEFINITIONS("-DX11") - SET(SRCS_common ${SRCS_common} src/appcore-X.c) -ENDIF(_WITH_X11) SET(HEADERS_common appcore-common.h) INCLUDE(FindPkgConfig) SET(APPCORE_PKG_CHECK_MODULES "gio-2.0 vconf sensor aul dlog ecore capi-system-info") -IF(_WITH_X11) - SET(APPCORE_PKG_CHECK_MODULES "${APPCORE_PKG_CHECK_MODULES} x11 eina ecore-x") -ENDIF(_WITH_X11) -IF(_WITH_WAYLAND) - SET(APPCORE_PKG_CHECK_MODULES "${APPCORE_PKG_CHECK_MODULES} ecore-wayland wayland-client tizen-extension-client wayland-tbm-client") -ENDIF(_WITH_WAYLAND) - +SET(APPCORE_PKG_CHECK_MODULES "${APPCORE_PKG_CHECK_MODULES} ecore-wayland wayland-client tizen-extension-client wayland-tbm-client") pkg_check_modules(pkg_common REQUIRED ${APPCORE_PKG_CHECK_MODULES}) @@ -58,12 +44,7 @@ SET_TARGET_PROPERTIES(${APPCORE_COMMON} PROPERTIES VERSION ${FULLVER}) SET_TARGET_PROPERTIES(${APPCORE_COMMON} PROPERTIES COMPILE_FLAGS ${EXTRA_CFLAGS_common}) TARGET_LINK_LIBRARIES(${APPCORE_COMMON} ${pkg_common_LDFLAGS} "-ldl") -IF(_WITH_WAYLAND) - CONFIGURE_FILE(${APPCORE_COMMON}-wayland.pc.in ${APPCORE_COMMON}.pc @ONLY) -ENDIF(_WITH_WAYLAND) -IF(_WITH_X11) - CONFIGURE_FILE(${APPCORE_COMMON}-x.pc.in ${APPCORE_COMMON}.pc @ONLY) -ENDIF(_WITH_X11) +CONFIGURE_FILE(${APPCORE_COMMON}.pc.in ${APPCORE_COMMON}.pc @ONLY) INSTALL(TARGETS ${APPCORE_COMMON} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${APPCORE_COMMON}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) @@ -81,9 +62,6 @@ SET(HEADERS_efl appcore-efl.h) INCLUDE(FindPkgConfig) SET(APPCORE_PKG_CHECK_MODULES2 "elementary dlog ecore gobject-2.0 glib-2.0 aul pkgmgr-info ttrace capi-system-info") -IF(_WITH_X11) - SET(APPCORE_PKG_CHECK_MODULES2 "${APPCORE_PKG_CHECK_MODULES2} ecore-x") -ENDIF(_WITH_X11) pkg_check_modules(pkg_efl REQUIRED ${APPCORE_PKG_CHECK_MODULES2}) |