Skip to content

Commit

Permalink
Move cpack_add_component below include(CPack)
Browse files Browse the repository at this point in the history
  • Loading branch information
daschuer authored Oct 15, 2023
1 parent ad1272d commit 6446e3a
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3366,19 +3366,6 @@ if(WAVPACK)
target_link_libraries(mixxx-lib PRIVATE WavPack::wavpack)
endif()

if (APPLOCAL_COMPONENT_DEFINED)
cpack_add_component(applocal
DISPLAY_NAME "Plug-Ins"
DESCRIPTION "Plug-ins that are loaded at runtime if necessary"
HIDDEN
REQUIRED)

# In order to run Mixx from the build directory install applocal components
add_custom_command(
TARGET mixxx POST_BUILD
COMMAND "${CMAKE_COMMAND}" -DCOMPONENT=applocal -DCMAKE_INSTALL_PREFIX="${CMAKE_CURRENT_BINARY_DIR}" -P cmake_install.cmake)
endif()

# Configure file with build options
file(RELATIVE_PATH MIXXX_INSTALL_DOCDIR_RELATIVE_TO_DATADIR "${CMAKE_INSTALL_PREFIX}/${MIXXX_INSTALL_DATADIR}" "${CMAKE_INSTALL_PREFIX}/${MIXXX_INSTALL_DOCDIR}")
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/src/config.h" @ONLY)
Expand Down Expand Up @@ -3453,6 +3440,19 @@ endif()

include(CPack)

if (APPLOCAL_COMPONENT_DEFINED)
cpack_add_component(applocal
DISPLAY_NAME "Plug-Ins"
DESCRIPTION "Plug-ins that are loaded at runtime if necessary"
HIDDEN
REQUIRED)

# In order to run Mixx from the build directory install applocal components
add_custom_command(
TARGET mixxx POST_BUILD
COMMAND "${CMAKE_COMMAND}" -DCOMPONENT=applocal -DCMAKE_INSTALL_PREFIX="${CMAKE_CURRENT_BINARY_DIR}" -P cmake_install.cmake)
endif()

if(APPLE AND MACOS_BUNDLE)
set(BUNDLE_NAME "${MIXXX_INSTALL_PREFIX}")
set(BUNDLE_DIRS "${CMAKE_PREFIX_PATH}/lib")
Expand Down

0 comments on commit 6446e3a

Please sign in to comment.