SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@722 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2020-03-01 11:53:37 +00:00
parent 0d2ae8bc58
commit ff1adc8cbb
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qad/CMakeLists.txt
View File

@@ -24,7 +24,6 @@ if(STATIC_LIB)
message(STATUS "Building QAD static libraries") message(STATUS "Building QAD static libraries")
else() else()
set(QAD_LIB_TYPE SHARED) set(QAD_LIB_TYPE SHARED)
add_definitions(-DQAD_SHARED_DEFINE)
message(STATUS "Building QAD shared libraries") message(STATUS "Building QAD shared libraries")
endif() endif()
@@ -116,6 +115,9 @@ macro(qad_project NAME _MODULES _LIBS)
qt_sources(SRC) qt_sources(SRC)
qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS ${PROJ_NAME}_QM) qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS ${PROJ_NAME}_QM)
qt_add_library(${PROJ_NAME} ${QAD_LIB_TYPE} out_CPP ${EXPORT_HEADER}) qt_add_library(${PROJ_NAME} ${QAD_LIB_TYPE} out_CPP ${EXPORT_HEADER})
if(NOT STATIC_LIB)
qt_target_compile_definitions(${PROJ_NAME} PRIVATE QAD_SHARED_DEFINE)
endif()
qt_target_link_libraries(${PROJ_NAME} ${_LIBS}) qt_target_link_libraries(${PROJ_NAME} ${_LIBS})
qad_install(${PROJ_NAME} "${out_HDR}" ${PROJ_NAME}_QM) qad_install(${PROJ_NAME} "${out_HDR}" ${PROJ_NAME}_QM)
set(${NAME}_UTILS 1) set(${NAME}_UTILS 1)

12
qad/QtWraps.cmake
View File

@@ -426,6 +426,18 @@ macro(qt_target_link_libraries _NAME)
endmacro() endmacro()
# usage: qt_target_compile_definitions(...), syntax similar to original "target_compile_definitions()"
# Specify compile definitions to use when compiling a given <target>
macro(qt_target_compile_definitions _NAME)
foreach(_v ${_QT_VERSIONS_})
if (LOCAL_FOUND${_v})
set(_TARGET ${_NAME}${TARGET_SUFFIX_Qt${_v}})
target_compile_definitions(${_TARGET} ${ARGN})
endif()
endforeach()
endmacro()
# usage: qt_install(...), syntax similar to original "install()" # usage: qt_install(...), syntax similar to original "install()"
# install targets for founded Qt versions # install targets for founded Qt versions
# if DESTINATION set to "QtBin" files will be installed # if DESTINATION set to "QtBin" files will be installed