[svn-r19898] Remove use of /MT compile flag for building static libs and programs. Added BUILT_AS_STATIC_LIBRARY define to set the windows import/export defines correctly for static libraries.

6 files changed, 2 insertions, 9 deletions

diff --git a/hl/CMakeLists.txt b/hl/CMakeLists.txt
index 2871734..9ce3043 100644
--- a/hl/CMakeLists.txt
+++ b/hl/CMakeLists.txt
@@ -6,6 +6,8 @@ PROJECT (HDF5_HL)
 #-----------------------------------------------------------------------------
 IF (BUILD_SHARED_LIBS)
   SET (HL_BUILT_AS_DYNAMIC_LIB 1)
+ELSE (BUILD_SHARED_LIBS)
+  SET (HL_BUILT_AS_STATIC_LIB 1)
 ENDIF (BUILD_SHARED_LIBS)
 
 #-----------------------------------------------------------------------------
diff --git a/hl/c++/examples/CMakeLists.txt b/hl/c++/examples/CMakeLists.txt
index 1e9682c..c445ae8 100644
--- a/hl/c++/examples/CMakeLists.txt
+++ b/hl/c++/examples/CMakeLists.txt
@@ -12,7 +12,6 @@ INCLUDE_DIRECTORIES (${HDF5_HL_CPP_SRC_DIR}/src)
 # --------------------------------------------------------------------
 ADD_EXECUTABLE (ptExampleFL ${HDF5_HL_CPP_EXAMPLES_SOURCE_DIR}/ptExampleFL.cpp)
 H5_NAMING (ptExampleFL)
-TARGET_WIN_PROPERTIES (ptExampleFL)
 TARGET_LINK_LIBRARIES (
     ptExampleFL
     ${HDF5_HL_CPP_LIB_TARGET}
@@ -22,7 +21,6 @@ TARGET_LINK_LIBRARIES (
 
 ADD_EXECUTABLE (ptExampleVL ${HDF5_HL_CPP_EXAMPLES_SOURCE_DIR}/ptExampleVL.cpp)
 H5_NAMING (ptExampleVL)
-TARGET_WIN_PROPERTIES (ptExampleVL)
 TARGET_LINK_LIBRARIES (
     ptExampleVL
     ${HDF5_HL_CPP_LIB_TARGET}
diff --git a/hl/c++/test/CMakeLists.txt b/hl/c++/test/CMakeLists.txt
index cf621a2..9e4b064 100644
--- a/hl/c++/test/CMakeLists.txt
+++ b/hl/c++/test/CMakeLists.txt
@@ -18,7 +18,6 @@ IF (BUILD_TESTING)
 
   ADD_EXECUTABLE (hl_ptableTest ${HDF5_HL_CPP_TEST_SOURCE_DIR}/ptableTest.cpp)
   H5_NAMING (hl_ptableTest)
-  TARGET_WIN_PROPERTIES (hl_ptableTest)
   TARGET_LINK_LIBRARIES (
       hl_ptableTest
       ${HDF5_LIB_TARGET}
diff --git a/hl/examples/CMakeLists.txt b/hl/examples/CMakeLists.txt
index b229aa9..1c7fff6 100644
--- a/hl/examples/CMakeLists.txt
+++ b/hl/examples/CMakeLists.txt
@@ -44,7 +44,6 @@ SET (examples
 FOREACH (example ${examples})
   ADD_EXECUTABLE (hl_ex_${example} ${HDF5_HL_EXAMPLES_SOURCE_DIR}/${example}.c)
   H5_NAMING (hl_ex_${example})
-  TARGET_WIN_PROPERTIES (hl_ex_${example})
   TARGET_LINK_LIBRARIES (hl_ex_${example} ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
 
   IF (BUILD_TESTING)
diff --git a/hl/test/CMakeLists.txt b/hl/test/CMakeLists.txt
index 22568ae..0f1cbf1 100644
--- a/hl/test/CMakeLists.txt
+++ b/hl/test/CMakeLists.txt
@@ -23,7 +23,6 @@ INCLUDE_DIRECTORIES (${HDF5_TEST_SRC_DIR})
 MACRO (HL_ADD_TEST hl_name files)
   ADD_EXECUTABLE (hl_${hl_name} ${hl_name}.c)
   H5_NAMING (hl_${hl_name})
-  TARGET_WIN_PROPERTIES (hl_${hl_name})
   TARGET_LINK_LIBRARIES (hl_${hl_name}
       ${HDF5_HL_LIB_TARGET}
       ${HDF5_LIB_TARGET}
@@ -88,7 +87,6 @@ HL_ADD_TEST (test_table "test_table_be.hdf5;test_table_cray.hdf5;test_table_le.h
 IF (HDF5_BUILD_GENERATORS AND NOT BUILD_SHARED_LIBS)
   ADD_EXECUTABLE (hl_gen_test_ds gen_test_ds.c)
   H5_NAMING (hl_gen_test_ds)
-  TARGET_WIN_PROPERTIES (hl_gen_test_ds)
   TARGET_LINK_LIBRARIES (hl_gen_test_ds
       ${HDF5_HL_LIB_TARGET}
       ${HDF5_LIB_TARGET}
diff --git a/hl/tools/CMakeLists.txt b/hl/tools/CMakeLists.txt
index 8ed3fab..2399335 100644
--- a/hl/tools/CMakeLists.txt
+++ b/hl/tools/CMakeLists.txt
@@ -19,7 +19,6 @@ INCLUDE_DIRECTORIES (${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5)
 
 ADD_EXECUTABLE (gif2h5 ${GIF2H5_SRCS})
 H5_NAMING (gif2h5)
-TARGET_WIN_PROPERTIES (gif2h5)
 TARGET_LINK_LIBRARIES (gif2h5 ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
 
 #-- Add h52gif program
@@ -29,7 +28,6 @@ SET (hdf2gif_SRCS
 )
 ADD_EXECUTABLE (hdf2gif ${hdf2gif_SRCS})
 H5_NAMING (hdf2gif)
-TARGET_WIN_PROPERTIES (hdf2gif)
 TARGET_LINK_LIBRARIES (hdf2gif ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
 
 # --------------------------------------------------------------------
@@ -40,7 +38,6 @@ TARGET_LINK_LIBRARIES (hdf2gif ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_T
 IF (HDF5_BUILD_GENERATORS AND NOT BUILD_SHARED_LIBS)
     ADD_EXECUTABLE (hl_h52gifgentest ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/h52gifgentst.c)
     H5_NAMING (hl_h52gifgentest)
-    TARGET_WIN_PROPERTIES (hl_h52gifgentest)
     TARGET_LINK_LIBRARIES (hl_h52gifgentest ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
     
 #    ADD_TEST (NAME hl_h52gifgentest COMMAND $<TARGET_FILE:hl_h52gifgentest>)