From c1f2595478de73613b703f6a13dad929ff3f6a37 Mon Sep 17 00:00:00 2001
From: cobrapitz <12397702+cobrapitz@users.noreply.github.com>
Date: Mon, 10 Apr 2023 20:31:52 +0200
Subject: [PATCH] feat: add define USE_CBLIB_DEFINES to exclude defines by
 default

---
 CMakeLists.txt       | 46 +++++++++++++++++++++++++-------------------
 include/cb.h         |  3 +++
 tests/test_tests.cpp |  1 +
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38b130c..7a18267 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,12 +13,27 @@ include(cmake/CMakeSettings.cmake)
 # Project properties
 #######################################################################################################################
 
+set(CBLIB_SOURCE_DIR src/cb)
+set(CBLIB_INCLUDE_DIR include/cb)
+
+set(CBLIB_HEADERS
+        ${CBLIB_INCLUDE_DIR}/cb.h # contains combined includes
+        ${CBLIB_INCLUDE_DIR}/base.h
+        ${CBLIB_INCLUDE_DIR}/types/types.h
+        ${CBLIB_INCLUDE_DIR}/time/time.h
+        ${CBLIB_INCLUDE_DIR}/test/test.h
+        )
+set(CBLIB_SOURCES
+        ${CBLIB_SOURCE_DIR}/base.cpp
+        ${CBLIB_SOURCE_DIR}/types/types.cpp
+        ${CBLIB_SOURCE_DIR}/time/time.cpp
+        ${CBLIB_SOURCE_DIR}/test/test.cpp
+        )
+
+
 add_library(${PROJECT_NAME} STATIC
-        src/cb/base.cpp
-        src/cb/types/types.cpp
-        src/cb/time/time.cpp
-        src/cb/test/test.cpp
-)
+        ${CBLIB_SOURCES}
+        )
 
 
 #######################################################################################################################
@@ -29,28 +44,19 @@ target_include_directories(${PROJECT_NAME}
         PUBLIC
         $<INSTALL_INTERFACE:include>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-        PRIVATE
-        ${CMAKE_CURRENT_SOURCE_DIR}/src
+#        PRIVATE
+#        ${CMAKE_CURRENT_SOURCE_DIR}/src
         )
 
-#######################################################################################################################
-# Target properties
-#######################################################################################################################
-
-#set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
-#set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION_MAJOR})
-#set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER source/cb.h)
-
-
 
 #######################################################################################################################
 # Tests
 #######################################################################################################################
 
-if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
     include(CTest)
-endif()
+endif ()
 
-if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
+if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
     add_subdirectory(tests)
-endif()
\ No newline at end of file
+endif ()
\ No newline at end of file
diff --git a/include/cb.h b/include/cb.h
index 011e0a7..9dd2771 100644
--- a/include/cb.h
+++ b/include/cb.h
@@ -4,8 +4,11 @@
 #ifndef GODOT_HUB_MAP_CB_H
 #define GODOT_HUB_MAP_CB_H
 
+#ifdef USE_CBLIB_DEFINES
+
 #define assertm(exp, msg) = assert(((void)msg, exp))
 
+#endif
 
 #include "cb/test/test.h"
 #include "cb/time/time.h"
diff --git a/tests/test_tests.cpp b/tests/test_tests.cpp
index d73b916..c84a2e2 100644
--- a/tests/test_tests.cpp
+++ b/tests/test_tests.cpp
@@ -1,3 +1,4 @@
+#define USE_CBLIB_DEFINES
 #include <cb.h>
 
 #include "gtest/gtest.h"