Skip to content

Commit

Permalink
Merge pull request ossimlabs#273 from ossimlabs/drb-20210505
Browse files Browse the repository at this point in the history
Fixed cmake warnings with call to
  • Loading branch information
gpotts authored May 5, 2021
2 parents a62cfe8 + 3792f92 commit b49bb38
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion cmake/CMakeModules/FindFFmpeg.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ IF (FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVDEVICE_FOUND AND FFMPEG_LIBAVCODE
# This function sets FFMPEG_FOUND if variables are valid.
#---
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args( FFMPEG DEFAULT_MSG
find_package_handle_standard_args( FFmpeg DEFAULT_MSG
FFMPEG_LIBRARIES
FFMPEG_INCLUDE_DIRS )

Expand Down
2 changes: 1 addition & 1 deletion cmake/CMakeModules/FindGit.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ ENDIF(GIT_EXECUTABLE)
# Handle the QUIETLY and REQUIRED arguments and set GIT_FOUND to TRUE if
# all listed variables are TRUE
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args( GIT DEFAULT_MSG
find_package_handle_standard_args( Git DEFAULT_MSG
GIT_EXECUTABLE
GIT_VERSION_STRING )

Expand Down
2 changes: 1 addition & 1 deletion cmake/CMakeModules/FindJsonCpp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ if (USE_OSSIM_JSONCPP)
${OSSIM_INSTALL_PREFIX}/include/ossim NO_DEFAULT_PATH)
message("-- JSONCPP: Using amalgamated form in ossim package.")
set(JSONCPP_LIBRARY "")
find_package_handle_standard_args( JSONCPP DEFAULT_MSG JSONCPP_INCLUDE_DIR )
find_package_handle_standard_args( JsonCpp DEFAULT_MSG JSONCPP_INCLUDE_DIR )

else(USE_OSSIM_JSONCPP)
# The use of the amalgamated form was explicitly rejected. Need to look for installed package:
Expand Down
2 changes: 1 addition & 1 deletion cmake/CMakeModules/FindOssimVideo.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ FIND_LIBRARY(OSSIMVIDEO_LIBRARY NAMES ${OSSIMVIDEO_NAMES})
# handle the QUIETLY and REQUIRED arguments and set OSSIMVIDEO_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSSIMVIDEO DEFAULT_MSG OSSIMVIDEO_LIBRARY OSSIMVIDEO_INCLUDE_DIR)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OssimVideo DEFAULT_MSG OSSIMVIDEO_LIBRARY OSSIMVIDEO_INCLUDE_DIR)

IF(OSSIMVIDEO_FOUND)
SET( OSSIMVIDEO_LIBRARIES ${OSSIMVIDEO_LIBRARY} )
Expand Down
2 changes: 1 addition & 1 deletion cmake/CMakeModules/FindossimPlanet.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ FIND_LIBRARY(OSSIMPLANET_LIBRARY NAMES ${OSSIMPLANET_NAMES})
# handle the QUIETLY and REQUIRED arguments and set OSSIMPLANET_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSSIMPLANET DEFAULT_MSG OSSIMPLANET_LIBRARY OSSIMPLANET_INCLUDE_DIR)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(ossimPlanet DEFAULT_MSG OSSIMPLANET_LIBRARY OSSIMPLANET_INCLUDE_DIR)

IF(OSSIMPLANET_FOUND)
SET( OSSIMPLANET_LIBRARIES ${OSSIMPLANET_LIBRARY} )
Expand Down

0 comments on commit b49bb38

Please sign in to comment.