From 80ebb424a5c1dfe232242b9bb572047318382377 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Thu, 11 May 2017 15:02:21 +0300 Subject: [PATCH] Install dll's to correct path (#213) --- CMakeLists.txt | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 40d8d77..603f6bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -396,10 +396,10 @@ endif () # ---------------------------------------------------------------------------- # installation directories if (OS_WINDOWS) - set (RUNTIME_INSTALL_DIR Bin) - set (LIBRARY_INSTALL_DIR Lib) - set (INCLUDE_INSTALL_DIR Include) - set (CONFIG_INSTALL_DIR CMake) + set (RUNTIME_INSTALL_DIR "bin") + set (LIBRARY_INSTALL_DIR "lib") + set (INCLUDE_INSTALL_DIR "include") + set (CONFIG_INSTALL_DIR "lib/cmake/${PACKAGE_NAME}") set (PKGCONFIG_INSTALL_DIR) else () set (RUNTIME_INSTALL_DIR bin) @@ -500,14 +500,22 @@ configure_file (cmake/version.cmake.in "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-co if (BUILD_SHARED_LIBS AND INSTALL_SHARED_LIBS) foreach (opts IN ITEMS "" _nothreads) if (BUILD_gflags${opts}_LIB) - install (TARGETS gflags${opts}_shared DESTINATION ${LIBRARY_INSTALL_DIR} EXPORT ${EXPORT_NAME}) + install (TARGETS gflags${opts}_shared + EXPORT ${EXPORT_NAME} + RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR} + LIBRARY DESTINATION ${LIBRARY_INSTALL_DIR} + ARCHIVE DESTINATION ${LIBRARY_INSTALL_DIR}) endif () endforeach () endif () if (BUILD_STATIC_LIBS AND INSTALL_STATIC_LIBS) foreach (opts IN ITEMS "" _nothreads) if (BUILD_gflags${opts}_LIB) - install (TARGETS gflags${opts}_static DESTINATION ${LIBRARY_INSTALL_DIR} EXPORT ${EXPORT_NAME}) + install (TARGETS gflags${opts}_static + EXPORT ${EXPORT_NAME} + RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR} + LIBRARY DESTINATION ${LIBRARY_INSTALL_DIR} + ARCHIVE DESTINATION ${LIBRARY_INSTALL_DIR}) endif () endforeach () endif () -- 2.7.4