diff options
| author | Glenn Strauss <gstrauss@gluelogic.com> | 2023-01-14 18:45:53 -0500 |
|---|---|---|
| committer | Glenn Strauss <gstrauss@gluelogic.com> | 2023-01-14 18:45:53 -0500 |
| commit | 5bb8cbdc110ce9f8c4617c2130234dad206eceab (patch) | |
| tree | f3d1b839567c5d2f1f406cb5fe7d3adf749b1431 /src/CMakeLists.txt | |
| parent | 8f84c7be495158a52b30fb9f5c38c3d8add98f57 (diff) | |
| download | lighttpd-git-5bb8cbdc110ce9f8c4617c2130234dad206eceab.tar.gz | |
[cmake] use LIGHTTPD_MODULES_DIR as relative path (fixes #3185)
(thx brad)
x-ref:
"CMake: issue with modules path"
https://redmine.lighttpd.net/issues/3185
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index be1085fe..dde5dea4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -805,11 +805,10 @@ set(LIGHTTPD_VERSION_ID 0x104${PROJECT_VERSION_PATCH}) set(PACKAGE_NAME "${CMAKE_PROJECT_NAME}") set(PACKAGE_VERSION "${PROJECT_VERSION}") -if(NOT LIGHTTPD_MODULES_DIR) - set(LIGHTTPD_MODULES_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/lighttpd") -endif() - if(NOT WIN32) + if(NOT LIGHTTPD_MODULES_DIR) + set(LIGHTTPD_MODULES_DIR "${CMAKE_INSTALL_LIBDIR}/lighttpd") + endif() set(LIGHTTPD_LIBRARY_DIR "${CMAKE_INSTALL_PREFIX}/${LIGHTTPD_MODULES_DIR}") else() ## We use relative path in windows @@ -1218,8 +1217,8 @@ endif() if(NOT WIN32) install(TARGETS ${L_INSTALL_TARGETS} RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR} - LIBRARY DESTINATION ${LIGHTTPD_MODULES_DIR} - ARCHIVE DESTINATION ${LIGHTTPD_MODULES_DIR}/static) + LIBRARY DESTINATION ${LIGHTTPD_LIBRARY_DIR} + ARCHIVE DESTINATION ${LIGHTTPD_LIBRARY_DIR}/static) else() ## HACK to make win32 to install our libraries in desired directory.. install(TARGETS lighttpd |