From 4c378e0f930c749c8b6464320def86f7531b82e4 Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Wed, 25 Apr 2012 14:35:46 +0000
Subject: [PATCH] Build wm_hooks in its own directory. Makes the build
 structure more clear.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4896 3789f03b-4d11-0410-bbf8-ca57d06f2519
---
 win/CMakeLists.txt          |  1 +
 win/winvnc/CMakeLists.txt   | 12 ------------
 win/wm_hooks/CMakeLists.txt | 13 +++++++++++++
 3 files changed, 14 insertions(+), 12 deletions(-)
 create mode 100644 win/wm_hooks/CMakeLists.txt

diff --git a/win/CMakeLists.txt b/win/CMakeLists.txt
index 24f3fc4c..951f16ad 100644
--- a/win/CMakeLists.txt
+++ b/win/CMakeLists.txt
@@ -7,4 +7,5 @@ add_subdirectory(rfb_win32)
 if(BUILD_WINVNC)
 add_subdirectory(vncconfig)
 add_subdirectory(winvnc)
+add_subdirectory(wm_hooks)
 endif()
diff --git a/win/winvnc/CMakeLists.txt b/win/winvnc/CMakeLists.txt
index 94799649..16f30b70 100644
--- a/win/winvnc/CMakeLists.txt
+++ b/win/winvnc/CMakeLists.txt
@@ -1,13 +1,5 @@
 include_directories(${CMAKE_BINARY_DIR}/win ${CMAKE_CURRENT_SOURCE_DIR})
 
-add_library(wm_hooks SHARED
-  ../wm_hooks/wm_hooks.cxx
-  ../wm_hooks/wm_hooks.def
-  ../wm_hooks/wm_hooks.rc)
-
-# We want the DLL to be named wm_hooks.dll rather than libwm_hooks.dll
-set_target_properties(wm_hooks PROPERTIES PREFIX "")
-
 set(VNCVIEWER_JAR_PATH ${CMAKE_BINARY_DIR}/java/VncViewer.jar)
 set(INDEX_VNC_PATH ${CMAKE_CURRENT_SOURCE_DIR}/index.vnc)
 
@@ -35,7 +27,3 @@ endif()
 install(TARGETS winvnc4
   RUNTIME DESTINATION ${BIN_DIR}
 )
-
-install(TARGETS wm_hooks
-  RUNTIME DESTINATION ${BIN_DIR}
-)
diff --git a/win/wm_hooks/CMakeLists.txt b/win/wm_hooks/CMakeLists.txt
new file mode 100644
index 00000000..071edafd
--- /dev/null
+++ b/win/wm_hooks/CMakeLists.txt
@@ -0,0 +1,13 @@
+include_directories(${CMAKE_BINARY_DIR}/win ${CMAKE_CURRENT_SOURCE_DIR})
+
+add_library(wm_hooks SHARED
+  ../wm_hooks/wm_hooks.cxx
+  ../wm_hooks/wm_hooks.def
+  ../wm_hooks/wm_hooks.rc)
+
+# We want the DLL to be named wm_hooks.dll rather than libwm_hooks.dll
+set_target_properties(wm_hooks PROPERTIES PREFIX "")
+
+install(TARGETS wm_hooks
+  RUNTIME DESTINATION ${BIN_DIR}
+)
-- 
2.39.5