Merge branch 'sb-graph-dev' into sb-graph-tearing

Author: yamilsaer

.github/workflows/c-cpp.yml

@@ -8,27 +8,38 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@v2
     - name: Install deps.
       run: | 
-        sudo add-apt-repository ppa:mhier/libboost-latest
         sudo apt-get update
-        sudo apt-get install autoconf
-        sudo apt-get install libboost1.81-dev
+        sudo apt-get install libboost1.83-dev
         sudo apt-get install cmake 
         sudo apt-get install g++
         sudo apt-get install rapidjson-dev
 
-    - name: Build
+    - name: Create build folder.
       working-directory: ./
       run: |
-        autoconf
-        ./configure 
-        make compile MODE=Release
+        mkdir -p build
+
+    - name: Configure
+      working-directory: ./build
+      run: |
+        cmake ..
+
+    - name: Build
+      working-directory: ./build
+      run: |
+        make
+
+    - name: Install
+      working-directory: ./build
+      run: |
+        make install
 
     - name: Tests
-      working-directory: ./
+      working-directory: ./build
       run: make test

.gitignore

@@ -1,39 +1,20 @@
-# Compiled objects.
-/obj
+# Install folder..
+/install
 
-# Generated library.
-/lib
+# Build folder.
+/build
 
-# Binary files
-/bin
-/test/performance/boost/bin
-/test/performance/boost/obj
+# Doc folder.
+/doc
 
 # 3rd-party libraries.
-/3rd-party/gtest/usr/
+/3rd-party/build/**
 /3rd-party/boost/*
 
 # Test files. 
 /test/parser/test_data/*
-/test/parser/obj/*
-/test/parser/bin/*
 /test/eval/test_data/*
-/test/eval/obj/*
-/test/eval/bin/*
-/test/performance/obj/*
-/test/performance/bin/*
-test/partitioner/bin/*
-
-# Doc files.
-/doc/*
-/sbg/doc/*
-/sbg/util/doc/*
-
-# Compile/Autoconf files.
-config.*
-configure
-Makefile
-/autom4te.cache
+/test/build/bin/
 
 # Log files
 *.log

3rd-party/CMakeLists.txt

@@ -0,0 +1,23 @@
+set(3RD_PARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+
+set(GTEST_LIB "${CMAKE_CURRENT_SOURCE_DIR}/build/lib/libgtest.a")
+set(GTEST_DIR "googletest-release-1.12.1")
+set(GTEST_CODE  ${GTEST_DIR}.tar.gz)
+
+
+add_custom_command(
+    OUTPUT ${GTEST_LIB}  
+    COMMAND ${CMAKE_COMMAND} -E echo "Building gtest."
+    COMMAND ${CMAKE_COMMAND} -E tar xvzf ${3RD_PARTY_DIR}/gtest/${GTEST_CODE}
+    COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/${GTEST_DIR}/build
+    COMMAND cd ${CMAKE_CURRENT_BINARY_DIR}/${GTEST_DIR}/build && cmake .. -DCMAKE_INSTALL_PREFIX=${3RD_PARTY_DIR}/build
+	COMMAND make -C ${CMAKE_CURRENT_BINARY_DIR}/${GTEST_DIR}/build install
+)
+
+add_custom_target(
+    3rd-party-libs
+    DEPENDS  ${GTEST_LIB}
+    COMMAND install ${3RD_PARTY_DIR}/build/lib/lib* ${CMAKE_INSTALL_PREFIX}/lib
+)
+
+add_dependencies(sbgraph 3rd-party-libs)

CMakeLists.txt

@@ -0,0 +1,90 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(SBG)
+
+set(CMAKE_INSTALL_PREFIX ${PROJECT_SOURCE_DIR}/install)
+
+# Set default build type to Release if not specified
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type" FORCE)
+endif()
+
+# Set C++ standard
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+# Build mode flags
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+  add_compile_definitions(SBG_PARTITIONER_LOGGING)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb -Wall ") # -Werror
+else()
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reorder")
+endif()
+
+# Output directories
+set(BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin)
+set(LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib)
+
+# Create output directories
+file(MAKE_DIRECTORY
+  ${BIN_DIR}
+  ${LIB_DIR}
+)
+
+# Define install rules for library headers.
+function(install_lib_headers headers_dir)
+  file(GLOB_RECURSE PROJECT_HEADERS
+    "${headers_dir}/*.hpp"
+  )
+
+  get_filename_component(CURRENT_DIR_BASENAME "${headers_dir}" NAME)
+
+  install(FILES
+    ${PROJECT_HEADERS}
+    DESTINATION "include/${CURRENT_DIR_BASENAME}"
+  )
+endfunction()
+
+# sbgraph-library
+add_library(sbgraph STATIC)
+
+# Add subdirectories
+add_subdirectory(3rd-party)
+add_subdirectory(algorithms)
+add_subdirectory(eval)
+add_subdirectory(parser)
+add_subdirectory(ast)
+add_subdirectory(sbg)
+add_subdirectory(test)
+add_subdirectory(util)
+
+set_target_properties(sbgraph PROPERTIES DEBUG_POSTFIX "d")
+target_include_directories(sbgraph PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(sbgraph sbg-dev)
+add_dependencies(sbgraph sbg-dev)
+
+# install
+install(
+  TARGETS sbgraph
+  RUNTIME DESTINATION lib
+  COMPONENT sbgraph
+  LIBRARY
+  DESTINATION lib
+  PERMISSIONS
+  OWNER_READ
+  OWNER_WRITE
+  OWNER_EXECUTE
+  GROUP_READ
+  GROUP_EXECUTE
+  WORLD_READ
+  WORLD_EXECUTE
+  COMPONENT sbgraph
+)
+
+add_custom_target(doc
+  COMMAND echo "Generating Project documentation."
+)
+
+add_dependencies(doc eval-doc sbg-doc util-doc)
+
+set_target_properties(doc PROPERTIES EXCLUDE_FROM_ALL ON)