used glob instead of manually specifying files. cmake does not recommend this, but we always re-run cmake anyway after adding files since we use vs.

src/cmd/synergyc/CMakeLists.txt

@@ -14,12 +14,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set(src
+set(sources
 	synergyc.cpp
 )
 
 if (WIN32)
-	list(APPEND src
+	list(APPEND sources
 		CMSWindowsClientTaskBarReceiver.cpp
 		CMSWindowsClientTaskBarReceiver.h
 		resource.h
@@ -31,12 +31,12 @@ if (WIN32)
 		tb_wait.ico
 	)
 elseif (APPLE)
-	list(APPEND src COSXClientTaskBarReceiver.cpp)
+	list(APPEND sources COSXClientTaskBarReceiver.cpp)
 elseif (UNIX)
-	list(APPEND src CXWindowsClientTaskBarReceiver.cpp)	
+	list(APPEND sources CXWindowsClientTaskBarReceiver.cpp)	
 endif()
 
-set(inc
+include_directories(
 	../../lib/arch
 	../../lib/base
 	../../lib/client
@@ -52,13 +52,12 @@ set(inc
 )
 
 if (UNIX)
-	list(APPEND inc
+	include_directories(
 		../../..
 	)
 endif()
 
-include_directories(${inc})
-add_executable(synergyc ${src})
+add_executable(synergyc ${sources})
 target_link_libraries(synergyc
 	arch base client common io mt net ipc platform server synergy cryptopp ${libs})
 

src/cmd/synergyd/CMakeLists.txt

@@ -14,11 +14,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set(src
-	synergyd.cpp
-)
+file(GLOB headers "*.h")
+file(GLOB sources "*.cpp")
 
-set(inc
+include_directories(
 	../../lib/arch
 	../../lib/base
 	../../lib/common
@@ -31,17 +30,15 @@ set(inc
 )
 
 if (UNIX)
-	list(APPEND inc
+	include_directories(
 		../../..
 	)
 endif()
 
-include_directories(${inc})
-
 if (WIN32)
-  add_executable(synergyd WIN32 ${src})
+  add_executable(synergyd WIN32 ${sources})
 else()
-  add_executable(synergyd ${src})
+  add_executable(synergyd ${sources})
 endif()
 
 target_link_libraries(synergyd

src/cmd/synergyp/CMakeLists.txt

@@ -14,12 +14,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set(src
+set(sources
 	synergyp.cpp
 )
 
 if (WIN32)
-	list(APPEND src
+	list(APPEND sources
 		CMSWindowsPortableTaskBarReceiver.cpp
 		CMSWindowsPortableTaskBarReceiver.h
 		resource.h
@@ -31,12 +31,12 @@ if (WIN32)
 		tb_wait.ico
 	)
 elseif (APPLE)
-	list(APPEND src COSXPortableTaskBarReceiver.cpp)	
+	list(APPEND sources COSXPortableTaskBarReceiver.cpp)	
 elseif (UNIX)
-	list(APPEND src CXWindowsPortableTaskBarReceiver.cpp)
+	list(APPEND sources CXWindowsPortableTaskBarReceiver.cpp)
 endif()
 
-set(inc
+include_directories(
 	../../lib/arch
 	../../lib/base
 	../../lib/common
@@ -52,17 +52,15 @@ set(inc
 )
 
 if (UNIX)
-	list(APPEND inc
+	include_directories(
 		../../..
 	)
 endif()
 
-include_directories(${inc})
-
 if (WIN32)
-	add_executable(synergyp WIN32 ${src})
+	add_executable(synergyp WIN32 ${sources})
 else()
-	add_executable(synergyp ${src})
+	add_executable(synergyp ${sources})
 endif()	
 	
 target_link_libraries(synergyp

src/cmd/synergys/CMakeLists.txt

@@ -14,12 +14,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set(src
+set(sources
 	synergys.cpp
 )
 
 if (WIN32)
-	list(APPEND src
+	list(APPEND sources
 		CMSWindowsServerTaskBarReceiver.cpp
 		CMSWindowsServerTaskBarReceiver.h
 		resource.h
@@ -31,12 +31,12 @@ if (WIN32)
 		tb_wait.ico
 	)
 elseif (APPLE)
-	list(APPEND src COSXServerTaskBarReceiver.cpp)	
+	list(APPEND sources COSXServerTaskBarReceiver.cpp)	
 elseif (UNIX)
-	list(APPEND src CXWindowsServerTaskBarReceiver.cpp)
+	list(APPEND sources CXWindowsServerTaskBarReceiver.cpp)
 endif()
 
-set(inc
+include_directories(
 	../../lib/arch
 	../../lib/base
 	../../lib/common
@@ -52,13 +52,12 @@ set(inc
 )
 
 if (UNIX)
-	list(APPEND inc
+	include_directories(
 		../../..
 	)
 endif()
 
-include_directories(${inc})
-add_executable(synergys ${src})
+add_executable(synergys ${sources})
 target_link_libraries(synergys
 	arch base client common io mt net ipc platform server synergy cryptopp ${libs})
 

src/cmd/syntool/CMakeLists.txt

@@ -13,11 +13,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set(src
-	syntool.cpp
-)
+file(GLOB headers "*.h")
+file(GLOB sources "*.cpp")
 
-set(inc
+include_directories(
 	../../lib/arch
 	../../lib/base
 	../../lib/common
@@ -32,13 +31,12 @@ set(inc
 )
 
 if (UNIX)
-	list(APPEND inc
+	include_directories(
 		../../..
 	)
 endif()
 
-include_directories(${inc})
-add_executable(syntool ${src})
+add_executable(syntool ${sources})
 target_link_libraries(syntool
 	synergy arch base client common io ipc mt net platform server cryptopp ${libs})
 

src/cmd/usynergy/CMakeLists.txt

@@ -15,11 +15,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 if (WIN32)
-	set(src uSynergyWin32.c)
+	set(sources uSynergyWin32.c)
 elseif (UNIX)
-	set(src uSynergyUnix.c)
+	set(sources uSynergyUnix.c)
 endif()
 
 include_directories(../../micro)
-add_executable(usynergy ${src})
+add_executable(usynergy ${sources})
 target_link_libraries(usynergy micro)