Skip to content

Commit

Permalink
Set correct _prefix (vc_x64_dll) for the wxWidgets 3.0 on Windows (x64)
Browse files Browse the repository at this point in the history
When running the configuration on Windows (x64), and to find the
correct wxWidgets 3.0 libraries, 'vc_x64_dll' should be used as
prefix instead of vc_dll.

Patch: Sandeep Thakkar, Mihir Pandya.
Reviewed by: Ashesh Vashi
  • Loading branch information
sandeep-edb authored and asheshv committed May 22, 2020
1 parent 19693f8 commit 72fae35
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion cmake/FindWX.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,16 @@ IF(WIN32 AND NOT CYGWIN AND NOT MSYS)
SET(_suffix "${_suffix}u")
ENDIF(_unicode)

SET(_arch "") # Set architecture
IF(WX_VERSION GREATER_EQUAL 3.0 AND CMAKE_SIZEOF_VOID_P EQUAL 8)
set(_arch _x64)
ENDIF(WX_VERSION GREATER_EQUAL 3.0 AND CMAKE_SIZEOF_VOID_P EQUAL 8)

# Figure out the build prefix directory
IF(_static)
SET(_prefix "vc_lib")
ELSE(_static)
SET(_prefix "vc_dll")
SET(_prefix "vc${_arch}_dll")
ENDIF(_static)

# Find the Unix configure script. We'll attempt to extract a version number from it.
Expand Down

0 comments on commit 72fae35

Please sign in to comment.