kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix-qt4_use_modules-QtAx' 

ce0c480 Qt4Macros: Handle Qt ActiveX libraries in qt4_use_modules.
This commit is contained in:
Brad King 2013-06-03 09:56:26 -04:00 committed by CMake Topic Stage
parent acf42ba325 ce0c4802c0
commit 800e764e80
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Modules/Qt4Macros.cmake
View File

@ -451,14 +451,22 @@ function(qt4_use_modules _target _link_type)
endif() endif()
foreach(_module ${modules}) foreach(_module ${modules})
string(TOUPPER ${_module} _ucmodule) string(TOUPPER ${_module} _ucmodule)
if (NOT QT_QT${_ucmodule}_FOUND) set(_targetPrefix QT_QT${_ucmodule})
message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.") if (_ucmodule STREQUAL QAXCONTAINER OR _ucmodule STREQUAL QAXSERVER)
if (NOT QT_Q${_ucmodule}_FOUND)
message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.")
endif()
set(_targetPrefix QT_Q${_ucmodule})
else()
if (NOT QT_QT${_ucmodule}_FOUND)
message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.")
endif()
if ("${_ucmodule}" STREQUAL "MAIN")
message(FATAL_ERROR "Can not use \"${_module}\" module with qt4_use_modules.")
endif()
endif() endif()
if ("${_ucmodule}" STREQUAL "MAIN") target_link_libraries(${_target} ${link_type} ${${_targetPrefix}_LIBRARIES})
message(FATAL_ERROR "Can not use \"${_module}\" module with qt4_use_modules.") set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${${_targetPrefix}_INCLUDE_DIR} ${QT_HEADERS_DIR} ${QT_MKSPECS_DIR}/default)
endif() set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${${_targetPrefix}_COMPILE_DEFINITIONS})
target_link_libraries(${_target} ${link_type} ${QT_QT${_ucmodule}_LIBRARY})
set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${QT_QT${_ucmodule}_INCLUDE_DIR} ${QT_HEADERS_DIR} ${QT_MKSPECS_DIR}/default)
set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${QT_QT${_ucmodule}_COMPILE_DEFINITIONS})
endforeach() endforeach()
endfunction() endfunction()