From 5fb7b3619dd2df8d29237202cd4e04ba96ff9901 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Thu, 31 Jan 2013 17:58:07 +0100 Subject: [PATCH] Feature 1905: New version v1_1_0 Bug 1538 Diego CACERES -Eduardo DAVILA Normal CMakeList FindWxWidgets debug --- Version.cmake | 2 +- cmake/FindWxWidgetsWin32.cmake | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Version.cmake b/Version.cmake index 34698ae..abc8e56 100644 --- a/Version.cmake +++ b/Version.cmake @@ -24,5 +24,5 @@ # ------------------------------------------------------------------------ */ SET(crea_MAJOR_VERSION 1) -SET(crea_MINOR_VERSION 0) +SET(crea_MINOR_VERSION 1) SET(crea_BUILD_VERSION 0) diff --git a/cmake/FindWxWidgetsWin32.cmake b/cmake/FindWxWidgetsWin32.cmake index fadac59..e7541fb 100644 --- a/cmake/FindWxWidgetsWin32.cmake +++ b/cmake/FindWxWidgetsWin32.cmake @@ -127,12 +127,29 @@ SET(WXWIDGETS_CONFIG_PATH ${WXWIDGETS_ROOT_DIR}) # IF( WIN32_STYLE_FIND ) +# EED 31 jan 2013 +# IF( WXWIDGETS_USE_SHARED ) +# SET(WXWIDGETS_LIB_PATH "${WXWIDGETS_ROOT_DIR}/lib/vc_dll" ) +# ELSE( WXWIDGETS_USE_SHARED ) +# SET(WXWIDGETS_LIB_PATH "${WXWIDGETS_ROOT_DIR}/lib/vc_lib" ) +# ENDIF( WXWIDGETS_USE_SHARED ) + + IF (CMAKE_CL_64) ## EED 31 jan 2012 + IF( WXWIDGETS_USE_SHARED ) + SET(WXWIDGETS_LIB_PATH "${WXWIDGETS_ROOT_DIR}/lib/vc_amd64_dll" ) + ELSE( WXWIDGETS_USE_SHARED ) + SET(WXWIDGETS_LIB_PATH "${WXWIDGETS_ROOT_DIR}/lib/vc_amd_lib" ) + ENDIF( WXWIDGETS_USE_SHARED ) + ELSE(CMAKE_CL_64) IF( WXWIDGETS_USE_SHARED ) SET(WXWIDGETS_LIB_PATH "${WXWIDGETS_ROOT_DIR}/lib/vc_dll" ) ELSE( WXWIDGETS_USE_SHARED ) SET(WXWIDGETS_LIB_PATH "${WXWIDGETS_ROOT_DIR}/lib/vc_lib" ) ENDIF( WXWIDGETS_USE_SHARED ) + ENDIF(CMAKE_CL_64) + SET( WXWIDGETS_LINK_DIRECTORIES ${WXWIDGETS_LIB_PATH} ) + ELSE( WIN32_STYLE_FIND ) IF (UNIX_STYLE_FIND) -- 2.47.1