From 096e5ff42f74db52a6e3ac40b1a084e19ca3a9f7 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Sun, 16 Dec 2018 22:21:55 -0800 Subject: Fixed cmake install commands --- BuildUtils.cmake | 4 +++- CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/BuildUtils.cmake b/BuildUtils.cmake index 0e3a1b52..0f80ce47 100644 --- a/BuildUtils.cmake +++ b/BuildUtils.cmake @@ -200,7 +200,9 @@ endfunction() function(install_core_lib _TARGET) get_core_library_relative_dir(${_TARGET} TARGET_RELATIVE_PATH) install(TARGETS ${_TARGET} - DESTINATION "${DILIGENT_CORE_INSTALL_DIR}/bin" + ARCHIVE DESTINATION "${DILIGENT_CORE_INSTALL_DIR}/lib" + LIBRARY DESTINATION "${DILIGENT_CORE_INSTALL_DIR}/lib" + RUNTIME DESTINATION "${DILIGENT_CORE_INSTALL_DIR}/bin" ) if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/interface") diff --git a/CMakeLists.txt b/CMakeLists.txt index 905b2af0..457ba054 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -215,7 +215,7 @@ elseif(PLATFORM_IOS) endif() endif() -if(NOT ${DILIGENT_CORE_INSTALL_DIR}) +if(NOT DILIGENT_CORE_INSTALL_DIR) set(DILIGENT_CORE_INSTALL_DIR "DiligentCore") endif() -- cgit v1.2.3