Skip to content

Commit

Permalink
Merge pull request #17 from rafmudaf/f/fast-farm
Browse files Browse the repository at this point in the history
Remove superfluous CMake flag for FAST Farm
  • Loading branch information
jjonkman authored Mar 30, 2021
2 parents a7d5eb5 + 87f2fee commit 8913e61
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 13 deletions.
1 change: 0 additions & 1 deletion .github/workflows/automated-dev-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ jobs:
cmake \
-DCMAKE_INSTALL_PREFIX:PATH=${{runner.workspace}}/install \
-DCMAKE_Fortran_COMPILER:STRING=${{env.FORTRAN_COMPILER}} \
-DBUILD_FAST_FARM:BOOL=ON \
-DOPENMP:BOOL=ON \
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
-DBUILD_TESTING:BOOL=ON \
Expand Down
10 changes: 2 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ option(USE_DLL_INTERFACE "Enable runtime loading of dynamic libraries" on)
option(FPE_TRAP_ENABLED "Enable FPE trap in compiler options" off)
option(ORCA_DLL_LOAD "Enable OrcaFlex Library Load" on)
option(BUILD_OPENFAST_CPP_API "Enable building OpenFAST - C++ API" off)
option(BUILD_FAST_FARM "Enable building FAST.Farm glue code" off)
option(OPENMP "Enable OpenMP support" off)

# Precompiler/preprocessor flag configuration
Expand Down Expand Up @@ -106,6 +105,8 @@ set(OPENFAST_MODULES
icedyn
icefloe
map
wakedynamics
awae
)

set(OPENFAST_REGISTRY_INCLUDES "" CACHE INTERNAL "Registry includes paths")
Expand All @@ -119,13 +120,6 @@ foreach(IDIR IN ITEMS ${OPENFAST_MODULES})
add_subdirectory("${CMAKE_SOURCE_DIR}/modules/${IDIR}")
endforeach(IDIR IN ITEMS ${OPENFAST_MODULES})

if (BUILD_FAST_FARM)
add_subdirectory("${CMAKE_SOURCE_DIR}/modules/wakedynamics")
add_subdirectory("${CMAKE_SOURCE_DIR}/modules/awae")
set_registry_includes("modules" wakedynamics)
set_registry_includes("modules" awae)
endif()

add_subdirectory(glue-codes)

# Install fortran .mod files also to installation directory
Expand Down
5 changes: 1 addition & 4 deletions glue-codes/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,4 @@ if(BUILD_OPENFAST_CPP_API)
add_subdirectory(openfast-cpp)
endif()

if(BUILD_FAST_FARM)
add_subdirectory(fast-farm)
endif()

add_subdirectory(fast-farm)

0 comments on commit 8913e61

Please sign in to comment.