diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-06-04 14:29:23 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-06-04 15:25:52 +0200 |
| commit | 2c03498f5e7615dc2cf9d9575541d2905c5f9e08 (patch) | |
| tree | 0d124c1f2d2032c2ae3f387f6115f89923263861 /examples | |
| parent | 1dc6f2054e9249ec0d53deac32509b0e39ab117e (diff) | |
CMake: Rename example conflicting with the one in qtmultimedia
Change-Id: Ie4ea514c351d593ae087081158e5cb328e9e19a9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/activeqt/mediaplayer/CMakeLists.txt | 14 |
1 files changed, 6 insertions, 8 deletions
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}" |