Skip to content

Commit 0f386dc

Browse files
committed
CPack components support
1 parent ad06d7e commit 0f386dc

File tree

2 files changed

+21
-7
lines changed

2 files changed

+21
-7
lines changed

CMakeLists.txt

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -988,15 +988,25 @@ set ( CPACK_PACKAGE_VERSION_PATCH ${FLUIDSYNTH_VERSION_MICRO} )
988988
set ( CPACK_PACKAGE_EXECUTABLES "fluidsynth" "FluidSynth CLI" )
989989

990990
# source packages
991-
set ( CPACK_SOURCE_GENERATOR TGZ;TBZ2;ZIP )
992-
set ( CPACK_SOURCE_IGNORE_FILES "/.svn/;/build/;~$;.cproject;.project;/.settings/;${CPACK_SOURCE_IGNORE_FILES}" )
991+
set ( CPACK_SOURCE_IGNORE_FILES "/.git/;/build/;~$;.cproject;.project;/.settings/;${CPACK_SOURCE_IGNORE_FILES}" )
993992
set ( CPACK_SOURCE_PACKAGE_FILE_NAME "${PACKAGE}-${VERSION}" )
994993
set ( CPACK_SOURCE_STRIP_FILES OFF )
995994

996995
# binary packages
997996
include ( InstallRequiredSystemLibraries )
998-
set ( CPACK_GENERATOR STGZ;TGZ;TBZ2;ZIP )
999997
set ( CPACK_PACKAGE_NAME ${PACKAGE} )
1000998
set ( CPACK_STRIP_FILES ON )
1001999

10021000
include ( CPack )
1001+
1002+
cpack_add_component(${PACKAGE}_runtime
1003+
DISPLAY_NAME "Runtime Library"
1004+
DESCRIPTION "Shared library (DLL) needed to run FluidSynth programs")
1005+
cpack_add_component(${PACKAGE}_program
1006+
DISPLAY_NAME "FluidSynth Application"
1007+
DESCRIPTION "FluidSynth Command Line Interface Program"
1008+
DEPENDS ${PACKAGE}_runtime)
1009+
cpack_add_component(${PACKAGE}_development
1010+
DISPLAY_NAME "C Headers and import library"
1011+
DESCRIPTION "C headers and import library for using FluidSynth"
1012+
DEPENDS ${PACKAGE}_runtime)

src/CMakeLists.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -564,17 +564,21 @@ if ( MACOSX_FRAMEWORK )
564564
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${PACKAGE}_program
565565
FRAMEWORK DESTINATION "${FRAMEWORK_INSTALL_PREFIX}/${FRAMEWORK_INSTALL_DIR}" COMPONENT ${PACKAGE}_runtime
566566
ARCHIVE DESTINATION "${FRAMEWORK_INSTALL_PREFIX}/${FRAMEWORK_INSTALL_DIR}" COMPONENT ${PACKAGE}_development
567-
)
567+
)
568568
else ( MACOSX_FRAMEWORK )
569-
install ( TARGETS fluidsynth libfluidsynth
569+
install ( TARGETS fluidsynth
570570
EXPORT FluidSynthTargets
571571
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${PACKAGE}_program
572+
)
573+
install ( TARGETS libfluidsynth
574+
EXPORT FluidSynthTargets
575+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${PACKAGE}_runtime
572576
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${PACKAGE}_runtime
573577
NAMELINK_COMPONENT ${PACKAGE}_development
574578
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${PACKAGE}_development
575579
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fluidsynth COMPONENT ${PACKAGE}_development
576-
)
577-
install ( FILES ${public_main_HEADER} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT ${PACKAGE}_development )
580+
)
581+
install ( FILES ${public_main_HEADER} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT ${PACKAGE}_development )
578582
endif ( MACOSX_FRAMEWORK )
579583

580584
# Exported targets.

0 commit comments

Comments
 (0)