First pass at conan build

Author: CodeByDrescher

.github/workflows/cd.yml

@@ -6,7 +6,7 @@ env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
 
-jobs:
+#jobs:
 #  build-and-push-image:
 #    runs-on: ubuntu-latest
 #    permissions:
@@ -38,6 +38,7 @@ jobs:
 #          tags: ${{ steps.meta.outputs.tags }}
 #          labels: ${{ steps.meta.outputs.labels }}
 
+jobs:
   native-build:
     name:
       native-build-${{ matrix.platform }}
@@ -62,7 +63,6 @@ jobs:
         shell: bash
         run: |
           brew install boost
-          brew install hdf5
           brew install ninja
 
           brew install llvm
@@ -81,39 +81,49 @@ jobs:
         if: matrix.platform == 'macos-14'
         shell: bash
         run: |
-          brew install boost
-          brew install hdf5
-          brew install ninja
-
-          brew install llvm
-          echo 'export PATH="/opt/homebrew/opt/llvm/bin:$PATH"' >> /Users/runner/.bash_profile
-          ln -s /opt/homebrew/bin/gfortran-14 /usr/local/bin/gfortran
-          
-          gcc --version
-          gfortran --version
-          cmake --version
-          brew info boost
-          brew info hdf5
+          brew install conan
+          conan --version
+          mkdir -p ~/.conan2/profiles/
+          touch ~/.conan2/profiles/default # if we don't make a file first, cp thinks its a folder that doesn't exist
+          cp conan-profiles/CI-CD/MacOS-ARM8_profile.txt ~/.conan2/profiles/default
+          conan install . \
+               --output-folder build \
+               --build SundialsSolverStandalone_x64
+#          brew install boost
+#          brew install ninja
+#
+#          brew install llvm
+#          echo 'export PATH="/opt/homebrew/opt/llvm/bin:$PATH"' >> /Users/runner/.bash_profile
+#          ln -s /opt/homebrew/bin/gfortran-14 /usr/local/bin/gfortran
+#
+#          gcc --version
+#          gfortran --version
+#          cmake --version
+#          brew info boost
+#          brew info hdf5
 
       - name: Build on ARM Macos
         if: matrix.platform == 'macos-14'
         run: |
           platform=macos
           echo "working dir is $PWD"
 
-          mkdir build
           cd build
 
           export PATH="/opt/homebrew/opt/llvm/bin:$PATH"
+          
+          cmake -B . -S .. -G "Ninja" -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Debug
+          cmake --build .
 
-          cmake \
-          -G Ninja \
-          -DCMAKE_C_COMPILER=/opt/homebrew/opt/llvm/bin/clang \
-          -DCMAKE_CXX_COMPILER=/opt/homebrew/opt/llvm/bin/clang++ \
-          -DOPTION_TARGET_MESSAGING=OFF \
-          -B . -S ..
-
-          ninja
+#          mkdir build
+#          cd build
+#          cmake \
+#          -G Ninja \
+#          -DCMAKE_C_COMPILER=/opt/homebrew/opt/llvm/bin/clang \
+#          -DCMAKE_CXX_COMPILER=/opt/homebrew/opt/llvm/bin/clang++ \
+#          -DOPTION_TARGET_MESSAGING=OFF \
+#          -B . -S ..
+#          ninja
 
       - name: Build on Intel Macos
         if: matrix.platform == 'macos-13'

.gitignore

@@ -24,3 +24,7 @@ NFsim_v1.11/tests/smoke/SimID_273069657_0_.gdat
 NFsim_v1.11/tests/smoke/SimID_273069657_0_.species
 
 IDAWin/tests/smoke/SimID_1489333437_0_.ida
+
+CMakeUserPresets.json
+conan-build
+conan-build/*

CMakeLists.txt

@@ -8,7 +8,7 @@ project(vcell-ode-numerics)
 set(CMAKE_CXX_STANDARD 17)
 enable_language(CXX)
 enable_language(C)
-enable_language(Fortran)
+#enable_language(Fortran)
 
 #############################################
 #  If this isn't explicitly set in cmake 3.x.x, we get warnings
@@ -44,13 +44,13 @@ if (LINUX)
 		set (ARCH_64bit FALSE)
 		set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
 		set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
-		set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m32")
+#		set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m32")
 	endif()
 
 	if (LINUX_64bit_BINARIES) 
 		set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
 		set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
-		set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m64")
+#		set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m64")
 	endif()
 endif()
 
@@ -144,7 +144,7 @@ if (WINDOWS)
 	set(CMAKE_RC_FLAGS "-DGCC_WINDRES")
 endif(WINDOWS)
 
-add_definitions(-DFORTRAN_UNDERSCORE)
+#add_definitions(-DFORTRAN_UNDERSCORE)
 
 #############################################
 # installation directories
@@ -220,9 +220,11 @@ if (OPTION_EXTRA_CONFIG_INFO)
 
 	include(CMakePrintHelpers)
 	cmake_print_variables(OPTION_TARGET_MESSAGING OPTION_TARGET_DOCS)
-	cmake_print_variables(CMAKE_CXX_FLAGS CMAKE_C_FLAGS CMAKE_Fortran_FLAGS)
+#	cmake_print_variables(CMAKE_CXX_FLAGS CMAKE_C_FLAGS CMAKE_Fortran_FLAGS)
+	cmake_print_variables(CMAKE_CXX_FLAGS CMAKE_C_FLAGS)
 	cmake_print_variables(CMAKE_SYSTEM_NAME WINDOWS WIN32 MINGW APPLE ARCH_64bit ARCH_32bit)
-	cmake_print_variables(CMAKE_CPP_COMPILER CMAKE_C_COMPILER CMAKE_CXX_COMPILER CMAKE_Fortran_COMPILER)
+#	cmake_print_variables(CMAKE_CPP_COMPILER CMAKE_C_COMPILER CMAKE_CXX_COMPILER CMAKE_Fortran_COMPILER)
+	cmake_print_variables(CMAKE_CPP_COMPILER CMAKE_C_COMPILER CMAKE_CXX_COMPILER)
 	cmake_print_variables(HAVE_ZLIB)
 endif ()
 

conan-profiles/CI-CD/MacOS-ARM8_profile.txt

@@ -0,0 +1,8 @@
+[settings]
+arch=armv8
+build_type=Release
+compiler=apple-clang
+compiler.cppstd=gnu17
+compiler.libcxx=libc++
+compiler.version=13
+os=Macos

conanfile.txt

@@ -0,0 +1,11 @@
+[requires]
+libcurl/8.12.1
+zlib/1.3.1
+
+[tool_requires]
+cmake/[>=3.13]
+ninja/1.12.1
+
+[generators]
+CMakeDeps
+CMakeToolchain