Commit 224987ca authored by Emmanuel Christophe's avatar Emmanuel Christophe
Browse files

COMP: revert the use of the LINK_INTERFACE_LIBRARIES (not working on opensolaris)

parent 6b87b4c9
...@@ -12,10 +12,11 @@ ENDIF( NOT OTB_USE_PQXX ) ...@@ -12,10 +12,11 @@ ENDIF( NOT OTB_USE_PQXX )
ADD_LIBRARY(OTBCommon ${OTBCommon_SRCS}) ADD_LIBRARY(OTBCommon ${OTBCommon_SRCS})
SET_TARGET_PROPERTIES(OTBCommon #Apparently not supported by opensolaris at least
PROPERTIES #SET_TARGET_PROPERTIES(OTBCommon
LINK_INTERFACE_LIBRARIES "" # PROPERTIES
) # LINK_INTERFACE_LIBRARIES ""
#)
TARGET_LINK_LIBRARIES (OTBCommon ITKAlgorithms ITKStatistics ITKCommon otbconfigfile) TARGET_LINK_LIBRARIES (OTBCommon ITKAlgorithms ITKStatistics ITKCommon otbconfigfile)
IF(OTB_USE_MAPNIK) IF(OTB_USE_MAPNIK)
TARGET_LINK_LIBRARIES(OTBCommon ${MAPNIK_LIBRARY}) TARGET_LINK_LIBRARIES(OTBCommon ${MAPNIK_LIBRARY})
......
...@@ -30,10 +30,11 @@ ENDIF(OTB_COMPILE_JPEG2000) ...@@ -30,10 +30,11 @@ ENDIF(OTB_COMPILE_JPEG2000)
ADD_LIBRARY(OTBIO ${OTBIO_SRCS}) ADD_LIBRARY(OTBIO ${OTBIO_SRCS})
SET_TARGET_PROPERTIES(OTBIO #Apparently not supported by opensolaris at least
PROPERTIES # SET_TARGET_PROPERTIES(OTBIO
LINK_INTERFACE_LIBRARIES "" # PROPERTIES
) # LINK_INTERFACE_LIBRARIES ""
# )
TARGET_LINK_LIBRARIES (OTBIO ${GDAL_LIBRARY} ${OGR_LIBRARY} ${JPEG_LIBRARY} ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} OTBCommon) 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) TARGET_LINK_LIBRARIES (OTBIO otbossim otbossimplugins ITKIO ITKCommon dxf otbkml)
......
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
FILE(GLOB OTBTesting_SRCS "*.cxx" ) FILE(GLOB OTBTesting_SRCS "*.cxx" )
ADD_LIBRARY(OTBTesting ${OTBTesting_SRCS}) ADD_LIBRARY(OTBTesting ${OTBTesting_SRCS})
SET_TARGET_PROPERTIES(OTBTesting #SET_TARGET_PROPERTIES(OTBTesting
PROPERTIES # PROPERTIES
LINK_INTERFACE_LIBRARIES "" # LINK_INTERFACE_LIBRARIES ""
) #)
TARGET_LINK_LIBRARIES (OTBTesting OTBBasicFilters OTBIO OTBCommon ITKBasicFilters) TARGET_LINK_LIBRARIES (OTBTesting OTBBasicFilters OTBIO OTBCommon ITKBasicFilters)
IF(OTB_LIBRARY_PROPERTIES) IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(OTBTesting PROPERTIES ${OTB_LIBRARY_PROPERTIES}) SET_TARGET_PROPERTIES(OTBTesting PROPERTIES ${OTB_LIBRARY_PROPERTIES})
......
...@@ -140,11 +140,12 @@ IF(NOT OTB_DISABLE_UTILITIES_COMPILATION) ...@@ -140,11 +140,12 @@ IF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
${ossim_imaging_SRCS} ${ossim_imaging_SRCS}
${ossim_parallel_SRCS} ${ossim_parallel_SRCS}
${ossim_elevation_SRCS}) ${ossim_elevation_SRCS})
SET_TARGET_PROPERTIES(otbossim #Apparently not supported by opensolaris at least
PROPERTIES # SET_TARGET_PROPERTIES(otbossim
LINK_INTERFACE_LIBRARIES "" # PROPERTIES
) # LINK_INTERFACE_LIBRARIES ""
# )
# TARGET_LINK_LIBRARIES(otbossim ${GDAL_LIBRARY})#To make sure that gdal appear before geotiff # 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 ${JPEG_LIBRARY} ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} ${OPENTHREADS_LIBRARY})
TARGET_LINK_LIBRARIES(otbossim ${OPENTHREADS_LIBRARY}) TARGET_LINK_LIBRARIES(otbossim ${OPENTHREADS_LIBRARY})
...@@ -240,4 +241,4 @@ INSTALL(FILES ${ossim_config_HDR} ...@@ -240,4 +241,4 @@ INSTALL(FILES ${ossim_config_HDR}
DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbossim/include/ossim DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbossim/include/ossim
COMPONENT Development) COMPONENT Development)
ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT) ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
\ No newline at end of file
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