Skip to content
Permalink
Browse files

Properly set the *_FOUND variables for the Globus libs

I don't see how these FindGlobus*.cmake routines ever worked.
Calling FindPackage(XxxYyy REQUIRED) checks for a XxxYyy_FOUND
variable on return to determine success and NOT Xxx_Yyy_FOUND which
which is what was set in both those routines.  I made the minimal
change of Xxx_Yyy_FOUND->XxxYyy_FOUND for both routines.  The other
library and include paths still have the name separation, Xxx_Yyy_*.
This allows the packages to be be found and builds the library.
  • Loading branch information...
tacketar committed Oct 5, 2016
1 parent 4547060 commit 7dad3c0db98f1b0b059f1dc54203eb7168cefd7e
@@ -10,6 +10,7 @@ TIMESTAMP(LSTORE_DSI_TIMESTAMP)

find_package(GlobusCommon REQUIRED)
find_package(GlobusGridftpServer REQUIRED)

set(GRIDFTP_OBJS
src/command.c
src/lstore_dsi.c
@@ -23,8 +23,8 @@ set(GLOBUS_COMMON_INCLUDE_DIRS ${GLOBUS_COMMON_INCLUDE_DIR})
include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set GLOBUS_COMMON_FOUND to TRUE
# if all listed variables are TRUE
find_package_handle_standard_args(GLOBUS_COMMON DEFAULT_MSG
find_package_handle_standard_args(GLOBUSCOMMON DEFAULT_MSG
GLOBUS_COMMON_LIBRARY GLOBUS_COMMON_INCLUDE_DIR)

mark_as_advanced( GLOBUS_COMMON_FOUND GLOBUS_COMMON_INCLUDE_DIR GLOBUS_COMMON_LIBRARY )
mark_as_advanced( GLOBUSCOMMON_FOUND GLOBUS_COMMON_INCLUDE_DIR GLOBUS_COMMON_LIBRARY )

@@ -23,8 +23,8 @@ set(GLOBUS_GRIDFTP_SERVER_INCLUDE_DIRS ${GLOBUS_GRIDFTP_SERVER_INCLUDE_DIR})
include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set GLOBUS_GRIDFTP_SERVER_FOUND to TRUE
# if all listed variables are TRUE
find_package_handle_standard_args(GLOBUS_GRIDFTP_SERVER DEFAULT_MSG
find_package_handle_standard_args(GLOBUSGRIDFTPSERVER DEFAULT_MSG
GLOBUS_GRIDFTP_SERVER_LIBRARY GLOBUS_GRIDFTP_SERVER_INCLUDE_DIR)

mark_as_advanced( GLOBUS_GRIDFTP_SERVER_FOUND GLOBUS_GRIDFTP_SERVER_INCLUDE_DIR GLOBUS_GRIDFTP_SERVER_LIBRARY )
mark_as_advanced(GLOBUSGRIDFTPSERVER_FOUND GLOBUS_GRIDFTP_SERVER_INCLUDE_DIR GLOBUS_GRIDFTP_SERVER_LIBRARY )

0 comments on commit 7dad3c0

Please sign in to comment.
You can’t perform that action at this time.