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

CMake: Remove duplicate and unused defines

Browse Source 
Remove unused CMake code to get number of mono source files.
wxUSE_BASE=1 is also defined in wx_set_target_properties.
There seems no reason to define _LIB and DLL_EXPORTS, wx does not use it. They
were probably added because the vcxproj files have them.
This commit is contained in:
Maarten Bent
2022-04-10 23:44:59 +02:00
parent 4999c1c84b
commit 7683219f90
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/cmake/functions.cmake
View File

@@ -271,7 +271,7 @@ function(wx_set_target_properties target_name)
endif()
# Set common compile definitions
target_compile_definitions(${target_name} PRIVATE WXBUILDING _LIB)
target_compile_definitions(${target_name} PRIVATE WXBUILDING)
if(target_name_short STREQUAL "mono" AND wxUSE_GUI)
target_compile_definitions(${target_name} PRIVATE wxUSE_GUI=1 wxUSE_BASE=1)
elseif(wxTARGET_IS_PLUGIN)
@@ -350,9 +350,9 @@ function(wx_set_target_properties target_name)
if(wxBUILD_SHARED)
string(TOUPPER ${target_name_short} target_name_upper)
if(target_name_short STREQUAL "mono")
target_compile_definitions(${target_name} PRIVATE DLL_EXPORTS WXMAKINGDLL)
target_compile_definitions(${target_name} PRIVATE WXMAKINGDLL)
elseif(NOT wxTARGET_IS_PLUGIN)
target_compile_definitions(${target_name} PRIVATE DLL_EXPORTS WXMAKINGDLL_${target_name_upper})
target_compile_definitions(${target_name} PRIVATE WXMAKINGDLL_${target_name_upper})
endif()
target_compile_definitions(${target_name} INTERFACE WXUSINGDLL)
endif()