Commit a2647f16 authored by Emmanuel Christophe's avatar Emmanuel Christophe
Browse files

BUG: openthread issue on windows

parent 9ff619de
......@@ -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.
......
......@@ -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}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment