X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2FCREAMacro_FindAndUseWxWidgets.cmake;fp=cmake%2FCREAMacro_FindAndUseWxWidgets.cmake;h=527d94fc7fca88c382446bfd351bc764f461f12f;hb=71b11bf892079ae97bda2f13b79a4ca8cad6e454;hp=9a89323de1e844017774c16ba5fc5b18ad569ae2;hpb=dcab8273ee1401287fab043f09b308fb2d765f44;p=crea.git diff --git a/cmake/CREAMacro_FindAndUseWxWidgets.cmake b/cmake/CREAMacro_FindAndUseWxWidgets.cmake index 9a89323..527d94f 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 ON) SET(WXW_USE_UNICODE OFF) SET(WXW_USE_SHARED ON) SET(WXW_USE_UNIV OFF) @@ -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