Skip to content

Commit

Permalink
Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
aminya committed Mar 1, 2024
1 parent 57c32ae commit a097159
Show file tree
Hide file tree
Showing 18 changed files with 61 additions and 47 deletions.
8 changes: 4 additions & 4 deletions .ninja_log
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ninja log v5
1 1313 0 doc_format_html c9b4b4d43334804b
1 1313 0 /media/aminya/Linux/GitHub/Cpp/project_options/docs/build/doc_format_html c9b4b4d43334804b
0 1067 0 doc_format_html c9b4b4d43334804b
0 1067 0 /media/aminya/Linux/GitHub/Cpp/project_options/docs/build/doc_format_html c9b4b4d43334804b
0 464 0 doc_format_html c9b4b4d43334804b
0 464 0 /media/aminya/Linux/GitHub/Cpp/project_options/docs/build/doc_format_html c9b4b4d43334804b
0 477 0 doc_format_html c9b4b4d43334804b
0 477 0 /media/aminya/Linux/GitHub/Cpp/project_options/docs/build/doc_format_html c9b4b4d43334804b
2 changes: 1 addition & 1 deletion CMakeCache.txt
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3
//Minor version of cmake used to create the current loaded cache
CMAKE_CACHE_MINOR_VERSION:INTERNAL=28
//Patch version of cmake used to create the current loaded cache
CMAKE_CACHE_PATCH_VERSION:INTERNAL=1
CMAKE_CACHE_PATCH_VERSION:INTERNAL=3
//Path to CMake executable.
CMAKE_COMMAND:INTERNAL=/usr/bin/cmake
//Path to cpack program executable.
Expand Down
15 changes: 15 additions & 0 deletions CMakeFiles/3.28.3/CMakeSystem.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
set(CMAKE_HOST_SYSTEM "Linux-6.5.0-21-generic")
set(CMAKE_HOST_SYSTEM_NAME "Linux")
set(CMAKE_HOST_SYSTEM_VERSION "6.5.0-21-generic")
set(CMAKE_HOST_SYSTEM_PROCESSOR "x86_64")



set(CMAKE_SYSTEM "Linux-6.5.0-21-generic")
set(CMAKE_SYSTEM_NAME "Linux")
set(CMAKE_SYSTEM_VERSION "6.5.0-21-generic")
set(CMAKE_SYSTEM_PROCESSOR "x86_64")

set(CMAKE_CROSSCOMPILING "FALSE")

set(CMAKE_SYSTEM_LOADED 1)
11 changes: 11 additions & 0 deletions CMakeFiles/CMakeConfigureLog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,14 @@ events:
message: |
The system is: Linux - 6.2.0-39-generic - x86_64
...

---
events:
-
kind: "message-v1"
backtrace:
- "/usr/share/cmake-3.28/Modules/CMakeDetermineSystem.cmake:233 (message)"
- "CMakeLists.txt:6 (project)"
message: |
The system is: Linux - 6.5.0-21-generic - x86_64
...
4 changes: 2 additions & 2 deletions CMakeFiles/common.ninja
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,14 @@ build install/local$:RelWithDebInfo: phony CMakeFiles/RelWithDebInfo/install/loc
#############################################
# Re-run CMake if any of its inputs changed.

build CMakeFiles/impl-Debug.ninja build-Debug.ninja CMakeFiles/impl-Release.ninja build-Release.ninja CMakeFiles/impl-RelWithDebInfo.ninja build-RelWithDebInfo.ninja build.ninja: RERUN_CMAKE | /media/aminya/Linux/GitHub/Cpp/project_options/docs/CMakeLists.txt /media/aminya/Linux/GitHub/Cpp/project_options/docs/cmake/FindSphinx.cmake /media/aminya/Linux/GitHub/Cpp/project_options/docs/conf.py.in /media/aminya/Linux/GitHub/Cpp/project_options/src/Cache.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Common.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/CompilerWarnings.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Conan.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/CrossCompiler.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Cuda.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/DetectCompiler.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Doxygen.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/DynamicProjectOptions.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Git.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Hardening.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Index.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Linker.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/MinGW.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Optimization.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/PackageProject.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Sanitizers.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/StaticAnalyzers.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/SystemLink.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Tests.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Utilities.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/VCEnvironment.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Vcpkg.cmake /usr/share/cmake-3.28/Modules/CMakeGenericSystem.cmake /usr/share/cmake-3.28/Modules/CMakeInitializeConfigs.cmake /usr/share/cmake-3.28/Modules/CMakeSystemSpecificInformation.cmake /usr/share/cmake-3.28/Modules/CMakeSystemSpecificInitialize.cmake /usr/share/cmake-3.28/Modules/ExternalProject/shared_internal_commands.cmake /usr/share/cmake-3.28/Modules/FetchContent.cmake /usr/share/cmake-3.28/Modules/FindPackageHandleStandardArgs.cmake /usr/share/cmake-3.28/Modules/FindPackageMessage.cmake /usr/share/cmake-3.28/Modules/FindPython.cmake /usr/share/cmake-3.28/Modules/FindPython/Support.cmake /usr/share/cmake-3.28/Modules/Platform/Linux-Initialize.cmake /usr/share/cmake-3.28/Modules/Platform/Linux.cmake /usr/share/cmake-3.28/Modules/Platform/UnixPaths.cmake CMakeCache.txt CMakeFiles/3.28.1/CMakeSystem.cmake
build CMakeFiles/impl-Debug.ninja build-Debug.ninja CMakeFiles/impl-Release.ninja build-Release.ninja CMakeFiles/impl-RelWithDebInfo.ninja build-RelWithDebInfo.ninja build.ninja: RERUN_CMAKE | /media/aminya/Linux/GitHub/Cpp/project_options/docs/CMakeLists.txt /media/aminya/Linux/GitHub/Cpp/project_options/docs/cmake/FindSphinx.cmake /media/aminya/Linux/GitHub/Cpp/project_options/docs/conf.py.in /media/aminya/Linux/GitHub/Cpp/project_options/src/Cache.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Common.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/CompilerWarnings.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Conan.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/CrossCompiler.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Cuda.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/DetectCompiler.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Doxygen.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/DynamicProjectOptions.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Git.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Hardening.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Index.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Linker.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/MinGW.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Optimization.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/PackageProject.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Sanitizers.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/StaticAnalyzers.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/SystemLink.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Tests.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Utilities.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/VCEnvironment.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Vcpkg.cmake /usr/share/cmake-3.28/Modules/CMakeGenericSystem.cmake /usr/share/cmake-3.28/Modules/CMakeInitializeConfigs.cmake /usr/share/cmake-3.28/Modules/CMakeSystemSpecificInformation.cmake /usr/share/cmake-3.28/Modules/CMakeSystemSpecificInitialize.cmake /usr/share/cmake-3.28/Modules/ExternalProject/shared_internal_commands.cmake /usr/share/cmake-3.28/Modules/FetchContent.cmake /usr/share/cmake-3.28/Modules/FindPackageHandleStandardArgs.cmake /usr/share/cmake-3.28/Modules/FindPackageMessage.cmake /usr/share/cmake-3.28/Modules/FindPython.cmake /usr/share/cmake-3.28/Modules/FindPython/Support.cmake /usr/share/cmake-3.28/Modules/Platform/Linux-Initialize.cmake /usr/share/cmake-3.28/Modules/Platform/Linux.cmake /usr/share/cmake-3.28/Modules/Platform/UnixPaths.cmake CMakeCache.txt CMakeFiles/3.28.3/CMakeSystem.cmake
pool = console


#############################################
# A missing CMake input file is not an error.

build /media/aminya/Linux/GitHub/Cpp/project_options/docs/CMakeLists.txt /media/aminya/Linux/GitHub/Cpp/project_options/docs/cmake/FindSphinx.cmake /media/aminya/Linux/GitHub/Cpp/project_options/docs/conf.py.in /media/aminya/Linux/GitHub/Cpp/project_options/src/Cache.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Common.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/CompilerWarnings.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Conan.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/CrossCompiler.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Cuda.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/DetectCompiler.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Doxygen.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/DynamicProjectOptions.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Git.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Hardening.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Index.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Linker.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/MinGW.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Optimization.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/PackageProject.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Sanitizers.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/StaticAnalyzers.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/SystemLink.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Tests.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Utilities.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/VCEnvironment.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Vcpkg.cmake /usr/share/cmake-3.28/Modules/CMakeGenericSystem.cmake /usr/share/cmake-3.28/Modules/CMakeInitializeConfigs.cmake /usr/share/cmake-3.28/Modules/CMakeSystemSpecificInformation.cmake /usr/share/cmake-3.28/Modules/CMakeSystemSpecificInitialize.cmake /usr/share/cmake-3.28/Modules/ExternalProject/shared_internal_commands.cmake /usr/share/cmake-3.28/Modules/FetchContent.cmake /usr/share/cmake-3.28/Modules/FindPackageHandleStandardArgs.cmake /usr/share/cmake-3.28/Modules/FindPackageMessage.cmake /usr/share/cmake-3.28/Modules/FindPython.cmake /usr/share/cmake-3.28/Modules/FindPython/Support.cmake /usr/share/cmake-3.28/Modules/Platform/Linux-Initialize.cmake /usr/share/cmake-3.28/Modules/Platform/Linux.cmake /usr/share/cmake-3.28/Modules/Platform/UnixPaths.cmake CMakeCache.txt CMakeFiles/3.28.1/CMakeSystem.cmake: phony
build /media/aminya/Linux/GitHub/Cpp/project_options/docs/CMakeLists.txt /media/aminya/Linux/GitHub/Cpp/project_options/docs/cmake/FindSphinx.cmake /media/aminya/Linux/GitHub/Cpp/project_options/docs/conf.py.in /media/aminya/Linux/GitHub/Cpp/project_options/src/Cache.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Common.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/CompilerWarnings.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Conan.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/CrossCompiler.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Cuda.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/DetectCompiler.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Doxygen.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/DynamicProjectOptions.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Git.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Hardening.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Index.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Linker.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/MinGW.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Optimization.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/PackageProject.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Sanitizers.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/StaticAnalyzers.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/SystemLink.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Tests.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Utilities.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/VCEnvironment.cmake /media/aminya/Linux/GitHub/Cpp/project_options/src/Vcpkg.cmake /usr/share/cmake-3.28/Modules/CMakeGenericSystem.cmake /usr/share/cmake-3.28/Modules/CMakeInitializeConfigs.cmake /usr/share/cmake-3.28/Modules/CMakeSystemSpecificInformation.cmake /usr/share/cmake-3.28/Modules/CMakeSystemSpecificInitialize.cmake /usr/share/cmake-3.28/Modules/ExternalProject/shared_internal_commands.cmake /usr/share/cmake-3.28/Modules/FetchContent.cmake /usr/share/cmake-3.28/Modules/FindPackageHandleStandardArgs.cmake /usr/share/cmake-3.28/Modules/FindPackageMessage.cmake /usr/share/cmake-3.28/Modules/FindPython.cmake /usr/share/cmake-3.28/Modules/FindPython/Support.cmake /usr/share/cmake-3.28/Modules/Platform/Linux-Initialize.cmake /usr/share/cmake-3.28/Modules/Platform/Linux.cmake /usr/share/cmake-3.28/Modules/Platform/UnixPaths.cmake CMakeCache.txt CMakeFiles/3.28.3/CMakeSystem.cmake: phony


#############################################
Expand Down
22 changes: 5 additions & 17 deletions build-html.log
Original file line number Diff line number Diff line change
Expand Up @@ -47,23 +47,11 @@ loading pickled environment... done
myst v2.0.0: MdParserConfig(commonmark_only=False, gfm_only=False, enable_extensions=set(), disable_syntax=[], all_links_external=False, url_schemes=('http', 'https', 'mailto', 'ftp'), ref_domains=None, fence_as_directive=set(), number_code_blocks=[], title_to_header=False, heading_anchors=0, heading_slug_func=None, html_meta={}, footnote_transition=True, words_per_minute=200, substitutions={}, linkify_fuzzy_links=True, dmath_allow_labels=True, dmath_allow_space=True, dmath_allow_digits=True, dmath_double_inline=False, update_mathjax=True, mathjax_classes='tex2jax_process|mathjax_process|math|output_area', enable_checkboxes=False, suppress_warnings=[], highlight_code_blocks=True)
building [mo]: targets for 0 po files that are out of date
writing output...
building [html]: targets for 1 source files that are out of date
updating environment: 0 added, 3 changed, 0 removed
reading sources... [ 33%] indexreading sources... [ 67%] src/indexreading sources... [100%] src/project_options_example
building [html]: targets for 0 source files that are out of date
updating environment: 0 added, 0 changed, 0 removed
reading sources...
looking for now-outdated files... none found
pickling environment... done
checking consistency... done
preparing documents... done
copying assets... copying downloadable files... [ 50%] LICENSE.txtcopying downloadable files... [100%] Unlicense.txt
copying static files... done
copying extra files... done
done
writing output... [ 33%] indexwriting output... [ 67%] src/indexwriting output... [100%] src/project_options_example
generating indices... genindex done
highlighting module code...
writing additional pages... search done
dumping search index in English (code: en)... done
dumping object inventory... done
build succeeded, 9 warnings.
no targets are out of date.
build succeeded, 1 warning.

The HTML pages are in html.
Binary file modified doctrees/environment.pickle
Binary file not shown.
Binary file modified doctrees/index.doctree
Binary file not shown.
Binary file modified doctrees/src/Readme_top.doctree
Binary file not shown.
Binary file modified doctrees/src/index.doctree
Binary file not shown.
Binary file modified doctrees/src/project_options_example.doctree
Binary file not shown.
2 changes: 1 addition & 1 deletion html/_sources/src/Readme_top.md.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ A general-purpose CMake library that provides functions that improve the CMake e
- using custom linkers (e.g. lld)
- `package_project`: automatic packaging/installation of the project for seamless usage via find_package/target_link through CMake's FetchContent, vcpkg, etc.
- `run_vcpkg`: automatic installation of vcpkg and the project dependencies
- `ENABLE_CONAN` in `project_options`: automatic installation of Conan and the project dependencies
- `run_conan`: automatic installation of conan and the project dependencies
- `dynamic_project_options`: a wrapper around `project_options` to change the options on the fly dynamically
- `target_link_system_libraries` and `target_include_system_directories`: linking/including external dependencies/headers without warnings
- `target_link_cuda`: linking Cuda to a target
Expand Down
7 changes: 4 additions & 3 deletions html/_sources/src/project_options_example.md.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ endif()

# Add project_options from https://github.com/aminya/project_options
# Change the version in the following URL to update the package (watch the releases of the repository for future updates)
set(PROJECT_OPTIONS_VERSION "v0.34.0")
set(PROJECT_OPTIONS_VERSION "v0.35.0")
FetchContent_Declare(
_project_options
URL https://github.com/aminya/project_options/archive/refs/tags/${PROJECT_OPTIONS_VERSION}.zip)
Expand All @@ -31,7 +31,10 @@ include(${_project_options_SOURCE_DIR}/Index.cmake)
run_vcpkg(
VCPKG_URL "https://github.com/microsoft/vcpkg.git"
VCPKG_REV "10e052511428d6b0c7fcc63a139e8024bb146032"
ENABLE_VCPKG_UPDATE
)
# Install conan dependencies: - should be called before defining project()
run_conan()

# Set the project name and language
project(myproject LANGUAGES CXX C)
Expand Down Expand Up @@ -72,7 +75,6 @@ project_options(
${ENABLE_CPPCHECK}
${ENABLE_CLANG_TIDY}
ENABLE_VS_ANALYSIS
# ENABLE_CONAN
# ENABLE_INTERPROCEDURAL_OPTIMIZATION
# ENABLE_NATIVE_OPTIMIZATION
${ENABLE_DOXYGEN}
Expand All @@ -95,7 +97,6 @@ project_options(
# ENABLE_BUILD_WITH_TIME_TRACE
# ENABLE_UNITY
# LINKER "lld"
# CONAN_PROFILE ${profile_path}
)
```

Expand Down
Loading

0 comments on commit a097159

Please sign in to comment.