diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-09-09 16:31:46 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-09-09 16:31:46 (GMT) |
| commit | ff47a7df1bc78ddf36d247c76abc03e6861b1c01 (patch) | |
| tree | 78b4786655f00c75616fc894deec00989bb1f724 /c++ | |
| parent | ec5f5c868fb4dad3452db045c627fe258b152cd2 (diff) | |
| download | hdf5-ff47a7df1bc78ddf36d247c76abc03e6861b1c01.zip hdf5-ff47a7df1bc78ddf36d247c76abc03e6861b1c01.tar.gz hdf5-ff47a7df1bc78ddf36d247c76abc03e6861b1c01.tar.bz2 | |
[svn-r19362] Move Windows specific compile and link flags to macros
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/examples/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | c++/test/CMakeLists.txt | 11 |
2 files changed, 2 insertions, 20 deletions
diff --git a/c++/examples/CMakeLists.txt b/c++/examples/CMakeLists.txt index c5024f5..a650db5 100644 --- a/c++/examples/CMakeLists.txt +++ b/c++/examples/CMakeLists.txt @@ -23,16 +23,7 @@ SET (examples FOREACH (example ${examples}) ADD_EXECUTABLE (cpp_ex_${example} ${HDF5_CPP_EXAMPLES_SOURCE_DIR}/${example}.cpp) H5_NAMING (cpp_ex_${example}) - IF (WIN32) - IF (MSVC) - IF (NOT BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (cpp_ex_${example} - PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:MSVCRT" - ) - ENDIF (NOT BUILD_SHARED_LIBS) - ENDIF (MSVC) - ENDIF (WIN32) + TARGET_WIN_PROPERTIES (cpp_ex_${example}) TARGET_LINK_LIBRARIES (cpp_ex_${example} ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET}) ADD_TEST (NAME cpp_ex_${example} COMMAND $<TARGET_FILE:cpp_ex_${example}>) diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt index 722bd37..e29963e 100644 --- a/c++/test/CMakeLists.txt +++ b/c++/test/CMakeLists.txt @@ -37,16 +37,7 @@ INCLUDE_DIRECTORIES (${HDF5_TEST_SRC_DIR} ) ADD_EXECUTABLE (cpp_testhdf5 ${CPP_TEST_SRCS} ) H5_NAMING (cpp_testhdf5) -IF (WIN32) - IF (MSVC) - IF (NOT BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (cpp_testhdf5 - PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:MSVCRT" - ) - ENDIF (NOT BUILD_SHARED_LIBS) - ENDIF (MSVC) -ENDIF (WIN32) +TARGET_WIN_PROPERTIES (cpp_testhdf5) TARGET_LINK_LIBRARIES (cpp_testhdf5 ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET} |