Skip to content

Commit

Permalink
Merge pull request #1439 from LLNL/bugfix/whitlock/quickstart_line_nu…
Browse files Browse the repository at this point in the history
…mbers

Fix line numbers in Quickstart Guide
  • Loading branch information
BradWhitlock authored Oct 9, 2024
2 parents e5dcbaa + 8dbc8e2 commit 9fccfd7
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 5 deletions.
2 changes: 2 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ variables:
jobs:
- job: Build_and_Test

timeoutInMinutes: 90

strategy:
matrix:
linux_gcc13:
Expand Down
9 changes: 6 additions & 3 deletions src/docs/sphinx/quickstart_guide/zero_to_axom.rst
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ CMake-based build system example

.. literalinclude:: ../../../examples/using-with-cmake/CMakeLists.txt
:language: cmake
:lines: 27-50
:start-after: _zerotoaxom_docs_start
:end-before: _zerotoaxom_docs_end

See: ``examples/axom/using-with-cmake``

Expand All @@ -119,7 +120,8 @@ BLT-based build system example

.. literalinclude:: ../../../examples/using-with-blt/CMakeLists.txt
:language: cmake
:lines: 31-61
:start-after: _zerotoaxom_docs_start
:end-before: _zerotoaxom_docs_end

See: ``examples/axom/using-with-blt``

Expand All @@ -129,6 +131,7 @@ Makefile-based build system example

.. literalinclude:: ../../../examples/using-with-make/Makefile.in
:language: make
:lines: 28-39
:start-after: _zerotoaxom_docs_start
:end-before: _zerotoaxom_docs_end

See: ``examples/axom/using-with-make``
4 changes: 2 additions & 2 deletions src/examples/using-with-blt/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ project(using_with_blt)
# Define some config options
option(EXAMPLE_VERBOSE_OUTPUT "Verbose output about imported targets" OFF)


# _zerotoaxom_docs_start
#------------------------------------------------------------------------------
# Set up BLT with validity checks
#------------------------------------------------------------------------------
Expand Down Expand Up @@ -60,7 +60,7 @@ find_dependency(axom REQUIRED
blt_add_executable(NAME example
SOURCES example.cpp
DEPENDS_ON axom axom::fmt)

# _zerotoaxom_docs_end

#------------------------------------------------------------------------------
# Optionally, print out information about imported targets
Expand Down
2 changes: 2 additions & 0 deletions src/examples/using-with-cmake/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ project(using_with_cmake)

message(STATUS "CMake Version: ${CMAKE_VERSION}")

# _zerotoaxom_docs_start
#------------------------------------------------------------------------------
# Check for AXOM_DIR and use CMake's find_package to import axom's targets
#------------------------------------------------------------------------------
Expand Down Expand Up @@ -85,3 +86,4 @@ target_include_directories(example PRIVATE ${AXOM_INCLUDE_DIRS})
# link to axom targets
target_link_libraries(example axom)
target_link_libraries(example axom::fmt)
# _zerotoaxom_docs_end
2 changes: 2 additions & 0 deletions src/examples/using-with-make/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
# and linking flags.
#------------------------------------------------------------------------------

# _zerotoaxom_docs_start
AXOM_DIR ?= ../../..

CXX=@CMAKE_CXX_COMPILER@
Expand All @@ -37,3 +38,4 @@ main:

clean:
rm -f example
# _zerotoaxom_docs_end

0 comments on commit 9fccfd7

Please sign in to comment.