Skip to content

Commit

Permalink
added extra line at eof
Browse files Browse the repository at this point in the history
  • Loading branch information
Liam Bindle committed Jan 8, 2019
1 parent cab1935 commit 2957ef5
Show file tree
Hide file tree
Showing 15 changed files with 24 additions and 12 deletions.
11 changes: 6 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
cmake_minimum_required(VERSION 3.0.2)
project(GEOS_Chem VERSION 12.0.0 LANGUAGES Fortran CXX)
project(GEOS_Chem VERSION 12.0.0 LANGUAGES Fortran)

# Add our module path
# Add our module path and include our helpers
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeScripts)
include(GC-Helpers)

# Define the base target which will hold the build configuration
# Define the base target (which will store the build configuration properties)
add_library(BaseTarget INTERFACE)

# Put mod files in mod subdirectory
# Put all mod files in mod subdirectory
set(CMAKE_Fortran_MODULE_DIRECTORY ${PROJECT_BINARY_DIR}/mod)
target_include_directories(BaseTarget
INTERFACE ${PROJECT_BINARY_DIR}/mod
)

# Get the run directory and implementation type
# Get the run directory and implementation type
include(GC-GetRunDir) # sets RUNDIR and IMPL

if("${IMPL}" STREQUAL "Classic")
Expand All @@ -33,3 +33,4 @@ add_subdirectory(HEMCO)
add_subdirectory(ISOROPIA)
add_subdirectory(GeosRad)
add_subdirectory(GeosCore)

1 change: 1 addition & 0 deletions GeosCore/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -126,3 +126,4 @@ if("${IMPL}" STREQUAL "Classic")
RUNTIME DESTINATION ${RUNDIR}
)
endif()

1 change: 1 addition & 0 deletions GeosRad/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,4 @@ target_compile_options(RRTMG
PRIVATE
-r8 -O1 -override-limits
)

1 change: 1 addition & 0 deletions GeosUtil/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ add_library(GeosUtil2 STATIC
target_link_libraries(GeosUtil2
PUBLIC NcdfUtil
)

3 changes: 2 additions & 1 deletion HEMCO/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
add_subdirectory(Core)
add_subdirectory(Extensions)
add_subdirectory(Interfaces)
add_subdirectory(Interfaces)

1 change: 1 addition & 0 deletions HEMCO/Core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,4 @@ target_compile_options(HCO
""
$<$<STREQUAL:"${CMAKE_Fortran_COMPILER_ID}","GNU">:-ffree-form -ffree-line-length-none>
)

1 change: 1 addition & 0 deletions HEMCO/Extensions/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ add_library(HCOX STATIC
target_link_libraries(HCOX
PUBLIC HCO
)

1 change: 1 addition & 0 deletions HEMCO/Interfaces/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ add_library(HCOI STATIC
target_link_libraries(HCOI
PUBLIC HCOX
)

1 change: 1 addition & 0 deletions Headers/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ add_library(Headers STATIC
target_link_libraries(Headers
PUBLIC KPPFirstPass
)

1 change: 1 addition & 0 deletions History/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ add_library(History STATIC
target_link_libraries(History
PUBLIC KPP
)

1 change: 1 addition & 0 deletions ISOROPIA/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ target_compile_options(Isoropia

list(APPEND GC_EXTRA_TARGETS "Isoropia")
set(GC_EXTRA_TARGETS "${GC_EXTRA_TARGETS}" PARENT_SCOPE)

9 changes: 3 additions & 6 deletions KPP/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
#[[
Uses variables:
MECH
]]

# Add the correct subdirectory based on ${MECH}
if("${MECH}" STREQUAL "Standard")
add_subdirectory(Standard)
elseif("${MECH}" STREQUAL "Tropchem")
add_subdirectory(Tropchem)
else()
message(FATAL_ERROR "KPP build target for MECH=${MECH} is not yet implemented")
endif()
endif()

1 change: 1 addition & 0 deletions KPP/Standard/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ add_library(KPP STATIC
target_link_libraries(KPP
PUBLIC GeosUtil2
)

1 change: 1 addition & 0 deletions KPP/Tropchem/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ add_library(KPP STATIC
target_link_libraries(KPP
PUBLIC GeosUtil2
)

2 changes: 2 additions & 0 deletions NcdfUtil/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@ add_library(NcdfUtil STATIC
)
target_link_libraries(NcdfUtil
PUBLIC GeosUtil
# Note that NetCDF libraries are linked into BaseTarget
)

0 comments on commit 2957ef5

Please sign in to comment.