From 4659e43a6b0914e3da6048328cece6e01be95e44 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 11 Oct 2018 12:24:15 -0500
Subject: HDFFV-10603 fixup cmake usage

---
 config/cmake_ext_mod/ConfigureChecks.cmake | 4 ++--
 src/CMakeLists.txt                         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/cmake_ext_mod/ConfigureChecks.cmake b/config/cmake_ext_mod/ConfigureChecks.cmake
index 4204511..40f1440 100644
--- a/config/cmake_ext_mod/ConfigureChecks.cmake
+++ b/config/cmake_ext_mod/ConfigureChecks.cmake
@@ -273,7 +273,7 @@ if (NOT WINDOWS)
   set (HDF_EXTRA_C_FLAGS -D_GNU_SOURCE)
 
   option (HDF_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON)
-  if (HDF_ENABLE_LARGE_FILE)
+  if (HDF_ENABLE_LARGE_FILE AND NOT DEFINED TEST_LFS_WORKS_RUN)
     set (msg "Performing TEST_LFS_WORKS")
     TRY_RUN (TEST_LFS_WORKS_RUN   TEST_LFS_WORKS_COMPILE
         ${CMAKE_BINARY_DIR}
@@ -563,7 +563,7 @@ endif ()
 if (WINDOWS)
   if (NOT HDF_NO_IOEO_TEST)
   message (STATUS "Checking for InitOnceExecuteOnce:")
-  if (NOT DEFINED ${${HDF_PREFIX}_HAVE_IOEO})
+  if (NOT DEFINED ${HDF_PREFIX}_HAVE_IOEO)
     if (LARGEFILE)
       set (CMAKE_REQUIRED_DEFINITIONS
           "${CURRENT_TEST_DEFINITIONS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 49a84df..5314697 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -895,7 +895,7 @@ if (NOT EXISTS ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c)
   TARGET_C_PROPERTIES (H5detect STATIC)
   target_link_libraries (H5detect
       PRIVATE "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>" $<$<PLATFORM_ID:Windows>:ws2_32.lib>
-      INTERFACE $<$<PLATFORM_ID:Emscripten>:"-O0">
+      PRIVATE $<$<PLATFORM_ID:Emscripten>:"-O0">
   )
 
   option (HDF5_BATCH_DETECT "Use batch file to execute H5detect" OFF)
@@ -956,7 +956,7 @@ target_compile_definitions(H5make_libsettings PUBLIC ${HDF_EXTRA_C_FLAGS} ${HDF_
 TARGET_C_PROPERTIES (H5make_libsettings STATIC)
 target_link_libraries (H5make_libsettings
     PRIVATE "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>" $<$<PLATFORM_ID:Windows>:ws2_32.lib>
-    INTERFACE $<$<PLATFORM_ID:Emscripten>:"-O0">
+    PRIVATE $<$<PLATFORM_ID:Emscripten>:"-O0">
 )
 
 add_custom_command (
-- 
cgit v0.12