Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove endfunction(<string>) and endmacro(<string>) (#274, #382) #383

Merged
merged 1 commit into from
Jun 23, 2021
Merged

Remove endfunction(<string>) and endmacro(<string>) (#274, #382) #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions tribits/common_tpls/find_modules/FindHDF5.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ macro(_hdf5_boolean_convert _var)
else()
set(${_var} FALSE)
endif()
endmacro(_HDF5_BOOLEAN_CONVERT)
endmacro()



Expand All @@ -87,7 +87,7 @@ function(_hdf5_chomp_string old_str new_str_var)

set(${new_str_var} ${_tmp} PARENT_SCOPE)

endfunction(_HDF5_CHOMP_STRING)
endfunction()



Expand Down Expand Up @@ -115,7 +115,7 @@ function(_hdf5_parse_settings_file _file _key _value)

set(${_value} ${_tmp} PARENT_SCOPE)

endfunction(_HDF5_PARSE_SETTINGS_FILE)
endfunction()



Expand All @@ -126,7 +126,7 @@ function(_hdf5_define_version _file _var)

set(${_var} ${_tmp} PARENT_SCOPE)

endfunction(_HDF5_DEFINE_VERSION _var)
endfunction()



Expand All @@ -138,7 +138,7 @@ function(_hdf5_define_parallel_build _file _var)

set(${_var} ${_tmp} PARENT_SCOPE)

endfunction(_HDF5_DEFINE_PARALLEL_BUILD _file _var)
endfunction()



Expand Down Expand Up @@ -171,7 +171,7 @@ function(_hdf5_extra_library_dirs _file _var)
endif()
set(${_var} ${_directories} PARENT_SCOPE)

endfunction(_HDF5_EXTRA_LIBRARY_DIRS _file _var)
endfunction()

function(_hdf5_library_path _file _var)

Expand All @@ -181,7 +181,7 @@ function(_hdf5_library_path _file _var)
_hdf5_parse_settings_file(${_file} ${_search_key} _tmp)

set(${_var} ${_tmp} PARENT_SCOPE)
endfunction(_HDF5_LIBRARY_PATH _file _var)
endfunction()



Expand Down Expand Up @@ -231,7 +231,7 @@ function(_hdf5_extra_libraries _file _var)

set(${_var} ${_return_list} PARENT_SCOPE)

endfunction(_HDF5_EXTRA_LIBRARIES _file _var)
endfunction()



Expand Down Expand Up @@ -275,7 +275,7 @@ function(_hdf5_extra_include_dirs _file _var)
endif()
set(${_var} ${_directories} PARENT_SCOPE)

endfunction(_HDF5_EXTRA_INCLUDE_DIRS _file _var)
endfunction()

#
# End Functions/Macros
Expand Down
2 changes: 1 addition & 1 deletion tribits/common_tpls/utils/AddImportedLibrary.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,5 +111,5 @@ function(add_imported_library target_name)
endif()

endif()
endfunction(ADD_IMPORTED_LIBRARY)
endfunction()

4 changes: 2 additions & 2 deletions tribits/common_tpls/utils/AddPackageDependency.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function(add_package_dependency)
macro(_print_usage)
message("\nadd_package_dependency(<target_package> DEPENDS_ON <req_package>)\n"
" Add req_package to target_package dependencies.\n")
endmacro(_print_usage)
endmacro()

# Parse the arguments
set(_options "")
Expand Down Expand Up @@ -172,4 +172,4 @@ function(add_package_dependency)

endif()

endfunction(ADD_PACKAGE_DEPENDENCY)
endfunction()
2 changes: 1 addition & 1 deletion tribits/common_tpls/utils/ParseLibraryList.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,5 +112,5 @@ function(parse_library_list)
set(${PARSE_ARGS_FOUND} FALSE PARENT_SCOPE)
endif()

endfunction(PARSE_LIBRARY_LIST)
endfunction()