From 85b8f3784331508d6561448b28a89ff2e50d2c63 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Sun, 6 Sep 2020 21:45:40 +0300 Subject: [PATCH] Windows works --- CMakeLists.txt | 10 ++++++++-- libs/core/CMakeLists.txt | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 610af40..97a9925 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ macro(cd_plugin NAME _MODULES _LIBS) shstk_qt_plugin(cd_${NAME} "${_MODULES}" "cd_${NAME};${_LIBS}") endmacro() -shstk_install(cd FALSE "" "${CD_VERSION_FILE}") +shstk_install(cd FALSE "" "${cd_VERSION_FILE}") if (NOT LOCAL) file(GLOB CMAKES "cmake/*.cmake" "cmake/*.in") install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules) @@ -60,7 +60,13 @@ message("----------CD-----------") message(" Build for ${QtVersions}") message(" Linkage: ${cd_LIB_TYPE_MSG}") message(" Type : ${cd_BUILD_TYPE}") -message(" Install: \"${CMAKE_INSTALL_PREFIX}\"") +if (NOT LOCAL) + message(" Install: \"${CMAKE_INSTALL_PREFIX}\"") +else() + if(NOT PIP_FREERTOS) + message(" Install: local \"bin\", \"lib\" and \"include\"") + endif() +endif() message("") print_list("${_qt_libs}" " Libraries:" " * ") if (NOT "x${_qt_plugs}" STREQUAL "x") diff --git a/libs/core/CMakeLists.txt b/libs/core/CMakeLists.txt index 7582cba..1be801b 100644 --- a/libs/core/CMakeLists.txt +++ b/libs/core/CMakeLists.txt @@ -16,4 +16,4 @@ target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${ target_link_libraries(${PROJECT_NAME} PIP) generate_export_header(${PROJECT_NAME}) list(APPEND HDRS "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_export.h") -shstk_install("qad" FALSE ${PROJECT_NAME} "${HDRS}") +shstk_install("cd" FALSE ${PROJECT_NAME} "${HDRS}")