File tree Expand file tree Collapse file tree 2 files changed +14
-9
lines changed
Expand file tree Collapse file tree 2 files changed +14
-9
lines changed Original file line number Diff line number Diff line change @@ -1256,10 +1256,6 @@ write_basic_package_version_file(${PKG_VERSION_FILE}
12561256 VERSION ${ALLEGRO_VERSION}
12571257 COMPATIBILITY AnyNewerVersion
12581258)
1259- install (
1260- TARGETS ${ALLEGRO_TARGETS}
1261- EXPORT ${PKG_TARGETS_NAME}
1262- )
12631259install (
12641260 EXPORT ${PKG_TARGETS_NAME}
12651261 NAMESPACE ${PKG_NAME} ::
@@ -1276,6 +1272,20 @@ export(EXPORT ${PKG_TARGETS_NAME}
12761272 NAMESPACE ${PKG_NAME} ::
12771273)
12781274
1275+ #-----------------------------------------------------------------------------#
1276+ #
1277+ # Misc installation
1278+ #
1279+ #-----------------------------------------------------------------------------#
1280+
1281+ # This lives here instead of add_our_library primarily because we only set up
1282+ # the PKG_TARGETS_NAME here.
1283+ install (
1284+ TARGETS ${ALLEGRO_TARGETS}
1285+ EXPORT ${PKG_TARGETS_NAME}
1286+ FRAMEWORK DESTINATION "${FRAMEWORK_INSTALL_PREFIX} "
1287+ )
1288+
12791289#-----------------------------------------------------------------------------#
12801290#
12811291# Documentation
Original file line number Diff line number Diff line change @@ -225,11 +225,6 @@ function(set_our_framework_properties target nm)
225225endfunction (set_our_framework_properties)
226226
227227function (install_our_library target filename)
228- install (TARGETS ${target}
229- FRAMEWORK DESTINATION "${FRAMEWORK_INSTALL_PREFIX} "
230- # Doesn't work, see below.
231- # PUBLIC_HEADER DESTINATION "include"
232- )
233228 if (MSVC AND BUILD_SHARED_LIBS )
234229 install (FILES ${CMAKE_BINARY_DIR} /lib/\${CMAKE_INSTALL_CONFIG_NAME} /${filename} .pdb
235230 DESTINATION ${CMAKE_INSTALL_LIBDIR}
You can’t perform that action at this time.
0 commit comments