Mercurial > hgweb.cgi > pecunia
changeset 163:7835ff90d1c2
Prefixed all CMake library variables by their project names.
| author | John Schneiderman <JohnMS@member.fsf.org> |
|---|---|
| date | Tue, 19 Jan 2021 16:35:16 +0100 |
| parents | 41ffe38cd9d1 |
| children | 7ebc56fc3906 |
| files | CMakeLists.txt src/CMakeLists.txt |
| diffstat | 2 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Fri Jan 15 18:52:50 2021 +0100 +++ b/CMakeLists.txt Tue Jan 19 16:35:16 2021 +0100 @@ -33,7 +33,7 @@ conan_basic_setup() endif (EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake") -option(${PROJECT_NAME}_BUILD_SHARED_LIBRARY "Enables compiling as a shared library." ON) +option(${PROJECT_NAME}_BUILD_SHARED_LIBRARY "Enables building as a shared library, else static." ON) if (${PROJECT_NAME}_BUILD_SHARED_LIBRARY) @@ -42,7 +42,7 @@ set(${PROJECT_NAME}_LIBRARY_TYPE "STATIC") endif (${PROJECT_NAME}_BUILD_SHARED_LIBRARY) -option(${PROJECT_NAME}_ENABLE_TESTS "Enables compiling and executing tests." OFF) +option(${PROJECT_NAME}_ENABLE_TESTS "Enables building and executing tests." OFF) if (${PROJECT_NAME}_ENABLE_TESTS) include(CTest) @@ -92,11 +92,11 @@ set(${PROJECT_NAME}_HOMEPAGE_URL "http://source.schneiderman.me/pecunia/") if (EXISTS "${CMAKE_INSTALL_PREFIX}/lib32/" AND CMAKE_SIZEOF_VOID_P EQUAL 4) - set (LIBRARY_INSTALL_DIR lib32) + set (${PROJECT_NAME}_LIBRARY_INSTALL_DIR lib32) elseif (EXISTS "${CMAKE_INSTALL_PREFIX}/lib64/" AND CMAKE_SIZEOF_VOID_P EQUAL 8) - set (LIBRARY_INSTALL_DIR lib64) + set (${PROJECT_NAME}_LIBRARY_INSTALL_DIR lib64) else () - set (LIBRARY_INSTALL_DIR lib) + set (${PROJECT_NAME}_LIBRARY_INSTALL_DIR lib) endif (EXISTS "${CMAKE_INSTALL_PREFIX}/lib32/" AND CMAKE_SIZEOF_VOID_P EQUAL 4) if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
--- a/src/CMakeLists.txt Fri Jan 15 18:52:50 2021 +0100 +++ b/src/CMakeLists.txt Tue Jan 19 16:35:16 2021 +0100 @@ -106,8 +106,8 @@ TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets RUNTIME DESTINATION bin - LIBRARY DESTINATION ${LIBRARY_INSTALL_DIR} - ARCHIVE DESTINATION ${LIBRARY_INSTALL_DIR} + LIBRARY DESTINATION ${Pecunia_LIBRARY_INSTALL_DIR} + ARCHIVE DESTINATION ${Pecunia_LIBRARY_INSTALL_DIR} INCLUDES DESTINATION include ) install( @@ -138,13 +138,13 @@ install( EXPORT ${PROJECT_NAME}Targets FILE ${PROJECT_NAME}Targets.cmake - DESTINATION ${LIBRARY_INSTALL_DIR}/cmake/${PROJECT_NAME} + DESTINATION ${Pecunia_LIBRARY_INSTALL_DIR}/cmake/${PROJECT_NAME} ) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}Config.cmake ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}Version.cmake - DESTINATION ${LIBRARY_INSTALL_DIR}/cmake/${PROJECT_NAME} + DESTINATION ${Pecunia_LIBRARY_INSTALL_DIR}/cmake/${PROJECT_NAME} ) if(NOT TARGET uninstall)