From: Eduardo DAVILA Date: Fri, 22 Jul 2022 13:17:32 +0000 (+0200) Subject: #3250 vtk9itk5wx3-macos X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=51d78c853f55c3b88292a8c569e87e61621116da;p=bbtkGEditor.git #3250 vtk9itk5wx3-macos --- diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/CMakeLists.txt b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/CMakeLists.txt index ae0ec73..091bcb2 100644 --- 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 43fe4da..29ec974 100644 --- 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 c29995f..f58afe3 100644 --- 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 8ec6907..a75362f 100644 --- 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 464c705..d687638 100644 --- 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);