Commit 40b46e58 authored by Emmanuel Christophe's avatar Emmanuel Christophe
Browse files

ENH: moving VisuRefac to Visualization

parent 7ac0fe08
# Sources of non-templated classes.
FILE(GLOB OTBVisuRefac_SRCS "*.cxx" )
FILE(GLOB OTBVisualization_SRCS "*.cxx" )
# To suppress "ld: cycle in dylib re-exports with /usr/X11R6/lib/libGL.dylib" error on APPLE and SHARED configuration
IF(APPLE AND BUILD_SHARED_LIBS)
......@@ -9,10 +9,10 @@ IF(APPLE AND BUILD_SHARED_LIBS)
ENDFOREACH(c)
ENDIF(APPLE AND BUILD_SHARED_LIBS)
ADD_LIBRARY(OTBVisuRefac ${OTBVisuRefac_SRCS})
TARGET_LINK_LIBRARIES (OTBVisuRefac OTBGui OTBCommon ${FLTK_LIBRARIES} ${OPENGL_LIBRARIES})
ADD_LIBRARY(OTBVisualization ${OTBVisualization_SRCS})
TARGET_LINK_LIBRARIES (OTBVisualization OTBGui OTBCommon ${FLTK_LIBRARIES} ${OPENGL_LIBRARIES})
INSTALL(TARGETS OTBVisuRefac
INSTALL(TARGETS OTBVisualization
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
......@@ -21,5 +21,5 @@ FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
INSTALL(FILES ${__files1} ${__files2}
DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/VisuRefac
DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Visualization
COMPONENT Development)
......@@ -18,5 +18,5 @@ SARPolarimetry
)
IF(OTB_USE_VISU_GUI)
SUBDIRS(Visu Gui VisuRefac)
SUBDIRS(Visu Gui Visualization)
ENDIF(OTB_USE_VISU_GUI)
......@@ -15,7 +15,7 @@ SET(TOL 0.0)
SET(EPSILON 0.000001)
# Test programs
SET(VISUREFAC_TESTS1 ${CXX_TEST_PATH}/otbVisuRefacTests1)
SET(VISUREFAC_TESTS1 ${CXX_TEST_PATH}/otbVisualizationTests1)
#------------ otb::ImageWidget -------------------------
......@@ -273,7 +273,7 @@ ${INPUTDATA}/DEM/srtm_directory
ENDIF(OTB_DATA_USE_LARGEINPUT)
# Testing srcs
SET(VisuRefac_SRCS1
SET(Visualization_SRCS1
otbImageWidgetNew.cxx
otbImageWidget.cxx
otbImageWidgetActionHandlerNew.cxx
......@@ -312,7 +312,7 @@ otbImageViewerEndToEndWithVectorData.cxx
)
# Building testing executables
ADD_EXECUTABLE(otbVisuRefacTests1 otbVisuRefacTests1.cxx ${VisuRefac_SRCS1})
TARGET_LINK_LIBRARIES(otbVisuRefacTests1 OTBVisuRefac OTBIO)
ADD_EXECUTABLE(otbVisualizationTests1 otbVisualizationTests1.cxx ${Visualization_SRCS1})
TARGET_LINK_LIBRARIES(otbVisualizationTests1 OTBVisualization OTBIO)
ENDIF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING )
......@@ -19,7 +19,7 @@ SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
${OTB_SOURCE_DIR}/Code/SpatialReasoning
${OTB_SOURCE_DIR}/Code/DisparityMap
${OTB_SOURCE_DIR}/Code/Visu
${OTB_SOURCE_DIR}/Code/VisuRefac
${OTB_SOURCE_DIR}/Code/Visualization
${OTB_SOURCE_DIR}/Code/Gui
${OTB_SOURCE_DIR}/Code/Fusion
${OTB_SOURCE_DIR}/Code/Projections
......@@ -190,7 +190,7 @@ SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
${OTB_INSTALL_INCLUDE_DIR}/SpatialReasoning
${OTB_INSTALL_INCLUDE_DIR}/DisparityMap
${OTB_INSTALL_INCLUDE_DIR}/Visu
${OTB_INSTALL_INCLUDE_DIR}/VisuRefac
${OTB_INSTALL_INCLUDE_DIR}/Visualization
${OTB_INSTALL_INCLUDE_DIR}/Gui
${OTB_INSTALL_INCLUDE_DIR}/Projections
${OTB_INSTALL_INCLUDE_DIR}/Radiometry
......
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