COMP: update cmake files to build against latest OTB develop

CMakeLists.txt

@@ -14,8 +14,7 @@ if(OTB_USE_TENSORFLOW)
   find_library(TENSORFLOW_CC_LIB NAMES libtensorflow_cc)
   find_library(TENSORFLOW_FRAMEWORK_LIB NAMES libtensorflow_framework)
 
-  set(OTBTensorflow_SYSTEM_INCLUDE_DIRS ${tensorflow_include_dir})
-  set(OTBTensorflow_LIBRARIES ${TENSORFLOW_CC_LIB} ${TENSORFLOW_FRAMEWORK_LIB})
+  set(TENSORFLOW_LIBS "${TENSORFLOW_CC_LIB}" "${TENSORFLOW_FRAMEWORK_LIB}")
 
 else()
   message("Tensorflow support disabled")

app/CMakeLists.txt

 if(OTB_USE_TENSORFLOW)
   # Tensorflow-dependent APPS
   OTB_CREATE_APPLICATION(NAME TensorflowModelServe
-	SOURCES otbTensorflowModelServe.cxx ${${otb-module}_SYSTEM_INCLUDE_DIRS}
-	LINK_LIBRARIES ${${otb-module}_LIBRARIES}
+	SOURCES otbTensorflowModelServe.cxx ${${otb-module}_SYSTEM_INCLUDE_DIRS} "${tensorflow_include_dir}"
+	LINK_LIBRARIES ${${otb-module}_LIBRARIES} ${TENSORFLOW_LIBS}
   )
 
   OTB_CREATE_APPLICATION(NAME TensorflowModelTrain
-	SOURCES otbTensorflowModelTrain.cxx ${${otb-module}_SYSTEM_INCLUDE_DIRS}
-	LINK_LIBRARIES ${${otb-module}_LIBRARIES}
+	SOURCES otbTensorflowModelTrain.cxx ${${otb-module}_SYSTEM_INCLUDE_DIRS} "${tensorflow_include_dir}"
+	LINK_LIBRARIES ${${otb-module}_LIBRARIES} ${TENSORFLOW_LIBS}
   )
 
   OTB_CREATE_APPLICATION(NAME TrainClassifierFromDeepFeatures
-	SOURCES otbTrainClassifierFromDeepFeatures.cxx ${${otb-module}_SYSTEM_INCLUDE_DIRS}
-	LINK_LIBRARIES ${${otb-module}_LIBRARIES}
+	SOURCES otbTrainClassifierFromDeepFeatures.cxx ${${otb-module}_SYSTEM_INCLUDE_DIRS} "${tensorflow_include_dir}"
+	LINK_LIBRARIES ${${otb-module}_LIBRARIES} ${TENSORFLOW_LIBS}
   )
   
   OTB_CREATE_APPLICATION(NAME ImageClassifierFromDeepFeatures
-	SOURCES otbImageClassifierFromDeepFeatures.cxx ${${otb-module}_SYSTEM_INCLUDE_DIRS}
-	LINK_LIBRARIES ${${otb-module}_LIBRARIES}
+	SOURCES otbImageClassifierFromDeepFeatures.cxx ${${otb-module}_SYSTEM_INCLUDE_DIRS} "${tensorflow_include_dir}"
+	LINK_LIBRARIES ${${otb-module}_LIBRARIES} ${TENSORFLOW_LIBS}
   )
 endif()
 
 # Tensorflow-independent APPS
 OTB_CREATE_APPLICATION(NAME PatchesExtraction
 	SOURCES otbPatchesExtraction.cxx
-	LINK_LIBRARIES ${OTBCOMMON_LIBRARIES}
+	LINK_LIBRARIES ${${otb-module}_LIBRARIES}
 )
 OTB_CREATE_APPLICATION(NAME LabelImageSampleSelection
 	SOURCES otbLabelImageSampleSelection.cxx
-	LINK_LIBRARIES ${OTBCOMMON_LIBRARIES}
+	LINK_LIBRARIES ${${otb-module}_LIBRARIES}
 )
 OTB_CREATE_APPLICATION(NAME DensePolygonClassStatistics
 	SOURCES otbDensePolygonClassStatistics.cxx
-	LINK_LIBRARIES ${OTBCOMMON_LIBRARIES}
+	LINK_LIBRARIES ${${otb-module}_LIBRARIES}
 )

otb-module.cmake

@@ -2,19 +2,19 @@ set(DOCUMENTATION "An unofficial module enabling to play with Tensorflow")
 
 # define the dependencies of the include module and the tests
 otb_module(OTBTensorflow
-	DEPENDS
-		OTBCommon
-		OTBApplicationEngine
-		OTBStreaming
-		OTBExtendedFilename
-		OTBImageIO
-		OTBSupervised
+  DEPENDS
+    OTBCommon
+    OTBApplicationEngine
+    OTBStreaming
+    OTBExtendedFilename
+    OTBImageIO
+    OTBSupervised
     OTBIOXML
     OTBConversion
     OTBStatistics
-	TEST_DEPENDS
-		OTBTestKernel
-		OTBCommandLine
-	DESCRIPTION
-		"${DOCUMENTATION}"
+  TEST_DEPENDS
+    OTBTestKernel
+    OTBCommandLine
+  DESCRIPTION
+    "${DOCUMENTATION}"
 )