diff --git a/BUILDING-cmake.md b/BUILDING-cmake.md index 336fbaebe..82a758115 100644 --- a/BUILDING-cmake.md +++ b/BUILDING-cmake.md @@ -263,7 +263,7 @@ documentation on how to set up the libprojectM build system for use in another p ### Importing libprojectM targets from an installed version This is the recommended and supported way of importing libprojectM in your project. This project installs a set of CMake -files in `//cmake/libprojectM`, containing target definitions, version and dependency checks as well as +files in `//cmake/projectM4`, containing target definitions, version and dependency checks as well as any additional libraries required for linking. Other projects then use CMake's `find_package` command to search for these files in [different locations](https://cmake.org/cmake/help/latest/command/find_package.html#search-procedure). diff --git a/src/libprojectM/CMakeLists.txt b/src/libprojectM/CMakeLists.txt index cda0e793a..eda335ad2 100644 --- a/src/libprojectM/CMakeLists.txt +++ b/src/libprojectM/CMakeLists.txt @@ -220,21 +220,21 @@ write_basic_package_version_file( configure_package_config_file(libprojectMConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/libprojectM/libprojectMConfig.cmake" - INSTALL_DESTINATION "${PROJECTM_LIB_DIR}/cmake/libprojectM" + INSTALL_DESTINATION "${PROJECTM_LIB_DIR}/cmake/projectM4" PATH_VARS PROJECTM_BIN_DIR PROJECTM_INCLUDE_DIR ) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libprojectM/libprojectMConfigVersion.cmake" "${CMAKE_CURRENT_BINARY_DIR}/libprojectM/libprojectMConfig.cmake" - DESTINATION "${PROJECTM_LIB_DIR}/cmake/libprojectM" + DESTINATION "${PROJECTM_LIB_DIR}/cmake/projectM4" COMPONENT Devel ) if(NOT ENABLE_EMSCRIPTEN AND ENABLE_GLES) install(FILES "${CMAKE_SOURCE_DIR}/cmake/gles/FindOpenGL.cmake" - DESTINATION "${PROJECTM_LIB_DIR}/cmake/libprojectM" + DESTINATION "${PROJECTM_LIB_DIR}/cmake/projectM4" COMPONENT Devel ) endif() @@ -242,7 +242,7 @@ endif() if(ENABLE_LLVM) install(FILES "${CMAKE_SOURCE_DIR}/cmake/gles/FindLLVM.cmake" - DESTINATION "${PROJECTM_LIB_DIR}/cmake/libprojectM" + DESTINATION "${PROJECTM_LIB_DIR}/cmake/projectM4" COMPONENT Devel ) endif() @@ -251,7 +251,7 @@ endif() install(EXPORT libprojectMTargets FILE libprojectMTargets.cmake NAMESPACE libprojectM:: - DESTINATION "${PROJECTM_LIB_DIR}/cmake/libprojectM" + DESTINATION "${PROJECTM_LIB_DIR}/cmake/projectM4" COMPONENT Devel ) diff --git a/src/playlist/CMakeLists.txt b/src/playlist/CMakeLists.txt index 74789198a..f6a948497 100644 --- a/src/playlist/CMakeLists.txt +++ b/src/playlist/CMakeLists.txt @@ -125,21 +125,21 @@ write_basic_package_version_file( configure_package_config_file(libprojectMPlaylistConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/libprojectMPlaylist/libprojectMPlaylistConfig.cmake" - INSTALL_DESTINATION "${PROJECTM_LIB_DIR}/cmake/libprojectMPlaylist" + INSTALL_DESTINATION "${PROJECTM_LIB_DIR}/cmake/projectM4Playlist" PATH_VARS PROJECTM_BIN_DIR PROJECTM_INCLUDE_DIR ) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libprojectMPlaylist/libprojectMPlaylistConfigVersion.cmake" "${CMAKE_CURRENT_BINARY_DIR}/libprojectMPlaylist/libprojectMPlaylistConfig.cmake" - DESTINATION "${PROJECTM_LIB_DIR}/cmake/libprojectMPlaylist" + DESTINATION "${PROJECTM_LIB_DIR}/cmake/projectM4Playlist" COMPONENT Devel ) install(EXPORT libprojectMPlaylist FILE libprojectMPlaylistTargets.cmake NAMESPACE libprojectM:: - DESTINATION "${PROJECTM_LIB_DIR}/cmake/libprojectMPlaylist" + DESTINATION "${PROJECTM_LIB_DIR}/cmake/projectM4Playlist" COMPONENT Devel )