SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@252 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2017-08-03 09:57:46 +00:00
parent 8d24589a0f
commit fd095f859a
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cd_utils/CMakeLists.txt
View File

@@ -47,9 +47,9 @@ message(STATUS "Building ${PROJECT_NAME}")
install(FILES ${HDRS_UTILS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) install(FILES ${HDRS_UTILS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
endif() endif()
message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") #message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
else() else()
install(TARGETS ${PROJECT_NAME} DESTINATION bin) install(TARGETS ${PROJECT_NAME} DESTINATION bin)
message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") #message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
endif() endif()
#endif() #endif()

5
qad/QtWraps.cmake
View File

@@ -92,6 +92,11 @@ macro(find_qt)
#message("Qt5: plugins dir: ${Qt5_PLUGINS_DIR}") #message("Qt5: plugins dir: ${Qt5_PLUGINS_DIR}")
break() break()
endforeach() endforeach()
if ("x${Qt5_PLUGINS_DIR}" STREQUAL "x")
string(FIND "${Qt5_BIN}" "/" _ind REVERSE)
string(SUBSTRING "${Qt5_BIN}" 0 ${_ind} _l)
set(Qt5_PLUGINS_DIR "${_l}/plugins")
endif()
if (NOT _QT5_MSG) if (NOT _QT5_MSG)
message(STATUS "Found Qt5: ${_Qt5_qmake} (found version \"${Qt5_VERSION}\")") message(STATUS "Found Qt5: ${_Qt5_qmake} (found version \"${Qt5_VERSION}\")")
set(_QT5_MSG 1 CACHE BOOL "msg_qt5" FORCE) set(_QT5_MSG 1 CACHE BOOL "msg_qt5" FORCE)