master #59

Merged
peri4 merged 3 commits from master into release 2021-03-19 15:44:43 +03:00
5 changed files with 6 additions and 6 deletions

View File

@@ -42,7 +42,7 @@ find_package(PIP REQUIRED)
if (NOT CROSSTOOLS)
find_qt(Core QUIET)
qad_find_qt(Core QUIET)
if (SOME_QT_FOUND)
add_subdirectory(qad)
@@ -60,6 +60,6 @@ endif()
if(WIN32 AND SOME_QT_FOUND)
foreach(_l ${PIP_MODULES} ${CD_MODULES})
qt_install(TARGETS ${_l} RUNTIME DESTINATION QtBin)
qad_install(TARGETS ${_l} RUNTIME DESTINATION QtBin)
endforeach()
endif()

2
cd

Submodule cd updated: d6734e1954...5d1e42601a

2
cmake

Submodule cmake updated: 8966f58f60...44f27b5010

2
qad

Submodule qad updated: 6b4a903764...b14a48da6e