From a2647f16545f35396a7a979d2941812fe2483bb8 Mon Sep 17 00:00:00 2001
From: Emmanuel Christophe <emmanuel.christophe@orfeo-toolbox.org>
Date: Thu, 6 May 2010 13:58:35 +0800
Subject: [PATCH] BUG: openthread issue on windows
---
CMakeLists.txt | 4 ++--
Utilities/otbossim/CMakeLists.txt | 7 ++++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59d3da33f9..cf64b84dd9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,8 +74,8 @@ FIND_PACKAGE(Mercurial)
IF(Mercurial_FOUND)
Mercurial_WC_IDENTIFY(${PROJECT_SOURCE_DIR} OTB)
MESSAGE("Mercurial version is ${Mercurial_VERSION_HG}")
- MESSAGE("Repository revision is ${Project_WC_REVISION}")
- SET(OTB_VERSION_STRING "${OTB_VERSION_MAJOR}.${OTB_VERSION_MINOR}.${OTB_VERSION_PATCH}.${Project_WC_REVISION}")
+ MESSAGE("Repository revision is ${OTB_WC_REVISION}")
+ SET(OTB_VERSION_STRING "${OTB_VERSION_MAJOR}.${OTB_VERSION_MINOR}.${OTB_VERSION_PATCH}.${OTB_WC_REVISION}")
ELSE(Mercurial_FOUND)
# Version string should not include patch level. The major.minor is
# enough to distinguish available features of the toolkit.
diff --git a/Utilities/otbossim/CMakeLists.txt b/Utilities/otbossim/CMakeLists.txt
index 703ea9a18a..76ba81f251 100644
--- a/Utilities/otbossim/CMakeLists.txt
+++ b/Utilities/otbossim/CMakeLists.txt
@@ -76,6 +76,8 @@ IF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
# ENDIF(NOT BORLAND)
# ENDIF(CMAKE_COMPILER_IS_GNUCXX)
#
+
+IF(NOT OTB_BUILD_SHARED_LIB)
IF(WIN32)
IF(NOT BORLAND)
IF(NOT CYGWIN)
@@ -85,6 +87,7 @@ IF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
ENDIF(NOT CYGWIN)
ENDIF(NOT BORLAND)
ENDIF(WIN32)
+ENDIF(NOT OTB_BUILD_SHARED_LIB)
ADD_EXECUTABLE(version-config src/ossim/version-config.cpp)
@@ -123,7 +126,9 @@ IF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
)
#Specify that we are making DLL here
- ADD_DEFINITIONS(-DNOMINMAX -DOSSIMMAKINGDLL)
+ IF(NOT BUILD_SHARED_LIBS)
+ ADD_DEFINITIONS(-DNOMINMAX -DOSSIMMAKINGDLL)
+ ENDIF(NOT BUILD_SHARED_LIBS)
ADD_LIBRARY(otbossim
${ossim_init_SRCS}
--
GitLab