Keep hierarchy in installed headers

CMakeLists.txt

@@ -97,20 +97,18 @@ get_property(ALL_LINK_DIRS DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY LINK_D
 #####################################################################################
 ## Build the lib
 
-include_directories(
-    ${PROJECT_SOURCE_DIR}/bfps/cpp
-    )
+include_directories(${PROJECT_SOURCE_DIR}/bfps/cpp)
 
 file(GLOB_RECURSE cpp_for_lib ${PROJECT_SOURCE_DIR}/bfps/*.cpp)
 file(GLOB_RECURSE hpp_for_lib ${PROJECT_SOURCE_DIR}/bfps/*.hpp)
-LIST(APPEND source_files ${cpp_for_lib})
+LIST(APPEND source_files ${hpp_for_lib} ${cpp_for_lib})
 
 add_library(bfps ${source_files})
 
 target_link_libraries(bfps ${BFPS_LIBS})
-set_target_properties(bfps PROPERTIES PUBLIC_HEADER "${hpp_for_lib}")
 
-install(TARGETS bfps EXPORT BFPS_EXPORT DESTINATION lib/ PUBLIC_HEADER DESTINATION include/bfps )
+install(TARGETS bfps EXPORT BFPS_EXPORT DESTINATION lib/ )
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/bfps/cpp DESTINATION include/ FILES_MATCHING PATTERN "*.h*")
 
 #####################################################################################
 ## Export the configuration