Clean up the build system a bit.

This commit changes the directory structure by moving the library to a new directory called: observable.
ddinu · Apr 29, 2018 · 618c4e5 · 618c4e5
1 parent 0658caf
commit 618c4e5
Show file tree

Hide file tree

Showing 18 changed files with 62 additions and 39 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,32 +1,13 @@
 project(observable)
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.2)
 enable_testing()
+
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "")
+set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "cmake")
 
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
-include(default_source_groups)
-
-set(SOURCE_FILES include/observable/observable.hpp
-                 include/observable/observe.hpp
-                 include/observable/subject.hpp
-                 include/observable/subscription.hpp
-                 include/observable/value.hpp
-                 include/observable/expressions/expression.hpp
-                 include/observable/expressions/filters.hpp
-                 include/observable/expressions/math.hpp
-                 include/observable/expressions/operators.hpp
-                 include/observable/expressions/tree.hpp
-                 include/observable/expressions/utility.hpp
-                 include/observable/detail/collection.hpp
-                 include/observable/detail/type_traits.hpp)
-
-add_library(observable INTERFACE)
-target_include_directories(observable INTERFACE include)
-
-# Dummy target to get a project in IDEs.
-add_custom_target(observable_headers SOURCES ${SOURCE_FILES})
 
+add_subdirectory(observable)
 add_subdirectory(external)
 add_subdirectory(tests)
 add_subdirectory(benchmark)

diff --git a/README.rst b/README.rst
@@ -7,8 +7,8 @@ pattern, this is for you.
 Quick start
 -----------
 
-The library is header-only and has no dependencies; copy the
-``include/observable`` directory into your include path and you're set.
+The library is header-only and has no dependencies; add the
+``observable/include`` directory to your include path and you're set.
 
 Example:
 

diff --git a/cmake/compile_flags.cmake b/cmake/compile_flags.cmake
@@ -4,26 +4,35 @@
 # - target_name Name of the configured target.
 function(enable_strict_warnings target_name)
     if(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
-        set(release /Wall /wd4820 /wd4514 /wd4625 /wd4626 /wd4627 /wd5026
-                    /wd5027 /wd4710 /wd4668 /wd4711 /wd4548 /wd4868 /wd4571)
-        set(debug /WX)
+        target_compile_options(${target_name}
+            PRIVATE
+                /Wall /wd4820 /wd4514 /wd4625 /wd4626 /wd4627 /wd5026
+                /wd5027 /wd4710 /wd4668 /wd4711 /wd4548 /wd4868 /wd4571
+
+                $<$<CONFIG:Debug>:/WX>
+        )
     elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
-        set(release -Wall -Wextra -pedantic -Wshadow -Wabi)
-        set(debug -Werror)
+        target_compile_options(${target_name}
+            PRIVATE
+                -Wall -Wextra -pedantic -Wshadow -Wabi
+
+                $<$<CONFIG:Debug>:-Werror>
+        )
     elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL Clang)
-        set(release -Weverything -Wno-system-headers -Wabi -Wno-c++98-compat
-                    -Wno-c++98-compat-pedantic -Wno-exit-time-destructors
-                    -Wno-global-constructors -Wno-missing-prototypes
-                    -Wno-padded -Wno-documentation-unknown-command)
-        set(debug -Werror)
+        target_compile_options(${target_name}
+            PRIVATE
+                -Weverything -Wno-system-headers -Wabi -Wno-c++98-compat
+                -Wno-c++98-compat-pedantic -Wno-exit-time-destructors
+                -Wno-global-constructors -Wno-missing-prototypes
+                -Wno-padded -Wno-documentation-unknown-command
+
+                $<$<CONFIG:Debug>:-Werror>
+        )
     else()
         message(WARNING "Custom compiler flags not set.\n"
                         "Your compiler is not supported.\n"
                         "Detected id is '${CMAKE_CXX_COMPILER_ID}'.")
     endif()
-
-    target_compile_options(${target_name} PRIVATE ${release})
-    target_compile_options(${target_name} PRIVATE $<$<CONFIG:Debug>:${debug}>)
 endfunction(enable_strict_warnings)
 
 # Disablee all warnings.

diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile
@@ -1,7 +1,7 @@
 PROJECT_NAME = "Observable Reference"
 PROJECT_BRIEF = "Generic observable objects for C++"
 OUTPUT_DIRECTORY = ${OUTPUT_DIR}
-INPUT = ${CMAKE_SOURCE_DIR}/include/observable
+INPUT = ${CMAKE_SOURCE_DIR}/observable/include/observable
 LAYOUT_FILE = ${CMAKE_CURRENT_SOURCE_DIR}/DoxygenLayout.xml
 
 JAVADOC_AUTOBRIEF = YES

diff --git a/observable/CMakeLists.txt b/observable/CMakeLists.txt
@@ -0,0 +1,33 @@
+add_library(observable INTERFACE)
+
+add_custom_target(observable_headers # Just to generate a project in IDEs.
+    SOURCES
+        include/observable/observable.hpp
+        include/observable/observe.hpp
+        include/observable/subject.hpp
+        include/observable/subscription.hpp
+        include/observable/value.hpp
+        include/observable/expressions/expression.hpp
+        include/observable/expressions/filters.hpp
+        include/observable/expressions/math.hpp
+        include/observable/expressions/operators.hpp
+        include/observable/expressions/tree.hpp
+        include/observable/expressions/utility.hpp
+        include/observable/detail/collection.hpp
+        include/observable/detail/type_traits.hpp
+)
+
+target_include_directories(observable
+    INTERFACE
+        $<INSTALL_INTERFACE:include>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+)
+
+install(TARGETS observable EXPORT Observable
+    INCLUDES DESTINATION include
+)
+
+install(EXPORT Observable NAMESPACE Observable::
+    FILE ObservableTargets.cmake
+    DESTINATION lib/cmake/observable)
+
diff --git a/include/observable/detail/collection.hpp → .../include/observable/detail/collection.hpp b/include/observable/detail/collection.hpp → .../include/observable/detail/collection.hpp
diff --git a/include/observable/detail/type_traits.hpp → ...include/observable/detail/type_traits.hpp b/include/observable/detail/type_traits.hpp → ...include/observable/detail/type_traits.hpp
diff --git a/...ude/observable/expressions/expression.hpp → ...ude/observable/expressions/expression.hpp b/...ude/observable/expressions/expression.hpp → ...ude/observable/expressions/expression.hpp
diff --git a/include/observable/expressions/filters.hpp → ...nclude/observable/expressions/filters.hpp b/include/observable/expressions/filters.hpp → ...nclude/observable/expressions/filters.hpp
diff --git a/include/observable/expressions/math.hpp → ...e/include/observable/expressions/math.hpp b/include/observable/expressions/math.hpp → ...e/include/observable/expressions/math.hpp
diff --git a/include/observable/expressions/operators.hpp → ...lude/observable/expressions/operators.hpp b/include/observable/expressions/operators.hpp → ...lude/observable/expressions/operators.hpp
diff --git a/include/observable/expressions/tree.hpp → ...e/include/observable/expressions/tree.hpp b/include/observable/expressions/tree.hpp → ...e/include/observable/expressions/tree.hpp
diff --git a/include/observable/expressions/utility.hpp → ...nclude/observable/expressions/utility.hpp b/include/observable/expressions/utility.hpp → ...nclude/observable/expressions/utility.hpp
diff --git a/include/observable/observable.hpp → observable/include/observable/observable.hpp b/include/observable/observable.hpp → observable/include/observable/observable.hpp
diff --git a/include/observable/observe.hpp → observable/include/observable/observe.hpp b/include/observable/observe.hpp → observable/include/observable/observe.hpp
diff --git a/include/observable/subject.hpp → observable/include/observable/subject.hpp b/include/observable/subject.hpp → observable/include/observable/subject.hpp
diff --git a/include/observable/subscription.hpp → ...vable/include/observable/subscription.hpp b/include/observable/subscription.hpp → ...vable/include/observable/subscription.hpp
diff --git a/include/observable/value.hpp → observable/include/observable/value.hpp b/include/observable/value.hpp → observable/include/observable/value.hpp