X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2FCREAMacro_FindAndUseWxWidgets.cmake;h=00b642516e842d7c330c0babd96b49829f211a69;hb=008f253aee9bc52f4a2d2f7d78b1209efa55ca81;hp=cec6770218da39a9d9d6ce0db53b90ccf24f8d4d;hpb=0d9b01fc0a92aad82fa601c36952ffb2a89d5bbb;p=crea.git

diff --git a/cmake/CREAMacro_FindAndUseWxWidgets.cmake b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
index cec6770..00b6425 100644
--- a/cmake/CREAMacro_FindAndUseWxWidgets.cmake
+++ b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
@@ -11,7 +11,8 @@ MACRO(CREA_FIND_WXWIDGETS)
     SET(WXWINDOWS_USE_GL 1)
     
     #wxWidgets build related stuff
-    SET(WXW_USE_DEBUG ON)
+    # DO NOT FORCE DEBUG LIBS !!
+	SET(WXW_USE_DEBUG OFF)
     SET(WXW_USE_UNICODE OFF)
     SET(WXW_USE_SHARED ON)
     SET(WXW_USE_UNIV OFF)
@@ -35,11 +36,11 @@ MACRO(CREA_FIND_WXWIDGETS)
     pkg_check_modules (GTK2 gtk+-2.0)
     #MESSAGE("${GTK2_INCLUDE_DIRS}")
     # Can I require all my user to have the gl lib on linux, even if they do not really need it...
-    SET(WXGLCANVASLIBS "gl")
+#EED  SET(WXGLCANVASLIBS "gl")
     # aui ?
     SET(WXAUILIBS "aui")
     # LG : These options should be set by the user at top level of crea
-    FIND_PACKAGE(wxWidgets COMPONENTS base core adv 
+    FIND_PACKAGE(wxWidgets COMPONENTS base core adv html 
       ${WXAUILIBS}
       ${WXGLCANVASLIBS})
     #
@@ -71,8 +72,10 @@ MACRO(CREA_USE_WXWIDGETS)
     INCLUDE_DIRECTORIES(${WXWIDGETS_INCLUDE_DIR})
     LINK_DIRECTORIES( ${WXWIDGETS_LINK_DIRECTORIES} )
     SET(WXWIDGETS_LIBRARIES
-      ${WXWIDGETS_LIBRARIES}     
-      ${WXWIDGETS_LIBRARIES} wxmsw28d_aui      
+      ${WXWIDGETS_LIBRARIES}  
+#DO NOT FORCE DEBUG LIBS !!
+      debug wxmsw28d_aui
+      optimized wxmsw28_aui
       debug msvcrtd
       debug msvcprtd
       optimized msvcrt