Skip to content

Commit

Permalink
shipping fypp together with fdict
Browse files Browse the repository at this point in the history
fypp is required to build it, and now it is shipped together
with the library.

This should make it simpler for end-users to use fdict.

Signed-off-by: Nick Papior <[email protected]>
  • Loading branch information
zerothi committed Mar 23, 2023
1 parent 51e9525 commit aaafeb3
Show file tree
Hide file tree
Showing 5 changed files with 3,094 additions and 16 deletions.
4 changes: 3 additions & 1 deletion config/ProjectOptions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,9 @@ endfunction()


# Ensure we have the program fypp installed
find_program(FYPP fypp)
find_program(FYPP fypp
HINTS ${CMAKE_SOURCE_DIR}/utils
)
if(NOT FYPP)
message(FATAL_ERROR "Could not find executable fypp -- it is required for the pre-processing step")
endif()
Expand Down
2 changes: 1 addition & 1 deletion config/README
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ These configuration files are highly inspired from the
github.com/fortran-lang/stdlib project.

I acknowledge and thank them for their continued support to
the Fortran community!
the Fortran community!
29 changes: 15 additions & 14 deletions config/template.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,27 @@ function(set_defined name value)
set(${name} "${stripvalue}")
endif()
endmacro()
string(TOUPPER PROJECT_NAME_UPPER "@PROJECT_NAME@")

# define the fyppflags used to compile
set_defined(@PROJECT_NAME@_FYPPFLAGS "@FYPPFLAGS@")
set_defined(${PROJECT_NAME_UPPER}_FYPPFLAGS "@FYPPFLAGS@")

# define the different data-types used
set_defined(@PROJECT_NAME@_WITH_INT8 "@WITH_INT8@")
set_defined(@PROJECT_NAME@_WITH_INT16 "@WITH_INT16@")
set_defined(@PROJECT_NAME@_WITH_REAL80 "@WITH_REAL80@")
set_defined(@PROJECT_NAME@_WITH_REAL128 "@WITH_REAL128@")
set_defined(@PROJECT_NAME@_WITH_LOG8 "@WITH_LOG16@")
set_defined(@PROJECT_NAME@_WITH_LOG64 "@WITH_LOG64@")
set_defined(@PROJECT_NAME@_WITH_ISO_C "@WITH_ISO_C@")
set_defined(${PROJECT_NAME_UPPER}_WITH_INT8 "@WITH_INT8@")
set_defined(${PROJECT_NAME_UPPER}_WITH_INT16 "@WITH_INT16@")
set_defined(${PROJECT_NAME_UPPER}_WITH_REAL80 "@WITH_REAL80@")
set_defined(${PROJECT_NAME_UPPER}_WITH_REAL128 "@WITH_REAL128@")
set_defined(${PROJECT_NAME_UPPER}_WITH_LOG8 "@WITH_LOG16@")
set_defined(${PROJECT_NAME_UPPER}_WITH_LOG64 "@WITH_LOG64@")
set_defined(${PROJECT_NAME_UPPER}_WITH_ISO_C "@WITH_ISO_C@")

# Set the ranks as defined by the input
set_defined(@PROJECT_NAME@_MAXRANK "@MAXRANK@")
set_defined(@PROJECT_NAME@_MAXRANK_INT "@MAXRANK_INT@")
set_defined(@PROJECT_NAME@_MAXRANK_REAL "@MAXRANK_REAL@")
set_defined(@PROJECT_NAME@_MAXRANK_CMPLX "@MAXRANK_CMPLX@")
set_defined(@PROJECT_NAME@_MAXRANK_LOG "@MAXRANK_LOG@")
set_defined(@PROJECT_NAME@_MAXRANK_ISO_C "@MAXRANK_ISO_C@")
set_defined(${PROJECT_NAME_UPPER}_MAXRANK "@MAXRANK@")
set_defined(${PROJECT_NAME_UPPER}_MAXRANK_INT "@MAXRANK_INT@")
set_defined(${PROJECT_NAME_UPPER}_MAXRANK_REAL "@MAXRANK_REAL@")
set_defined(${PROJECT_NAME_UPPER}_MAXRANK_CMPLX "@MAXRANK_CMPLX@")
set_defined(${PROJECT_NAME_UPPER}_MAXRANK_LOG "@MAXRANK_LOG@")
set_defined(${PROJECT_NAME_UPPER}_MAXRANK_ISO_C "@MAXRANK_ISO_C@")

if(NOT TARGET "@PROJECT_NAME@::@PROJECT_NAME@")
include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
Expand Down
Loading

0 comments on commit aaafeb3

Please sign in to comment.