summaryrefslogtreecommitdiffstats
path: root/config/cmake_ext_mod
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-07-17 21:08:43 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-07-17 21:08:43 (GMT)
commit0a9180c0746618d08396d57f3fa5c94aa45e5b65 (patch)
treeb62cc7783440a9408c3eb1db7d0a0e3e4aade576 /config/cmake_ext_mod
parentac8a1f02ab5cb260f23acbe865090033a0183303 (diff)
downloadhdf5-0a9180c0746618d08396d57f3fa5c94aa45e5b65.zip
hdf5-0a9180c0746618d08396d57f3fa5c94aa45e5b65.tar.gz
hdf5-0a9180c0746618d08396d57f3fa5c94aa45e5b65.tar.bz2
HDFFV-10845 update mingw cmake changes
Diffstat (limited to 'config/cmake_ext_mod')
-rw-r--r--config/cmake_ext_mod/ConfigureChecks.cmake5
-rw-r--r--config/cmake_ext_mod/HDFMacros.cmake10
2 files changed, 10 insertions, 5 deletions
diff --git a/config/cmake_ext_mod/ConfigureChecks.cmake b/config/cmake_ext_mod/ConfigureChecks.cmake
index b05fbc8..8b68a9f 100644
--- a/config/cmake_ext_mod/ConfigureChecks.cmake
+++ b/config/cmake_ext_mod/ConfigureChecks.cmake
@@ -21,9 +21,6 @@ include (CheckTypeSize)
include (CheckVariableExists)
include (TestBigEndian)
-set (HDF_EXTRA_C_FLAGS)
-set (HDF_EXTRA_FLAGS)
-
#-----------------------------------------------------------------------------
# APPLE/Darwin setup
#-----------------------------------------------------------------------------
@@ -264,6 +261,8 @@ HDF_FUNCTION_TEST (STDC_HEADERS)
# The linux-lfs option is deprecated.
set (LINUX_LFS 0)
+set (HDF_EXTRA_C_FLAGS)
+set (HDF_EXTRA_FLAGS)
if (NOT WINDOWS)
# Might want to check explicitly for Linux and possibly Cygwin
# instead of checking for not Solaris or Darwin.
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake
index d145607..e1b79d8 100644
--- a/config/cmake_ext_mod/HDFMacros.cmake
+++ b/config/cmake_ext_mod/HDFMacros.cmake
@@ -86,7 +86,7 @@ macro (INSTALL_TARGET_PDB libtarget targetdestination targetcomponent)
${targetfilename}
DESTINATION
${targetdestination}
- CONFIGURATIONS $<CONFIG>
+ CONFIGURATIONS Debug RelWithDebInfo
COMPONENT ${targetcomponent}
OPTIONAL
)
@@ -101,7 +101,7 @@ macro (INSTALL_PROGRAM_PDB progtarget targetdestination targetcomponent)
$<TARGET_PDB_FILE:${progtarget}>
DESTINATION
${targetdestination}
- CONFIGURATIONS $<CONFIG>
+ CONFIGURATIONS Debug RelWithDebInfo
COMPONENT ${targetcomponent}
OPTIONAL
)
@@ -128,6 +128,12 @@ macro (HDF_SET_LIB_OPTIONS libtarget libname libtype)
endif ()
endif ()
+ set_target_properties (${libtarget}
+ PROPERTIES
+ OUTPUT_NAME
+ ${LIB_RELEASE_NAME}
+ )
+
if (${libtype} MATCHES "STATIC")
if (WIN32)
set_target_properties (${libtarget}