summaryrefslogtreecommitdiff
path: root/unity-shared/CMakeLists.txt
diff options
authorMichal Hruby <michal.mhr@gmail.com>2012-10-11 13:04:13 +0200
committerMichal Hruby <michal.mhr@gmail.com>2012-10-11 13:04:13 +0200
commitea9780c33cb4e926b43b7f11e603db2468e9f3bc (patch)
treeaa5600c3e2b8b4e90b985f4beb7a930a544b76e7 /unity-shared/CMakeLists.txt
parent8262f4286d4c36befdd7611b76c6f25fdfcd3682 (diff)
parenta32dbba4ac890d5430335264f8da3db16568d707 (diff)
Merge trunk
(bzr r2769.4.3)
Diffstat (limited to 'unity-shared/CMakeLists.txt')
-rw-r--r--unity-shared/CMakeLists.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/unity-shared/CMakeLists.txt b/unity-shared/CMakeLists.txt
index fcfe2811e..d1bd61857 100644
--- a/unity-shared/CMakeLists.txt
+++ b/unity-shared/CMakeLists.txt
@@ -35,7 +35,6 @@ set (UNITY_SHARED_SOURCES
DashStyle.cpp
DefaultThumbnailProvider.cpp
FontSettings.cpp
- KeyboardUtil.cpp
IMTextEntry.cpp
IconLoader.cpp
IconRenderer.cpp
@@ -65,6 +64,8 @@ set (UNITY_SHARED_SOURCES
UnityWindowView.cpp
UserThumbnailProvider.cpp
WindowManager.cpp
+ XKeyboardUtil.cpp
+ XWindowManager.cpp
)
add_library (unity-shared STATIC ${UNITY_SHARED_SOURCES})
@@ -77,7 +78,7 @@ add_dependencies (unity-shared unity-core-${UNITY_API_VERSION})
# compiz
set (UNITY_SHARED_COMPIZ_SOURCES
- PluginAdapterCompiz.cpp
+ PluginAdapter.cpp
)
add_library (unity-shared-compiz STATIC ${UNITY_SHARED_COMPIZ_SOURCES})
target_link_libraries (unity-shared-compiz ${LIBS})
@@ -86,7 +87,7 @@ add_dependencies (unity-shared-compiz unity-shared)
# standalone
set (UNITY_SHARED_STANDALONE_SOURCES
- PluginAdapterStandalone.cpp
+ StandaloneWindowManager.cpp
)
add_library (unity-shared-standalone STATIC ${UNITY_SHARED_STANDALONE_SOURCES})
target_link_libraries (unity-shared-standalone ${LIBS})