From 2c03498f5e7615dc2cf9d9575541d2905c5f9e08 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 4 Jun 2021 14:29:23 +0200 Subject: CMake: Rename example conflicting with the one in qtmultimedia Change-Id: Ie4ea514c351d593ae087081158e5cb328e9e19a9 Reviewed-by: Joerg Bornemann Reviewed-by: Qt CI Bot --- examples/activeqt/mediaplayer/CMakeLists.txt | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'examples/activeqt/mediaplayer/CMakeLists.txt') diff --git a/examples/activeqt/mediaplayer/CMakeLists.txt b/examples/activeqt/mediaplayer/CMakeLists.txt index acc01c1..9b5210d 100644 --- a/examples/activeqt/mediaplayer/CMakeLists.txt +++ b/examples/activeqt/mediaplayer/CMakeLists.txt @@ -1,7 +1,5 @@ -# Generated from mediaplayer.pro. - cmake_minimum_required(VERSION 3.14) -project(mediaplayer LANGUAGES CXX) +project(mediaplayer_activeqt LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -13,30 +11,30 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/activeqt/mediaplayer") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/activeqt/mediaplayer_activeqt") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Widgets) find_package(Qt6 COMPONENTS AxContainer) -qt_add_executable(mediaplayer +qt_add_executable(mediaplayer_activeqt main.cpp mainwindow.ui mediaaxwidget.h ) -set_target_properties(mediaplayer PROPERTIES +set_target_properties(mediaplayer_activeqt PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) -target_link_libraries(mediaplayer PUBLIC +target_link_libraries(mediaplayer_activeqt PUBLIC Qt::AxContainer Qt::Core Qt::Gui Qt::Widgets ) -install(TARGETS mediaplayer +install(TARGETS mediaplayer_activeqt RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -- cgit v1.2.3