Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
run: echo "VCPKG_ROOT=${{ github.workspace }}/vcpkg" >> $GITHUB_ENV

- name: Create tests config
working-directory: brazierORM
working-directory: brazier-orm
run: |
mkdir -p tests/config
cat > tests/config/config.hpp <<'EOF'
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
-DVCPKG_INSTALLED_DIR=${{ github.workspace }}/vcpkg_installed
-DVCPKG_OVERLAY_PORTS=${{ github.workspace }}/registry/ports
-DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake
-S brazierORM
-S brazier-orm

- name: Build
run: cmake --build build --config ${{ matrix.build_type }}
Expand Down Expand Up @@ -185,7 +185,7 @@ jobs:
run: echo "VCPKG_ROOT=${{ github.workspace }}/vcpkg" >> $GITHUB_ENV

- name: Create tests config
working-directory: brazierORM
working-directory: brazier-orm
run: |
New-Item -ItemType Directory -Force -Path "tests\config" | Out-Null
@'
Expand Down Expand Up @@ -213,7 +213,7 @@ jobs:
-DVCPKG_INSTALLED_DIR=${{ github.workspace }}/vcpkg_installed
-DVCPKG_OVERLAY_PORTS=${{ github.workspace }}/registry/ports
-DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake
-S brazierORM
-S brazier-orm

- name: Build
run: cmake --build build --config ${{ matrix.build_type }}
Expand Down Expand Up @@ -297,7 +297,7 @@ jobs:
run: echo "VCPKG_ROOT=${{ github.workspace }}/vcpkg" >> $GITHUB_ENV

- name: Create tests config
working-directory: brazierORM
working-directory: brazier-orm
run: |
mkdir -p tests/config
cat > tests/config/config.hpp <<'EOF'
Expand Down Expand Up @@ -325,7 +325,7 @@ jobs:
-DVCPKG_INSTALLED_DIR=${{ github.workspace }}/vcpkg_installed
-DVCPKG_OVERLAY_PORTS=${{ github.workspace }}/registry/ports
-DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake
-S brazierORM
-S brazier-orm

- name: Build
run: cmake --build build --config ${{ matrix.build_type }}
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
.env
config.json

vcpkg-configuration.json
vcpkg-configuration.json
11 changes: 2 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
# CMakeList.txt: файл проекта CMake верхнего уровня; проведите глобальную конфигурацию
# и включите сюда подпроекты.
#
cmake_minimum_required (VERSION 3.10)
cmake_minimum_required (VERSION 3.10)

# Включение горячей перезагрузки для компиляторов MSVC, если поддерживается.
if (POLICY CMP0141)
cmake_policy(SET CMP0141 NEW)
set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<IF:$<AND:$<C_COMPILER_ID:MSVC>,$<CXX_COMPILER_ID:MSVC>>,$<$<CONFIG:Debug,RelWithDebInfo>:EditAndContinue>,$<$<CONFIG:Debug,RelWithDebInfo>:ProgramDatabase>>")
Expand All @@ -27,7 +23,4 @@ endif()

project ("brazier-orm")



# Включите подпроекты.
add_subdirectory ("brazierORM")
add_subdirectory ("brazier-orm")
10 changes: 5 additions & 5 deletions brazierORM/CMakeLists.txt → brazier-orm/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.14)
project(brazier-orm VERSION 0.1.0 LANGUAGES CXX)
project(brazier-orm VERSION 0.1.1 LANGUAGES CXX)

set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
Expand Down Expand Up @@ -56,15 +56,15 @@ if(MSVC)
)
endif()

option(BUILD_DEMO "Build brazierORM demo executable" ON)
option(BUILD_DEMO "Build brazier-orm demo executable" ON)

if(BUILD_DEMO)
add_executable(brazierORM brazierORM.cpp)
target_include_directories(brazierORM PRIVATE
add_executable(brazier-orm brazier-orm.cpp)
target_include_directories(brazier-orm PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/include
)
target_link_libraries(brazierORM PRIVATE brazier_orm)
target_link_libraries(brazier-orm PRIVATE brazier_orm)
endif()

install(TARGETS brazier_orm
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "brazier-orm-dev",
"version": "0.1.0",
"version": "0.1.1",
"license": "LGPL-3.0-or-later",
"description": "ORM from Brazier Framework",
"builtin-baseline": "f2e1c41da38c71be74ef48684666991929b45418",
Expand Down
Loading