diff --git a/qad/cmake/QADDeploy.cmake b/qad/cmake/QADDeploy.cmake index 9331ecd..763fc53 100644 --- a/qad/cmake/QADDeploy.cmake +++ b/qad/cmake/QADDeploy.cmake @@ -1,4 +1,4 @@ -# set_deploy_property( NAME [NAME [...]]) +# set_deploy_property( [SHARED | STATIC] NAME [NAME [...]]) # # Set target deploy property, where NAME one of: # * LABEL - application icon name @@ -8,6 +8,7 @@ # * ICON - icon file # * INFO - additional info # +# Specify SHARED or STATIC if your target is library # You can setup several properties in one command # # @@ -64,7 +65,9 @@ macro(set_deploy_property _T) set(_name) set(_is_name 1) foreach(_i ${ARGN}) - if (_is_name) + if (("x${_i}" STREQUAL "xSHARED") OR ("x${_i}" STREQUAL "xSTATIC")) + set(${_T}_TYPE "${_i}") + elseif(_is_name) set(_is_name 0) if (_i IN_LIST __prop_names) else() @@ -86,15 +89,12 @@ macro(make_rc _T _out) set(WINDOWS_RC_LABEL "${${_T}_LABEL}") set(WINDOWS_RC_COMPANY "${${_T}_COMPANY}") set(WINDOWS_RC_INFO "${${_T}_INFO}") - get_target_property(target_type ${_T} TYPE) - message("target_type=${target_type}") - if (target_type STREQUAL "EXECUTABLE") - elseif (target_type STREQUAL "SHARED_LIBRARY") - set(WINDOWS_RC_FILETYPE "0x2L") - elseif (target_type STREQUAL "STATIC_LIBRARY") - set(WINDOWS_RC_FILETYPE "0x7L") - else() - set(WINDOWS_RC_FILETYPE "0x1L") + if (("x${${_T}_TYPE}" STREQUAL "x") OR ("x${${_T}_TYPE}" STREQUAL "xEXECUTABLE")) + set(WINDOWS_RC_FILETYPE "0x1L") + elseif ("x${${_T}_TYPE}" STREQUAL "xSHARED") + set(WINDOWS_RC_FILETYPE "0x2L") + elseif ("x${${_T}_TYPE}" STREQUAL "xSTATIC") + set(WINDOWS_RC_FILETYPE "0x7L") endif() get_filename_component(WINDOWS_RC_ICON "${${_T}_ICON}" REALPATH BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(_rc_file "${CMAKE_CURRENT_BINARY_DIR}/winres.rc")