Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1256,10 +1256,6 @@ write_basic_package_version_file(${PKG_VERSION_FILE}
VERSION ${ALLEGRO_VERSION}
COMPATIBILITY AnyNewerVersion
)
install(
TARGETS ${ALLEGRO_TARGETS}
EXPORT ${PKG_TARGETS_NAME}
)
install(
EXPORT ${PKG_TARGETS_NAME}
NAMESPACE ${PKG_NAME}::
Expand All @@ -1276,6 +1272,20 @@ export(EXPORT ${PKG_TARGETS_NAME}
NAMESPACE ${PKG_NAME}::
)

#-----------------------------------------------------------------------------#
#
# Misc installation
#
#-----------------------------------------------------------------------------#

# This lives here instead of add_our_library primarily because we only set up
# the PKG_TARGETS_NAME here.
install(
TARGETS ${ALLEGRO_TARGETS}
EXPORT ${PKG_TARGETS_NAME}
FRAMEWORK DESTINATION "${FRAMEWORK_INSTALL_PREFIX}"
)

#-----------------------------------------------------------------------------#
#
# Documentation
Expand Down
5 changes: 0 additions & 5 deletions cmake/Common.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -225,11 +225,6 @@ function(set_our_framework_properties target nm)
endfunction(set_our_framework_properties)

function(install_our_library target filename)
install(TARGETS ${target}
FRAMEWORK DESTINATION "${FRAMEWORK_INSTALL_PREFIX}"
# Doesn't work, see below.
# PUBLIC_HEADER DESTINATION "include"
)
if(MSVC AND BUILD_SHARED_LIBS)
install(FILES ${CMAKE_BINARY_DIR}/lib/\${CMAKE_INSTALL_CONFIG_NAME}/${filename}.pdb
DESTINATION ${CMAKE_INSTALL_LIBDIR}
Expand Down
Loading