diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-12-30 14:03:15 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-12-30 14:03:15 (GMT) |
| commit | 8a7bf1ae4efd144ddf77f2a1c9701c36f913b5a4 (patch) | |
| tree | af334956696330b4ce9811ca890d41bfd44770e2 /c++ | |
| parent | a863723db866ed63377aecd1e90cffa08f43c020 (diff) | |
| download | hdf5-8a7bf1ae4efd144ddf77f2a1c9701c36f913b5a4.zip hdf5-8a7bf1ae4efd144ddf77f2a1c9701c36f913b5a4.tar.gz hdf5-8a7bf1ae4efd144ddf77f2a1c9701c36f913b5a4.tar.bz2 | |
[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.
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | c++/examples/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | c++/test/CMakeLists.txt | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/c++/CMakeLists.txt b/c++/CMakeLists.txt index 7571e54..26c9521 100644 --- a/c++/CMakeLists.txt +++ b/c++/CMakeLists.txt @@ -6,6 +6,8 @@ PROJECT (HDF5_CPP) #----------------------------------------------------------------------------- IF (BUILD_SHARED_LIBS) SET (CPP_BUILT_AS_DYNAMIC_LIB 1) +ELSE (BUILD_SHARED_LIBS) + SET (CPP_BUILT_AS_STATIC_LIB 1) ENDIF (BUILD_SHARED_LIBS) #----------------------------------------------------------------------------- diff --git a/c++/examples/CMakeLists.txt b/c++/examples/CMakeLists.txt index 053cbd5..9bbb9a3 100644 --- a/c++/examples/CMakeLists.txt +++ b/c++/examples/CMakeLists.txt @@ -23,7 +23,6 @@ SET (examples FOREACH (example ${examples}) ADD_EXECUTABLE (cpp_ex_${example} ${HDF5_CPP_EXAMPLES_SOURCE_DIR}/${example}.cpp) H5_NAMING (cpp_ex_${example}) - TARGET_WIN_PROPERTIES (cpp_ex_${example}) TARGET_LINK_LIBRARIES (cpp_ex_${example} ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET}) IF (BUILD_TESTING) diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt index 569e609..a50a643 100644 --- a/c++/test/CMakeLists.txt +++ b/c++/test/CMakeLists.txt @@ -37,7 +37,6 @@ INCLUDE_DIRECTORIES (${HDF5_TEST_SRC_DIR} ) ADD_EXECUTABLE (cpp_testhdf5 ${CPP_TEST_SRCS} ) H5_NAMING (cpp_testhdf5) -TARGET_WIN_PROPERTIES (cpp_testhdf5) TARGET_LINK_LIBRARIES (cpp_testhdf5 ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET} |