mirror of
https://github.com/JHUAPL/kaiju.git
synced 2026-01-08 22:58:05 -05:00
Removing obsolete cmake package policy and making a cosmetic change to gamhelio block to ease future merges with working helio branches.
This commit is contained in:
@@ -1,10 +1,6 @@
|
||||
cmake_minimum_required(VERSION 3.20.2)
|
||||
project(Kaiju Fortran)
|
||||
|
||||
# use the new version of CMP0074, this tells cmake to use <PACKAGE>_ROOT environment
|
||||
# variables when looking for packages
|
||||
cmake_policy(SET CMP0074 NEW)
|
||||
|
||||
# add and search for pfunit (fingers crossed)
|
||||
list(APPEND CMAKE_PREFIX_PATH "./external")
|
||||
find_package(PFUNIT QUIET)
|
||||
@@ -161,22 +157,6 @@ add_executable(gamera.x src/drivers/gamerax.F90 ${GAMIC})
|
||||
target_link_libraries(gamera.x gamlib baselib)
|
||||
add_dependencies(gamera gamera.x)
|
||||
|
||||
#-------------
|
||||
#Kaiju: Gamera helio
|
||||
message("Adding Gamera Helio module ...")
|
||||
|
||||
#Add source
|
||||
#add_subdirectory(src/gamera)
|
||||
|
||||
#Print gamera helio info
|
||||
#message("\tBricksize is ${bricksize}")
|
||||
message("\tIC file is ${GAMHELIC}")
|
||||
add_custom_target(gamhelio ALL)
|
||||
message("\tAdding executable gamhelio.x")
|
||||
add_executable(gamhelio.x src/drivers/gamerax.F90 ${GAMHELIC})
|
||||
target_link_libraries(gamhelio.x gamlib baselib)
|
||||
add_dependencies(gamera gamhelio.x)
|
||||
|
||||
#-------------
|
||||
#Kaiju: Dragon King
|
||||
message("Adding dragonking module ...")
|
||||
@@ -238,6 +218,18 @@ add_executable(voltron.x src/drivers/voltronx.F90)
|
||||
target_link_libraries(voltron.x baselib voltlib gamlib dragonkinglib remixlib chimplib raijulib)
|
||||
add_dependencies(voltron voltron.x)
|
||||
|
||||
#-------------
|
||||
#Kaiju: Gamera helio
|
||||
message("Adding Gamera Helio module ...")
|
||||
#Print gamera helio info
|
||||
message("\tBricksize is ${bricksize}")
|
||||
message("\tIC file is ${GAMHELIC}")
|
||||
add_custom_target(gamhelio ALL)
|
||||
message("\tAdding executable gamhelio.x")
|
||||
add_executable(gamhelio.x src/drivers/gamerax.F90 ${GAMHELIC})
|
||||
target_link_libraries(gamhelio.x gamlib baselib)
|
||||
add_dependencies(gamera gamhelio.x)
|
||||
|
||||
if(ENABLE_MPI)
|
||||
#-------------
|
||||
#Kaiju: Base MPI
|
||||
@@ -272,6 +264,7 @@ if(ENABLE_MPI)
|
||||
#-------------
|
||||
#Kaiju: Gamera Helio MPI
|
||||
message("Adding Gamera Helio MPI module ...")
|
||||
message("\tIC file is ${GAMHELIC}")
|
||||
add_custom_target(gamhelio_mpi ALL)
|
||||
message("\tAdding executable gamhelio_mpi.x")
|
||||
add_executable(gamhelio_mpi.x src/drivers/gamera_mpix.F90 ${GAMHELIC})
|
||||
|
||||
Reference in New Issue
Block a user