From 02e0bddd09737a72a2ca92d8ee8cba7060d0a6aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Wed, 22 Feb 2017 12:59:30 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@163 a8b55f48-bf90-11e4-a774-851b48703e85 --- CMakeLists.txt | 2 +- qad_blockview/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 93a8be8..cbcaa57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ if (WIN32) set(PIP_DLL_DIR "${CMAKE_CURRENT_BINARY_DIR}/pip") endif() -set(LIST_LIBS pip qad_widgets qad_utils qad_application qad_blockview qad_graphic qad_sql_table piqt cd_utils qcd_utils kx_utils piqt_utils touch_widgets qglview) +set(LIST_LIBS pip qad_utils qad_widgets qad_application qad_blockview qad_graphic qad_sql_table piqt cd_utils qcd_utils kx_utils piqt_utils touch_widgets qglview) foreach(L ${LIST_LIBS}) add_subdirectory(${L}) include_directories(${L}) diff --git a/qad_blockview/CMakeLists.txt b/qad_blockview/CMakeLists.txt index bba99c9..563d534 100644 --- a/qad_blockview/CMakeLists.txt +++ b/qad_blockview/CMakeLists.txt @@ -38,9 +38,11 @@ if (LIB) install(FILES ${MOCS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif () + install(TARGETS blockeditor DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"") else () install(TARGETS ${PROJECT_NAME} DESTINATION bin) + install(TARGETS blockeditor DESTINATION bin) message(STATUS "Install to local \"bin\"") endif () add_subdirectory(plugin)