2 files changed, 14 insertions, 16 deletions
diff --git a/include/libssh/CMakeLists.txt b/include/libssh/CMakeLists.txt
index dc67ab9..af7b2eb 100644
--- a/include/libssh/CMakeLists.txt
+++ b/include/libssh/CMakeLists.txt
@@ -8,6 +8,13 @@ set(libssh_HDRS
   ssh2.h
 )
 
+if (WITH_SERVER)
+  set(libssh_HDRS
+    ${libssh_HDRS}
+    server.h
+  )
+endif (WITH_SERVER)
+
 install(
   FILES
     ${libssh_HDRS}
@@ -17,18 +24,3 @@ install(
     headers
 )
 
-if (WITH_SERVER)
-  set(server_HDRS
-    server.h
-  )
-
-  install(
-    FILES
-      ${server_HDRS}
-    DESTINATION
-      ${INCLUDE_INSTALL_DIR}/${APPLICATION_NAME}
-    COMPONENT
-      libraries
-  )
-endif (WITH_SERVER)
-
diff --git a/libssh/CMakeLists.txt b/libssh/CMakeLists.txt
index 9c78d0d..a62ec06 100644
--- a/libssh/CMakeLists.txt
+++ b/libssh/CMakeLists.txt
@@ -89,7 +89,6 @@ set(libssh_SRCS
   misc.c
   options.c
   packet.c
-  server.c
   session.c
   sftp.c
   sftpserver.c
@@ -98,6 +97,13 @@ set(libssh_SRCS
   wrapper.c
 )
 
+if (WITH_SERVER)
+  set(libssh_SRCS
+    ${libssh_SRCS}
+    server.c
+  )
+endif (WITH_SERVER)
+
 include_directories(
   ${LIBSSH_PUBLIC_INCLUDE_DIRS}
   ${LIBSSH_PRIVATE_INCLUDE_DIRS}