This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via c8519dd1a03d1f19e4e465b32b6039ace785dc9a (commit)
via 870f91e389ec5727e8bd08e9d46bfa29f7e4b77d (commit)
from 323a0408bcc78f06b821f3eb3e44954d38e745ee (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8519dd1a03d1f19e4e465b32b6039ace785dc9a
commit c8519dd1a03d1f19e4e465b32b6039ace785dc9a
Merge: 323a040 870f91e
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Sep 10 08:51:38 2013 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Sep 10 08:51:38 2013 -0400
Merge topic 'FindwxWidgets-msvc-x64' into next
870f91e FindwxWidgets: Look in x64 directories for MSVC (#14393)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=870f91e389ec5727e8bd08e9d46bfa29f7e4b77d
commit 870f91e389ec5727e8bd08e9d46bfa29f7e4b77d
Author: Marius Luca <mar...@dreamer-ge.com>
AuthorDate: Mon Sep 9 18:32:00 2013 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Sep 10 08:41:13 2013 -0400
FindwxWidgets: Look in x64 directories for MSVC (#14393)
When compiling the 64 bit version of wxWidgets using nmake the library
folders become vc_x64_lib and vc_x64_dll and can coexist with the win32
version.
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index 37a894c..28c1b64 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -475,6 +475,8 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
# settings.
if(MINGW)
set(WX_LIB_DIR_PREFIX gcc)
+ elseif(CMAKE_CL_64)
+ set(WX_LIB_DIR_PREFIX vc_x64)
else()
set(WX_LIB_DIR_PREFIX vc)
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindwxWidgets.cmake | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
