partial revert of CMake changes

CMakeLists.txt

@@ -257,12 +257,11 @@ if(BUILD_EXAMPLESERVER)
     set(server_source $<TARGET_OBJECTS:open62541-object>)
     add_executable(server_static examples/server.c ${server_source})
     add_executable(server_simple examples/server_simple.c ${server_source})
+    add_executable(server examples/server.c)
     if(ENABLE_AMALGAMATION)
-        add_executable(server examples/server.c ${server_source})
-    else()
-        add_executable(server examples/server.c)
-        target_link_libraries(server open62541)
+       ADD_DEPENDENCIES(server_simple amalgamation) 
     endif()
+    target_link_libraries(server open62541)
     if(WIN32)
         target_link_libraries(server_static ws2_32)
         target_link_libraries(server_simple ws2_32)
@@ -298,12 +297,11 @@ if(BUILD_EXAMPLECLIENT)
 	add_definitions(-DBENCHMARK)
     set(client_source $<TARGET_OBJECTS:open62541-object>)
 	add_executable(client_static examples/client.c ${client_source})
+    add_executable(client examples/client.c)
 	if(ENABLE_AMALGAMATION)
-	   add_executable(client examples/client.c ${client_source})
-	else()
-	   add_executable(client examples/client.c)
-	   target_link_libraries(client open62541)
+	   ADD_DEPENDENCIES(client amalgamation) 
 	endif()
+	target_link_libraries(client open62541)
     if(WIN32)
         target_link_libraries(client_static ws2_32)
         target_link_libraries(client ws2_32)