solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

CMake: Create only one target file

Browse source 
Put the target file in lib/cmake/wxWidgets directory.
This commit is contained in:
Maarten Bent 2022-04-12 21:12:57 +02:00
parent 797df0530d
commit 039f0a924a
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
build/cmake/functions.cmake
View file

@ -432,13 +432,12 @@ macro(wx_add_library name)
set(runtime_dir "bin")
endif()
wx_install(TARGETS ${name}
EXPORT ${name}Targets
EXPORT wxWidgetsTargets
LIBRARY DESTINATION "lib/${GEN_EXPR_DIR_FIX}${wxPLATFORM_LIB_DIR}"
ARCHIVE DESTINATION "lib/${GEN_EXPR_DIR_FIX}${wxPLATFORM_LIB_DIR}"
RUNTIME DESTINATION "${runtime_dir}/${GEN_EXPR_DIR_FIX}${wxPLATFORM_LIB_DIR}"
BUNDLE DESTINATION Applications/wxWidgets
)
wx_install(EXPORT ${name}Targets NAMESPACE wx:: DESTINATION "lib/${wxPLATFORM_LIB_DIR}/cmake")
wx_target_enable_precomp(${name} "${wxSOURCE_DIR}/include/wx/wxprec.h")
endif()
endmacro()
@ -587,8 +586,7 @@ function(wx_set_builtin_target_properties target_name)
wx_set_common_target_properties(${target_name} DEFAULT_WARNINGS)
if(NOT wxBUILD_SHARED)
wx_install(TARGETS ${name} EXPORT ${name}Targets ARCHIVE DESTINATION "lib/${GEN_EXPR_DIR_FIX}${wxPLATFORM_LIB_DIR}")
wx_install(EXPORT ${name}Targets NAMESPACE wx:: DESTINATION "lib/${wxPLATFORM_LIB_DIR}/cmake")
wx_install(TARGETS ${name} EXPORT wxWidgetsTargets ARCHIVE DESTINATION "lib/${GEN_EXPR_DIR_FIX}${wxPLATFORM_LIB_DIR}")
endif()
endfunction()

2
build/cmake/install.cmake
View file

@ -55,6 +55,8 @@ else()
)
endif()
install(EXPORT wxWidgetsTargets NAMESPACE wx:: DESTINATION "lib/cmake/wxWidgets")
# uninstall target
if(MSVC_IDE)
set(UNINST_NAME UNINSTALL)