Moved headers to a separate include subdirectory.

Author: glynos

CMakeLists.txt

@@ -9,8 +9,6 @@ project(Uri)
 
 find_package(Threads REQUIRED)
 
-include_directories(${Uri_SOURCE_DIR}/src)
-
 set(CMAKE_VERBOSE_MAKEFILE true)
 
 if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
@@ -47,6 +45,8 @@ foreach(flag_var
    endif(${flag_var} MATCHES "/MD")
 endforeach(flag_var)
 
+include_directories(${Uri_SOURCE_DIR}/src ${Uri_SOURCE_DIR}/include)
+
 add_subdirectory(src)
 
 # Testing
@@ -68,6 +68,3 @@ if (DOXYGEN_FOUND)
     set(CPP-NETLIB_GENERATE_DOCS ON)
   endif()
 endif(DOXYGEN_FOUND)
-
-#propagate sources to parent scope for one-lib-build
-set(Uri_SRCS ${Uri_SRCS} PARENT_SCOPE)

Doxyfile.in

@@ -128,7 +128,7 @@ FULL_PATH_NAMES        = YES
 # If left blank the directory from which doxygen is run is used as the
 # path to strip.
 
-STRIP_FROM_PATH        = @CMAKE_CURRENT_SOURCE_DIR@/src/
+STRIP_FROM_PATH        = @CMAKE_CURRENT_SOURCE_DIR@/include/
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
 # the path mentioned in the documentation of a class, which tells
@@ -626,7 +626,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@/src/network
+INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@/include
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -658,7 +658,7 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = @CMAKE_CURRENT_SOURCE_DIR@/src/network/uri/detail
+EXCLUDE                = @CMAKE_CURRENT_SOURCE_DIR@/include/network/uri/detail
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded

src/network/optional.hpp include/network/optional.hpp

@@ -21,15 +21,6 @@ if(${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
     target_link_libraries(network-uri "c++")
   endif()
 endif()
-install(
-  TARGETS
-  network-uri
-  DESTINATION lib
-  )
-
-install(DIRECTORY network
-  DESTINATION include
-  )
 
 #propagate sources to parent scope for one-lib-build
 set(Uri_SRCS ${Uri_SRCS} PARENT_SCOPE)