vtk9itk5wx3-macos

diff --git a/appli/creaDevManager/CMakeLists.txt b/appli/creaDevManager/CMakeLists.txt
index f09ae28223ba7d27e037eef5e59ad58f3e75ad1e..27c6554da7429d097d9a0578fb43a0a35aba55fb 100644 (file)
--- a/appli/creaDevManager/CMakeLists.txt
+++ b/appli/creaDevManager/CMakeLists.txt
@@ -70,6 +70,12 @@ SET ( ${EXE_NAME}_LINK_LIBRARIES
   creaDevManagerLib
 )
 
   creaDevManagerLib
 )
 

+       message("EED -----22222----------- "  )
+       message("EED ---------------- "  ${${EXE_NAME}_LINK_LIBRARIES}  )
+       message("EED ---------------- " )
+
+
+

 #-Creates and installs the exe-----------------------------------------------
 CREA_ADD_EXECUTABLE( ${EXE_NAME} )
 #============================================================================
 #-Creates and installs the exe-----------------------------------------------
 CREA_ADD_EXECUTABLE( ${EXE_NAME} )
 #============================================================================

diff --git a/cmake/CREAMacro_FindAndUseWxWidgets.cmake b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
index 5cf2e98f9b5a2d66b3e9062f5852f88d876e63b4..ecf3892e0c99674bedb17742dc58c4eb95c2a116 100644 (file)
--- 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
       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}")
     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})
        
          
        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"   
        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} )
   ELSE(WIN32)
     IF(APPLE)
         INCLUDE( ${wxWidgets_USE_FILE} )


@@ -159,9 +166,6 @@ MACRO(CREA_USE_WXWIDGETS)
                ${GTK3_LIBRARIES}
                ${wxWidgets_LIBRARIES}      
                )
                ${GTK3_LIBRARIES}
                ${wxWidgets_LIBRARIES}      
                )

-
-
-

     ENDIF(APPLE)
   ENDIF(WIN32)
 ENDMACRO(CREA_USE_WXWIDGETS)
     ENDIF(APPLE)
   ENDIF(WIN32)
 ENDMACRO(CREA_USE_WXWIDGETS)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b86c5d4d53ff590772d05902c47c8f10b218d770..e9fc0aee69b076023eb48f534078c16c9d3f9ac8 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -80,9 +80,17 @@ TARGET_LINK_LIBRARIES(crea
   ${WXWIDGETS_LIBRARIES}
   ${VTK_LIBRARIES}
   ${BOOST_LIBRARIES}
   ${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})
 
 #
 SET_TARGET_PROPERTIES(crea PROPERTIES ${CREA_LIBRARY_PROPERTIES})
 
 #