Improved structure and CMakeLists.txt

Author: 5cript

CMakeLists.txt

@@ -1,7 +1,15 @@
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 3.21)
+
+include(cmake/options.cmake)
+
+project(interval-tree)
 
 add_library(interval-tree INTERFACE)
 
 target_include_directories(interval-tree INTERFACE ./include)
 
+if(DRAW_EXAMPLES)
+    add_subdirectory(cairo-wrap)
+    add_subdirectory(drawings)
+endif()
 add_subdirectory(tests)

cmake/options.cmake

@@ -0,0 +1 @@
+option(DRAW_EXAMPLES "Draws some examples in a subdirectory. run make_drawable.sh before this" OFF )

drawings/CMakeLists.txt

@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.21)
+
+add_executable(interval-tree-drawings "main.cpp")
+
+target_link_libraries(interval-tree-drawings PRIVATE interval-tree cairo cairo-wrap)
+
+set_target_properties(interval-tree-drawings PROPERTIES OUTPUT_NAME "make_drawings")

tests/example_drawings.hpp renamed to drawings/example_drawings.hpp

@@ -1,11 +1,10 @@
 #pragma once
-#ifdef INTERVAL_TREE_DO_DRAWINGS
 
-#include "../draw.hpp"
+#include <interval-tree/draw.hpp>
 
 #include <string>
 
-void drawDocExample()
+static void drawDocExample()
 {
     using namespace lib_interval_tree;
 
@@ -25,7 +24,7 @@ void drawDocExample()
     drawTree("drawings/doc_example.png", tree, false, false);
 }
 
-void drawFromTests1()
+static void drawFromTests1()
 {
     using namespace lib_interval_tree;
     using namespace std::string_literals;
@@ -68,10 +67,8 @@ void drawFromTests1()
     drawTree("drawings/from_tests_1_deoverlapped.png", tree, false, false);
 }
 
-void drawAll()
+static void drawAll()
 {
     drawDocExample();
     drawFromTests1();
 }
-
-#endif // INTERVAL_TREE_DO_DRAWINGS

draw.hpp renamed to include/interval-tree/draw.hpp

@@ -1,5 +1,5 @@
 # Version Check
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 3.21)
 
 # Default CXX Standard
 if (NOT "${CMAKE_CXX_STANDARD}")
@@ -13,24 +13,13 @@ if (NOT EXISTS ${CMAKE_BINARY_DIR}/CMakeCache.txt)
 	endif()
 endif()
 
-option(DRAW_EXAMPLES "Draws some examples in a subdirectory. run make_drawable.sh before this" OFF )
-
-# Project
-project(tree-tests)
-
 # Add Files
 file(GLOB sources "*.cpp")
 
 # Add Executable
 add_executable(tree-tests ${sources})
 
 target_link_libraries(tree-tests PRIVATE gtest gmock interval-tree)
-# Options
-if(DRAW_EXAMPLES)
-	target_compile_definitions(tree-tests PRIVATE -DINTERVAL_TREE_DO_DRAWINGS=1)	
-	find_library(LCAIRO_WRAP NAMES cairo_wrap PATHS "../../cairo-wrap/build" STATIC)	
-	target_link_libraries(tree-tests PRIVATE ${LCAIRO_WRAP} cairo)
-endif()
 
 # Compiler Options
 set(DEBUG_OPTIONS -fexceptions -g -Wall -pedantic-errors -pedantic)