Skip to content

Commit

Permalink
Merge pull request #25 from climbfuji/landsfcutil_remove_8_from_search
Browse files Browse the repository at this point in the history
Remove _8 version of landsfcutil from Modules/Findlandsfcutil.cmake
  • Loading branch information
climbfuji authored Feb 25, 2020
2 parents 2f3ea79 + b92f180 commit f90bde5
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions Modules/Findlandsfcutil.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
if(DEFINED ENV{LANDSFCUTIL_LIB4} )
set(LANDSFCUTIL_VER $ENV{LANDSFCUTIL_VER} CACHE STRING "LANDSFCUTIL Version")
set(LANDSFCUTIL_LIB4 $ENV{LANDSFCUTIL_LIB4} CACHE STRING "LANDSFCUTIL_4 Library Location")
set(LANDSFCUTIL_LIB8 $ENV{LANDSFCUTIL_LIBd} CACHE STRING "LANDSFCUTIL_8 Library Location")
set(LANDSFCUTIL_LIBd $ENV{LANDSFCUTIL_LIBd} CACHE STRING "LANDSFCUTIL_d Library Location")
set(LANDSFCUTIL_INC4 $ENV{LANDSFCUTIL_INC4} CACHE STRING "LANDSFCUTIL_4 Include Location")
set(LANDSFCUTIL_INC8 $ENV{LANDSFCUTIL_INC8} CACHE STRING "LANDSFCUTIL_8 Include Location")
set(LANDSFCUTIL_INCd $ENV{LANDSFCUTIL_INCd} CACHE STRING "LANDSFCUTIL_d Include Location")

set(name "landsfcutil")
Expand All @@ -16,7 +14,7 @@ if(DEFINED ENV{LANDSFCUTIL_LIB4} )
string(REGEX MATCH "(v[0-9]+\\.[0-9]+\\.[0-9]+)" _ ${${uppercase_name}_LIB4})
set(version ${CMAKE_MATCH_1})

set(kinds "4" "d" "8")
set(kinds "4" "d")
foreach(kind ${kinds})
set(lib_name ${name}_${kind})
set(versioned_lib_name ${name}_${version}_${kind})
Expand Down

0 comments on commit f90bde5

Please sign in to comment.