Moved more of the CMake file into the non DOC_BUILD branch

MintonGroup · Dec 20, 2023 · 91ba74f · 91ba74f
1 parent c1d7498
commit 91ba74f
Show file tree

Hide file tree

Showing 2 changed files with 96 additions and 96 deletions.
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -16,7 +16,7 @@ build:
   tools:
     python: "3.11"
   apt_packages:
-    - graphviz   
+    - graphviz
   jobs:
     pre_build:
       - ford fortran_docs.md 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,112 +13,112 @@
 ##################################################
 CMAKE_MINIMUM_REQUIRED(VERSION 3.6.0...3.27.1)
 SET(SKBUILD_PROJECT_NAME "swiftest" CACHE STRING "Name of project set by scikit-build")
-SET(SKBUILD_SCRIPTS_DIR "${CMAKE_SOURCE_DIR}/bin" CACHE STRING "Install location of binary executable")
-
 
 # Get version stored in text file
 FILE(READ "version.txt" VERSION)
-PROJECT(${SKBUILD_PROJECT_NAME} LANGUAGES C Fortran VERSION ${VERSION})
-
-# Use the old method to get Python packages, as that's what scikit-build uses
-IF (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.27")
-    CMAKE_POLICY(SET CMP0148 OLD)
-ENDIF ()
-
-# Set some options the user may choose
-OPTION(USE_COARRAY "Use Coarray Fortran for parallelization of test particles" OFF)
-OPTION(USE_OPENMP "Use OpenMP for parallelization" ON)
-OPTION(USE_SIMD "Use SIMD vectorization" ON)
-OPTION(BUILD_SHARED_LIBS "Build using shared libraries" ON)
-
-INCLUDE(GNUInstallDirs)
-IF (SKBUILD)
-    SET(INSTALL_BINDIR ${SKBUILD_PLATLIB_DIR}/${SKBUILD_PROJECT_NAME}) 
-    SET(INSTALL_LIBDIR ${SKBUILD_PLATLIB_DIR}/${SKBUILD_PROJECT_NAME}) 
-    SET(INSTALL_INCLUDEDIR ${INSTALL_LIBDIR}) 
-    IF (APPLE)
-        SET(CMAKE_INSTALL_RPATH "@loader_path")
-    ELSEIF (LINUX)
-        SET(CMAKE_INSTALL_RPATH $ORIGIN)
+# Check if DOC_BUILD environment variable is set and skip build if it is
+IF (DEFINED ENV{DOC_BUILD})
+    MESSAGE(STATUS "DOC_BUILD is set. Skipping build process.")
+    PROJECT(${SKBUILD_PROJECT_NAME} VERSION ${VERSION})
+ELSE()
+    SET(SKBUILD_SCRIPTS_DIR "${CMAKE_SOURCE_DIR}/bin" CACHE STRING "Install location of binary executable")
+    PROJECT(${SKBUILD_PROJECT_NAME} LANGUAGES C Fortran VERSION ${VERSION})
+    # Use the old method to get Python packages, as that's what scikit-build uses
+    IF (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.27")
+        CMAKE_POLICY(SET CMP0148 OLD)
     ENDIF ()
-ELSE ()
-    SET(INSTALL_BINDIR ${CMAKE_INSTALL_BINDIR})
-    SET(INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR})
-    SET(INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR})
-ENDIF ()
-
-# Have the .mod files placed in the include folder
-SET(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
-
-# Add our local modules to the module ldpath
-FILE(TO_CMAKE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules" LOCAL_MODULE_PATH)
-LIST(APPEND CMAKE_MODULE_PATH ${LOCAL_MODULE_PATH})
-
-IF (CMAKE_Fortran_COMPILER_ID MATCHES "^Intel")
-    SET(COMPILER_OPTIONS "Intel" CACHE STRING "Compiler identified as Intel")
-ELSEIF (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
-    SET(COMPILER_OPTIONS "GNU" CACHE STRING "Compiler identified as gfortran")
-ELSE ()
-    MESSAGE(FATAL_ERROR "Compiler ${CMAKE_Fortran_COMPILER_ID} not recognized!") 
-ENDIF ()
-
-# The following section is modified from Numpy f2py documentation
-IF(PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR)
-  MESSAGE(FATAL_ERROR "In-source builds not allowed. Please make a new directory (called a build directory) and run CMake from there.\n")
-ENDIF()
 
-FIND_PACKAGE(NETCDF_Fortran REQUIRED)
-IF (MSVC)
-    FIND_PACKAGE(HDF5 NAMES hdf5 COMPONENTS C HL REQUIRED CONFIG)
-    MESSAGE(STATUS "HDF5_FOUND: ${HDF5_FOUND}")
-    MESSAGE(STATUS "HDF5_VERSION: ${HDF5_VERSION}")
-    MESSAGE(STATUS "HDF5_LIBRARIES: ${HDF5_LIBRARIES}")
-    MESSAGE(STATUS "HDF5_INCLUDE_DIRS: ${HDF5_INCLUDE_DIRS}")
-ELSE ()
-    FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED)
-ENDIF ()
-
-# Ensure scikit-build modules
-FIND_PACKAGE(Python COMPONENTS Interpreter Development.Module REQUIRED)
-
-
-SET(SRC "${CMAKE_SOURCE_DIR}/src")
-SET(PY "${CMAKE_SOURCE_DIR}/swiftest")
-
-#####################################
-# Tell how to install this executable
-#####################################
-IF(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    SET(CMAKE_INSTALL_PREFIX "C:\\Program Files\\swiftest")
-    FILE(TO_CMAKE_PATH ${CMAKE_INSTALL_PREFIX} CMAKE_INSTALL_PREFIX)
-    SET(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Path for install")
-ELSE()
-    SET(CMAKE_INSTALL_PREFIX /usr/local CACHE PATH "Path for install")
-ENDIF()
+    # Set some options the user may choose
+    OPTION(USE_COARRAY "Use Coarray Fortran for parallelization of test particles" OFF)
+    OPTION(USE_OPENMP "Use OpenMP for parallelization" ON)
+    OPTION(USE_SIMD "Use SIMD vectorization" ON)
+    OPTION(BUILD_SHARED_LIBS "Build using shared libraries" ON)
+
+    INCLUDE(GNUInstallDirs)
+    IF (SKBUILD)
+        SET(INSTALL_BINDIR ${SKBUILD_PLATLIB_DIR}/${SKBUILD_PROJECT_NAME}) 
+        SET(INSTALL_LIBDIR ${SKBUILD_PLATLIB_DIR}/${SKBUILD_PROJECT_NAME}) 
+        SET(INSTALL_INCLUDEDIR ${INSTALL_LIBDIR}) 
+        IF (APPLE)
+            SET(CMAKE_INSTALL_RPATH "@loader_path")
+        ELSEIF (LINUX)
+            SET(CMAKE_INSTALL_RPATH $ORIGIN)
+        ENDIF ()
+    ELSE ()
+        SET(INSTALL_BINDIR ${CMAKE_INSTALL_BINDIR})
+        SET(INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR})
+        SET(INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR})
+    ENDIF ()
 
+    # Have the .mod files placed in the include folder
+    SET(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
 
-# Make sure paths are correct for Unix or Windows style
-FILE(TO_CMAKE_PATH ${SRC} SRC)
-FILE(TO_CMAKE_PATH ${PY} PY)
+    # Add our local modules to the module ldpath
+    FILE(TO_CMAKE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules" LOCAL_MODULE_PATH)
+    LIST(APPEND CMAKE_MODULE_PATH ${LOCAL_MODULE_PATH})
 
-# Set the name of the swiftest library
-SET(SWIFTEST_LIBRARY ${SKBUILD_PROJECT_NAME})
+    IF (CMAKE_Fortran_COMPILER_ID MATCHES "^Intel")
+        SET(COMPILER_OPTIONS "Intel" CACHE STRING "Compiler identified as Intel")
+    ELSEIF (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
+        SET(COMPILER_OPTIONS "GNU" CACHE STRING "Compiler identified as gfortran")
+    ELSE ()
+        MESSAGE(FATAL_ERROR "Compiler ${CMAKE_Fortran_COMPILER_ID} not recognized!") 
+    ENDIF ()
 
-# Determine compiler options
-IF(NOT CMAKE_Fortran_COMPILER_SUPPORTS_F90)
-    MESSAGE(FATAL_ERROR "Fortran compiler does not support F90")
-ENDIF(NOT CMAKE_Fortran_COMPILER_SUPPORTS_F90)
-INCLUDE(SetParallelizationLibrary)
+    # The following section is modified from Numpy f2py documentation
+    IF(PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR)
+    MESSAGE(FATAL_ERROR "In-source builds not allowed. Please make a new directory (called a build directory) and run CMake from there.\n")
+    ENDIF()
+
+    FIND_PACKAGE(NETCDF_Fortran REQUIRED)
+    IF (MSVC)
+        FIND_PACKAGE(HDF5 NAMES hdf5 COMPONENTS C HL REQUIRED CONFIG)
+        MESSAGE(STATUS "HDF5_FOUND: ${HDF5_FOUND}")
+        MESSAGE(STATUS "HDF5_VERSION: ${HDF5_VERSION}")
+        MESSAGE(STATUS "HDF5_LIBRARIES: ${HDF5_LIBRARIES}")
+        MESSAGE(STATUS "HDF5_INCLUDE_DIRS: ${HDF5_INCLUDE_DIRS}")
+    ELSE ()
+        FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED)
+    ENDIF ()
+
+    # Ensure scikit-build modules
+    FIND_PACKAGE(Python COMPONENTS Interpreter Development.Module REQUIRED)
+
+
+    SET(SRC "${CMAKE_SOURCE_DIR}/src")
+    SET(PY "${CMAKE_SOURCE_DIR}/swiftest")
+
+    #####################################
+    # Tell how to install this executable
+    #####################################
+    IF(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+        SET(CMAKE_INSTALL_PREFIX "C:\\Program Files\\swiftest")
+        FILE(TO_CMAKE_PATH ${CMAKE_INSTALL_PREFIX} CMAKE_INSTALL_PREFIX)
+        SET(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Path for install")
+    ELSE()
+        SET(CMAKE_INSTALL_PREFIX /usr/local CACHE PATH "Path for install")
+    ENDIF()
+
+
+    # Make sure paths are correct for Unix or Windows style
+    FILE(TO_CMAKE_PATH ${SRC} SRC)
+    FILE(TO_CMAKE_PATH ${PY} PY)
+
+    # Set the name of the swiftest library
+    SET(SWIFTEST_LIBRARY ${SKBUILD_PROJECT_NAME})
+
+    # Determine compiler options
+    IF(NOT CMAKE_Fortran_COMPILER_SUPPORTS_F90)
+        MESSAGE(FATAL_ERROR "Fortran compiler does not support F90")
+    ENDIF(NOT CMAKE_Fortran_COMPILER_SUPPORTS_F90)
+    INCLUDE(SetParallelizationLibrary)
+
+    IF (COMPILER_OPTIONS STREQUAL "Intel" AND NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
+        INCLUDE(SetMKL)
+    ENDIF ()
+    INCLUDE(SetSwiftestFlags) 
 
-IF (COMPILER_OPTIONS STREQUAL "Intel" AND NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    INCLUDE(SetMKL)
-ENDIF ()
-INCLUDE(SetSwiftestFlags) 
 
-# Check if DOC_BUILD environment variable is set and skip build if it is
-IF (DEFINED ENV{DOC_BUILD})
-    MESSAGE(STATUS "DOC_BUILD is set. Skipping build process.")
-ELSE()
 
     # The source for the SWIFTEST binary and have it placed in the bin folder
     ADD_SUBDIRECTORY(${SRC} ${CMAKE_INSTALL_BINDIR})