new cmake build

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

qad_widgets/CMakeLists.txt

@@ -1,43 +1,41 @@
 project(qad_widgets)
 cmake_minimum_required(VERSION 2.6)
 find_package(Qt4 REQUIRED)
+if (MINGW)
+	find_package(MinGW REQUIRED)
+endif()
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES})
-
+option(LIB "System install" 0)
+option(DEBUG "Build with -g3" 0)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
-set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
-
-set(MOCS "qpiconsole.h" "spinslider.h"
-			"colorbutton.h" "chardialog.h" "shortcuts.h"
-			"qipedit.h" "clineedit.h" "ecombobox.h"
-			"qpointedit.h" "qrectedit.h" "iconedlabel.h"
-			"qcodeedit.h" "qvariantedit.h")
-set(CPPS "qpiconsole.cpp" "spinslider.cpp" "colorbutton.cpp"
-			"chardialog.cpp" "shortcuts.cpp" "qipedit.cpp"
-			"clineedit.cpp" "ecombobox.cpp" "qpointedit.cpp"
-			"qrectedit.cpp" "qcodeedit.cpp" "qvariantedit.cpp")
+if (DEBUG)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
+endif ()
+set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+file(GLOB MOCS "./*.h")
+file(GLOB CPPS "./*.cpp")
 file(GLOB UIS "./*.ui")
 file(GLOB RES "./*.qrc")
 qt4_wrap_ui(CUIS ${UIS})
 qt4_wrap_cpp(CMOCS ${MOCS} OPTIONS -nw)
 qt4_add_resources(CRES ${RES})
-add_library(qad_widgets SHARED ${CPPS} ${CUIS} ${CMOCS} ${CRES})
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-target_link_libraries(qad_widgets ${LIBS})
-if (DEFINED LIB)
-	set(LIB 1)
-	if (${WIN32})
-		find_package(MinGW REQUIRED)
+add_library(${PROJECT_NAME} SHARED ${CPPS} ${CUIS} ${CMOCS} ${CRES} ${MOCS})
+target_link_libraries(${PROJECT_NAME} ${LIBS})
+if (LIB)
+	if (WIN32)
 		set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
 		install(FILES ${MOCS} DESTINATION ${MINGW_INCLUDE})
-		install(TARGETS qad_widgets DESTINATION ${MINGW_LIB})
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
 		get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
-		install(TARGETS qad_widgets DESTINATION ${QTDIR})
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR})
 	else ()
 		set(CMAKE_INSTALL_PREFIX /usr)
 		install(FILES ${MOCS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
-		install(TARGETS qad_widgets DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 	endif ()
+	message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"")
 else ()
-	install(TARGETS qad_widgets DESTINATION bin)
+	install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+	message(STATUS "Install to local \"bin\"")
 endif ()
+add_subdirectory(plugin)

qad_widgets/make_lib.bat

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

qad_widgets/plugin/CMakeLists.txt

@@ -0,0 +1,20 @@
+project(qad_widgets_plugin)
+cmake_minimum_required(VERSION 2.6)
+find_package(Qt4 REQUIRED)
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES} "..")
+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 ()
+set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+add_definitions(-DQT_PLUGIN)
+add_definitions(-DQT_NO_DEBUG)
+add_definitions(-DQT_SHARED)
+add_definitions(-DQDESIGNER_EXPORT_WIDGETS)
+file(GLOB PMOCS "./*.h")
+file(GLOB PCPPS "./*.cpp")
+qt4_wrap_cpp(PCMOCS ${PMOCS} OPTIONS -nw)
+add_library(${PROJECT_NAME} SHARED ${PCMOCS} ${PCPPS} ${PMOCS})
+target_link_libraries(${PROJECT_NAME} ${LIBS} ${QT_QTDESIGNER_LIBRARY} qad_widgets)
+install(TARGETS ${PROJECT_NAME} DESTINATION ${QT_PLUGINS_DIR}/designer)

qad_widgets/qad_widgets.pro

@@ -1,28 +0,0 @@
-### eqmake4 was here ###
-CONFIG += designer plugin release
-TARGET      = $$qtLibraryTarget(qad_widgets_plugin)
-TEMPLATE    = lib
-
-HEADERS     = qad_widgets.h \
-    spinsliderplugin.h colorbuttonplugin.h \
-    chardialogplugin.h shortcutsplugin.h qipeditplugin.h \
-    clineeditplugin.h ecomboboxplugin.h \
-    qpointeditplugin.h qrecteditplugin.h \
-    qpiconsoleplugin.h iconedlabelplugin.h \
-    qcodeeditplugin.h qvarianteditplugin.h
-SOURCES     = qad_widgets.cpp \
-    spinsliderplugin.cpp colorbuttonplugin.cpp \
-    chardialogplugin.cpp shortcutsplugin.cpp qipeditplugin.cpp \
-    clineeditplugin.cpp ecomboboxplugin.cpp \
-    qpointeditplugin.cpp qrecteditplugin.cpp \
-    qpiconsoleplugin.cpp lconedlabelplugin.cpp \
-    qcodeeditplugin.cpp qvarianteditplugin.cpp
-RESOURCES   = qad_widgets.qrc
-TRANSLATIONS = lang/qad_widgets_ru.ts
-LIBS        += -L. -lqad_widgets
-
-target.path = $$[QT_INSTALL_PLUGINS]/designer
-INSTALLS    += target
-
-CONFIG -= debug_and_release debug
-CONFIG += release