Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LOGCXX-536 Use CMAKE_INSTALL_LIBDIR instead CMAKE_INSTALL_DATAROOTDIR… #77

Merged
merged 1 commit into from
Dec 11, 2021
Merged

LOGCXX-536 Use CMAKE_INSTALL_LIBDIR instead CMAKE_INSTALL_DATAROOTDIR… #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ if(UNIX)
)

install(FILES "${CMAKE_CURRENT_BINARY_DIR}/liblog4cxx.pc"
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig)
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

if(LOG4CXX_QT_SUPPORT)
set(prefix "${CMAKE_INSTALL_PREFIX}")
Expand All @@ -110,7 +110,7 @@ if(UNIX)
)

install(FILES "${CMAKE_CURRENT_BINARY_DIR}/liblog4cxx-qt.pc"
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig)
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
endif(LOG4CXX_QT_SUPPORT)
endif(UNIX)

Expand All @@ -119,7 +119,7 @@ endif(UNIX)
# target_link_libraries( myApplication PRIVATE log4cxx)
install(EXPORT log4cxxTargets
FILE log4cxxConfig.cmake
DESTINATION share/cmake/log4cxx
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/log4cxx
)
# Support for find_package(log4cxx 0.11) in consuming CMake projects
include(CMakePackageConfigHelpers)
Expand All @@ -128,13 +128,13 @@ write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/log4cxxConfigVersi
COMPATIBILITY SameMinorVersion
)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/log4cxxConfigVersion.cmake"
DESTINATION share/cmake/log4cxx
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/log4cxx
)

if(LOG4CXX_QT_SUPPORT)
install(EXPORT log4cxx-qtTargets
FILE log4cxx-qtConfig.cmake
DESTINATION share/cmake/log4cxx
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/log4cxx
)
# Support for find_package(log4cxx 0.11) in consuming CMake projects
include(CMakePackageConfigHelpers)
Expand All @@ -143,7 +143,7 @@ if(LOG4CXX_QT_SUPPORT)
COMPATIBILITY SameMinorVersion
)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/log4cxx-qtConfigVersion.cmake"
DESTINATION share/cmake/log4cxx
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/log4cxx
)
endif(LOG4CXX_QT_SUPPORT)

Expand Down