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

Some CMake mods to LibFind and FindXYZ modules #444

Closed
wants to merge 3 commits into from
Closed

Some CMake mods to LibFind and FindXYZ modules #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7d0d7f
Fix usage of find_package_handle_standard_args
bartgol Nov 24, 2021
a50327a
Simplified cmake logic in LibFind.cmake
bartgol Nov 24, 2021
fba78cf
A couple of mods in find_package_component
bartgol Dec 9, 2021
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
3 changes: 3 additions & 0 deletions cmake/FindGPTL.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,6 @@ foreach (GPTL_comp IN LISTS GPTL_FIND_VALID_COMPONENTS)
endif ()

endforeach ()

# Handle QUIET/REQUIRED, and set <PKG>_FOUND if all required components were found
find_package_handle_standard_args (GPTL HANDLE_COMPONENTS)
3 changes: 3 additions & 0 deletions cmake/FindHDF5.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,3 +123,6 @@ foreach (HDF5_comp IN LISTS HDF5_FIND_VALID_COMPONENTS)
endif ()

endforeach ()

# Handle QUIET/REQUIRED, and set <PKG>_FOUND if all required components were found
find_package_handle_standard_args (HDF5 HANDLE_COMPONENTS)
3 changes: 3 additions & 0 deletions cmake/FindMPE.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,6 @@ foreach (NCDFcomp IN LISTS MPE_FIND_VALID_COMPONENTS)
endif ()

endforeach ()

# Handle QUIET/REQUIRED, and set <PKG>_FOUND if all required components were found
find_package_handle_standard_args (MPE HANDLE_COMPONENTS)
3 changes: 3 additions & 0 deletions cmake/FindMPISERIAL.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,6 @@ foreach (MPISERIAL_comp IN LISTS MPISERIAL_FIND_VALID_COMPONENTS)
endif ()

endforeach ()

# Handle QUIET/REQUIRED, and set <PKG>_FOUND if all required components were found
find_package_handle_standard_args (MPISERIAL HANDLE_COMPONENTS)
3 changes: 3 additions & 0 deletions cmake/FindNetCDF.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,3 +145,6 @@ foreach (NCDFcomp IN LISTS NetCDF_FIND_VALID_COMPONENTS)
endif ()

endforeach ()

# Handle QUIET/REQUIRED, and set <PKG>_FOUND if all required components were found
find_package_handle_standard_args (NetCDF HANDLE_COMPONENTS)
3 changes: 3 additions & 0 deletions cmake/FindPnetCDF.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,6 @@ foreach (PNCDFcomp IN LISTS PnetCDF_FIND_VALID_COMPONENTS)
endif ()

endforeach ()

# Handle QUIET/REQUIRED, and set <PKG>_FOUND if all required components were found
find_package_handle_standard_args (PnetCDF HANDLE_COMPONENTS)
172 changes: 62 additions & 110 deletions cmake/LibFind.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,120 +192,73 @@ function (find_package_component PKG)

# Only continue if package not found already
if (NOT ${PKGCOMP}_FOUND)

# Handle QUIET and REQUIRED arguments
if (${${PKG}_FIND_QUIETLY})
set (${PKGCOMP}_FIND_QUIETLY TRUE)
endif ()
if (${${PKG}_FIND_REQUIRED})
set (${PKGCOMP}_FIND_REQUIRED TRUE)
endif ()

# Determine search order
set (SEARCH_DIRS)
if (${PKG}_HINTS)
list (APPEND SEARCH_DIRS ${${PKG}_HINTS})
endif ()
if (${PKG}_PATHS)
list (APPEND SEARCH_DIRS ${${PKG}_PATHS})
endif ()
if (${PKGCOMP}_PATH)
list (APPEND SEARCH_DIRS ${${PKGCOMP}_PATH})
endif ()
if (${PKG}_PATH)
list (APPEND SEARCH_DIRS ${${PKG}_PATH})
endif ()
if (DEFINED ENV{${PKGCOMPUP}})
list (APPEND SEARCH_DIRS $ENV{${PKGCOMPUP}})
endif ()
if (DEFINED ENV{${PKGUP}})
list (APPEND SEARCH_DIRS $ENV{${PKGUP}})
endif ()
if (CMAKE_SYSTEM_PREFIX_PATH)
list (APPEND SEARCH_DIRS ${CMAKE_SYSTEM_PREFIX_PATH})
endif ()

# Start the search for the include file and library file
set (${PKGCOMP}_PREFIX ${PKGCOMP}_PREFIX-NOTFOUND)
set (${PKGCOMP}_INCLUDE_DIR ${PKGCOMP}_INCLUDE_DIR-NOTFOUND)
set (${PKGCOMP}_LIBRARY ${PKGCOMP}_LIBRARY-NOTFOUND)
foreach (dir IN LISTS SEARCH_DIRS)

# Search for include file names in current dirrectory
foreach (iname IN LISTS ${PKGCOMP}_INCLUDE_NAMES)
if (EXISTS ${dir}/${iname})
set (${PKGCOMP}_PREFIX ${dir})
set (${PKGCOMP}_INCLUDE_DIR ${dir})
break ()
endif ()
if (EXISTS ${dir}/include/${iname})
set (${PKGCOMP}_PREFIX ${dir})
set (${PKGCOMP}_INCLUDE_DIR ${dir}/include)
break ()
endif ()
endforeach ()

# Search for library file names in the found prefix only!
if (${PKGCOMP}_PREFIX)
find_library (${PKGCOMP}_LIBRARY
NAMES ${${PKGCOMP}_LIBRARY_NAMES}
PATHS ${${PKGCOMP}_PREFIX}
PATH_SUFFIXES lib
NO_DEFAULT_PATH)

# If found, check if library is static or dynamic
if (${PKGCOMP}_LIBRARY)
is_shared_library (${PKGCOMP}_IS_SHARED ${${PKGCOMP}_LIBRARY})

# If we want only shared libraries, and it isn't shared...
if (PREFER_SHARED AND NOT ${PKGCOMP}_IS_SHARED)
find_shared_library (${PKGCOMP}_SHARED_LIBRARY
NAMES ${${PKGCOMP}_LIBRARY_NAMES}
PATHS ${${PKGCOMP}_PREFIX}
PATH_SUFFIXES lib
NO_DEFAULT_PATH)
if (${PKGCOMP}_SHARED_LIBRARY)
set (${PKGCOMP}_LIBRARY ${${PKGCOMP}_SHARED_LIBRARY})
set (${PKGCOMP}_IS_SHARED TRUE)
endif ()

# If we want only static libraries, and it is shared...
elseif (PREFER_STATIC AND ${PKGCOMP}_IS_SHARED)
find_static_library (${PKGCOMP}_STATIC_LIBRARY
NAMES ${${PKGCOMP}_LIBRARY_NAMES}
PATHS ${${PKGCOMP}_PREFIX}
PATH_SUFFIXES lib
NO_DEFAULT_PATH)
if (${PKGCOMP}_STATIC_LIBRARY)
set (${PKGCOMP}_LIBRARY ${${PKGCOMP}_STATIC_LIBRARY})
set (${PKGCOMP}_IS_SHARED FALSE)
endif ()
endif ()

# Determine search order. NOTE: non-defined vars are simply not appended
set (SEARCH_DIRS
${${PKG}_HINTS}
${${PKG}_PATHS}
${${PKGCOMP}_PATH}
${${PKG}_PATH}
$ENV{${PKGCOMPUP}}
$ENV{${PKGUP}}
${CMAKE_SYSTEM_PREFIX_PATH})

# Start the search for the include file(s) and library file(s)
find_path (${PKGCOMP}_INCLUDE_DIR
NAMES ${${PKGCOMP}_INCLUDE_NAMES}
NO_DEFAULT_PATH
PATHS ${SEARCH_DIRS}
PATH_SUFFIXES include)

# Only search for libs "near" the include dir
find_library (${PKGCOMP}_LIBRARY
NAMES ${${PKGCOMP}_LIBRARY_NAMES}
HINTS ${${PKGCOMP}_INCLUDE_DIR} ${${PKGCOMP}_INCLUDE_DIR}/../
PATH_SUFFIXES lib lib64
NO_DEFAULT_PATH)

# If found, check if library is static or dynamic
if (${PKGCOMP}_LIBRARY)
is_shared_library (${PKGCOMP}_IS_SHARED ${${PKGCOMP}_LIBRARY})

# If we want only shared libraries, and it isn't shared...
if (PREFER_SHARED AND NOT ${PKGCOMP}_IS_SHARED)
find_shared_library (${PKGCOMP}_SHARED_LIBRARY
NAMES ${${PKGCOMP}_LIBRARY_NAMES}
HINTS ${${PKGCOMP}_INCLUDE_DIR} ${${PKGCOMP}_INCLUDE_DIR}/../
PATH_SUFFIXES lib
NO_DEFAULT_PATH)
if (${PKGCOMP}_SHARED_LIBRARY)
set (${PKGCOMP}_LIBRARY ${${PKGCOMP}_SHARED_LIBRARY})
set (${PKGCOMP}_IS_SHARED TRUE)
endif ()

# If include dir and library both found, then we're done
if (${PKGCOMP}_INCLUDE_DIR AND ${PKGCOMP}_LIBRARY)
break ()

# Otherwise, reset the search variables and continue
else ()
set (${PKGCOMP}_PREFIX ${PKGCOMP}_PREFIX-NOTFOUND)
set (${PKGCOMP}_INCLUDE_DIR ${PKGCOMP}_INCLUDE_DIR-NOTFOUND)
set (${PKGCOMP}_LIBRARY ${PKGCOMP}_LIBRARY-NOTFOUND)

# If we want only static libraries, and it is shared...
elseif (PREFER_STATIC AND ${PKGCOMP}_IS_SHARED)
find_static_library (${PKGCOMP}_STATIC_LIBRARY
NAMES ${${PKGCOMP}_LIBRARY_NAMES}
HINTS ${${PKGCOMP}_INCLUDE_DIR} ${${PKGCOMP}_INCLUDE_DIR}/../
PATH_SUFFIXES lib
NO_DEFAULT_PATH)
if (${PKGCOMP}_STATIC_LIBRARY)
set (${PKGCOMP}_LIBRARY ${${PKGCOMP}_STATIC_LIBRARY})
set (${PKGCOMP}_IS_SHARED FALSE)
endif ()
endif ()

endforeach ()
endif ()

# handle the QUIETLY and REQUIRED arguments and
# set NetCDF_C_FOUND to TRUE if all listed variables are TRUE
find_package_handle_standard_args (${PKGCOMP} DEFAULT_MSG
${PKGCOMP}_LIBRARY
${PKGCOMP}_INCLUDE_DIR)
# Use find_package_handle_standard_args only if this is not a component-specific
# call, to avoid lengthy cmake warnings. If this is a component specific call, the upstream
# Find<PKG>.cmake module will take care of calling the macro, using HANDLE_COMPONENTS
if (NOT COMP)
find_package_handle_standard_args (${PKGCOMP} DEFAULT_MSG
${PKGCOMP}_LIBRARY
${PKGCOMP}_INCLUDE_DIR)
elseif (${PKGCOMP}_LIBRARY AND ${PKGCOMP}_INCLUDE_DIR)
set (${PKGCOMP}_FOUND TRUE)
endif()

mark_as_advanced (${PKGCOMP}_INCLUDE_DIR ${PKGCOMP}_LIBRARY)

# HACK For bug in CMake v3.0:
set (${PKGCOMP}_FOUND ${${PKGCOMPUP}_FOUND})

# Set return variables
if (${PKGCOMP}_FOUND)
Expand All @@ -320,7 +273,6 @@ function (find_package_component PKG)
set (${PKGCOMP}_LIBRARY ${${PKGCOMP}_LIBRARY} PARENT_SCOPE)
set (${PKGCOMP}_LIBRARIES ${${PKGCOMP}_LIBRARIES} PARENT_SCOPE)
set (${PKGCOMP}_IS_SHARED ${${PKGCOMP}_IS_SHARED} PARENT_SCOPE)

endif ()

endfunction ()
Expand Down