Skip to content

Commit

Permalink
Merge pull request #101 from bigladder/refactor/logical-layout
Browse files Browse the repository at this point in the history
Implement Company Naming Convention
  • Loading branch information
michael-okeefe authored Nov 13, 2024
2 parents 4540736 + 6734211 commit b4a0b14
Show file tree
Hide file tree
Showing 65 changed files with 8,617 additions and 8,211 deletions.
14 changes: 8 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020 - 2024 Big Ladder Software LLC. All rights reserved.
# Copyright (c) 2020 - 2024 Big Ladder Software, LLC.
# See the LICENSE.txt file for additional terms and conditions.
# NOTE: THIS FILE IS AUTO-GENERATED. DO NOT EDIT.
cmake_minimum_required(VERSION 3.10) # required for gtest_discover_tests
Expand All @@ -12,10 +12,6 @@ project(erin
# NOTE: Required for some dependencies to build (e.g., toml11).
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
configure_file(
${PROJECT_SOURCE_DIR}/include/erin/version.h.in
${PROJECT_BINARY_DIR}/include/erin/version.h
)

# Set a default build type if none was specified
if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
Expand All @@ -41,7 +37,13 @@ if (NOT ${PROJECT_NAME}_STATIC_LIB)
endif ()

include(build-options-interface)
message(STATUS "Building ${PROJECT_NAME} ${PROJECT_VERSION}")
include(get-git-hash)
message(STATUS "Building ${PROJECT_NAME} ${PROJECT_VERSION} (${PROJECT_GIT_HASH})")
configure_file(
${PROJECT_SOURCE_DIR}/include/erin/version.h.in
${PROJECT_BINARY_DIR}/include/erin/version.h
)


# Set up testing/coverage
if (${PROJECT_NAME}_BUILD_TESTING)
Expand Down
9 changes: 0 additions & 9 deletions Gemfile

This file was deleted.

14 changes: 0 additions & 14 deletions Gemfile.lock

This file was deleted.

2 changes: 1 addition & 1 deletion Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ tasks:
desc: Initialize the build directory
cmds:
- mkdir build
- cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Debug -DCMAKE_EXPORT_COMPILE_COMMANDS=1
- cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_EXPORT_COMPILE_COMMANDS=1

build:
desc: (Re)build the application
Expand Down
2 changes: 1 addition & 1 deletion app/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020 - 2024 Big Ladder Software LLC. All rights reserved.
# Copyright (c) 2020 - 2024 Big Ladder Software, LLC.
# See the LICENSE.txt file for additional terms and conditions.
# NOTE: THIS FILE IS AUTO-GENERATED. DO NOT EDIT.
configure_file(
Expand Down
11 changes: 5 additions & 6 deletions app/compilation_settings.h.in
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
/* Copyright (c) 2020-2024 Big Ladder Software LLC. All rights reserved.
* See the LICENSE.txt file for additional terms and conditions. */
// Copyright (c) 2020 - 2024 Big Ladder Software, LLC.
// See the LICENSE.txt file for additional terms and conditions.

#ifndef APPS_COMPILATION_SETTINGS_H
#define APPS_COMPILATION_SETTINGS_H
#ifndef APP_COMPILATION_SETTINGS_H
#define APP_COMPILATION_SETTINGS_H

std::string const build_type =
std::string{"@CMAKE_BUILD_TYPE@"};
std::string const build_type = std::string{"@CMAKE_BUILD_TYPE@"};

#endif
Loading

0 comments on commit b4a0b14

Please sign in to comment.