diff options
| author | William Hua <william.hua@canonical.com> | 2014-01-29 16:52:32 -0500 |
|---|---|---|
| committer | William Hua <william.hua@canonical.com> | 2014-01-29 16:52:32 -0500 |
| commit | 11e1982390846d8b6da92afca74b65599a8bf9d7 (patch) | |
| tree | 8fc57b2be473e76027c6eb0dc6cb59011ac67053 /unity-shared/CMakeLists.txt | |
| parent | f04322a39ab0dc33fcbfdbfc43babbd371f1d85a (diff) | |
| parent | 6321310fabe12b8767adab6d7a794fdb7f530587 (diff) | |
Merge trunk.
(bzr r3608.4.13)
Diffstat (limited to 'unity-shared/CMakeLists.txt')
| -rw-r--r-- | unity-shared/CMakeLists.txt | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/unity-shared/CMakeLists.txt b/unity-shared/CMakeLists.txt index 05c374dcb..bb2e6e179 100644 --- a/unity-shared/CMakeLists.txt +++ b/unity-shared/CMakeLists.txt @@ -23,6 +23,7 @@ set (UNITY_SHARED_SOURCES BackgroundEffectHelper.cpp DashStyle.cpp DebugDBusInterface.cpp + DecorationStyle.cpp DefaultThumbnailProvider.cpp DeltaRestrainment.cpp DesktopApplicationManager.cpp @@ -93,12 +94,20 @@ add_pch(pch/unity-shared_pch.hh unity-shared) if (ENABLE_X_SUPPORT) # compiz + set (UNITY_SHARED_COMPIZ_SOURCES + CompizUtils.cpp PluginAdapter.cpp ) + + find_package (PkgConfig) + pkg_check_modules (COMPIZ_OPENGL REQUIRED compiz-opengl) + add_library (unity-shared-compiz STATIC ${UNITY_SHARED_COMPIZ_SOURCES}) - target_link_libraries (unity-shared-compiz ${LIBS}) + # This makes linker to include library dir in RUNPATH + find_library (COMPIZ_OPENGL_LIB opengl ${COMPIZ_OPENGL_LIBDIR}) + target_link_libraries (unity-shared-compiz ${LIBS} ${COMPIZ_OPENGL_LIB} ${COMPIZ_OPENGL_LDFLAGS}) add_dependencies (unity-shared-compiz unity-shared) # bamf application manager @@ -124,3 +133,7 @@ add_executable (app-manager StandaloneAppManager.cpp) add_dependencies (app-manager unity-shared unity-shared-bamf unity-shared-standalone) target_link_libraries (app-manager unity-shared unity-shared-bamf unity-shared-standalone) +add_executable (decorations-style StandaloneDecorationStyle.cpp) +add_dependencies (decorations-style unity-shared) +target_link_libraries (decorations-style unity-shared) + |