kicad-developers team mailing list archive
-
kicad-developers team
-
Mailing list archive
-
Message #23097
[PATCH 10/19] FindwxWidgets.cmake: Expect directory layout for MSVC 64 bit
On 64 bit MSVC, the DLLs and import libraries are placed in a directory
called vc_x64, to allow parallel installation of 32 and 64 bit wxWidgets.
---
CMakeModules/FindwxWidgets.cmake | 2 ++
1 file changed, 2 insertions(+)
diff --git a/CMakeModules/FindwxWidgets.cmake b/CMakeModules/FindwxWidgets.cmake
index 0e7eb7a..8ac93f3 100644
--- a/CMakeModules/FindwxWidgets.cmake
+++ b/CMakeModules/FindwxWidgets.cmake
@@ -480,6 +480,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()
Follow ups
References
-
[PATCH 00/19] FindwxWidgets.cmake updates
From: Simon Richter, 2016-02-13
-
[PATCH 01/19] FindwxWidgets.cmake: Remove arguments from else() and end*()
From: Simon Richter, 2016-02-13
-
[PATCH 02/19] FindwxWidgets.cmake: remove a few dbg_msg() invocations
From: Simon Richter, 2016-02-13
-
[PATCH 03/19] FindwxWidgets.cmake: Use uppercase for DBG_MSG macro
From: Simon Richter, 2016-02-13
-
[PATCH 04/19] FindwxWidgets.cmake: Show line number in debug output
From: Simon Richter, 2016-02-13
-
[PATCH 05/19] FindwxWidgets.cmake: Use uppercase for macro names
From: Simon Richter, 2016-02-13
-
[PATCH 06/19] FindwxWidgets.cmake: Use lowercase for CMake builtins
From: Simon Richter, 2016-02-13
-
[PATCH 07/19] FindwxWidgets.cmake: Fix indentation
From: Simon Richter, 2016-02-13
-
[PATCH 08/19] FindwxWidgets.cmake: Look for versioned wx-config scripts
From: Simon Richter, 2016-02-13
-
[PATCH 09/19] FindwxWidgets.cmake: documentation for variables
From: Simon Richter, 2016-02-13