SHS/cd
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Windows works

Browse Source
This commit is contained in:
Пелипенко Иван
2020-09-06 21:45:40 +03:00
parent 23b275d17d
commit 85b8f37843
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -41,7 +41,7 @@ macro(cd_plugin NAME _MODULES _LIBS)
shstk_qt_plugin(cd_${NAME} "${_MODULES}" "cd_${NAME};${_LIBS}") shstk_qt_plugin(cd_${NAME} "${_MODULES}" "cd_${NAME};${_LIBS}")
endmacro() endmacro()
shstk_install(cd FALSE "" "${CD_VERSION_FILE}") shstk_install(cd FALSE "" "${cd_VERSION_FILE}")
if (NOT LOCAL) if (NOT LOCAL)
file(GLOB CMAKES "cmake/*.cmake" "cmake/*.in") file(GLOB CMAKES "cmake/*.cmake" "cmake/*.in")
install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules) install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules)
@@ -60,7 +60,13 @@ message("----------CD-----------")
message(" Build for ${QtVersions}") message(" Build for ${QtVersions}")
message(" Linkage: ${cd_LIB_TYPE_MSG}") message(" Linkage: ${cd_LIB_TYPE_MSG}")
message(" Type : ${cd_BUILD_TYPE}") 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("") message("")
print_list("${_qt_libs}" " Libraries:" " * ") print_list("${_qt_libs}" " Libraries:" " * ")
if (NOT "x${_qt_plugs}" STREQUAL "x") if (NOT "x${_qt_plugs}" STREQUAL "x")

2
libs/core/CMakeLists.txt
View File

@@ -16,4 +16,4 @@ target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${
target_link_libraries(${PROJECT_NAME} PIP) target_link_libraries(${PROJECT_NAME} PIP)
generate_export_header(${PROJECT_NAME}) generate_export_header(${PROJECT_NAME})
list(APPEND HDRS "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_export.h") 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}")