CMake changes to build installers

.github/workflows/test_macos12.yml

@@ -37,5 +37,5 @@ jobs:
  conda run -n svfsiplus pytest -rPv --durations=0
  - name: Run unit tests
  run: |
- cd build/svFSI-build/Source/svFSI
- ctest --verbose
+ cd build/svFSIplus-build/Source/svFSI
+ ctest --verbose

.github/workflows/test_ubuntu.yml

@@ -56,17 +56,17 @@ jobs:
  conda run -n svfsiplus pytest -rPv --durations=0
  - name: Run unit tests
  run: | 
- cd build/svFSI-build/Source/svFSI
+ cd build/svFSIplus-build/Source/svFSI
  ctest --verbose
  - name: Generate code coverage
  run: |
- cd build/svFSI-build
+ cd build/svFSIplus-build
  make coverage
  - name: Save coverage report
  uses: actions/upload-artifact@v3
  with:
  name: coverage_report
- path: build/svFSI-build/coverage
+ path: build/svFSIplus-build/coverage
  - name: Upload coverage reports to Codecov
  uses: codecov/codecov-action@v3
  env:

CMakeLists.txt

@@ -54,6 +54,7 @@ endif()
 
 #-----------------------------------------------------------------------------
 Project(SV_TOP)
+message(STATUS "SV_TOP: ${SV_TOP}")
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
@@ -124,9 +125,9 @@ set(SV_EXTERNALS_TOPLEVEL_DIR "${CMAKE_BINARY_DIR}/Externals-build/sv_externals"
 # svFSIplus solver.
 set(SV_ADDITIONAL_CMAKE_ARGS "" CACHE STRING "If more options want to be provided to the sv_externals build, they can be with this string")
 set(SV_APPLE_CMAKE_ARGS)
-ExternalProject_Add(svFSI
+ExternalProject_Add(svFSIplus
  SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Code
- BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/svFSI-build
+ BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/svFSIplus-build
  DEPENDS Externals
  DOWNLOAD_COMMAND ""
  UPDATE_COMMAND ""

Code/CMake/SimVascularDependentOptions.cmake

@@ -82,9 +82,16 @@ endif()
 #-----------------------------------------------------------------------------
 # Shared Libs
 #-----------------------------------------------------------------------------
-set(SV_INSTALL_HEADERS ON)
-set(SV_INSTALL_EXTERNALS ON)
-set(SV_INSTALL_LIBS ON)
+
+set(SV_INSTALL_HEADERS OFF)
+#set(SV_INSTALL_HEADERS ON)
+
+set(SV_INSTALL_EXTERNALS OFF)
+#set(SV_INSTALL_EXTERNALS ON)
+
+set(SV_INSTALL_LIBS OFF)
+#set(SV_INSTALL_LIBS ON)
+
 if(BUILD_SHARED_LIBS)
  set(SV_LIBRARY_TYPE "SHARED" CACHE STRING "Shared cache" FORCE)
  set(SV_STATIC_BUILD "0")

Code/CMakeLists.txt

@@ -90,14 +90,14 @@ include(SimVascularDependentOptions)
 include(SimVascularInstallSetup)
 
 #set(SV_USE_TRILINOS {SV_USE_TRILINOS} PARENT_SCOPE)
-#set(SV_USE_TRILINOS OFF CACHE INTERNAL BOOL "Use Trilinos Library with svFSI")
+#set(SV_USE_TRILINOS OFF CACHE INTERNAL BOOL "Use Trilinos Library with svFSIplus")
 #set(SV_USE_TRILINOS OFF CACHE BOOL INTERNAL)
 
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Set EXE names for the executables
-set(SV_SVFSI_EXE "svFSI")
+set(SV_SVFSI_EXE "svfsiplus")
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
@@ -159,8 +159,3 @@ if(SV_ENABLE_DISTRIBUTION)
 endif()
 #-----------------------------------------------------------------------------
 
-#-----------------------------------------------------------------------------
-# Configure Exe Scripts, this should be the last subdirectory
-include(SimVascularInstallLibs)
-add_subdirectory(Scripts)
-#-----------------------------------------------------------------------------