← Back to team overview

kicad-developers team mailing list archive

[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