Fruit builds with CMake

Signed-off-by: Steven Hahn <[email protected]>
ORNL-Fusion · Feb 20, 2024 · b08b24c · b08b24c
1 parent d2a967b
commit b08b24c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 380 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -63,14 +63,6 @@ add_subdirectory (src)
 add_definitions (-DMAC)
 
 if(1)
-#  Configure FRUIT
-    include_directories (${FRUIT_INCLUDE_PATH})
-    set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${FRUIT_LINK_FLAGS}")
-
-    #  Configure KORCSRC
-    include_directories (${KORCSRC_INCLUDE_PATH})
-    set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${KORCSRC_LINK_FLAGS}")
-
     add_subdirectory (test)
 
     enable_testing()     
@@ -80,11 +72,6 @@ if(1)
 		      WORKING_DIRECTORY build/bin
     )
 
-    add_test (NAME regression_test_1
-              COMMAND korc_regtest1.sh
-              WORKING_DIRECTORY test/reg_tests
-    )
-
 endif ()		     
 
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -28,10 +28,16 @@ list (APPEND korc_sources
     korc_pspline.f90
 )
 
-korc_sources
-main.f90
+set(korc_main "")
+list(APPEND korc_main
+	    main.f90
+)
+
+add_library(korc_lib ${korc_sources})
+set_property(TARGET korc_lib PROPERTY LINKER_LANGUAGE Fortran)
 
-add_executable (xkorc ${korc_sources})
+add_executable (xkorc ${korc_main})
+target_link_libraries(xkorc korc_lib)
 set_property(TARGET xkorc PROPERTY LINKER_LANGUAGE Fortran)
 
 option (CORI_DIR "Use Cori directories" OFF)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -3,9 +3,6 @@
 
 add_library (fruit fruit/fruit.f90)
 
-#add_library (fruit_mpi fruit/fruit_mpi.f90)
-#target_link_libraries(fruit_mpi PUBLIC fruit )
-
 set (korc_tests "")
 list (APPEND korc_tests
      korc_test.f90
@@ -16,6 +13,7 @@ list (APPEND korc_tests
 add_executable (xtest ${korc_tests})
 set_property(TARGET xtest PROPERTY LINKER_LANGUAGE Fortran)
 
-target_link_libraries (xtest fruit xkorc ${MPI_Fortran_LIBRARIES})
+target_link_libraries (xtest fruit korc_lib ${MPI_Fortran_LIBRARIES})
 target_link_libraries (xtest ${HDF5_LIBRARIES})
 target_link_libraries (xtest ${KORCSRC_LIBRARIES})
+