Windows 11 support: ifx compiler, hardened SDK/path detection, and cross-platform fixes (#26)

* Windows: support ifx build and update README

* Update Eigen download URL and ignore buildOO

* Update Windows setup docs and harden oneAPI/CUDA path detection

* Harden SDK path detection for ifx (IntelLLVM) and Windows build types

- HDF5: fix Windows HDF5_DIR path and add cmake/hdf5 fallback
- JsonFortran/bspline-fortran: detect IntelLLVM compiler (ifx) as 'intelllvm' FC_NAME, add cross-variant fallback paths and intel alias
- nlopt: use BUILD_TYPE-suffixed path on Windows with fallback to legacy unsuffixed path

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Johan Westraadt <westraadt.1@osu.edu>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: 3 people

.gitignore

@@ -23,6 +23,7 @@ Support/Scripts/GMT/gmt.history
 /Release/
 /DebugOO/
 /ReleaseOO/
+/buildOO/
 .ctags
 .vscode
 /ExternalProjects

CMakeLists.txt

@@ -15,7 +15,7 @@ if(WIN32)
   message(STATUS "**************************************************************************")
   message(STATUS "* Platform: Windows")
   message(STATUS "* ONLY NVidia GPUs are supported on Windows platforms. Please ensure that")
-  message(STATUS "* the NVidia GPU computing toolkit version 10.0 is installed on your")
+  message(STATUS "* the NVidia GPU computing toolkit version 10.0 or newer is installed on your")
   message(STATUS "* computer before trying to compile EMsoft.")
   message(STATUS "**************************************************************************")
 
@@ -187,13 +187,21 @@ FILE(APPEND ${EMsoftOO_SDK_FILE} "set(CMAKE_EXPORT_COMPILE_COMMANDS ON)\n")
 #------------------------------------------------------------------------------
 # Get the name of the Fortran compiler for easier decisions
 get_filename_component (Fortran_COMPILER_NAME ${CMAKE_Fortran_COMPILER} NAME)
+set(EMSOFTOO_FORTRAN_IS_GNU OFF)
+set(EMSOFTOO_FORTRAN_IS_INTEL OFF)
+
+if(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" OR Fortran_COMPILER_NAME MATCHES "gfortran.*")
+  set(EMSOFTOO_FORTRAN_IS_GNU ON)
+elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel" OR Fortran_COMPILER_NAME MATCHES "ifort.*" OR Fortran_COMPILER_NAME MATCHES "ifx.*")
+  set(EMSOFTOO_FORTRAN_IS_INTEL ON)
+endif()
 
 #------------------------------------------------------------------------------
 # On Windows we are going to use Intel MKL with the FFTW interface so we do not
 # need to install FFTW3
-if(${Fortran_COMPILER_NAME} MATCHES "gfortran.*")
+if(EMSOFTOO_FORTRAN_IS_GNU)
   include(FFTW)
-elseif (${Fortran_COMPILER_NAME} MATCHES "ifort.*")
+elseif(EMSOFTOO_FORTRAN_IS_INTEL)
   set(OSX_DEPLOYMENT_TARGET "10.13")
   include(MKL)
 else()

ReadMe.md

@@ -15,24 +15,25 @@ source code base. Note that this SDK can co-exist alongside the regular SDK buil
 
 ## Prerequisites ##
 
-+ CMake 3.15.x or later installed on system (preferably 3.25)
-+ Compiler Suite installed on system 
-+ Fortran compiler installed on system
-+ Git installed on the system
++ CMake 3.25 or later installed on the system. The Visual Studio 2022 bundled CMake 3.31.x works.
++ Compiler suite installed on the system
++ Fortran compiler installed on the system
++ Git 2.x installed on the system
++ On Windows for this branch, install Visual Studio 2022 plus Intel oneAPI Base Toolkit and HPC Toolkit so that `ifx` and MKL are available
 
 ## Supported Platforms ##
 
-| Operating System | C/C++ Compiler | Fortran Compiler |
-|------------------|----------------|------------------|
-| macOS (>=10.13) | Xcode Native tools (10/11) | GFortran 6.3.0 or Intel Fortran 19\*\* |
-| Windows (10) | Visual Studio 2015 (CE/Pro) | Intel Fortran v17/v19 |
-| Linux (Ubuntu 16.x, CentOS 7.x) | GCC 7.x and Above, Clang 3.8 and greater | GNU Fortran 6.3.5 20160904 or newer |
+| Operating System | C/C++ Compiler | Fortran Compiler | Status |
+|------------------|----------------|------------------|--------|
+| macOS (>=10.13) | Xcode Native tools (10/11) | GFortran 6.3.0 or Intel Fortran 19\*\* | Legacy instructions |
+| Windows 11 | Visual Studio 2022 | Intel oneAPI `ifx` | Validated on this branch |
+| Linux (Ubuntu 16.x, CentOS 7.x) | GCC 7.x and above, Clang 3.8 and greater | GNU Fortran 6.3.5 20160904 or newer | Legacy instructions |
 
 \*\*macOS Note: If you are installing Intel Fortran try to install into a location **other** then /opt/intel which is the default. Try /opt/intel_sw instead.
 
 ## Git Locations ##
 
-Git verison 2.x is required.
+Git version 2.x is required.
 
 | Operating System |  Notes  |
 |------------------|--------------|
@@ -47,7 +48,7 @@ Git verison 2.x is required.
 | HDF5 | 1.12.2 | Compiled from Source |
 | CLFortran | 0.0.1 | Compiled from Source on GitHub |
 | FFTW | 3.3.5 | Compiled (macOS/Linux) |
-| Intel MKL | 2019_xxxx | Precompiled for IFort compilers (windows & macos) |
+| Intel MKL | oneAPI install | Uses the MKL installation that ships with Intel oneAPI on Windows |
 | Json-Fortran | 4.2.1 | Compiled from source on GitHub |
 | Eigen | 3.3.5 | Compiled from Source |
 | Qt 5 | 5.12.4 | Precompiled Binaries from [www.qt.io](http://download.qt.io) |
@@ -75,34 +76,59 @@ Git verison 2.x is required.
 
 ## Windows Instructions ##
 
-*Currently ONLY NMake files are supported. Visual Studio support is being looked at*
+> "All hope abandon ye who enter here..."
 
-1. Install your compiler tools
-2. Install CMake on your system
-3. Install a Fortran compiler on your system
-4. Install Git on your system
-5. Create the following Directories:
-    + C:/Users/[USERNAME]/EMsoftOO_SDK
-    + C:/Users/[USERNAME]/EMsoft-Dev
-6. Open a command prompt and invoke the following commands
+Toolchain installation behavior can vary across compiler, CUDA, CMake, and IDE versions, and package layouts may differ between systems. As a result, additional post-install configuration is often required; in practice, a disciplined, agentic workflow (iterative validation, environment checks, and targeted reconfiguration) is necessary for reliable setup.
+
+This branch is currently validated on Windows with the `NMake Makefiles` generator, Visual Studio 2022 Community, and Intel oneAPI `ifx` (tested with Visual Studio 2022 17.14.x, oneAPI 2025.3.1, CUDA 12.9.1, and the Visual Studio 2022 bundled CMake 3.31.x).
+
+### Toolchain Installation ###
+
+1. Install Visual Studio 2022 Community 17.14.x with the Desktop development with C++ workload.
+   + Download bootstrapper: [vs_community.exe](https://aka.ms/vs/17/release/vs_community.exe)
+   + Release history (17.x details): [Visual Studio 2022 Release History](https://learn.microsoft.com/en-us/visualstudio/releases/2022/release-history)
+2. Install Intel oneAPI Base Toolkit 2025.3.1.35 (provides MKL and core toolchain pieces).
+   + Download: [intel-oneapi-base-toolkit-2025.3.1.35.exe](https://registrationcenter-download.intel.com/akdlm/IRC_NAS/076e961b-2c29-48a8-9203-c96f00e7051b/intel-oneapi-base-toolkit-2025.3.1.35.exe)
+3. Install Intel oneAPI HPC Toolkit 2025.3.1.54 (provides `ifx` Fortran).
+   + Download: [intel-oneapi-hpc-toolkit-2025.3.1.54_offline.exe](https://registrationcenter-download.intel.com/akdlm/IRC_NAS/36f868e9-84b3-4b4f-90ef-ca84092cae6a/intel-oneapi-hpc-toolkit-2025.3.1.54_offline.exe)
+4. Install NVIDIA CUDA Toolkit 12.9.1 if `BUILD_CLFortran=ON` (required for OpenCL headers/libs used by CLFortran on Windows).
+   + Download page (Windows x86_64): [CUDA Toolkit 12.9.1 Downloads](https://developer.nvidia.com/cuda-12-9-1-download-archive?target_arch=x86_64&target_os=Windows)
+5. Install Git.
+6. Install CMake 3.25 or later, or use the CMake that ships with Visual Studio 2022.
+
+### Configure and Build ###
+
+1. Open a Command Prompt window.
+2. Initialize the Visual Studio 2022 and Intel oneAPI build environment:
+
+        call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat" intel64 vs2022
+
+3. Choose an SDK install location, for example:
+
+        C:/Users/[USERNAME]/EMsoftOO_SDK
 
-        cd C:/Users/[USERNAME]/EMsoft-Dev
-		git clone git://www.github.com/emsoft-org/EMsoftSuperbuild
+4. Clone the repository and configure a Release build:
+
+        cd C:/Users/[USERNAME]
+        git clone https://github.com/EMsoft-org/EMsoftSuperbuild.git
         cd EMsoftSuperbuild
-        mkdir Debug
-        cd Debug
-        cmake -G "NMake Makefiles" -DEMsoftOO_SDK=C:/Users/[USERNAME]/EMsoftOO_SDK -DCMAKE_BUILD_TYPE=Debug ../
-        nmake
-        cd ../
-        mkdir Release
-        cd Release
-        cmake -G "NMake Makefiles" -DEMsoftOO_SDK=C:/Users/[USERNAME]/EMsoftOO_SDK -DCMAKE_BUILD_TYPE=Release ../
-        make -j
+        cmake -S . -B build-ifx -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_Fortran_COMPILER=ifx -DEMsoftOO_SDK=C:/Users/[USERNAME]/EMsoftOO_SDK -DINSTALL_QT5=OFF
+
+5. Build the SDK:
+
+        cmake --build build-ifx
+
+6. After a successful build, the generated SDK configuration file will be located at:
+
+        C:/Users/[USERNAME]/EMsoftOO_SDK/EMsoftOO_SDK.cmake
 
-7. The initial run of CMake is going to take  **REALLY** long time because it will be downloading the full Qt 5.x installer which is about 3~4 GB in size. On macOS systems it then must verify the .dmg, mount it and run the installer (which verifies the .app). Go get coffee. Compiling (the 'make -j' part) should not take that long, only about 5 minutes or so.
+7. To generate a Debug SDK, use a different build directory and switch `-DCMAKE_BUILD_TYPE=Debug`.
 
-**NOTE**: there is currently a known issue where the Qt 5.x installer will NOT actually run during the Linux cmake process. If the user does *NOT* want to build the GUI application then this is fine. If the user does want to build the GUI application then they will need to install Qt 5.x themselves. The download will be at /path/to/EMsoft_SDK/superbuild/Qt/download
+### Notes ###
 
-The developer can use CMakeGui if they would like instead of the command lines. The only required variable are the path to where you want the EMsoft_SDK folder and the build type (Debug or Release)
++ `-DINSTALL_QT5=OFF` builds the command-line dependency stack only. Set `-DINSTALL_QT5=ON` if you also want Qt 5 and EBSDLib.
++ Enabling Qt will trigger a very large Qt download during the first configure.
++ If CUDA is installed in a non-default location, set `-DNVIDIA_CUDA_DIR=<path>` and `-DNVIDIA_CUDA_DEV_VERSION=12.9`.
++ The developer can also use CMake GUI. The required variables are `EMsoftOO_SDK` and `CMAKE_BUILD_TYPE`.
 
 Once the SDK builds correctly, no errors are reported on the command line, then the developer can proceed to clone and build EMsoft itself.

projects/Bcls.cmake

@@ -45,10 +45,15 @@ else()
   endif()
 endif()
 
-if(${Fortran_COMPILER_NAME} MATCHES "gfortran.*")
+if(EMSOFTOO_FORTRAN_IS_GNU)
   set(BCLS_USE_MKL "OFF")
-elseif (${Fortran_COMPILER_NAME} MATCHES "ifort.*")
+elseif(EMSOFTOO_FORTRAN_IS_INTEL)
   set(BCLS_USE_MKL "ON")
+  set(BCLS_MKL_DIR "${MKL_DIR}")
+  if(NOT "${BCLS_MKL_DIR}" STREQUAL "")
+    # Avoid backslash escape parsing issues in generated ExternalProject scripts on Windows.
+    file(TO_CMAKE_PATH "${BCLS_MKL_DIR}" BCLS_MKL_DIR)
+  endif()
 else()
   message(STATUS "The Fotran compiler is NOT recognized. EMsoft may not support it.")
   message(FATAL_ERROR "Current Fotran Compiler is ${CMAKE_Fortran_COMPILER}")
@@ -77,7 +82,7 @@ ExternalProject_Add(${extProjectName}
     -DOpenCL_INCLUDE_DIR:PATH=${OpenCL_INCLUDE_DIR}
     -DOpenCL_LIBRARY:FILEPATH=${OpenCL_LIBRARY}
     -DBCLS_USE_MKL:BOOL=${BCLS_USE_MKL}
-    -DMKL_DIR:PATH=${MKL_DIR}
+    -DMKL_DIR:STRING=${BCLS_MKL_DIR}
 
   LOG_DOWNLOAD 1
   LOG_UPDATE 1

projects/CLFortran.cmake

@@ -28,20 +28,53 @@ set_property(DIRECTORY PROPERTY EP_BASE ${EMsoftOO_SDK}/superbuild)
 
 if(WIN32)
   set(MIN_CUDA_VERSION "10.0")
-  set(NVIDIA_CUDA_DEV_VERSION ${MIN_CUDA_VERSION} CACHE STRING "CUDA developer version, to use")
-  if(${NVIDIA_CUDA_DEV_VERSION} LESS ${MIN_CUDA_VERSION})
-    message(FATAL_ERROR "NVIDIA CUDA version must be at least ${MIN_CUDA_VERSION} (got ${NVIDIA_CUDA_DEV_VERSION})")
-  endif()
+  set(NVIDIA_CUDA_DEV_VERSION "" CACHE STRING "CUDA developer version to use (for example: 12.9). Leave empty to auto-detect the latest installed version.")
   if("${NVIDIA_CUDA_DIR}" STREQUAL "")
     set(NVIDIA_CUDA_DIR "C:/Program Files/NVIDIA GPU Computing Toolkit")
     message(STATUS "NVIDIA CUDA Install: Using default location of ${NVIDIA_CUDA_DIR}")
   endif()
+
+  if(NOT EXISTS "${NVIDIA_CUDA_DIR}/CUDA")
+    message(STATUS "NVIDIA GPU Computing Toolkit is NOT in selected location.")
+    message(STATUS "Please set NVIDIA_CUDA_DIR to the top-level NVIDIA toolkit directory.")
+    message(STATUS "Or disable CLFortran with -DBUILD_CLFortran=OFF for CPU-only builds.")
+    message(FATAL_ERROR "NVIDIA CUDA toolkit root not found: ${NVIDIA_CUDA_DIR}/CUDA")
+  endif()
+
+  if("${NVIDIA_CUDA_DEV_VERSION}" STREQUAL "")
+    file(GLOB _cuda_dirs RELATIVE "${NVIDIA_CUDA_DIR}/CUDA" "${NVIDIA_CUDA_DIR}/CUDA/v*")
+    set(_detected_cuda_version "")
+    foreach(_cuda_dir IN LISTS _cuda_dirs)
+      string(REGEX REPLACE "^v" "" _cuda_ver "${_cuda_dir}")
+      if(NOT _cuda_ver VERSION_LESS ${MIN_CUDA_VERSION})
+        if("${_detected_cuda_version}" STREQUAL "" OR _cuda_ver VERSION_GREATER _detected_cuda_version)
+          set(_detected_cuda_version "${_cuda_ver}")
+        endif()
+      endif()
+    endforeach()
+    set(NVIDIA_CUDA_DEV_VERSION "${_detected_cuda_version}" CACHE STRING "CUDA developer version to use (for example: 12.9). Leave empty to auto-detect the latest installed version." FORCE)
+    if(NOT "${NVIDIA_CUDA_DEV_VERSION}" STREQUAL "")
+      message(STATUS "NVIDIA CUDA Install: Auto-detected version ${NVIDIA_CUDA_DEV_VERSION}")
+    endif()
+  endif()
+
+  if("${NVIDIA_CUDA_DEV_VERSION}" STREQUAL "")
+    message(STATUS "No compatible CUDA installation was detected (minimum required: ${MIN_CUDA_VERSION}).")
+    message(STATUS "Install CUDA from https://developer.nvidia.com/cuda-downloads")
+    message(STATUS "or disable CLFortran with -DBUILD_CLFortran=OFF")
+    message(FATAL_ERROR "NVIDIA CUDA is not installed or not detected")
+  endif()
+
+  if(${NVIDIA_CUDA_DEV_VERSION} VERSION_LESS ${MIN_CUDA_VERSION})
+    message(FATAL_ERROR "NVIDIA CUDA version must be at least ${MIN_CUDA_VERSION} (got ${NVIDIA_CUDA_DEV_VERSION})")
+  endif()
+
   if(NOT EXISTS "${NVIDIA_CUDA_DIR}/CUDA/v${NVIDIA_CUDA_DEV_VERSION}")
     message(STATUS "NVIDIA GPU Computing Toolkit is NOT in selected location.")
-    message(STATUS "Please set the NVIDIA_CUDA_DIR CMake variable to point to the top level installation of the NVIDIA GPU Computing Toolkit installation")
+    message(STATUS "Please set NVIDIA_CUDA_DIR to the top-level NVIDIA toolkit directory.")
     message(STATUS "CLFortran uses version ${NVIDIA_CUDA_DEV_VERSION} of that toolkit.")
-    message(STATUS "Downlaod from ${NVIDIA_CUDA_DEV_VERSION} https://developer.nvidia.com/cuda-${NVIDIA_CUDA_DEV_VERSION}-download-archive")
-    message(STATUS "or change NVIDIA_CUDA_DEV_VERSION to installed version")
+    message(STATUS "Download archive: https://developer.nvidia.com/cuda-download-archive")
+    message(STATUS "or change NVIDIA_CUDA_DEV_VERSION to an installed version")
     message(FATAL_ERROR "NVIDIA CUDA ${NVIDIA_CUDA_DEV_VERSION} is not installed or not detected")
   endif()
 

projects/Eigen.cmake

@@ -13,7 +13,7 @@ set(Eigen_VERSION "3.3.9")
 message(STATUS "Building: ${extProjectName} ${Eigen3_VERSION}: -DBUILD_EIGEN=${BUILD_EIGEN}")
 
 #set(Eigen_URL "https://bitbucket.org/eigen/eigen/get/${Eigen_VERSION}.tar.gz")
-set(Eigen_URL "http://dream3d.bluequartz.net/binaries/SDK/Eigen-${Eigen_VERSION}.tar.gz")
+set(Eigen_URL "https://gitlab.com/libeigen/eigen/-/archive/${Eigen_VERSION}/eigen-${Eigen_VERSION}.tar.gz")
 set(SOURCE_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Source/${extProjectName}.tar.gz")
 
 if(WIN32)

projects/HDF5.cmake

@@ -19,6 +19,39 @@ message(STATUS "Building: ${extProjectName} ${HDF5_VERSION}: -DBUILD_HDF5=${BUIL
 
 set(HDF5_BUILD_SHARED_LIBS ON)
 set(HDF5_INSTALL "${EMsoftOO_SDK}/${extProjectName}-${HDF5_VERSION}-${CMAKE_BUILD_TYPE}")
+set(HDF5_CMAKE_ARGS
+  -DBUILD_SHARED_LIBS:BOOL=${HDF5_BUILD_SHARED_LIBS}
+  -DBUILD_STATIC_LIBS:BOOL=ON
+  -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
+  -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
+  -DCMAKE_Fortran_COMPILER:FILEPATH=${CMAKE_Fortran_COMPILER}
+  -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+  -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+  -DCMAKE_OSX_DEPLOYMENT_TARGET=${OSX_DEPLOYMENT_TARGET}
+  -DCMAKE_OSX_SYSROOT=${OSX_SDK}
+  -DCMAKE_CXX_STANDARD=11
+  -DCMAKE_C_STANDARD=11
+  -DCMAKE_CXX_STANDARD_REQUIRED=ON
+  -DHDF5_BUILD_WITH_INSTALL_NAME=ON
+  -DHDF5_BUILD_CPP_LIB=ON
+  -DHDF5_BUILD_HL_LIB=ON
+  -DHDF_PACKAGE_NAMESPACE=hdf5::
+  -DHDF5_BUILD_FORTRAN=ON
+  -DHDF5_BUILD_EXAMPLES=OFF
+  -DBUILD_TESTING=OFF
+)
+
+if(WIN32 AND CMAKE_Fortran_COMPILER_ID STREQUAL "IntelLLVM")
+  # ifx fails while linking the shared high-level Fortran HDF5 library, but the
+  # static HDF5/Fortran libraries build cleanly and are sufficient for the SDK.
+  set(HDF5_BUILD_SHARED_LIBS OFF)
+  list(REMOVE_AT HDF5_CMAKE_ARGS 0)
+  list(INSERT HDF5_CMAKE_ARGS 0 -DBUILD_SHARED_LIBS:BOOL=${HDF5_BUILD_SHARED_LIBS})
+  list(APPEND HDF5_CMAKE_ARGS
+    -DONLY_SHARED_LIBS:BOOL=OFF
+    -DHDF5_INSTALL_MOD_FORTRAN:STRING=STATIC
+  )
+endif()
 
 
 if( CMAKE_BUILD_TYPE MATCHES Debug )
@@ -59,24 +92,8 @@ ExternalProject_Add(${extProjectName}
   INSTALL_DIR "${HDF5_INSTALL}"
 
   CMAKE_ARGS
-    -DBUILD_SHARED_LIBS:BOOL=${HDF5_BUILD_SHARED_LIBS}
-    -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
-    -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
-    -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-    -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+    ${HDF5_CMAKE_ARGS}
     ${C_CXX_FLAGS}
-    -DCMAKE_OSX_DEPLOYMENT_TARGET=${OSX_DEPLOYMENT_TARGET}
-    -DCMAKE_OSX_SYSROOT=${OSX_SDK}
-    -DCMAKE_CXX_STANDARD=11
-    -DCMAKE_C_STANDARD=11
-    -DCMAKE_CXX_STANDARD_REQUIRED=ON
-    -DHDF5_BUILD_WITH_INSTALL_NAME=ON 
-    -DHDF5_BUILD_CPP_LIB=ON 
-    -DHDF5_BUILD_HL_LIB=ON
-    -DHDF_PACKAGE_NAMESPACE=hdf5::
-    -DHDF5_BUILD_FORTRAN=ON
-    -DHDF5_BUILD_EXAMPLES=OFF
-    -DBUILD_TESTING=OFF
 
   LOG_DOWNLOAD 1
   LOG_UPDATE 1
@@ -96,10 +113,13 @@ if(APPLE)
   FILE(APPEND ${EMsoftOO_SDK_FILE} "set(HDF5_DIR \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${HDF5_VERSION}-\${BUILD_TYPE}/cmake\" CACHE PATH \"\")\n")
 elseif(WIN32)
   FILE(APPEND ${EMsoftOO_SDK_FILE} "set(HDF5_INSTALL \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${HDF5_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n")
-  FILE(APPEND ${EMsoftOO_SDK_FILE} "set(HDF5_DIR \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${HDF5_VERSION}-\${BUILD_TYPE}/cmake/hdf5\" CACHE PATH \"\")\n")
+  FILE(APPEND ${EMsoftOO_SDK_FILE} "set(HDF5_DIR \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${HDF5_VERSION}-\${BUILD_TYPE}/cmake\" CACHE PATH \"\")\n")
 else()
   FILE(APPEND ${EMsoftOO_SDK_FILE} "set(HDF5_INSTALL \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${HDF5_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n")
   FILE(APPEND ${EMsoftOO_SDK_FILE} "set(HDF5_DIR \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${HDF5_VERSION}-\${BUILD_TYPE}/cmake\" CACHE PATH \"\")\n")
 endif()
+FILE(APPEND ${EMsoftOO_SDK_FILE} "if(NOT EXISTS \"\${HDF5_DIR}/hdf5-config.cmake\" AND EXISTS \"\${HDF5_INSTALL}/cmake/hdf5/hdf5-config.cmake\")\n")
+FILE(APPEND ${EMsoftOO_SDK_FILE} "  set(HDF5_DIR \"\${HDF5_INSTALL}/cmake/hdf5\" CACHE PATH \"\" FORCE)\n")
+FILE(APPEND ${EMsoftOO_SDK_FILE} "endif()\n")
 FILE(APPEND ${EMsoftOO_SDK_FILE} "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \${HDF5_DIR})\n")
 FILE(APPEND ${EMsoftOO_SDK_FILE} "set(HDF5_VERSION \"${HDF5_VERSION}\" CACHE STRING \"\")\n")