two small fixes (#758)

* fix mcarray docs typos * mark adv house keeping for two cmake vars that are only used as outputs
LLNL · May 10, 2021 · a6c9e99 · a6c9e99
1 parent d4e6e82
commit a6c9e99
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/docs/sphinx/blueprint_mcarray.rst b/src/docs/sphinx/blueprint_mcarray.rst
@@ -26,7 +26,7 @@ Properties and Transforms
 
  * **conduit::blueprint::mcarray::is_interleaved(const Node &mcarray)** 
 
-     Checks if an mcarray has an interleaved memory layout for tuple components (eg: struct of arrays style) 
+     Checks if an mcarray has an interleaved memory layout for tuple components (eg: array of structs style) 
 
      * Example: {x0, y0, z0, x1, y1, z1, ... , xN, yN, zN}
 
@@ -63,8 +63,8 @@ Here is a list of valid strings for the *mcarray_type* argument:
 | interleaved       | One allocation, using interleaved memory layout          |
 |                   | with float64 components (array of structs style)         |
 +-------------------+----------------------------------------------------------+
-| separate          | Three allocations, separe float64 components arrays for  |
-|                   | {x,y,z}                                                  |
+| separate          | Three allocations, separate float64 components arrays    |
+|                   | for {x,y,z}                                              |
 +-------------------+----------------------------------------------------------+
 | contiguous        | One allocation, using a contiguous memory layout with    |
 |                   | float64 components (struct of arrays style)              |

diff --git a/src/libs/conduit/CMakeLists.txt b/src/libs/conduit/CMakeLists.txt
@@ -15,6 +15,11 @@ convert_to_native_escaped_file_path(${CMAKE_INSTALL_PREFIX}
                                     CONDUIT_INSTALL_PREFIX)
 
 set(CONDUIT_INSTALL_PREFIX ${CONDUIT_INSTALL_PREFIX} CACHE STRING "" FORCE)
+# CONDUIT_INSTALL_PREFIX is basically used as an output var so
+# we mark it as advanced b/c otherwise folks may see it in ccmake or
+# the cmake gui  and think they should be setting it
+mark_as_advanced(CONDUIT_INSTALL_PREFIX)
+
 
 if(FORTRAN_FOUND)
     set(CONDUIT_FORTRAN_COMPILER ${CMAKE_Fortran_COMPILER})

diff --git a/src/libs/relay/CMakeLists.txt b/src/libs/relay/CMakeLists.txt
@@ -160,6 +160,10 @@ if(UNIX AND NOT APPLE)
     set(CONDUIT_MAKE_EXTRA_LIBS "${CONDUIT_MAKE_EXTRA_LIBS} -ldl -lrt ${CMAKE_THREAD_LIBS_INIT}" CACHE STRING "" FORCE)
 endif()
 
+# CONDUIT_MAKE_EXTRA_LIBS is basically used as an output var so
+# we mark it as advanced b/c otherwise folks may see it in ccmake or
+# the cmake gui  and think they should be setting it
+mark_as_advanced(CONDUIT_MAKE_EXTRA_LIBS)
 
 #
 # Link with silo and hdf5 and adios if these are enabled