Skip to content

Commit

Permalink
Fixed export/install for later investigation
Browse files Browse the repository at this point in the history
  • Loading branch information
nathanjhood committed Mar 15, 2024
1 parent 0092a86 commit 4fab33b
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 25 deletions.
50 changes: 26 additions & 24 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ if (NOT DEFINED JUCE_VERSION)
message (STATUS " Found JUCE v${JUCE_VERSION}...")
endif ()

option (STONEYDSP_BIQUADS_TARGET_IS_INSTALLABLE "" OFF)
option (STONEYDSP_BIQUADS_USING_JUCE_RECOMMENDED_CONFIG_FLAGS "" ON)
option (STONEYDSP_BIQUADS_USING_JUCE_RECOMMENDED_LTO_FLAGS "" ON)
option (STONEYDSP_BIQUADS_USING_JUCE_RECOMMENDED_WARNING_FLAGS "" ON)
Expand Down Expand Up @@ -203,8 +204,6 @@ unset(STONEYDSP_BIQUADS_INCLUDEDIR)
set(STONEYDSP_BIQUADS_INCLUDEDIR
$<BUILD_INTERFACE:${STONEYDSP_BIQUADS_BINARY_DIR}/include>
$<INSTALL_INTERFACE:include>
# CACHE PATH "Installation directory for include files, a relative path that will be joined with ${CMAKE_INSTALL_PREFIX} or an absolute path."
# FORCE
)

#[=============================================================================[
Expand All @@ -223,12 +222,13 @@ endif ()

include(CMakePackageConfigHelpers)

export (
TARGETS ${STONEYDSP_BIQUADS_TARGETS}
FILE share/cmake/StoneyDSPBiquadsTargets.cmake
NAMESPACE StoneyDSP::
)

if (STONEYDSP_BIQUADS_TARGET_IS_INSTALLABLE)
export (
TARGETS ${STONEYDSP_BIQUADS_TARGETS}
FILE share/cmake/StoneyDSPBiquadsTargets.cmake
NAMESPACE StoneyDSP::
)
endif ()
#[=============================================================================[
Install & CPack configuration
]=============================================================================]#
Expand Down Expand Up @@ -261,15 +261,24 @@ configure_package_config_file(
INSTALL_DESTINATION "${STONEYDSP_BIQUADS_INSTALL_DESTINATION}"
)

install(TARGETS ${STONEYDSP_BIQUADS_TARGETS}
EXPORT StoneyDSPBiquadsTargets
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/StoneyDSP"
PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/StoneyDSP"
FILE_SET biquads_HEADERS
)
if (STONEYDSP_BIQUADS_TARGET_IS_INSTALLABLE)
install(
TARGETS ${STONEYDSP_BIQUADS_TARGETS}
EXPORT StoneyDSPBiquadsTargets
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/StoneyDSP"
PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/StoneyDSP"
FILE_SET biquads_HEADERS
)
install(
EXPORT StoneyDSPBiquadsTargets
FILE StoneyDSPBiquadsTargets.cmake
NAMESPACE StoneyDSP::
DESTINATION lib/cmake/StoneyDSP
)
endif ()

install(FILES
"${STONEYDSP_BIQUADS_BINARY_DIR}/StoneyDSPBiquadsConfigVersion.cmake"
Expand All @@ -286,13 +295,6 @@ install(FILES
DESTINATION "${STONEYDSP_BIQUADS_INSTALL_DESTINATION}"
)

install(
EXPORT StoneyDSPBiquadsTargets
FILE StoneyDSPBiquadsTargets.cmake
NAMESPACE StoneyDSP::
DESTINATION lib/cmake/StoneyDSP
)

# offer a basic/messy CPack
set(STONEYDSP_BIQUADS_CPACK_GENERATORS "")
list(APPEND STONEYDSP_BIQUADS_CPACK_GENERATORS
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.1.138
1.2.1.145

0 comments on commit 4fab33b

Please sign in to comment.