Fix typo in parsing function arguments; adjust Findifdhc module

FNALssi · Jan 29, 2024 · 4dcaaa1 · 4dcaaa1
1 parent 66205d4
commit 4dcaaa1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Modules/BuildDictionary.cmake b/Modules/BuildDictionary.cmake
@@ -336,7 +336,7 @@ function(build_dictionary)
 endfunction()
 
 function(_generate_dictionary)
-  cmake_parse_arguments(PARSE_ARGV 2 GD "" "AUX_OUTPUT_VAR" "")
+  cmake_parse_arguments(PARSE_ARGV 0 GD "" "AUX_OUTPUT_VAR" "")
   set(generate_dictionary_usage "_generate_dictionary( [DICT_FUNCTIONS] [dictionary_name] )")
   # Add target-specific include directories and compile definitions,
   # accounting safely for generator expressions.

diff --git a/Modules/Findifdhc.cmake b/Modules/Findifdhc.cmake
@@ -19,7 +19,7 @@ if (ifdhc_FOUND)
   set(_cet_ifdhc_config_mode CONFIG_MODE)
 else()
   unset(_cet_ifdhc_config_mode)
-  find_file(_cet_ifdh_h NAMES ifdh.h HINTS ENV IFDHC_INC)
+  find_file(_cet_ifdh_h NAMES ifdh.h HINTS ENV IFDHC_INC ENV IFDHC_DIR PATH_SUFFIXES inc)
   if (_cet_ifdh_h)
     get_filename_component(_cet_ifdhc_include_dir "${_cet_ifdh_h}" PATH)
     if (_cet_ifdhc_include_dir STREQUAL "/")
@@ -63,4 +63,3 @@ unset(_cet_ifdhc_config_mode)
 unset(_cet_ifdhc_dir)
 unset(_cet_ifdhc_include_dir)
 unset(_cet_ifdh_h CACHE)
-