From 3f0d0742a3e2a024c57c3372cc3f303760d11b2d Mon Sep 17 00:00:00 2001 From: Tom Eichlersmith <31970302+tomeichlersmith@users.noreply.github.com> Date: Mon, 9 Sep 2024 10:58:47 -0500 Subject: [PATCH] Trailing ldmx command refs (#1450) No issues, I just noticed that there were some leftover references to the `ldmx` command in a few places. I have not replaced every reference to `ldmx`, just ones I think are okay to be replaced. - in cmake error about in-source builds - in Detectors about unarchiving old geometries - in DetDescr about enabling detectorid bindings --- CMakeLists.txt | 5 +++-- DetDescr/README.md | 7 +++++-- Detectors/data/README.md | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c66c59646..93e2d9936 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,8 +9,9 @@ get_filename_component(srcdir "${CMAKE_SOURCE_DIR}" REALPATH) get_filename_component(bindir "${CMAKE_BINARY_DIR}" REALPATH) if ("${srcdir}" STREQUAL "${bindir}") message(FATAL_ERROR "ldmx-sw does not support in-source builds. - Call 'ldmx cmake ..' from within a 'build/' subdirectory or - Tell cmake to use a different build directory with 'ldmx cmake -B build -S .'") + Call 'denv cmake ..' from within a 'build/' subdirectory or + Tell cmake to use a different build directory with 'denv cmake -B build -S .' + 'just configure' and 'just build' will do the necessary directory movement for you as well.") endif() # Set the project name diff --git a/DetDescr/README.md b/DetDescr/README.md index 54e0bf9f5..6f2192617 100644 --- a/DetDescr/README.md +++ b/DetDescr/README.md @@ -7,8 +7,11 @@ ## Building DetDescr with DetectorID binding support The DetDescr repository can optionally be built to enable Python bindings to most of the functionalities of the various DetectorID classes. This requires Boost.Python to be installed, which is part of the [the LDMX-software container distribution](https://github.com/LDMX-Software/docker) since [version 3.3](https://github.com/LDMX-Software/docker/releases/tag/v3.3). Since older versions of the container environment don't come with this library, the feature needs to be explicitly enabled as a CMake option. -``` sh -ldmx cmake .. -DBUILD_DETECTORID_BINDINGS=ON +```sh +cd build +denv cmake .. -DBUILD_DETECTORID_BINDINGS=ON +# OR +just configure -DBUILD_DETECTORID_BINDINGS=ON ``` **Note:** Due to a bug, this option currently does not work if you built LDMX-sw with Sanitizer support (one of the `-DENABLE_SANITIZER_X=ON` settings). If your Python session crashes after trying to import the `libDetDescr`, try recompiling LDMX-sw with Sanitizer support disabled. diff --git a/Detectors/data/README.md b/Detectors/data/README.md index 3b4b73fcd..8a42621a5 100644 --- a/Detectors/data/README.md +++ b/Detectors/data/README.md @@ -40,5 +40,5 @@ Previously used geometries can be found under the `archived` directory. In case ``` cd ldmx-sw/Detectors/data tar -xzf archived/.tar.gz -ldmx compile # even if you've already done this before! +just configure build # even if you've already done this before! ```