[Gdcm-hackers] gdcm-git:Grassroots DICOM branch master updated. 73c78f8c054a946eabef24840a2d9a04010
Cross-platform DICOM implementation
Brought to you by:
malat
|
From: Mathieu M. <ma...@us...> - 2011-04-19 16:36:02
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Grassroots DICOM".
The branch, master has been updated
via 73c78f8c054a946eabef24840a2d9a0401085c8f (commit)
from f0a5840afbbf21cf96351d7d722b74b1bda8be33 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://gdcm.git.sourceforge.net/git/gitweb.cgi?p=gdcm/gdcm;a=commit;h=73c78f8c054a946eabef24840a2d9a0401085c8f
commit 73c78f8c054a946eabef24840a2d9a0401085c8f
Author: Mathieu Malaterre <mat...@gm...>
Date: Tue Apr 19 18:35:04 2011 +0200
Make sure to only install pdb files in Debug or RelWithDebInfo mode
diff --git a/CMake/InstallMacros.cmake b/CMake/InstallMacros.cmake
index 324fcd6..918a612 100644
--- a/CMake/InstallMacros.cmake
+++ b/CMake/InstallMacros.cmake
@@ -39,11 +39,14 @@ MACRO (install_pdb library)
FOREACH(cfg ${CMAKE_CONFIGURATION_TYPES})
get_target_property(library_dll ${library} LOCATION_${cfg})
string(REPLACE .dll .pdb library_pdb ${library_dll})
- install (FILES ${library_pdb}
- DESTINATION ${GDCM_INSTALL_BIN_DIR}
- COMPONENT Development
- CONFIGURATIONS ${cfg}
- )
+ string(TOLOWER ${cfg} lcfg)
+ if(lcfg STREQUAL "debug" or lcfg STREQUAL "relwithdebinfo")
+ install (FILES ${library_pdb}
+ DESTINATION ${GDCM_INSTALL_BIN_DIR}
+ COMPONENT Development
+ CONFIGURATIONS ${cfg}
+ )
+ endif()
ENDFOREACH(cfg ${CMAKE_CONFIGURATION_TYPES})
ELSE(CMAKE_CONFIGURATION_TYPES)
# nmake
@@ -51,10 +54,13 @@ MACRO (install_pdb library)
# the value of CMAKE_DEBUG_POSTFIX
get_target_property(library_dll ${library} LOCATION_${CMAKE_BUILD_TYPE})
string(REPLACE .dll .pdb library_pdb ${library_dll})
- install (FILES ${library_pdb}
- DESTINATION ${GDCM_INSTALL_BIN_DIR}
- COMPONENT Development
- )
+ string(TOLOWER ${CMAKE_BUILD_TYPE} lcfg)
+ if(lcfg STREQUAL "debug" or lcfg STREQUAL "relwithdebinfo")
+ install (FILES ${library_pdb}
+ DESTINATION ${GDCM_INSTALL_BIN_DIR}
+ COMPONENT Development
+ )
+ endif()
ENDIF(CMAKE_CONFIGURATION_TYPES)
endif (MSVC)
ENDMACRO (install_pdb)
diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 4e60ae0..17adf6d 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -11,7 +11,7 @@ SUBDIRS(
# ctest...well except one, the case where a user set BUILD_TESTING=OFF
# since this would deactivate the dashboard and would not submit...doh!
# So instead let's create a test that would build gdcm with this option
-IF(UNIX AND GDCM_TEST_BOOTSTRAP)
+IF(GDCM_TEST_BOOTSTRAP)
ADD_TEST(BuildGDCM ${CMAKE_CTEST_COMMAND}
--build-and-test ${GDCM_SOURCE_DIR} ${GDCM_BINARY_DIR}/GDCMLocal
--build-two-config
@@ -37,4 +37,4 @@ IF(UNIX AND GDCM_TEST_BOOTSTRAP)
--build-options -DGDCM_BUILD_TESTING:BOOL=ON -DGDCM_BUILD_SHARED_LIBS:BOOL=OFF -DGDCM_SUPPORT_BROKEN_IMPLEMENTATION:BOOL=OFF -DGDCM_LEGACY_REMOVE:BOOL=ON
--test-command ${CMAKE_CTEST_COMMAND}
)
-ENDIF(UNIX AND GDCM_TEST_BOOTSTRAP)
+ENDIF(GDCM_TEST_BOOTSTRAP)
-----------------------------------------------------------------------
Summary of changes:
CMake/InstallMacros.cmake | 24 +++++++++++++++---------
Testing/CMakeLists.txt | 4 ++--
2 files changed, 17 insertions(+), 11 deletions(-)
hooks/post-receive
--
Grassroots DICOM
|