From: Eduardo Enrique Davila Serrano <davila@creatis.insa-lyon.fr>
Date: Wed, 28 Sep 2022 04:55:31 +0000 (+0200)
Subject: vtk9itk5wx3-macos
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;ds=inline;h=8630e8e0be90e8e8519086b66eecda83e095e87e;hp=-c;p=crea.git

vtk9itk5wx3-macos
---

8630e8e0be90e8e8519086b66eecda83e095e87e
diff --git a/appli/creaDevManager/CMakeLists.txt b/appli/creaDevManager/CMakeLists.txt
index f09ae28..27c6554 100644
--- a/appli/creaDevManager/CMakeLists.txt
+++ b/appli/creaDevManager/CMakeLists.txt
@@ -70,6 +70,12 @@ SET ( ${EXE_NAME}_LINK_LIBRARIES
   creaDevManagerLib
 )
 
+	message("EED -----22222----------- "  )
+	message("EED ---------------- "  ${${EXE_NAME}_LINK_LIBRARIES}  )
+	message("EED ---------------- " )
+
+
+
 #-Creates and installs the exe-----------------------------------------------
 CREA_ADD_EXECUTABLE( ${EXE_NAME} )
 #============================================================================
diff --git a/cmake/CREAMacro_FindAndUseWxWidgets.cmake b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
index 5cf2e98..ecf3892 100644
--- a/cmake/CREAMacro_FindAndUseWxWidgets.cmake
+++ b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
@@ -84,9 +84,8 @@ endif(APPLE)
       SET(WXAUILIBS "aui")
       # LG : These options should be set by the user at top level of crea
       FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS base core adv html
-      ${WXAUILIBS}
-      ${WXGLCANVASLIBS}
-    )
+					${WXAUILIBS}
+					${WXGLCANVASLIBS}	)
     IF(wxWidgets_FOUND)
       MESSAGE ( STATUS "=======================================")
       MESSAGE ( STATUS "Looking for wxWidgets... found ${wxWidgets_CONFIG_EXECUTABLE}")
@@ -126,11 +125,19 @@ MACRO(CREA_USE_WXWIDGETS)
 	  
 	include(${wxWidgets_USE_FILE})
 	
+
 	SET(WXWIDGETS_LIBRARIES ${wxWidgets_LIBRARIES}   
 	            "${wxWidgets_LIB_DIR}/libwxmsw32u_aui.a"   
 				"${wxWidgets_LIB_DIR}/libwxmsw32u_webview.a"    
 				"${wxWidgets_LIB_DIR}/libwxmsw32u_html.a"   
-				"${wxWidgets_LIB_DIR}/libwxmsw32u_adv.a" )    	  
+				"${wxWidgets_LIB_DIR}/libwxmsw32u_adv.a" 
+	            "${wxWidgets_LIB_DIR}/libwxmsw32u_gl.a"   
+	            "${wxWidgets_LIB_DIR}/libwxmsw32u_media.a"   
+	            "${wxWidgets_LIB_DIR}/libwxmsw32u_core.a"   
+	            "${wxWidgets_LIB_DIR}/libwxbase32u.a"   
+	            "${wxWidgets_LIB_DIR}/libwxbase32u_net.a"   
+				)    	  
+	
   ELSE(WIN32)
     IF(APPLE)
         INCLUDE( ${wxWidgets_USE_FILE} )
@@ -159,9 +166,6 @@ MACRO(CREA_USE_WXWIDGETS)
       		${GTK3_LIBRARIES}
       		${wxWidgets_LIBRARIES}      
 		)
-
-
-
     ENDIF(APPLE)
   ENDIF(WIN32)
 ENDMACRO(CREA_USE_WXWIDGETS)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b86c5d4..e9fc0ae 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -80,9 +80,17 @@ TARGET_LINK_LIBRARIES(crea
   ${WXWIDGETS_LIBRARIES}
   ${VTK_LIBRARIES}
   ${BOOST_LIBRARIES}
-
 )
 
+	message("EED ---------------- "  )
+	message("EED ---------------- " ${WXWIDGETS_LIBRARIES}  )
+	message("EED ---------------- " )
+	message("EED ---------------- " ${VTK_LIBRARIES} )
+	message("EED ---------------- " )
+	message("EED ---------------- " ${BOOST_LIBRARIES} )
+	message("EED ---------------- " )
+
+
 SET_TARGET_PROPERTIES(crea PROPERTIES ${CREA_LIBRARY_PROPERTIES})
 
 #