Commit e2ff51d8 authored by Cyrille Valladeau's avatar Cyrille Valladeau

MRG

parents 5009e64c 68c921d4
......@@ -12,10 +12,11 @@ ENDIF( NOT OTB_USE_PQXX )
ADD_LIBRARY(OTBCommon ${OTBCommon_SRCS})
SET_TARGET_PROPERTIES(OTBCommon
PROPERTIES
LINK_INTERFACE_LIBRARIES ""
)
#Apparently not supported by opensolaris at least
#SET_TARGET_PROPERTIES(OTBCommon
# PROPERTIES
# LINK_INTERFACE_LIBRARIES ""
#)
TARGET_LINK_LIBRARIES (OTBCommon ITKAlgorithms ITKStatistics ITKCommon otbconfigfile)
IF(OTB_USE_MAPNIK)
TARGET_LINK_LIBRARIES(OTBCommon ${MAPNIK_LIBRARY})
......
......@@ -30,10 +30,11 @@ ENDIF(OTB_COMPILE_JPEG2000)
ADD_LIBRARY(OTBIO ${OTBIO_SRCS})
SET_TARGET_PROPERTIES(OTBIO
PROPERTIES
LINK_INTERFACE_LIBRARIES ""
)
#Apparently not supported by opensolaris at least
# SET_TARGET_PROPERTIES(OTBIO
# PROPERTIES
# LINK_INTERFACE_LIBRARIES ""
# )
TARGET_LINK_LIBRARIES (OTBIO ${GDAL_LIBRARY} ${OGR_LIBRARY} ${JPEG_LIBRARY} ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} OTBCommon)
TARGET_LINK_LIBRARIES (OTBIO otbossim otbossimplugins ITKIO ITKCommon dxf otbkml)
......
......@@ -124,11 +124,11 @@ TerraSarCalibrationImageFunctor<TInput, TOutput>
}
else
{
// m_ImageSize[1]-(lineId+1) because the first acquisition line is the last image one.
// line+1 because image starts to 0.
// (m_ImageSize[1]-1)-(lineId) because the first acquisition line is the last image one.
// (m_ImageSize[1]-1) because image starts to 0.
//double interval = static_cast<double>(m_ImageSize[1]) / static_cast<double>(m_NoisePolynomialCoefficientsList.size());
// compute utc time of the line
double currTimeUTC = m_TimeUTC[0] + static_cast<double>(m_ImageSize[1]-(lineId-1))*m_InvPRF;
double currTimeUTC = m_TimeUTC[0] + static_cast<double>((m_ImageSize[1]-1)-lineId)*m_InvPRF;
unsigned int id = 0;
bool go = true;
// deduct the corresponding noise acquisition index
......
......@@ -3,10 +3,10 @@
FILE(GLOB OTBTesting_SRCS "*.cxx" )
ADD_LIBRARY(OTBTesting ${OTBTesting_SRCS})
SET_TARGET_PROPERTIES(OTBTesting
PROPERTIES
LINK_INTERFACE_LIBRARIES ""
)
#SET_TARGET_PROPERTIES(OTBTesting
# PROPERTIES
# LINK_INTERFACE_LIBRARIES ""
#)
TARGET_LINK_LIBRARIES (OTBTesting OTBBasicFilters OTBIO OTBCommon ITKBasicFilters)
IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(OTBTesting PROPERTIES ${OTB_LIBRARY_PROPERTIES})
......
......@@ -140,11 +140,12 @@ IF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
${ossim_imaging_SRCS}
${ossim_parallel_SRCS}
${ossim_elevation_SRCS})
SET_TARGET_PROPERTIES(otbossim
PROPERTIES
LINK_INTERFACE_LIBRARIES ""
)
#Apparently not supported by opensolaris at least
# SET_TARGET_PROPERTIES(otbossim
# PROPERTIES
# LINK_INTERFACE_LIBRARIES ""
# )
# TARGET_LINK_LIBRARIES(otbossim ${GDAL_LIBRARY})#To make sure that gdal appear before geotiff
# TARGET_LINK_LIBRARIES(otbossim ${JPEG_LIBRARY} ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} ${OPENTHREADS_LIBRARY})
TARGET_LINK_LIBRARIES(otbossim ${OPENTHREADS_LIBRARY})
......@@ -240,4 +241,4 @@ INSTALL(FILES ${ossim_config_HDR}
DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbossim/include/ossim
COMPONENT Development)
ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
\ No newline at end of file
ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
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