Skip to content

Commit d3c124a

Browse files
Updating docs and misc updates for cmake and default yaml
1 parent 599c5ff commit d3c124a

File tree

6 files changed

+53
-23
lines changed

6 files changed

+53
-23
lines changed

CMakeLists.txt

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
55

66
project(runcpp2)
77

8+
# if(TARGET runcpp2)
9+
# message("runcpp2 cmake target has been added before. Skipping cmake...")
10+
# return()
11+
# endif()
12+
813
set(CMAKE_CXX_STANDARD 11)
914

1015
option(RUNCPP2_UPDATE_DEFAULT_YAMLS "Update default yaml files" OFF)
@@ -78,6 +83,20 @@ message("RUNCPP2_PROJECT_VERSION: ${RUNCPP2_PROJECT_VERSION}")
7883
# =========================================================================
7984
# External Dependencies
8085
# =========================================================================
86+
87+
# runcpp2 doesn't rely on install at all. Disabling it.
88+
# if(NOT DEFINED RUNCPP2_DISABLE_INSTALLATION)
89+
# # This variable is responsible for installation disabling.
90+
# set(RUNCPP2_DISABLE_INSTALLATION ON)
91+
#
92+
# # Replace install() with conditional installation.
93+
# macro(install)
94+
# if(NOT RUNCPP2_DISABLE_INSTALLATION)
95+
# _install(${ARGN})
96+
# endif()
97+
# endmacro()
98+
# endif()
99+
81100
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/ssLogger")
82101

83102
set(RYML_DEFAULT_CALLBACK_USES_EXCEPTIONS ON CACHE BOOL "" FORCE)
@@ -256,4 +275,4 @@ if(RUNCPP2_BUILD_TESTS)
256275
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Src/Tests")
257276
endif()
258277

259-
278+
# set(RUNCPP2_DISABLE_INSTALLATION OFF)

DefaultYAMLs/Default/g++.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ Templates:
1313
CommandPart: " -I\"{IncludeDirectoryPath}\""
1414
- Type: Once
1515
CommandPart: " \"{InputFilePath}\" -o \"{OutputFileDirectory}{/}{ObjectLinkFile.Prefix}{InputFileName}{ObjectLinkFile.Extension}\""
16-
1716
"g++_CompileExpectedOutputFiles": &g++_CompileExpectedOutputFiles
1817
- "{OutputFileDirectory}{/}{ObjectLinkFile.Prefix}{InputFileName}{ObjectLinkFile.Extension}"
1918

mkdocs/docs/TODO.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
- Add more default profiles
3434
- Migrate to libyaml
3535
- Ability to compile runcpp2 as single cpp, to ditch cmake
36+
- Migrate to DSResult and remove ssTest
3637

3738
## High Priority
3839

@@ -45,6 +46,8 @@
4546
- Add wildcard support for filenames and extensions (Files Globbing)
4647
- Add the ability to query script build directory
4748
- Add the ability to list script dependencies
49+
- Show build directory for a given cpp
50+
- Refactor CLI arguments to be action based
4851

4952
## TBD
5053

mkdocs/docs/extra.css

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,18 @@
1+
/* :not([data-md-state="blur"]) + :not(input:checked) + nav { */
2+
/* display: none; */
3+
/* } */
4+
/* */
5+
/* :not([data-md-state="blur"]) + input:checked + nav { */
6+
/* display: block; */
7+
/* } */
18

9+
/* .md-nav__item :not(input:checked) + nav { */
10+
/* display: none; */
11+
/* } */
12+
13+
:not([data-md-state="blur"]) + input:checked + nav {
14+
display: block;
15+
}
216

317
.md-header__button.md-logo {
418
// margin-top: 0;

mkdocs/docs/guides/external_dependencies.md

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -173,17 +173,12 @@ The only difference is that `PreBuild` and `PostBuild` hooks are replaced with
173173
- Name: MyLibrary
174174
# ... other fields ...
175175
Setup:
176-
DefaultPlatform:
177-
"g++":
178-
- "mkdir build"
176+
- "apt install cuda-toolkit"
177+
- "mkdir build"
179178
Build:
180-
DefaultPlatform:
181-
"g++":
182-
- "cmake --build build"
179+
- "cmake --build build"
183180
Cleanup:
184-
DefaultPlatform:
185-
"g++":
186-
- "rm -rf build"
181+
- "apt remove cuda-toolkit"
187182
```
188183

189184
---

mkdocs/mkdocs.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ theme:
1919
name: Switch to dark mode
2020
features:
2121
- toc.follow
22-
- toc.integrate
22+
# - toc.integrate
2323
- content.code.copy
2424
- content.code.select
2525
- navigation.sections
@@ -28,17 +28,17 @@ theme:
2828
- navigation.tabs.sticky
2929

3030
nav:
31-
- index.md
32-
# - guides.md
33-
- Guides:
34-
- guides/basics.md
35-
- guides/building_project_sources.md
36-
- guides/external_dependencies.md
37-
- guides/scriptable_pipeline.md
38-
- program_manual.md
39-
- build_settings.md
40-
- user_config.md
41-
- TODO.md
31+
- index.md
32+
# - guides.md
33+
- Guides:
34+
- guides/basics.md
35+
- guides/building_project_sources.md
36+
- guides/external_dependencies.md
37+
- guides/scriptable_pipeline.md
38+
- program_manual.md
39+
- build_settings.md
40+
- user_config.md
41+
- TODO.md
4242

4343
repo_url: https://github.com/Neko-Box-Coder/runcpp2
4444
repo_name: Neko-Box-Coder/runcpp2

0 commit comments

Comments
 (0)