Skip to content

Commit

Permalink
Fix CMakeLists.txt and refactor .gitignore
Browse files Browse the repository at this point in the history
Increase CMake minimum required version to 3.15 due to incompatibilities
with scikit-build-core. Update README.md.

Add POLICY checks to avoid errors on policy-unsupported versions.

Change CMP0167 policy of Boost searching to OLD due to non-compliance
with "Modern CMake" development patterns. Add "TODO" to fix this later.
Add useful logs to understand what Boost libraries were found by CMake.

Apply sort to .gitignore to improve readability.
Add .DS_Store, which is generated in macOS directories.
Add .cache, which is generated by clangd.
  • Loading branch information
Vdaleke committed Nov 18, 2024
1 parent a949e32 commit 8510a48
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 17 deletions.
24 changes: 13 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
cmake-build-debug/
build/
Build/
BUILD/
bUILD/
Datasets/
.sconsign.dblite
lib/
**/.DS_Store
**/myeasylog.log
.cache/
.csv
.idea/
.sconsign.dblite
.vscode/
**/myeasylog.log
dist
venv
BUILD/
Build/
Datasets/
bUILD/
build/
cmake-build-debug/
dist/
lib/
venv/
23 changes: 18 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
cmake_minimum_required(VERSION 3.13)
cmake_policy(SET CMP0144 NEW)
cmake_minimum_required(VERSION 3.15)
if (POLICY CMP0167)
# deprecated by definition, TODO: port project to "Modern CMake" https://gist.github.com/mbinna/c61dbb39bca0e4fb7d1f73b0d66a4fd1
cmake_policy(SET CMP0167 OLD)
endif()
if (POLICY CMP0144)
cmake_policy(SET CMP0144 NEW)
endif()

project(Desbordante)

option(COPY_PYTHON_EXAMPLES "Copy Python examples" OFF)
Expand Down Expand Up @@ -103,9 +110,15 @@ endif()

# configuring boost
set(Boost_USE_STATIC_LIBS OFF)
find_package(Boost 1.81.0 REQUIRED COMPONENTS container thread graph CONFIG)
include_directories(${Boost_INCLUDE_DIRS})
message(${Boost_INCLUDE_DIRS})

find_package(Boost 1.81.0 REQUIRED COMPONENTS container thread graph)
if (Boost_FOUND)
message(STATUS "Found Boost include dirs: ${Boost_INCLUDE_DIRS}")
include_directories( ${Boost_INCLUDE_DIRS})
message(STATUS "Found Boost library dirs: ${Boost_LIBRARY_DIRS}")
else ()
message(FATAL_ERROR "Boost not found. If boost is installed specify environment variables like \"BOOST_ROOT\" for hint to CMake where to search")
endif()

# providing subdirectories for header inclusion
include_directories(
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ The following instructions were tested on Ubuntu 20.04+ LTS and macOS Sonoma 14.
Prior to cloning the repository and attempting to build the project, ensure that you have the following software:

- GNU GCC, version 10+
- CMake, version 3.13+
- CMake, version 3.15+
- Boost library built with GCC, version 1.81.0+

To use test datasets you will need:
Expand Down

0 comments on commit 8510a48

Please sign in to comment.