Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Create wx-config for MinGW builds

Browse Source 
Use the same output folder for setup.h and wx-config as configure does.
This commit is contained in:
Maarten Bent
2020-02-16 15:23:03 +01:00
parent 10abcc0f78
commit 4196c67b72
4 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
build/cmake/init.cmake
View File

@@ -140,19 +140,15 @@ else()
set(wxCOMPILER_PREFIX)
endif()
if(MSVC OR MINGW)
if(MSVC)
if(wxBUILD_SHARED)
set(lib_suffix "dll")
else()
set(lib_suffix "lib")
endif()
if(MSVC)
# Include generator expression to suppress default Debug/Release pair
set(wxPLATFORM_LIB_DIR "$<1:/>${wxCOMPILER_PREFIX}${wxARCH_SUFFIX}_${lib_suffix}")
else()
set(wxPLATFORM_LIB_DIR "/${wxCOMPILER_PREFIX}${wxARCH_SUFFIX}_${lib_suffix}")
endif()
# Include generator expression to suppress default Debug/Release pair
set(wxPLATFORM_LIB_DIR "$<1:/>${wxCOMPILER_PREFIX}${wxARCH_SUFFIX}_${lib_suffix}")
else()
set(wxPLATFORM_LIB_DIR)
endif()
@@ -164,7 +160,7 @@ if(wxBUILD_CUSTOM_SETUP_HEADER_PATH)
set(wxSETUP_HEADER_PATH ${wxBUILD_CUSTOM_SETUP_HEADER_PATH})
else()
# Set path where setup.h will be created
if(MSVC OR MINGW)
if(MSVC)
if(wxUSE_UNICODE)
set(lib_unicode u)
else()