Move header files to namespace subdir

polybar · Oct 24, 2016 · bf55ef9 · bf55ef9
1 parent 58d0fe3
commit bf55ef9
Show file tree

Hide file tree

Showing 30 changed files with 8 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,6 +19,7 @@ if(NOT PYTHON_EXECUTABLE)
 endif()
 
 set(XPP_INCLUDE_DIRS
+  ${PROJECT_SOURCE_DIR}/include
   ${X11_INCLUDE_DIRS}
   ${X11_XCB_INCLUDE_DIR}
   ${XCB_XCB_INCLUDE_DIR}
@@ -129,26 +130,20 @@ endforeach(PROTO_RAW)
 #
 # Create project lib and commands
 #
-file(GLOB HEADER_FILES include/*.hpp)
+file(GLOB_RECURSE HEADER_FILES ${PROJECT_SOURCE_DIR}/include/*.hpp)
 add_library(${PROJECT_NAME} ${HEADER_FILES})
 
-set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 14)
-set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
-
-target_include_directories(${PROJECT_NAME} PUBLIC
-  ${PROJECT_SOURCE_DIR}/include
-  ${X11_INCLUDE_DIRS}
-  ${X11_XCB_INCLUDE_DIR}
-  ${XCB_XCB_INCLUDE_DIR})
+target_include_directories(${PROJECT_NAME} PUBLIC ${XPP_INCLUDE_DIRS})
+target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/include/xpp)
+target_link_libraries(${PROJECT_NAME} PRIVATE ${XPP_LIBRARIES})
 
-target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wpedantic)
+target_compile_options(${PROJECT_NAME} PRIVATE -std=c++14 -Wall -Wpedantic)
 target_compile_options(${PROJECT_NAME} PRIVATE $<$<CONFIG:Debug>:-g3 -DDEBUG>)
 target_compile_options(${PROJECT_NAME} PRIVATE $<$<CONFIG:Release>:-O3 -Wno-unused-variable>)
 
 target_compile_definitions(${PROJECT_NAME} PUBLIC ${X11_XCB_DEFINITIONS} ${XCB_DEFINITIONS})
 
 set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
-target_link_libraries(${PROJECT_NAME} ${XPP_LIBRARIES})
 
 #
 # Add commands
@@ -158,7 +153,7 @@ foreach(PROTO ${PROTO_LIST})
   add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD
     # FIXME: Find replacement for the hardcoded paths
     COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/generators/cpp_client.py -p "${PYTHON_XCBGEN}"
-    /usr/share/xcb/${PROTO}.xml > ${PROJECT_SOURCE_DIR}/include/proto/${PROTO_OUTPUT}.hpp)
+    /usr/share/xcb/${PROTO}.xml > ${PROJECT_SOURCE_DIR}/include/xpp/proto/${PROTO_OUTPUT}.hpp)
 endforeach(PROTO)
 
 #
@@ -167,6 +162,6 @@ endforeach(PROTO)
 get_directory_property(HAS_PARENT PARENT_DIRECTORY)
 
 if(HAS_PARENT)
-  set(XPP_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/include PARENT_SCOPE)
+  set(XPP_INCLUDE_DIRS ${XPP_INCLUDE_DIRS} PARENT_SCOPE)
   set(XPP_LIBRARIES ${PROJECT_NAME} PARENT_SCOPE)
 endif()
diff --git a/include/xpp b/include/xpp
diff --git a/include/Makefile → include/xpp/Makefile b/include/Makefile → include/xpp/Makefile
diff --git a/include/atom.hpp → include/xpp/atom.hpp b/include/atom.hpp → include/xpp/atom.hpp
diff --git a/include/colormap.hpp → include/xpp/colormap.hpp b/include/colormap.hpp → include/xpp/colormap.hpp
diff --git a/include/connection.hpp → include/xpp/connection.hpp b/include/connection.hpp → include/xpp/connection.hpp
diff --git a/include/core.hpp → include/xpp/core.hpp b/include/core.hpp → include/xpp/core.hpp
diff --git a/include/cursor.hpp → include/xpp/cursor.hpp b/include/cursor.hpp → include/xpp/cursor.hpp
diff --git a/include/drawable.hpp → include/xpp/drawable.hpp b/include/drawable.hpp → include/xpp/drawable.hpp
diff --git a/include/event.hpp → include/xpp/event.hpp b/include/event.hpp → include/xpp/event.hpp
diff --git a/include/flags.makefile → include/xpp/flags.makefile b/include/flags.makefile → include/xpp/flags.makefile
diff --git a/include/font.hpp → include/xpp/font.hpp b/include/font.hpp → include/xpp/font.hpp
diff --git a/include/fontable.hpp → include/xpp/fontable.hpp b/include/fontable.hpp → include/xpp/fontable.hpp
diff --git a/include/gcontext.hpp → include/xpp/gcontext.hpp b/include/gcontext.hpp → include/xpp/gcontext.hpp
diff --git a/include/generic.hpp → include/xpp/generic.hpp b/include/generic.hpp → include/xpp/generic.hpp
diff --git a/include/generic/error.hpp → include/xpp/generic/error.hpp b/include/generic/error.hpp → include/xpp/generic/error.hpp
diff --git a/include/generic/event.hpp → include/xpp/generic/event.hpp b/include/generic/event.hpp → include/xpp/generic/event.hpp
diff --git a/include/generic/extension.hpp → include/xpp/generic/extension.hpp b/include/generic/extension.hpp → include/xpp/generic/extension.hpp
diff --git a/include/generic/factory.hpp → include/xpp/generic/factory.hpp b/include/generic/factory.hpp → include/xpp/generic/factory.hpp
diff --git a/include/generic/input_iterator_adapter.hpp → ...de/xpp/generic/input_iterator_adapter.hpp b/include/generic/input_iterator_adapter.hpp → ...de/xpp/generic/input_iterator_adapter.hpp
diff --git a/include/generic/iterator_traits.hpp → include/xpp/generic/iterator_traits.hpp b/include/generic/iterator_traits.hpp → include/xpp/generic/iterator_traits.hpp
diff --git a/include/generic/reply_iterator.hpp → include/xpp/generic/reply_iterator.hpp b/include/generic/reply_iterator.hpp → include/xpp/generic/reply_iterator.hpp
diff --git a/include/generic/request.hpp → include/xpp/generic/request.hpp b/include/generic/request.hpp → include/xpp/generic/request.hpp
diff --git a/include/generic/resource.hpp → include/xpp/generic/resource.hpp b/include/generic/resource.hpp → include/xpp/generic/resource.hpp
diff --git a/include/generic/signature.hpp → include/xpp/generic/signature.hpp b/include/generic/signature.hpp → include/xpp/generic/signature.hpp
diff --git a/include/pixmap.hpp → include/xpp/pixmap.hpp b/include/pixmap.hpp → include/xpp/pixmap.hpp
diff --git a/include/proto/.gitignore → include/xpp/proto/.gitignore b/include/proto/.gitignore → include/xpp/proto/.gitignore
diff --git a/include/valueparam.hpp → include/xpp/valueparam.hpp b/include/valueparam.hpp → include/xpp/valueparam.hpp
diff --git a/include/window.hpp → include/xpp/window.hpp b/include/window.hpp → include/xpp/window.hpp
diff --git a/include/xpp.hpp → include/xpp/xpp.hpp b/include/xpp.hpp → include/xpp/xpp.hpp