From bbd3aa630cc7e5342ce5ec54a74cc5badcb74797 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Tue, 13 Sep 2011 16:46:28 +0200
Subject: [PATCH] ENH: fixup CMakeLists for newly merged wrappers
---
CMake/otbIncludeDirectories.cmake | 2 ++
Code/ApplicationEngine/CMakeLists.txt | 2 +-
Code/CMakeLists.txt | 3 +++
Code/Wrappers/CMakeLists.txt | 2 +-
Testing/Code/CMakeLists.txt | 2 ++
5 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/CMake/otbIncludeDirectories.cmake b/CMake/otbIncludeDirectories.cmake
index 851884f8fc..54cf7d4ca8 100644
--- a/CMake/otbIncludeDirectories.cmake
+++ b/CMake/otbIncludeDirectories.cmake
@@ -57,6 +57,7 @@ SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
${OTB_SOURCE_DIR}/Code/Visu
${OTB_SOURCE_DIR}/Code/Visualization
${OTB_BINARY_DIR}/Code/Visualization
+ ${OTB_SOURCE_DIR}/Code/ApplicationEngine
${OTB_MSINTTYPES_INCLUDE_DIR_BUILDTREE}
${OTB_SOURCE_DIR}/Utilities/otbsvm
${OTB_SOURCE_DIR}/Utilities/otbossimplugins
@@ -311,6 +312,7 @@ SET(OTB_INCLUDE_RELATIVE_DIRS ${OTB_INCLUDE_RELATIVE_DIRS}
OBIA
Fuzzy
ObjectDetection
+ ApplicationEngine
Utilities
Utilities/ITK
${OTB_MSINTTYPES_INCLUDE_RELATIVE_DIR}
diff --git a/Code/ApplicationEngine/CMakeLists.txt b/Code/ApplicationEngine/CMakeLists.txt
index 740dffdeab..6b6e569dde 100644
--- a/Code/ApplicationEngine/CMakeLists.txt
+++ b/Code/ApplicationEngine/CMakeLists.txt
@@ -2,7 +2,7 @@ file(GLOB srcs "*.cxx")
add_library(OTBWrapperCore ${srcs} ${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${CMAKE_SOURCE_DIR}/Code/Common)
-target_link_libraries(OTBWrapperCore OTBWrapperCommon OTBCommon OTBIO)
+target_link_libraries(OTBWrapperCore OTBCommon OTBIO)
install(TARGETS OTBWrapperCore
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
diff --git a/Code/CMakeLists.txt b/Code/CMakeLists.txt
index 79eef622d1..c25ca2df5b 100644
--- a/Code/CMakeLists.txt
+++ b/Code/CMakeLists.txt
@@ -31,6 +31,9 @@ IF(OTB_USE_PQXX)
ADD_SUBDIRECTORY(GeospatialAnalysis)
ENDIF(OTB_USE_PQXX)
+ADD_SUBDIRECTORY(ApplicationEngine)
+ADD_SUBDIRECTORY(Wrappers)
+
IF(OTB_COMPILE_WITH_FULL_WARNING)
IF(CMAKE_COMPILER_IS_GNUCXX)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OTB_FULL_WARNING_LIST_PARAMETERS}")
diff --git a/Code/Wrappers/CMakeLists.txt b/Code/Wrappers/CMakeLists.txt
index 15c4249bb7..87fe0aba02 100644
--- a/Code/Wrappers/CMakeLists.txt
+++ b/Code/Wrappers/CMakeLists.txt
@@ -22,4 +22,4 @@ if ( WRAP_PYQT )
add_subdirectory(PyQt)
endif()
- add_subdirectory(CommandLine)
\ No newline at end of file
+add_subdirectory(CommandLine)
\ No newline at end of file
diff --git a/Testing/Code/CMakeLists.txt b/Testing/Code/CMakeLists.txt
index d3850fdf96..427697234e 100644
--- a/Testing/Code/CMakeLists.txt
+++ b/Testing/Code/CMakeLists.txt
@@ -1,5 +1,6 @@
# $Id$
+ADD_SUBDIRECTORY(ApplicationEngine)
ADD_SUBDIRECTORY(Common)
ADD_SUBDIRECTORY(IO)
ADD_SUBDIRECTORY(BasicFilters)
@@ -32,3 +33,4 @@ IF(OTB_USE_PQXX)
ADD_SUBDIRECTORY(GeospatialAnalysis)
ENDIF(OTB_USE_PQXX)
+ADD_SUBDIRECTORY(Wrappers)
--
GitLab