diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-09-09 16:30:23 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-09-09 16:30:23 (GMT) |
| commit | bed127641399ec6c6e1479b7c394fd3a4eb56438 (patch) | |
| tree | bd923e43fb7c5a004a94f038b6c087d1d170f739 /hl/c++ | |
| parent | a5b16bbd75dddc008480448d458cb0a1b7ba70fa (diff) | |
| download | hdf5-bed127641399ec6c6e1479b7c394fd3a4eb56438.zip hdf5-bed127641399ec6c6e1479b7c394fd3a4eb56438.tar.gz hdf5-bed127641399ec6c6e1479b7c394fd3a4eb56438.tar.bz2 | |
[svn-r19361] Move Windows specific compile and link flags to macros
Diffstat (limited to 'hl/c++')
| -rw-r--r-- | hl/c++/examples/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | hl/c++/test/CMakeLists.txt | 11 |
2 files changed, 3 insertions, 30 deletions
diff --git a/hl/c++/examples/CMakeLists.txt b/hl/c++/examples/CMakeLists.txt index 0205309..23b0db3 100644 --- a/hl/c++/examples/CMakeLists.txt +++ b/hl/c++/examples/CMakeLists.txt @@ -13,16 +13,7 @@ INCLUDE_DIRECTORIES (${HDF5_HL_CPP_SRC_DIR}/src) IF (HDF5_BUILD_EXAMPLES) ADD_EXECUTABLE (ptExampleFL ${HDF5_HL_CPP_EXAMPLES_SOURCE_DIR}/ptExampleFL.cpp) H5_NAMING (ptExampleFL) - IF (WIN32) - IF (MSVC) - IF (NOT BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (ptExampleFL - PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:MSVCRT" - ) - ENDIF (NOT BUILD_SHARED_LIBS) - ENDIF (MSVC) - ENDIF (WIN32) + TARGET_WIN_PROPERTIES (ptExampleFL) TARGET_LINK_LIBRARIES ( ptExampleFL ${HDF5_HL_CPP_LIB_TARGET} @@ -34,16 +25,7 @@ IF (HDF5_BUILD_EXAMPLES) ADD_EXECUTABLE (ptExampleVL ${HDF5_HL_CPP_EXAMPLES_SOURCE_DIR}/ptExampleVL.cpp) H5_NAMING (ptExampleVL) - IF (WIN32) - IF (MSVC) - IF (NOT BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (ptExampleVL - PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:MSVCRT" - ) - ENDIF (NOT BUILD_SHARED_LIBS) - ENDIF (MSVC) - ENDIF (WIN32) + 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 afcb8fe..cf621a2 100644 --- a/hl/c++/test/CMakeLists.txt +++ b/hl/c++/test/CMakeLists.txt @@ -18,16 +18,7 @@ IF (BUILD_TESTING) ADD_EXECUTABLE (hl_ptableTest ${HDF5_HL_CPP_TEST_SOURCE_DIR}/ptableTest.cpp) H5_NAMING (hl_ptableTest) - IF (WIN32) - IF (MSVC) - IF (NOT BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (hl_ptableTest - PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:MSVCRT" - ) - ENDIF (NOT BUILD_SHARED_LIBS) - ENDIF (MSVC) - ENDIF (WIN32) + TARGET_WIN_PROPERTIES (hl_ptableTest) TARGET_LINK_LIBRARIES ( hl_ptableTest ${HDF5_LIB_TARGET} |