X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2FCREAMacro_FindAndUseWxWidgets.cmake;h=ecf3892e0c99674bedb17742dc58c4eb95c2a116;hb=8630e8e0be90e8e8519086b66eecda83e095e87e;hp=eaf4b1cdf36b7b7b1d1901b83fd5e70d0525cb1e;hpb=f2337ab0485f3c70869339e04fc7728c9a49fc02;p=crea.git

diff --git a/cmake/CREAMacro_FindAndUseWxWidgets.cmake b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
index eaf4b1c..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}/libwxmsw30u_aui.a"   
-				"${wxWidgets_LIB_DIR}/libwxmsw30u_webview.a"    
-				"${wxWidgets_LIB_DIR}/libwxmsw30u_html.a"   
-				"${wxWidgets_LIB_DIR}/libwxmsw30u_adv.a" )    	  
+	            "${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_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)