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

CMake: Add wxBUILD_FLAVOUR option

Browse Source 
It is similar to --with-flavour option from configure.

Mark some build options as advanced.
This commit is contained in:
Maarten Bent
2020-02-16 21:33:44 +01:00
parent 4196c67b72
commit 016061311a
3 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
build/cmake/functions.cmake
View File

@@ -144,29 +144,34 @@ function(wx_set_target_properties target_name is_base)
else() else()
set(lib_suffix) set(lib_suffix)
endif() endif()
set(lib_flavour "")
if(wxBUILD_FLAVOUR)
set(lib_flavour "_${wxBUILD_FLAVOUR}")
string(REPLACE "-" "_" lib_flavour ${lib_flavour})
endif()
if(WIN32) if(WIN32)
if(MSVC) if(MSVC)
# match visual studio name # match visual studio name
set_target_properties(${target_name} set_target_properties(${target_name}
PROPERTIES PROPERTIES
OUTPUT_NAME "wx${lib_toolkit}${lib_version}${lib_unicode}${lib_suffix}" OUTPUT_NAME "wx${lib_toolkit}${lib_version}${lib_unicode}${lib_flavour}${lib_suffix}"
OUTPUT_NAME_DEBUG "wx${lib_toolkit}${lib_version}${lib_unicode}d${lib_suffix}" OUTPUT_NAME_DEBUG "wx${lib_toolkit}${lib_version}${lib_unicode}d${lib_flavour}${lib_suffix}"
PREFIX "" PREFIX ""
) )
else() else()
# match configure name (mingw, cygwin) # match configure name (mingw, cygwin)
set_target_properties(${target_name} set_target_properties(${target_name}
PROPERTIES PROPERTIES
OUTPUT_NAME "wx_${lib_toolkit}${lib_unicode}${lib_suffix}-${lib_version}" OUTPUT_NAME "wx_${lib_toolkit}${lib_unicode}${lib_flavour}${lib_suffix}-${lib_version}"
OUTPUT_NAME_DEBUG "wx_${lib_toolkit}${lib_unicode}d${lib_suffix}-${lib_version}" OUTPUT_NAME_DEBUG "wx_${lib_toolkit}${lib_unicode}d${lib_flavour}${lib_suffix}-${lib_version}"
PREFIX "lib" PREFIX "lib"
) )
endif() endif()
if(wxBUILD_SHARED) if(wxBUILD_SHARED)
# Add compiler type and or vendor # Add compiler type and or vendor
set(dll_suffix "_${wxCOMPILER_PREFIX}") set(dll_suffix "${lib_flavour}${lib_suffix}_${wxCOMPILER_PREFIX}")
if(wxBUILD_VENDOR) if(wxBUILD_VENDOR)
wx_string_append(dll_suffix "_${wxBUILD_VENDOR}") wx_string_append(dll_suffix "_${wxBUILD_VENDOR}")
endif() endif()
@@ -177,20 +182,20 @@ function(wx_set_target_properties target_name is_base)
endif() endif()
set_target_properties(${target_name} set_target_properties(${target_name}
PROPERTIES PROPERTIES
RUNTIME_OUTPUT_NAME "wx${lib_toolkit}${dll_version}${lib_unicode}${lib_suffix}${dll_suffix}" RUNTIME_OUTPUT_NAME "wx${lib_toolkit}${dll_version}${lib_unicode}${dll_suffix}"
RUNTIME_OUTPUT_NAME_DEBUG "wx${lib_toolkit}${dll_version}${lib_unicode}d${lib_suffix}${dll_suffix}" RUNTIME_OUTPUT_NAME_DEBUG "wx${lib_toolkit}${dll_version}${lib_unicode}d${dll_suffix}"
PREFIX "" PREFIX ""
) )
target_compile_definitions(${target_name} PRIVATE target_compile_definitions(${target_name} PRIVATE
"-DWXDLLNAME=wx${lib_toolkit}${dll_version}${lib_unicode}$<$<CONFIG:Debug>:d>${lib_suffix}${dll_suffix}") "-DWXDLLNAME=wx${lib_toolkit}${dll_version}${lib_unicode}$<$<CONFIG:Debug>:d>${dll_suffix}")
endif() endif()
else() else()
set_target_properties(${target_name} set_target_properties(${target_name}
PROPERTIES PROPERTIES
OUTPUT_NAME wx_${lib_toolkit}${lib_unicode}${lib_suffix}-${lib_version} OUTPUT_NAME wx_${lib_toolkit}${lib_unicode}${lib_flavour}${lib_suffix}-${lib_version}
# NOTE: wx-config can not be used to connect the libraries with the debug suffix. # NOTE: wx-config can not be used to connect the libraries with the debug suffix.
#OUTPUT_NAME_DEBUG wx_${lib_toolkit}${lib_unicode}d${lib_suffix}-${lib_version} #OUTPUT_NAME_DEBUG wx_${lib_toolkit}${lib_unicode}d${lib_flavour}${lib_suffix}-${lib_version}
OUTPUT_NAME_DEBUG wx_${lib_toolkit}${lib_unicode}${lib_suffix}-${lib_version} OUTPUT_NAME_DEBUG wx_${lib_toolkit}${lib_unicode}${lib_flavour}${lib_suffix}-${lib_version}
) )
endif() endif()
if(CYGWIN) if(CYGWIN)

5
build/cmake/init.cmake
View File

@@ -118,6 +118,11 @@ if(NOT wxBUILD_SHARED)
wx_string_append(wxBUILD_FILE_ID "-static") wx_string_append(wxBUILD_FILE_ID "-static")
endif() endif()
wx_string_append(wxBUILD_FILE_ID "-${wxMAJOR_VERSION}.${wxMINOR_VERSION}") wx_string_append(wxBUILD_FILE_ID "-${wxMAJOR_VERSION}.${wxMINOR_VERSION}")
if(wxBUILD_FLAVOUR)
set(lib_flavour ${wxBUILD_FLAVOUR})
string(REPLACE "-" "_" lib_flavour ${lib_flavour})
wx_string_append(wxBUILD_FILE_ID "-${lib_flavour}")
endif()
set(wxARCH_SUFFIX) set(wxARCH_SUFFIX)

4
build/cmake/options.cmake
View File

@@ -50,14 +50,18 @@ endif()
if(WIN32) if(WIN32)
set(wxBUILD_VENDOR "custom" CACHE STRING "Short string identifying your company (used in DLL name)") set(wxBUILD_VENDOR "custom" CACHE STRING "Short string identifying your company (used in DLL name)")
endif() endif()
set(wxBUILD_FLAVOUR "" CACHE STRING "Specify a name to identify the build")
mark_as_advanced(wxBUILD_FLAVOUR)
wx_option(wxBUILD_OPTIMISE "use speed-optimised C/C++ compiler flags for release build" OFF) wx_option(wxBUILD_OPTIMISE "use speed-optimised C/C++ compiler flags for release build" OFF)
mark_as_advanced(wxBUILD_OPTIMISE)
if(MSVC) if(MSVC)
set(wxBUILD_STRIPPED_RELEASE_DEFAULT OFF) set(wxBUILD_STRIPPED_RELEASE_DEFAULT OFF)
else() else()
set(wxBUILD_STRIPPED_RELEASE_DEFAULT ON) set(wxBUILD_STRIPPED_RELEASE_DEFAULT ON)
endif() endif()
wx_option(wxBUILD_STRIPPED_RELEASE "remove debug symbols in release build" ${wxBUILD_STRIPPED_RELEASE_DEFAULT}) wx_option(wxBUILD_STRIPPED_RELEASE "remove debug symbols in release build" ${wxBUILD_STRIPPED_RELEASE_DEFAULT})
mark_as_advanced(wxBUILD_STRIPPED_RELEASE)
wx_option(wxUSE_NO_RTTI "disable RTTI support" OFF) wx_option(wxUSE_NO_RTTI "disable RTTI support" OFF)
# STL options # STL options