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

qcd_utils/CMakeLists.txt

@@ -2,55 +2,14 @@ project(qcd_utils)
 cmake_minimum_required(VERSION 2.6)
 if (NOT LIBPROJECT)
 	find_package(PIP REQUIRED)
-endif ()
-if (MINGW)
-	find_package(MinGW REQUIRED)
 endif()
-find_package(Qt4 REQUIRED)
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${PIP_INCLUDES} ${QT_INCLUDES})
-set(PULT_NAME "cd_pult")
-option(PULT "Build ${PULT_NAME}" 1)
-option(LIB "System install" 1)
-option(DEBUG "Build with -g3" 0)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
-if (DEBUG)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
-endif ()
-file(GLOB CPPS "*.cpp")
-file(GLOB MOCS "*.h")
-file(GLOB UIS "*.ui")
-file(GLOB RES "*.qrc")
-qt4_wrap_cpp(CMOCS ${MOCS} OPTIONS -nw)
-qt4_wrap_ui(CUIS ${UIS})
-qt4_add_resources(RESS ${RES})
-add_library(${PROJECT_NAME} SHARED ${CPPS} ${CMOCS} ${CUIS} ${RESS} ${MOCS})
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PIP_LIBRARY} qad_utils qad_widgets cd_utils piqt)
-target_link_libraries(${PROJECT_NAME} ${LIBS})
-
+find_package(QAD REQUIRED)
+include_directories(${PIP_INCLUDES} ${QAD_INCLUDES})
+set(LIBS ${PIP_LIBRARY} ${QAD_UTILS_LIBRARY} ${QAD_WIDGETS_LIBRARY} cd_utils piqt)
+qt_project(${PROJECT_NAME} "LIB" "${LIBS}" H CPP)
+sdk_install("" ${PROJECT_NAME} "${H}")
 if (NOT DEFINED ENV{QNX_HOST})
 	 if (PULT)
 		 add_subdirectory(pult)
 	 endif ()
 endif ()
- if (LIB)
-	if (WIN32)
-		set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
-		install(FILES ${MOCS} DESTINATION ${MINGW_INCLUDE})
-		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
-		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
-		get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
-		install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR})
-	else ()
-		if(APPLE)
-			set(CMAKE_INSTALL_PREFIX /usr/local)
-		else()
-			set(CMAKE_INSTALL_PREFIX /usr)
-		endif()
-		install(FILES ${MOCS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
-		install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
-	endif ()
-	message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"")
-else ()
-	install(TARGETS ${PROJECT_NAME} DESTINATION bin)
-	message(STATUS "Install to local \"bin\"")
-endif ()

qcd_utils/clean.bat

@@ -1,4 +0,0 @@
-#make clean
-del /q /f /s CMakeFiles
-rmdir /q /s CMakeFiles
-del /q /f CMakeCache.txt Makefile cmake_install.cmake install_manifest.txt *.user* *~ *cxx moc_* ui_* qrc_* *.o *.exe *.a *.dll *.lib core *.qrc.depends

qcd_utils/make_lib.bat

@@ -1 +0,0 @@
-cmake -G "MinGW Makefiles" -DLIB=1 && make install . %*

qcd_utils/pult/CMakeLists.txt

@@ -1,21 +1,8 @@
-project(cd_pult)
-cmake_minimum_required(VERSION 2.6)
 if (NOT LIBPROJECT)
 	find_package(PIP REQUIRED)
 endif ()
 if (MINGW)
 	find_package(MinGW REQUIRED)
 endif()
-find_package(Qt4 REQUIRED)
-find_package(OpenGL REQUIRED)
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${PIP_INCLUDES} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/../)
-file(GLOB PULT_CPPS "*.cpp")
-file(GLOB PULT_MOCS "*.h")
-file(GLOB PULT_UIS "*.ui")
-file(GLOB PULT_RES "*.qrc")
-qt4_wrap_cpp(PULT_CMOCS ${PULT_MOCS} OPTIONS -nw)
-qt4_wrap_ui(PULT_CUIS ${PULT_UIS})
-qt4_add_resources(PULT_RESS ${PULT_RES})
-add_executable(${PROJECT_NAME}  ${PULT_CPPS} ${PULT_CMOCS} ${PULT_CUIS} ${PULT_RESS} ${PULT_MOCS})
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_LIBRARIES} ${PIP_LIBRARY} qad_graphic qad_utils qad_widgets qcd_utils)
-target_link_libraries(${PROJECT_NAME} ${LIBS} cd_utils)
+set(LIBS ${QAD_GRAPHIC_LIBRARY} ${QAD_UTILS_LIBRARY} ${QAD_WIDGETS_LIBRARY} qcd_utils)
+qt_project(cd_pult "EXE" "${LIBS}" H CPP)