From 9668a848fa9f0232f8b640f4f7e2cc4b598eca41 Mon Sep 17 00:00:00 2001 From: bennibbelink <79653949+bennibbelink@users.noreply.github.com> Date: Tue, 30 Apr 2024 11:25:20 -0500 Subject: [PATCH 1/2] update GTest instructions --- source/cep/cep3.rst | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/source/cep/cep3.rst b/source/cep/cep3.rst index 1512379c..e3f25c13 100644 --- a/source/cep/cep3.rst +++ b/source/cep/cep3.rst @@ -339,10 +339,9 @@ The command for generating |cyclus| specific nuclear data is as follows: Once the file is generated it must be put onto rackspace. -**Update Gtest:** We include a copy of the fused Gtest source code within our -source tree located in the ``tests/GoogleTest`` directory. To keep up with -Gtest's natural evolution cycle, please download the latest release of Google Tests -and follow `the fused source directions here`_. If we go too long without doing this, +**Update GTest:** We fetch the GTest source code during our CMake build. To keep up with +GTest's natural evolution cycle, please reference the latest release of Google Tests +in ``tests/CMakeLists.txt`` If we go too long without doing this, it could be very painful to update. Cycamore @@ -366,4 +365,3 @@ This document is released under the CC-BY 3.0 license. .. _Rickshaw: https://github.com/ergs/rickshaw .. _CyclusJS: https://github.com/cyclus/cyclist2 .. _release: https://github.com/cyclus/release -.. _the fused source directions here: https://code.google.com/p/googletest/wiki/V1_6_AdvancedGuide#Fusing_Google_Test_Source_Files From 0c9d1c481ad88e3bd652911fc7288e5f09d2752d Mon Sep 17 00:00:00 2001 From: bennibbelink <79653949+bennibbelink@users.noreply.github.com> Date: Tue, 30 Apr 2024 11:43:16 -0500 Subject: [PATCH 2/2] clarify what to update in CMakeLists.txt --- source/cep/cep3.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/cep/cep3.rst b/source/cep/cep3.rst index e3f25c13..9787054f 100644 --- a/source/cep/cep3.rst +++ b/source/cep/cep3.rst @@ -340,9 +340,9 @@ The command for generating |cyclus| specific nuclear data is as follows: Once the file is generated it must be put onto rackspace. **Update GTest:** We fetch the GTest source code during our CMake build. To keep up with -GTest's natural evolution cycle, please reference the latest release of Google Tests -in ``tests/CMakeLists.txt`` If we go too long without doing this, -it could be very painful to update. +GTest's natural evolution cycle, please reference the latest release of Google Tests in the +``FetchContent_Declare()`` command near the top of ``tests/CMakeLists.txt``. +If we go too long without doing this, it could be very painful to update. Cycamore --------