fix: modernize and add pinned deps

Author: arcuru

.clang-format

@@ -0,0 +1 @@
+BasedOnStyle:  Google

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "deps/dlx"]
 	path = deps/dlx
-	url = git://github.com/patricksjackson/dlx-cpp.git
+	url = git@github.com:arcuru/dlx-cpp

CMakeLists.txt

@@ -1,41 +1,47 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.15)
+cmake_policy(SET CMP0048 NEW)  # for project version handling
+if(POLICY CMP0167)
+    cmake_policy(SET CMP0167 NEW)  # for modern Boost finding
+endif()
+
+
+project(nqueens 
+    VERSION 1.0
+    LANGUAGES CXX)
+
+# Modern CMake: Set C++ standard globally
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
 # Output compilation database for clangtidy
-set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 # Set default build type to Release
-if (NOT CMAKE_BUILD_TYPE)
-    message(STATUS "No build type selected, default to Release.")
+if(NOT CMAKE_BUILD_TYPE)
+    message(STATUS "No build type selected, default to Release")
     set(CMAKE_BUILD_TYPE "Release")
 endif()
 
-# Enable C++14 features on gcc/clang
-if("${CMAKE_CXX_COMPILER_ID}" MATCHES "(GNU|Clang)")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
-endif()
-
-# Enable Warnings
-# Clang has different warnings
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics -pedantic -Wall -Wextra -Wshadow -Werror")
-    set(CMAKE_CXX_FLAGS_DEBUG "-Og")
-    set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O3")
-else()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
-endif()
+# Modern threading support
+find_package(Threads REQUIRED)
 
-# Add library includes
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
+# Configure Boost
+set(Boost_USE_STATIC_LIBS OFF)
+set(Boost_USE_MULTITHREADED ON)
+set(Boost_USE_STATIC_RUNTIME OFF)
+find_package(Boost REQUIRED COMPONENTS unit_test_framework)
 
 # Include DLX
-add_subdirectory(${CMAKE_SOURCE_DIR}/deps/dlx EXCLUDE_FROM_ALL)
-include_directories(${CMAKE_SOURCE_DIR}/deps/dlx)
+add_subdirectory(${CMAKE_SOURCE_DIR}/deps/dlx)
+target_include_directories(dlx 
+    PUBLIC 
+        ${CMAKE_SOURCE_DIR}/deps/dlx
+)
 
-# Build nqueens lib and add to include path
+# Build nqueens lib
 add_subdirectory(src)
-include_directories(src)
-
-# Add tests
-enable_testing()
-add_subdirectory(test)
 
+# Enable testing
+include(CTest)
+add_subdirectory(test)

deps/dlx

@@ -0,0 +1,80 @@
+{
+  description = "NQueens solutions";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    pre-commit-hooks = {
+      url = "github:cachix/pre-commit-hooks.nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    # Utility functions to configure for multiple systems
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  # `inputs @` allows all the inputs to be accessed later if they're unnamed in the args.
+  outputs = {
+    self,
+    flake-utils,
+    nixpkgs,
+    pre-commit-hooks,
+    ...
+  }:
+    with flake-utils;
+      lib.eachSystem [lib.system.aarch64-linux lib.system.x86_64-linux] (system: let
+        pkgs = import nixpkgs {inherit system;};
+      in {
+        # Install devshell packages
+        devShells.default = pkgs.mkShell {
+          inherit (self.checks.${system}.pre-commit) shellHook;
+          packages = with pkgs; [
+            # General formatters/tools
+            deadnix
+            nixfmt
+            nodePackages.prettier
+            statix
+            shellcheck
+
+            # Generic C++ packages
+            cmake
+            gcc
+            ninja
+            clang
+
+            # Boost is needed for this repo
+            # (boost159.override { enableStatic = true; })
+            (boost.override {
+              enableStatic = true;
+              enableShared = true;
+              components = [
+                "unit_test_framework"
+              ];
+            })
+            pkg-config
+          ];
+          CMAKE_GENERATOR = "Ninja";
+        };
+
+        checks = {
+          # Add pre-commit-hooks. Note that these only run on the files in a commit unless running `nix flake check`.
+          pre-commit = pre-commit-hooks.lib.${system}.run {
+            src = ./.;
+            default_stages = ["commit"];
+            hooks = {
+              # Format any nix files
+              alejandra.enable = true;
+
+              # Lint/format the shell files.
+              shellcheck.enable = true;
+
+              # Format any changed files
+              # Formatting settings are contained in .clang-format
+              clang-format = {
+                enable = true;
+                types_or = ["c" "c++"];
+                excludes = ["catch.hpp"];
+              };
+            };
+          };
+        };
+      });
+}

flake.lock

@@ -1,14 +1,19 @@
-
-set(NQUEENS_SOURCE_FILES
-    array_queens.cpp
-    flat_queens.cpp
+add_library(nqueens_core
     dlx_queens.cpp
-    bit_queens.cpp
     thread_queens.cpp
-    super_queens.cpp
+    flat_queens.cpp    # Added
+    array_queens.cpp   # Added
+    bit_queens.cpp     # Added
+    super_queens.cpp   # Added
 )
 
-add_library(nqueens_core ${NQUEENS_SOURCE_FILES})
-
-target_link_libraries(nqueens_core dlx)
+target_include_directories(nqueens_core
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
+)
 
+target_link_libraries(nqueens_core
+    PUBLIC
+        dlx
+        Threads::Threads
+)