From 33b4e6af9cad5b42bd313231484b894a866538ed Mon Sep 17 00:00:00 2001 From: Emmanuel Christophe <emmanuel.christophe@orfeo-toolbox.org> Date: Fri, 21 Aug 2009 19:50:09 +0800 Subject: [PATCH] OSSIM: remove source files (not used anymore -> plugins) from compilation --- Utilities/otbossim/src/ossim/CMakeLists.txt | 4 +++- Utilities/otbossimplugins/CMakeLists.txt | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Utilities/otbossim/src/ossim/CMakeLists.txt b/Utilities/otbossim/src/ossim/CMakeLists.txt index caca9275a1..6da08c5031 100644 --- a/Utilities/otbossim/src/ossim/CMakeLists.txt +++ b/Utilities/otbossim/src/ossim/CMakeLists.txt @@ -17,6 +17,8 @@ FILE(GLOB_RECURSE ossim_dll_main_SRCS "dll_main/*.cpp") REMOVE(ossim_support_data_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/support_data/ossimDemPoint.cpp") REMOVE(ossim_plugin_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/plugin/ossimSharedObjectBridge.cpp") REMOVE(ossim_base_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/base/ossimFactoryBaseTemplate.cpp") +REMOVE(ossim_imaging_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/imaging/ErsSar/*") +REMOVE(ossim_imaging_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/imaging/RadarSat2/*") # Adjust the compiler flags to avoid problems with ossim code. IF(CMAKE_COMPILER_IS_GNUCXX) @@ -105,7 +107,7 @@ ${ossim_imaging_SRCS} ${ossim_parallel_SRCS} ${ossim_elevation_SRCS} ) -TARGET_LINK_LIBRARIES(otbossim ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} ${JPEG_LIBRARY} OpenThreads) +TARGET_LINK_LIBRARIES(otbossim ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} ${JPEG_LIBRARY} ${OPENTHREADS_LIBRARY}) IF(NOT OTB_INSTALL_NO_LIBRARIES) INSTALL(TARGETS otbossim diff --git a/Utilities/otbossimplugins/CMakeLists.txt b/Utilities/otbossimplugins/CMakeLists.txt index 5dc379b65b..84bc230def 100644 --- a/Utilities/otbossimplugins/CMakeLists.txt +++ b/Utilities/otbossimplugins/CMakeLists.txt @@ -4,7 +4,10 @@ SET(ossimplugins_VERSION_MAJOR "1") SET(ossimplugins_VERSION_MINOR "7") SET(ossimplugins_VERSION_PATCH "15") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/ossim ${CMAKE_CURRENT_SOURCE_DIR}/ossim/otb ${CMAKE_CURRENT_SOURCE_DIR}/../otbossim/include/ossim/projection ${CMAKE_CURRENT_SOURCE_DIR}/../otbossim/include/ossim/projection/otb) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/ossim ${CMAKE_CURRENT_SOURCE_DIR}/ossim/otb +# ${CMAKE_CURRENT_SOURCE_DIR}/../otbossim/include/ossim/projection +# ${CMAKE_CURRENT_SOURCE_DIR}/../otbossim/include/ossim/projection/otb +) #these two last directory are to be removed when the SAR plugin will have migrated SET(ossimplugins_SOURCES_DIR ${CMAKE_CURRENT_SOURCE_DIR}) -- GitLab