From e0fb2dde3f9c5ad74feac60c68feb085cf4cfc88 Mon Sep 17 00:00:00 2001 From: Julien Malik <julien.malik@c-s.fr> Date: Wed, 23 Nov 2011 12:55:11 +0100 Subject: [PATCH] COMP: define OSSIM_STATIC only when building internal ossim --- CMake/CommonDefinitions.cmake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CMake/CommonDefinitions.cmake b/CMake/CommonDefinitions.cmake index e5cd5ad964..301678960a 100644 --- a/CMake/CommonDefinitions.cmake +++ b/CMake/CommonDefinitions.cmake @@ -12,9 +12,12 @@ ENDIF(WIN32) SET(OTB_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) # OSSIM_STATIC macro -IF(NOT OTB_BUILD_SHARED_LIBS) - ADD_DEFINITIONS(-DOSSIM_STATIC) -ENDIF(NOT OTB_BUILD_SHARED_LIBS) +# Using an external static library of ossim is not supported +IF (WIN32) + IF(NOT OTB_BUILD_SHARED_LIBS AND NOT OTB_USE_EXTERNAL_OSSIM) + ADD_DEFINITIONS(-DOSSIM_STATIC) + ENDIF(NOT OTB_BUILD_SHARED_LIBS AND NOT OTB_USE_EXTERNAL_OSSIM) +ENDIF (WIN32) # On Visual Studio 8 MS deprecated C. This removes all 1.276E1265 security # warnings -- GitLab