Fixing to build each of the subdirs of Libra as an external project

Author: preshanth

CMakeLists.txt

@@ -406,17 +406,48 @@ ExternalProject_Add(
                     -DKokkos_COMPILE_LAUNCHER=${INSTALL_DIR}/bin/kokkos/kokkos_launch_compiler
                     -DKokkos_NVCC_WRAPPER=${INSTALL_DIR}/bin/kokkos/nvcc_wrapper
 		                -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
-                    -DINSTALL_DIR=${INSTALL_DIR}
                     -DTOP_LEVEL_DIR=${TOP_LEVEL_DIR}
     CONFIGURE_COMMAND PKG_CONFIG_PATH=${INSTALL_DIR}/lib/pkgconfig CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:${INSTALL_DIR}/lib/cmake/Hpg:${INSTALL_DIR}/lib/cmake/parafeed:${INSTALL_DIR}/lib/cmake/Kokkos 
                                       ${CMAKE_COMMAND} <SOURCE_DIR> -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_DIR} -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_CXX_FLAGS=-I${INSTALL_DIR}/include -Dcasacore_DIR=${INSTALL_DIR}/lib/cmake/casacore 
 		                                  -DCMAKE_PREFIX_PATH=${INSTALL_DIR}/lib/cmake/Hpg:${INSTALL_DIR}/lib/cmake/parafeed:${INSTALL_DIR}/lib/cmake/Kokkos:${INSTALL_DIR}/lib/cmake/GTest -DApps_BUILD_TESTS=${Apps_BUILD_TESTS} 
                                       -DCMAKE_BUILD_TYPE=${CASA_BUILD_TYPE} -DKokkos_COMPILE_LAUNCHER=${INSTALL_DIR}/bin/kokkos/kokkos_launch_compiler -DKokkos_NVCC_WRAPPER=${INSTALL_DIR}/bin/kokkos/nvcc_wrapper
-                                      -DINSTALL_DIR=${INSTALL_DIR} -DTOP_LEVEL_DIR=${TOP_LEVEL_DIR}
+                                      #-DINSTALL_DIR=${INSTALL_DIR} -DTOP_LEVEL_DIR=${TOP_LEVEL_DIR}
     BUILD_COMMAND   make -j${NCORES}
     INSTALL_COMMAND make install
 )
 
+# Add Libra/frameworks as an external project
+ExternalProject_Add(
+  Frameworks
+  SOURCE_DIR      ${CMAKE_SOURCE_DIR}/frameworks
+  DOWNLOAD_COMMAND ""
+  BINARY_DIR      ${BUILD_DIR}/Libra/frameworks
+  DEPENDS         Apps
+  CMAKE_ARGS      -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_DIR}
+                  -DCMAKE_INSTALL_LIBDIR=lib
+                  -DTOP_LEVEL_DIR=${TOP_LEVEL_DIR}
+                  -DINSTALL_DIR=${INSTALL_DIR}
+  CONFIGURE_COMMAND ${CMAKE_COMMAND} <SOURCE_DIR> -B <BINARY_DIR> -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_DIR} -DCMAKE_INSTALL_LIBDIR=lib -DTOP_LEVEL_DIR=${TOP_LEVEL_DIR} -DINSTALL_DIR=${INSTALL_DIR}
+  BUILD_COMMAND   make -j${NCORES} -C <BINARY_DIR>
+  INSTALL_COMMAND make install -C <BINARY_DIR>
+)
+
+# Add Libra/scripts as an external project
+ExternalProject_Add(
+  Scripts
+  SOURCE_DIR      ${CMAKE_SOURCE_DIR}/scripts
+  DOWNLOAD_COMMAND ""
+  BINARY_DIR      ${BUILD_DIR}/Libra/scripts
+  DEPENDS         Frameworks
+  CMAKE_ARGS      -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_DIR}
+                  -DCMAKE_INSTALL_LIBDIR=lib
+                  -DTOP_LEVEL_DIR=${TOP_LEVEL_DIR}
+                  -DINSTALL_DIR=${INSTALL_DIR}
+  CONFIGURE_COMMAND ${CMAKE_COMMAND} <SOURCE_DIR> -B <BINARY_DIR> -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_DIR} -DCMAKE_INSTALL_LIBDIR=lib -DTOP_LEVEL_DIR=${TOP_LEVEL_DIR} -DINSTALL_DIR=${INSTALL_DIR}
+  BUILD_COMMAND   make -j${NCORES} -C <BINARY_DIR>
+  INSTALL_COMMAND make install -C <BINARY_DIR>
+)
+
 if (LIBRA_USE_EXODUS)
   # setup a python vitual environment inside the install directory
   # after checking if python3 is installed

apps/src/CMakeLists.txt

@@ -64,17 +64,6 @@ endif()
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/examples)
 
-# Install the htclean scripts into the bin directory
-
-if(DEFINED TOP_LEVEL_DIR AND DEFINED INSTALL_DIR)
-  install(FILES 
-    ${TOP_LEVEL_DIR}/frameworks/htclean/libra_htclean.sh 
-    ${TOP_LEVEL_DIR}/scripts/runapp.sh 
-    ${TOP_LEVEL_DIR}/scripts/emajor.sh 
-    DESTINATION ${INSTALL_DIR}/bin)
-else()
-  message(WARNING "TOP_LEVEL_DIR or INSTALL_DIR is not defined, skipping script installation")
-endif()
 
 
 

frameworks/CMakeLists.txt

@@ -0,0 +1,27 @@
+project("LibRA Frameworks"
+    DESCRIPTION "LibRA CL, C/C++, Py Interfaces"
+    HOMEPAGE_URL https://github.com/ARDG-NRAO/LibRA
+    LANGUAGES CXX Fortran C)
+
+cmake_minimum_required(VERSION 3.12.0)
+
+# Check if the TOP_LEVEL_DIR and INSTALL_DIR are defined
+if(DEFINED TOP_LEVEL_DIR AND DEFINED INSTALL_DIR)
+        message(STATUS "TOP_LEVEL_DIR: ${TOP_LEVEL_DIR}")
+        message(STATUS "INSTALL_DIR: ${INSTALL_DIR}")
+else()
+        message(WARNING "TOP_LEVEL_DIR or INSTALL_DIR is not defined, skipping script installation")
+endif()
+
+# Define the list of files to install. This is the only place where the files are listed
+# and need to be edited for future additions. The rest are warnings and messages.
+set(FRAMEWORK_FILES
+    ${TOP_LEVEL_DIR}/frameworks/htclean/libra_htclean.sh
+)
+
+if(DEFINED TOP_LEVEL_DIR AND DEFINED INSTALL_DIR)
+    install(FILES ${FRAMEWORK_FILES} DESTINATION ${INSTALL_DIR}/bin)
+    message(STATUS "Scripts installed to ${INSTALL_DIR}/bin")
+else()
+    message(WARNING "TOP_LEVEL_DIR or INSTALL_DIR is not defined, skipping script installation")
+endif()

scripts/CMakeLists.txt

@@ -0,0 +1,28 @@
+project("LibRA Scripts"
+    DESCRIPTION "LibRA CL, C/C++, Py Interfaces"
+    HOMEPAGE_URL https://github.com/ARDG-NRAO/LibRA
+    LANGUAGES CXX Fortran C)
+
+cmake_minimum_required(VERSION 3.12.0)
+
+# Check if the TOP_LEVEL_DIR and INSTALL_DIR are defined
+if(DEFINED TOP_LEVEL_DIR AND DEFINED INSTALL_DIR)
+        message(STATUS "TOP_LEVEL_DIR: ${TOP_LEVEL_DIR}")
+        message(STATUS "INSTALL_DIR: ${INSTALL_DIR}")
+else()
+        message(WARNING "TOP_LEVEL_DIR or INSTALL_DIR is not defined, skipping script installation")
+endif()
+
+# Define the list of files to install. This is the only place where the files are listed
+# and need to be edited for future additions. The rest are warnings and messages.
+set(SCRIPT_FILES
+    ${TOP_LEVEL_DIR}/scripts/runapp.sh 
+    ${TOP_LEVEL_DIR}/scripts/emajor.sh
+)
+
+if(DEFINED TOP_LEVEL_DIR AND DEFINED INSTALL_DIR)
+    install(FILES ${SCRIPT_FILES} DESTINATION ${INSTALL_DIR}/bin)
+    message(STATUS "Scripts installed to ${INSTALL_DIR}/bin")
+else()
+    message(WARNING "TOP_LEVEL_DIR or INSTALL_DIR is not defined, skipping script installation")
+endif()