Merge pull request #2 from litmusautomation/cmake_install_fixes

Fix cmake issue after code review

CMakeLists.txt

@@ -124,21 +124,6 @@ if(NATS_BUILD_WITH_TLS)
 endif(NATS_BUILD_WITH_TLS)
 
 
-#---------------------------------------------------------------------
-# Add to the 'clean' target the list (and location) of files to remove
-
-list(APPEND NATS_INSTALLED_FILES "${CMAKE_INSTALL_PREFIX}/${NATS_INCLUDE_DIR}/nats.h")
-list(APPEND NATS_INSTALLED_FILES "${CMAKE_INSTALL_PREFIX}/${NATS_INCLUDE_DIR}/nats/nats.h")
-list(APPEND NATS_INSTALLED_FILES "${CMAKE_INSTALL_PREFIX}/${NATS_INCLUDE_DIR}/nats/status.h")
-list(APPEND NATS_INSTALLED_FILES "${CMAKE_INSTALL_PREFIX}/${NATS_INCLUDE_DIR}/nats/version.h")
-list(APPEND NATS_INSTALLED_FILES "${CMAKE_INSTALL_PREFIX}/${NATS_INCLUDE_DIR}/nats/adapters/libevent.h")
-list(APPEND NATS_INSTALLED_FILES "${CMAKE_INSTALL_PREFIX}/${NATS_INCLUDE_DIR}/nats/adapters/libuv.h")
-list(APPEND NATS_INSTALLED_FILES "${CMAKE_INSTALL_PREFIX}/${NATS_LIBDIR}/libnats${CMAKE_SHARED_LIBRARY_SUFFIX}")
-list(APPEND NATS_INSTALLED_FILES "${CMAKE_INSTALL_PREFIX}/${NATS_LIBDIR}/libnats_static${CMAKE_STATIC_LIBRARY_SUFFIX}")
-
-set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${NATS_INSTALLED_FILES}")
-#---------------------------------------------------------------------
-
 #------------
 # Versionning and Doc
 

src/CMakeLists.txt

@@ -10,7 +10,7 @@ if(NATS_BUILD_WITH_TLS)
 endif(NATS_BUILD_WITH_TLS)
 
 if(NATS_BUILD_STREAMING)
-  include_directories(${PROTOBUF_DIR}/${NATS_INCLUDE_DIR})
+  include_directories(${PROTOBUF_DIR}/include)
   include_directories(stan)
 endif(NATS_BUILD_STREAMING)
 
@@ -40,7 +40,7 @@ set_target_properties(nats nats_static PROPERTIES
 # --------------------------------------
 # Install the libraries and header files
 # --------------------------------------
-install(TARGETS nats LIBRARY DESTINATION ${NATS_LIBDIR})
+install(TARGETS nats DESTINATION ${NATS_LIBDIR})
 install(TARGETS nats_static ARCHIVE DESTINATION ${NATS_LIBDIR})
 install(FILES deprnats.h DESTINATION ${NATS_INCLUDE_DIR} RENAME nats.h)
 install(FILES nats.h status.h version.h DESTINATION ${NATS_INCLUDE_DIR}/nats)