Skip to content

Commit

Permalink
Merge pull request #3 from ESMCI/cleanup_cmakelists
Browse files Browse the repository at this point in the history
cleanup cmake lists and test bumpversion
  • Loading branch information
jedwards4b authored and billsacks committed Dec 3, 2023
2 parents 8aa3031 + 11c8df0 commit cf3b5a8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bumpversion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
tag_prefix: v
- name: Update version.txt
run: |
echo "character(len=*), parameter :: version=\"${{ steps.name_tag.outputs.new_tag }}\"" > version.inc
echo "character(len=*), parameter :: version=\"${{ steps.name_tag.outputs.new_tag }}\"\n" > version.inc
- name: Amend the last commit
run: |
git config --global user.email "[email protected]"
Expand Down
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ endif()
if (CMAKE_BUILD_TYPE STREQUAL "DEBUG")
set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -O0 -g")
endif()
set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -D_VERSION_=\"v1.0.0\"")

#==============================================================================
# DEFINE THE DEPENDENCIES
Expand Down Expand Up @@ -84,7 +83,7 @@ list(APPEND CMAKE_BUILD_RPATH ${netcdf_fortran_lib_location} ${netcdf_c_lib_loca
#message("CMAKE_BUILD_RPATH is ${CMAKE_BUILD_RPATH}")
add_executable (cprnc ${CPRNC_Fortran_SRCS} ${CPRNC_GenF90_SRCS})
#message("Setting include dir ${NetCDF_Fortran_INCLUDE_DIRS}")
target_include_directories(cprnc PUBLIC ${NetCDF_Fortran_INCLUDE_DIRS})
target_include_directories(cprnc PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${NetCDF_Fortran_INCLUDE_DIRS})

add_dependencies (cprnc genf90)

Expand Down

0 comments on commit cf3b5a8

Please sign in to comment.