CMake fixes

.github/workflows/cmake.yml

@@ -20,33 +20,36 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-    - name: Setup externals
+      - name: Setup
         shell: bash
         run: |
           # If your submodules are configured to use SSH instead of HTTPS please uncomment the following line
           # git config --global url."https://github.com/".insteadOf "git@github.com:"
           auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+          
           git submodule sync --recursive
           git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
           
           sudo apt-get update
           sudo apt-get install python3 python-is-python3
           sudo apt-get install -y libx11-dev libgl1-mesa-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev
+          sudo apt-get install -y clang-15
           
           cd Externals/glew/
           make extensions
 
-    - name: Set LLVM Toolchain
+      #- name: Set LLVM Toolchain
-      run: |
+        #run: |
-        sudo apt-get install -y llvm
+        # sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++ 10
-        sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++ 10
+        # sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 20
-        sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 20
 
       - name: Configure CMake
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+        run: |
+          clang++-15 -v
+          CC=clang-15 CXX=clang++-15 cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
 
       - name: Build
-      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+        run: CC=clang CXX=clang++ cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -v
 
       - name: Test
         working-directory: ${{github.workspace}}/build

Allocators/CMakeLists.txt

@@ -1,8 +1,3 @@
-
-cmake_minimum_required(VERSION 3.2)
-
-set(CMAKE_CXX_STANDARD 23)
-
 project(Allocators)
 
 ### ---------------------- Static Library  ---------------------  ###
@@ -18,5 +13,3 @@ file(GLOB TEST_SOURCES "./tests/*.cpp")
 add_executable(${PROJECT_NAME}Tests ${TEST_SOURCES})
 target_link_libraries(${PROJECT_NAME}Tests ${PROJECT_NAME} Utils)
 add_test(NAME ${PROJECT_NAME}Tests COMMAND ${PROJECT_NAME}Tests)
-
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib)

Allocators/private/HeapAllocator.cpp

@@ -5,6 +5,8 @@
 
 #include "PrivateConfig.hpp"
 
+#include <malloc.h>
+
 using namespace tp;
 
 #if not defined(MEM_DEBUG)
@@ -61,7 +63,7 @@ HeapAlloc::~HeapAlloc() {
 		DEBUG_BREAK("Destruction of not freed Allocator")
 
 #ifdef MEM_STACK_TRACE
-// TODO : log leaks and free them up
+		// TODO : log leaks and free them up
 #endif
 	}
 }

Allocators/private/HeapAllocatorGlobal.cpp

@@ -18,6 +18,9 @@ using namespace tp;
 void* HeapAllocGlobal::allocate(ualni aBlockSize) { return malloc(aBlockSize); }
 void HeapAllocGlobal::deallocate(void* aPtr) { free(aPtr); }
 HeapAllocGlobal::~HeapAllocGlobal() = default;
+bool HeapAllocGlobal::checkLeaks() { return false; }
+void HeapAllocGlobal::startIgnore() {}
+void HeapAllocGlobal::stopIgnore() {}
 
 #else
 
@@ -95,7 +98,7 @@ ALLOCATE:
 	}
 	mEntry = head;
 
-// 3) Trace the stack
+	// 3) Trace the stack
 #ifdef MEM_STACK_TRACE
 	head->mCallStack = gCSCapture->getSnapshot();
 #endif
@@ -146,7 +149,7 @@ void HeapAllocGlobal::deallocate(void* aPtr) {
 			ASSERT(!"Allocated Block Wrap Corrupted!")
 		}
 
-// 4) clear data
+		// 4) clear data
 #ifdef MEM_CLEAR_ON_ALLOC
 		memSetVal(data, head->mBlockSize, CLEAR_DEALLOC_VAL);
 #endif

CMakeLists.txt

@@ -1,16 +1,15 @@
-cmake_minimum_required(VERSION 3.2)
 
-set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/install)
+cmake_minimum_required(VERSION 3.5)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -gdwarf-4")
+set(CMAKE_CXX_STANDARD 20)
 
-enable_testing()
+# set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/./tmp/install)
+# set(CMAKE_CXX_FLAGS "-fuse-ld=lld-15 ${CMAKE_CXX_FLAGS} -gdwarf-4 ")
+# add_compile_definitions(MEM_DEBUG)
 
-project(Types)
+project(ModulesRoot)
 
-add_compile_definitions(MEM_DEBUG)
+include(CMakeOptions.txt)
-
-set(EXTERNALS ../Externals)
 
 add_subdirectory(Modules)
 add_subdirectory(Utils)

CMakeOptions.txt

@@ -0,0 +1,7 @@
+option(MODULES_MEMORY_DEBUG "Debug memory" OFF)
+
+if (MODULES_MEMORY_DEBUG)
+    add_compile_definitions(MEM_DEBUG)
+endif ()
+
+enable_testing()

CommandLine/CMakeLists.txt

@@ -1,8 +1,3 @@
-
-cmake_minimum_required(VERSION 3.2)
-
-set(CMAKE_CXX_STANDARD 23)
-
 project(CommandLine)
 
 ### ---------------------- Static Library  ---------------------  ###
@@ -18,5 +13,3 @@ file(GLOB TEST_SOURCES "./tests/*.cpp")
 add_executable(${PROJECT_NAME}Tests ${TEST_SOURCES})
 target_link_libraries(${PROJECT_NAME}Tests ${PROJECT_NAME} Utils)
 add_test(NAME ${PROJECT_NAME}Tests COMMAND ${PROJECT_NAME}Tests)
-
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib)

Connection/CMakeLists.txt

@@ -1,8 +1,3 @@
-
-cmake_minimum_required(VERSION 3.2)
-
-set(CMAKE_CXX_STANDARD 23)
-
 project(Connection)
 
 set(BINDINGS_INCLUDE ./../Externals/asio/asio/include)
@@ -21,5 +16,3 @@ file(GLOB TEST_SOURCES "./tests/*.cpp")
 add_executable(${PROJECT_NAME}Tests ${TEST_SOURCES})
 target_link_libraries(${PROJECT_NAME}Tests ${PROJECT_NAME} Utils)
 add_test(NAME ${PROJECT_NAME}Tests COMMAND ${PROJECT_NAME}Tests)
-
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib)

Containers/CMakeLists.txt

@@ -1,8 +1,3 @@
-
-cmake_minimum_required(VERSION 3.2)
-
-set(CMAKE_CXX_STANDARD 23)
-
 project(Containers)
 
 ### ---------------------- Static Library  ---------------------  ###
@@ -18,5 +13,3 @@ file(GLOB TEST_SOURCES "./tests/*.cpp")
 add_executable(${PROJECT_NAME}Tests ${TEST_SOURCES})
 target_link_libraries(${PROJECT_NAME}Tests ${PROJECT_NAME} Allocators)
 add_test(NAME ${PROJECT_NAME}Tests COMMAND ${PROJECT_NAME}Tests)
-
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib)

DataAnalysis/CMakeLists.txt

@@ -1,8 +1,3 @@
-
-cmake_minimum_required(VERSION 3.2)
-
-set(CMAKE_CXX_STANDARD 23)
-
 project(DataAnalysis)
 
 ### ---------------------- Externals  ---------------------  ###
@@ -35,5 +30,3 @@ target_include_directories(${PROJECT_NAME}Tests PUBLIC ./applications/)
 
 target_link_libraries(${PROJECT_NAME}Tests ${PROJECT_NAME} Utils)
 add_test(NAME ${PROJECT_NAME}Tests COMMAND ${PROJECT_NAME}Tests)
-
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib)

Graphics/CMakeLists.txt

@@ -1,12 +1,7 @@
-
-cmake_minimum_required(VERSION 3.2)
-
-set(CMAKE_CXX_STANDARD 23)
-
 project(Graphics)
 
 ### ---------------------- Externals  ---------------------  ###
-set(BINDINGS_INCLUDE ${EXTERNALS}/glfw/include ${EXTERNALS}/glew/include)
+set(BINDINGS_INCLUDE ../Externals/glfw/include ../Externals/glew/include)
 set(BINDINGS_LIBS glfw glew_s Imgui Nanovg)
 
 
@@ -30,5 +25,3 @@ file(GLOB TEST_SOURCES "./tests/*.cpp")
 add_executable(${PROJECT_NAME}Tests ${TEST_SOURCES})
 target_link_libraries(${PROJECT_NAME}Tests ${PROJECT_NAME} Utils)
 add_test(NAME ${PROJECT_NAME}Tests COMMAND ${PROJECT_NAME}Tests)
-
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib)

Math/CMakeLists.txt

@@ -1,8 +1,3 @@
-
-cmake_minimum_required(VERSION 3.2)
-
-set(CMAKE_CXX_STANDARD 23)
-
 project(Math)
 
 ### ---------------------- Static Library  ---------------------  ###
@@ -18,5 +13,3 @@ file(GLOB TEST_SOURCES "./tests/*.cpp")
 add_executable(${PROJECT_NAME}Tests ${TEST_SOURCES})
 target_link_libraries(${PROJECT_NAME}Tests ${PROJECT_NAME} Utils)
 add_test(NAME ${PROJECT_NAME}Tests COMMAND ${PROJECT_NAME}Tests)
-
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib)

Modules/CMakeLists.txt

@@ -1,8 +1,3 @@
-
-cmake_minimum_required(VERSION 3.2)
-
-set(CMAKE_CXX_STANDARD 23)
-
 project(Modules)
 
 ### ---------------------- Static Library  ---------------------  ###
@@ -16,6 +11,3 @@ file(GLOB SOURCES_TEST "./tests/*.cpp")
 add_executable(${PROJECT_NAME}Tests ${SOURCES_TEST})
 target_link_libraries(${PROJECT_NAME}Tests ${PROJECT_NAME})
 add_test(NAME ${PROJECT_NAME}Tests COMMAND ${PROJECT_NAME}Tests)
-
-
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib)

Objects/CMakeLists.txt

@@ -1,8 +1,3 @@
-
-cmake_minimum_required(VERSION 3.2)
-
-set(CMAKE_CXX_STANDARD 23)
-
 project(Objects)
 
 ### ---------------------- Static Library  ---------------------  ###
@@ -29,5 +24,3 @@ file(GLOB TEST_SOURCES "./tests/*.cpp" "./tests/*/*.cpp")
 add_executable(${PROJECT_NAME}Tests ${TEST_SOURCES})
 target_link_libraries(${PROJECT_NAME}Tests ${PROJECT_NAME} Utils)
 add_test(NAME ${PROJECT_NAME}Tests COMMAND ${PROJECT_NAME}Tests)
-
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib)

Parser/CMakeLists.txt

@@ -1,8 +1,3 @@
-
-cmake_minimum_required(VERSION 3.2)
-
-set(CMAKE_CXX_STANDARD 23)
-
 project(Parser)
 
 ### ---------------------- Static Library  ---------------------  ###
@@ -13,7 +8,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC ./public/)
 target_link_libraries(${PROJECT_NAME} PUBLIC Tokenizer)
 
 ### -------------------------- Applications  --------------------------  ###
-add_executable(cfg ./applications/Cfg.cpp )
+add_executable(cfg ./applications/Cfg.cpp)
 target_link_libraries(cfg ${PROJECT_NAME} CommandLine)
 
 configure_file(rsc/grammar.txt grammar.txt COPYONLY)
@@ -24,5 +19,3 @@ file(GLOB TEST_SOURCES "./tests/*.cpp")
 add_executable(${PROJECT_NAME}Tests ${TEST_SOURCES})
 target_link_libraries(${PROJECT_NAME}Tests ${PROJECT_NAME} Utils)
 add_test(NAME ${PROJECT_NAME}Tests COMMAND ${PROJECT_NAME}Tests)
-
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib)

RayTracer/CMakeLists.txt

@@ -1,8 +1,3 @@
-
-cmake_minimum_required(VERSION 3.2)
-
-set(CMAKE_CXX_STANDARD 23)
-
 project(RayTracer)
 
 ### ---------------------- Static Library  ---------------------  ###
@@ -31,5 +26,3 @@ target_include_directories(${PROJECT_NAME}Tests PUBLIC ./applications/)
 
 target_link_libraries(${PROJECT_NAME}Tests ${PROJECT_NAME} Utils ImageIO)
 add_test(NAME ${PROJECT_NAME}Tests COMMAND ${PROJECT_NAME}Tests)
-
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib)

Strings/CMakeLists.txt

@@ -1,8 +1,3 @@
-
-cmake_minimum_required(VERSION 3.2)
-
-set(CMAKE_CXX_STANDARD 23)
-
 project(Strings)
 
 ### ---------------------- Static Library  ---------------------  ###
@@ -18,5 +13,3 @@ file(GLOB TEST_SOURCES "./tests/*.cpp")
 add_executable(${PROJECT_NAME}Tests ${TEST_SOURCES})
 target_link_libraries(${PROJECT_NAME}Tests ${PROJECT_NAME} Utils)
 add_test(NAME ${PROJECT_NAME}Tests COMMAND ${PROJECT_NAME}Tests)
-
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib)

Tokenizer/CMakeLists.txt

@@ -1,8 +1,3 @@
-
-cmake_minimum_required(VERSION 3.2)
-
-set(CMAKE_CXX_STANDARD 23)
-
 project(Tokenizer)
 
 ### ---------------------- Static Library  ---------------------  ###
@@ -18,5 +13,3 @@ file(GLOB TEST_SOURCES "./tests/*.cpp")
 add_executable(${PROJECT_NAME}Tests ${TEST_SOURCES})
 target_link_libraries(${PROJECT_NAME}Tests ${PROJECT_NAME} Utils)
 add_test(NAME ${PROJECT_NAME}Tests COMMAND ${PROJECT_NAME}Tests)
-
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib)

Utils/CMakeLists.txt

@@ -1,8 +1,3 @@
-
-cmake_minimum_required(VERSION 3.2)
-
-set(CMAKE_CXX_STANDARD 23)
-
 project(Utils)
 
 ### ---------------------- Static Library  ---------------------  ###
@@ -19,6 +14,3 @@ file(GLOB TEST_SOURCES "./tests/*.cpp")
 add_executable(${PROJECT_NAME}Tests ${TEST_SOURCES})
 target_link_libraries(${PROJECT_NAME}Tests ${PROJECT_NAME})
 add_test(NAME ${PROJECT_NAME}Tests COMMAND ${PROJECT_NAME}Tests)
-
-
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib)