Merge pull request #3 from itpplasma/library_path

Static linking and dependency management for libneo

Author: krystophny

CMakeLists.txt

@@ -56,7 +56,6 @@ endif()
 cmake_policy(SET CMP0074 NEW)
 find_package(HDF5 COMPONENTS C Fortran HL REQUIRED)
 find_package(Boost 1.74 REQUIRED)
-find_package(FFTW REQUIRED)
 find_package(GSL REQUIRED)
 
 ### NetCDF
@@ -90,9 +89,10 @@ add_link_options(${NETCDF_FLIBS})
 
 include(ExternalProject)
 include(SetupCODE)
-include(SetupLIBNEO)
 include(SetupTriangle)
 include(SetupMFEM)
+include(Util)
+find_or_fetch(libneo)
 
 ### Project source files
 # SuiteSparse
@@ -157,7 +157,7 @@ add_library(mephit SHARED
   ${MEPHIT_C_SRC_FILES}
   ${MEPHIT_CPP_SRC_FILES}
 )
-add_dependencies(mephit LIBNEO MFEM TRIANGLE)
+add_dependencies(mephit MFEM TRIANGLE)
 target_include_directories(mephit PUBLIC
   ${magfie_include_dir}
   ${NETCDF_INCLUDES}
@@ -176,9 +176,9 @@ set(MEPHIT_LIBS
   LAPACK::LAPACK
   ${FFTW_LIBRARIES}
   ${triangle_lib}
-  ${magfie_lib}
-  ${neo_lib}
-  ${hdf5_tools_lib}
+  LIBNEO::magfie
+  LIBNEO::neo
+  LIBNEO::hdf5_tools
 )
 target_link_libraries(mephit ${MEPHIT_LIBS})
 if(LEGACY_SUITESPARSE)

cmake/SetupCODE.cmake

@@ -1,9 +1,17 @@
 if (DEFINED ENV{CODE})
     message(STATUS "External libraries prebuilt in $CODE=" $ENV{CODE})
-    set(LIBNEO_DIR $ENV{CODE}/libneo/build/ CACHE STRING "libneo directory")
-    set(FGSL_DIR $ENV{CODE}/external/fgsl-1.6.0/ CACHE STRING "FGSL directory")
-    set(TRIANGLE_DIR $ENV{CODE}/external/triangle/ CACHE STRING "TRIANGLE directory")
-    set(MFEM_DIR $ENV{CODE}/external/mfem-4.7/build/ CACHE STRING "MFEM directory")
+    if(EXISTS $ENV{CODE}/libneo/build/)
+        set(LIBNEO_DIR $ENV{CODE}/libneo/build/ CACHE STRING "libneo directory")
+    endif()
+    if(EXISTS $ENV{CODE}/external/fgsl-1.6.0/)
+        set(FGSL_DIR $ENV{CODE}/external/fgsl-1.6.0/ CACHE STRING "FGSL directory")
+    endif()
+    if(EXISTS $ENV{CODE}/external/triangle/)
+        set(TRIANGLE_DIR $ENV{CODE}/external/triangle/ CACHE STRING "TRIANGLE directory")
+    endif()
+    if(EXISTS $ENV{CODE}/external/mfem-4.7/build/)
+        set(MFEM_DIR $ENV{CODE}/external/mfem-4.7/build/ CACHE STRING "MFEM directory")
+    endif()
 else()
     message(STATUS "Downloading and building external libraries")
 endif()

cmake/SetupLIBNEO.cmake

@@ -17,12 +17,12 @@ else()# Define Triangle repository
       BUILD_COMMAND /bin/bash ${CMAKE_SOURCE_DIR}/cmake/setup_triangle.sh <SOURCE_DIR>
       INSTALL_COMMAND ""
       DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-      BUILD_BYPRODUCTS <SOURCE_DIR>/libtriangle${CMAKE_SHARED_LIBRARY_SUFFIX}
+      BUILD_BYPRODUCTS <SOURCE_DIR>/libtriangle.so
   )
   set(TRIANGLE_DIR ${CMAKE_BINARY_DIR}/triangle/src/TRIANGLE)
 endif()
 
 set(TRIANGLE_INCLUDE_DIR ${TRIANGLE_DIR} CACHE STRING "Path to triangle include")
 set(TRIANGLE_LIB_DIR ${TRIANGLE_DIR} CACHE STRING "Path to triangle lib")
 
-set(triangle_lib ${TRIANGLE_LIB_DIR}/libtriangle${CMAKE_SHARED_LIBRARY_SUFFIX} CACHE STRING "TRIANGLE lib")
+set(triangle_lib ${TRIANGLE_LIB_DIR}/libtriangle.so CACHE STRING "TRIANGLE lib")

cmake/SetupTriangle.cmake

@@ -0,0 +1,48 @@
+include(FetchContent)
+
+function(find_or_fetch DEPENDENCY)
+    if(DEFINED ENV{CODE} AND EXISTS $ENV{CODE}/${DEPENDENCY})
+        set(${DEPENDENCY}_SOURCE_DIR $ENV{CODE}/${DEPENDENCY})
+        message(STATUS "Using ${DEPENDENCY} in $ENV{CODE}/${DEPENDENCY}")
+    else()
+        set(REPO_URL https://github.com/itpplasma/${DEPENDENCY}.git)
+        get_branch_or_main(${REPO_URL} REMOTE_BRANCH)
+        message(STATUS "Using ${DEPENDENCY} branch ${REMOTE_BRANCH} from ${REPO_URL}")
+
+        FetchContent_Declare(
+            ${DEPENDENCY}
+            DOWNLOAD_EXTRACT_TIMESTAMP TRUE
+            GIT_REPOSITORY ${REPO_URL}
+            GIT_TAG ${REMOTE_BRANCH}
+        )
+        FetchContent_Populate(${DEPENDENCY})
+    endif()
+
+    add_subdirectory(${${DEPENDENCY}_SOURCE_DIR}
+        ${CMAKE_CURRENT_BINARY_DIR}/${DEPENDENCY}
+        EXCLUDE_FROM_ALL
+    )
+endfunction()
+
+
+function(get_branch_or_main REPO_URL REMOTE_BRANCH)
+    execute_process(
+        COMMAND git rev-parse --abbrev-ref HEAD
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        OUTPUT_VARIABLE BRANCH
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+
+    execute_process(
+        COMMAND git ls-remote --heads ${REPO_URL} ${BRANCH}
+        OUTPUT_VARIABLE BRANCH_EXISTS
+        ERROR_VARIABLE GIT_ERROR
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+
+    if(BRANCH_EXISTS)
+        set(${REMOTE_BRANCH} ${BRANCH} PARENT_SCOPE)
+    else()
+        set(${REMOTE_BRANCH} "main" PARENT_SCOPE)
+    endif()
+endfunction()