Merge branch 'cmake-refactoring' into 'main'

Updated cmake to robustly find dependencies using modules in cmake

See merge request ardg/libra!139

Author: sanbw

.gitignore

@@ -1,3 +1,4 @@
 *~
 /build/
-/install/
+/install/
+src/synthesis/TransformMachines/test/tBeamCalc.cc.bak

.gitlab-ci.yml

@@ -17,10 +17,6 @@ variables:
   CCACHE_BASEDIR: $CI_PROJECT_DIR
   CCACHE_DIR: "${CI_BUILDS_DIR}/ccache"
   GIT_CLEAN_FLAGS: none
-  SPACK_ROOT: "${CI_BUILDS_DIR}/spack-installs/spack-persistent"
-  SPACK_TEST_BASE_ENV: "spack-test-base"
-  LIBRA_TEST_ENV: "libra-test-${CI_PIPELINE_ID}"
-  SPACK_CACHE_DIR: "${CI_BUILDS_DIR}/spack-cache"
 
 cache:
   - key: ccache-global
@@ -75,9 +71,6 @@ build-job:
     - export CCACHE_BASEDIR="$PWD"
     - export CCACHE_COMPILERCHECK=content
     - export CCACHE_MAXSIZE=5G
-    # Ensure ccache is used by cmake
-    - export CMAKE_CXX_COMPILER_LAUNCHER=ccache
-    - export CMAKE_C_COMPILER_LAUNCHER=ccache
     - mkdir -p $CCACHE_DIR
     - if [ -d "$CCACHE_DIR" ] && [ "$(ls -A $CCACHE_DIR)" ]; then echo "Using existing ccache with $(ccache --show-stats | grep 'files in cache')"; else echo "Starting with empty ccache"; fi
     - ccache --show-stats || true
@@ -100,7 +93,7 @@ build-job:
     - which nvcc
     - mkdir -p build
     - cd build
-    - cmake -DApps_BUILD_TESTS=ON -DNCORES=8 -DKokkos_CUDA_ARCH_NAME=Kokkos_ARCH_VOLTA70 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache ..
+    - cmake -DApps_BUILD_TESTS=ON -DNCORES=8 -DKokkos_CUDA_ARCH_NAME=Kokkos_ARCH_VOLTA70 ..
     - make
   after_script:
     - echo "=== ccache statistics ==="
@@ -191,6 +184,11 @@ test-job:
 spack-test:
   needs: []
   stage: spack-test
+  variables:
+    SPACK_ROOT: "${CI_BUILDS_DIR}/spack-installs/spack-persistent"
+    SPACK_TEST_BASE_ENV: "spack-test-base"
+    LIBRA_TEST_ENV: "libra-test-${CI_PIPELINE_ID}"
+    SPACK_CACHE_DIR: "${CI_BUILDS_DIR}/spack-cache"
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       changes:
@@ -361,37 +359,32 @@ manual-trigger:
     - export CCACHE_BASEDIR="$PWD"
     - export CCACHE_COMPILERCHECK=content
     - export CCACHE_MAXSIZE=2G
-    - export CMAKE_CXX_COMPILER_LAUNCHER=ccache
-    - export CMAKE_C_COMPILER_LAUNCHER=ccache
     - if [ -d "$CCACHE_DIR" ] && [ "$(ls -A $CCACHE_DIR)" ]; then echo "Using existing ccache"; else echo "No active ccache found"; fi
     - mkdir -p $CCACHE_DIR
     - ccache --show-stats || true
     - git clean -ffdx
     - mkdir -p build
     - cd build
-    - cmake -DApps_BUILD_TESTS=ON -DKokkos_CUDA_ARCH_NAME=Kokkos_ARCH_VOLTA70 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache ..
+    - cmake -DApps_BUILD_TESTS=ON -DKokkos_CUDA_ARCH_NAME=Kokkos_ARCH_VOLTA70 ..
     - make -j$(nproc)
     - ccache --show-stats || true
   when: manual
   only:
     - branches
-  allow_failure: false
+  allow_failure: true
 
 manual-cpu-only:
   stage: build
   rules:
     - when: manual
-  allow_failure: false
+  allow_failure: true
   before_script:
     # Ensure submodules are in sync with the index
     - git submodule sync
     - git submodule update --init --recursive
     - export CCACHE_BASEDIR="$PWD"
     - export CCACHE_COMPILERCHECK=content
     - export CCACHE_MAXSIZE=5G
-    # Ensure ccache is used by cmake
-    - export CMAKE_CXX_COMPILER_LAUNCHER=ccache
-    - export CMAKE_C_COMPILER_LAUNCHER=ccache
     - mkdir -p $CCACHE_DIR
     - if [ -d "$CCACHE_DIR" ] && [ "$(ls -A $CCACHE_DIR)" ]; then echo "Using existing ccache with $(ccache --show-stats | grep 'files in cache')"; else echo "Starting with empty ccache"; fi
     - ccache --show-stats || true
@@ -404,7 +397,7 @@ manual-cpu-only:
     - echo "=== Building without CUDA ==="
     - mkdir -p build
     - cd build
-    - cmake -DApps_BUILD_TESTS=ON -DNCORES=8 -DLIBRA_DISABLE_CUDA=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache ..
+    - cmake -DApps_BUILD_TESTS=ON -DNCORES=8 -DLIBRA_DISABLE_CUDA=ON ..
     - make -j$(nproc)
   after_script:
     - echo "=== ccache statistics ==="
@@ -416,5 +409,5 @@ manual-spack:
   when: manual
   rules:
     - when: manual
-  allow_failure: false
+  allow_failure: true
 

CMakeLists.txt

@@ -1,37 +1,25 @@
-#-*- cmake -*-
-# Copyright (C) 2025
-# Associated Universities, Inc. Washington DC, USA.
-#
-# This library is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Library General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.
-#
-# This library is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-# License for more details.is
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this library; if not, write to the Free Software Foundation,
-# Inc., 675 Massachusetts Ave, Cambridge, MA 02139, USA.
-#
-# Correspondence concerning this should be addressed as follows:
-#        Postal address: National Radio Astronomy Observatory
-#                        1003 Lopezville Road,
-#                        Socorro, NM - 87801, USA
-#
+# LibRA Main CMakeLists.txt - Clean modular approach
+# Copyright 2025 Associated Universities, Inc. Washington DC, USA.
 
 cmake_minimum_required(VERSION 3.18)
 project("LibRA Apps"
-  DESCRIPTION "LibRA CL, C/C++, Py Interfaces"
-  HOMEPAGE_URL https://github.com/ARDG-NRAO/LibRA
-  LANGUAGES CXX Fortran C)
+    DESCRIPTION "LibRA CL, C/C++, Py Interfaces"
+    HOMEPAGE_URL https://github.com/ARDG-NRAO/LibRA
+    LANGUAGES CXX Fortran C)
 
 
 
 # Path and directory setup
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/paths.cmake)
+message("================ Top-level CMAKE_MODULE_PATH after paths.cmake ================")
+message("CMAKE_MODULE_PATH: ${CMAKE_MODULE_PATH}")
+message("Testing if FindWCSLIB.cmake can be found...")
+find_file(WCSLIB_FIND_MODULE FindWCSLIB.cmake PATHS ${CMAKE_MODULE_PATH})
+message("FindWCSLIB.cmake found at: ${WCSLIB_FIND_MODULE}")
+message("Testing find_package(WCSLIB) at top level...")
+find_package(WCSLIB QUIET)
+message("Top-level WCSLIB_FOUND: ${WCSLIB_FOUND}")
+message("================ End MODULE_PATH debug ================")
 
 # Load project configuration
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/libraconfig.cmake)
@@ -45,7 +33,6 @@ endif()
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/PrintLibraSummary.cmake)
 print_libra_summary()
 
-
 # Include dependencies
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/dependencies/Kokkos.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/dependencies/FFTW.cmake)