#3250 vtk9itk5wx3-macos

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/CMakeLists.txt b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/CMakeLists.txt
index ae0ec73eadf98f033f0f9dd3ae70098855523bf9..091bcb258ca42e75e1ca60325cdf90e4c509ecf3 100644 (file)
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/CMakeLists.txt
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/CMakeLists.txt
@@ -34,3 +34,5 @@ INCLUDE_DIRECTORIES(../../../data/icons)
 ADD_LIBRARY(bbsKernelEditorGraphic
                 ${bbsKernelEditorGraphic_CXX_SOURCES}
                 ${bbsKernelEditorGraphic_H_SOURCES}  )
+
+TARGET_LINK_LIBRARIES( bbsKernelEditorGraphic ${VTK_LIBRARIES} )

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/CMakeLists.txt b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/CMakeLists.txt
index 43fe4da51e95115607f05ab508d06fdbed39e413..29ec974a408657e4d7e7635fde32c3889576e809 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/CMakeLists.txt
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/CMakeLists.txt
@@ -35,3 +35,5 @@ INCLUDE_DIRECTORIES(../../../data/icons)
 ADD_LIBRARY(bbsVtkGUIEditorGraphic
                 ${bbsVtkGUIEditorGraphic_CXX_SOURCES}
                 ${bbsVtkGUIEditorGraphic_H_SOURCES}  )
+
+TARGET_LINK_LIBRARIES( bbsVtkGUIEditorGraphic ${VTK_LIBRARIES} )

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/CMakeLists.txt b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/CMakeLists.txt
index c29995fc54bfd9e0b699d2da3e243341b1c0a84b..f58afe3a2c20595fb88c4566f05d0ee0c6b5eeae 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/CMakeLists.txt
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/CMakeLists.txt
@@ -33,6 +33,8 @@ INCLUDE_DIRECTORIES(../bbsWxGUIEditorGraphic)
 INCLUDE_DIRECTORIES(../../../data/icons)
 
 
-ADD_LIBRARY(bbsWxGUIEditorGraphic
+ADD_LIBRARY( bbsWxGUIEditorGraphic
                 ${bbsWxGUIEditorGraphic_CXX_SOURCES}
                 ${bbsWxGUIEditorGraphic_H_SOURCES} )
+
+TARGET_LINK_LIBRARIES( bbsWxGUIEditorGraphic ${VTK_LIBRARIES} )

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
index 8ec6907de425efda932d4c5faae9a779cc9bd1c2..a75362f59584f70a50033233662ee85224d22eef 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
@@ -335,7 +335,7 @@ namespace bbtk
 
        //=========================================================================
 
-       void wxGEditorTabPanel::loadDiagram(ifstream &inputStream, const std::string &path) //DFCH
+       void wxGEditorTabPanel::loadDiagram(std::ifstream &inputStream, const std::string &path) //DFCH
        {
                this->SetFullPath(path);
                stringstream ss;

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.h
index 464c7059d038504e0cad5919d997b18389ada438..d687638569a6f3ed395d040ac42d549288ca8f6b 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.h
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.h
@@ -132,7 +132,7 @@ namespace bbtk
                void saveTempandUpdate(const std::string &);
 
                // Load BBG diagram
-               void loadDiagram(ifstream &inputStream, const std::string &path); //DFCH
+               void loadDiagram(std::ifstream &inputStream, const std::string &path); //DFCH
 
                void saveStringAction(const std::string &action);