Commit 2d1cfbfb authored by Emmanuel Christophe's avatar Emmanuel Christophe

COMP: mess in cmake

parent 0bd9d86c
......@@ -30,7 +30,7 @@ ENDIF(OTB_COMPILE_JPEG2000)
ADD_LIBRARY(OTBIO ${OTBIO_SRCS})
TARGET_LINK_LIBRARIES (OTBIO ${GDAL_LIBRARY} ${OGR_LIBRARY} OTBCommon)
TARGET_LINK_LIBRARIES (OTBIO ${GDAL_LIBRARY} ${OGR_LIBRARY} ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} ${JPEG_LIBRARY} OTBCommon)
TARGET_LINK_LIBRARIES (OTBIO otbossim otbossimplugins ITKIO ITKCommon dxf otbkml)
IF (OTB_USE_LIBLAS)
......@@ -70,10 +70,10 @@ IF(NOT OTB_COMPILE_JPEG2000)
ENDIF(NOT OTB_COMPILE_JPEG2000)
# Compile otbTestDriver
# Nedded in the OTB-Wrapping project.
# Needed in the OTB-Wrapping project.
# Has to be compiled even if the BUILD_TEST are set to OFF
IF(CMAKE_COMPILER_IS_GNUCXX)
SET_SOURCE_FILES_PROPERTIES(itkTestDriver.cxx PROPERTIES COMPILE_FLAGS -w)
SET_SOURCE_FILES_PROPERTIES(otbTestDriver.cxx PROPERTIES COMPILE_FLAGS -w)
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
ADD_EXECUTABLE(otbTestDriver otbTestDriver.cxx)
......
......@@ -29,7 +29,6 @@ void RegisterTests()
{
REGISTER_TEST(otbLeeFilter);
REGISTER_TEST(otbFrostFilterNew);
// REGISTER_TEST(otbFrostFilterTest);
REGISTER_TEST(otbFrostFilter);
REGISTER_TEST(otbImageToPointSetFilterTest);
REGISTER_TEST(otbOpeningClosingMorphologicalFilterNew);
......
......@@ -2,7 +2,7 @@ PROJECT(dxflib)
FILE(GLOB dxflib_SRCS "*.cpp")
ADD_LIBRARY(dxf ${dxflib_SRCS})
TARGET_LINK_LIBRARIES(dxf)
IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(dxf PROPERTIES ${OTB_LIBRARY_PROPERTIES})
ENDIF(OTB_LIBRARY_PROPERTIES)
......
......@@ -5,7 +5,6 @@ FILE(GLOB otbconfigfilelib_HDRS "ConfigFile.h")
ADD_LIBRARY(otbconfigfile ${otbconfigfilelib_SRCS} )
TARGET_LINK_LIBRARIES(otbconfigfile )
IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(otbconfigfile PROPERTIES ${OTB_LIBRARY_PROPERTIES})
ENDIF(OTB_LIBRARY_PROPERTIES)
......
......@@ -140,8 +140,9 @@ IF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
${ossim_imaging_SRCS}
${ossim_parallel_SRCS}
${ossim_elevation_SRCS}
)
TARGET_LINK_LIBRARIES(otbossim ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} ${JPEG_LIBRARY} ${OPENTHREADS_LIBRARY})
# TARGET_LINK_LIBRARIES(otbossim ${GDAL_LIBRARY})#To make sure that gdal appear before geotiff
# TARGET_LINK_LIBRARIES(otbossim ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} ${JPEG_LIBRARY} ${OPENTHREADS_LIBRARY})
IF(NOT OTB_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS otbossim
......
......@@ -23,9 +23,8 @@ SET(ossimplugins_SOURCES
${ossimplugins_ossim_SRCS}
)
ADD_LIBRARY(otbossimplugins ${ossimplugins_SOURCES} )
TARGET_LINK_LIBRARIES(otbossimplugins ${GDAL_LIBRARY} otbossim)
#TARGET_LINK_LIBRARIES(otbossimplugins ${GDAL_LIBRARY} otbossim)
IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(otbossimplugins PROPERTIES ${OTB_LIBRARY_PROPERTIES})
ENDIF(OTB_LIBRARY_PROPERTIES)
......
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