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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 10 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,16 @@ jobs:
- name: Checkout Project
uses: actions/checkout@v4.2.2

- name: Setup MSBuild
uses: microsoft/setup-msbuild@v2
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: '3.x'

- name: Install Jinja2
run: pip install jinja2

- name: Configure CMake
uses: threeal/cmake-action@v2.1.0
with:
source-dir: .
build-dir: .
options: |
CMAKE_BUILD_TYPE=Release
run: cmake -B build -A x64

- name: Build Solution with MSBuild
run: |
msbuild Model-Modifier.sln /p:Configuration=Release /p:Platform=x64
shell: cmd
- name: Build
run: cmake --build build --config Release
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -216,3 +216,4 @@ CMakeFiles/
cmake_install.cmake
CMakeCache.txt
*.sln
build/
65 changes: 0 additions & 65 deletions CMake/Default.cmake

This file was deleted.

12 changes: 0 additions & 12 deletions CMake/DefaultCXX.cmake

This file was deleted.

233 changes: 0 additions & 233 deletions CMake/Utils.cmake

This file was deleted.

28 changes: 9 additions & 19 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,28 +59,18 @@ if(MSVC)
endif()

################################################################################
# Nuget packages function stub.
# OreRenderer dependency
################################################################################
function(use_package TARGET PACKAGE VERSION)
message(WARNING "No implementation of use_package. Create yours. "
"Package \"${PACKAGE}\" with version \"${VERSION}\" "
"for target \"${TARGET}\" is ignored!")
endfunction()
include(FetchContent)

################################################################################
# Common utils
################################################################################
include(CMake/Utils.cmake)

################################################################################
# Additional Global Settings(add specific info there)
################################################################################
include(CMake/GlobalSettingsInclude.cmake OPTIONAL)
set(ORE_RENDERER_BUILD_DEMO OFF CACHE BOOL "" FORCE)

################################################################################
# Use solution folders feature
################################################################################
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
FetchContent_Declare(OreRenderer
GIT_REPOSITORY https://github.com/Ore-Software/OreRenderer.git
GIT_TAG main
GIT_SHALLOW TRUE
)
FetchContent_MakeAvailable(OreRenderer)

################################################################################
# Sub-projects
Expand Down
Loading
Loading