work with QGL*

qad/CMakeLists.txt

@@ -1,23 +1,9 @@
 cmake_minimum_required(VERSION 3.0)
 cmake_policy(SET CMP0017 NEW) # need include() with .cmake
 project(qad)
-set(_QAD_MAJOR    1)
-set(_QAD_MINOR    7)
-set(_QAD_REVISION 0)
-set(_QAD_SUFFIX   )
-set(_QAD_COMPANY  SHS)
-set(_QAD_DOMAIN   org.SHS)
 
-include(QADMacros)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
-if(STATIC_LIB)
-	set(QAD_LIB_TYPE STATIC)
-	add_definitions(-DQAD_STATIC_DEFINE)
-else()
-	set(QAD_LIB_TYPE SHARED)
-endif()
-
 if (NOT DEFINED ANDROID_PLATFORM)
 	find_package(OpenGL REQUIRED)
 endif()
@@ -30,17 +16,6 @@ endif()
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/qad_version.h")
 	file(REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/qad_version.h")
 endif()
-set(QAD_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/qad_version.h")
-set_version(QAD
-	MAJOR    "${_QAD_MAJOR}"
-	MINOR    "${_QAD_MINOR}"
-	REVISION "${_QAD_REVISION}"
-	BUILD    "${BUILD_NUMBER}"
-	SUFFIX   "${_QAD_SUFFIX}"
-	OUTPUT   "${QAD_VERSION_FILE}")
-set_deploy_property(QAD ${QAD_LIB_TYPE}
-	FULLNAME "${_QAD_DOMAIN}.*"
-	COMPANY  "${_QAD_COMPANY}")
 message(STATUS "Building QAD version ${QAD_VERSION} (${QAD_LIB_TYPE})")
 
 

qad/cmake/QADMacros.cmake

@@ -4,10 +4,21 @@ macro(_qt_install _TARGET IS_APP _DIR _HDR_VAR _QM_FILES)
 endmacro()
 
 
-macro(qad_plugin NAME _MODULES _LIBS)
+macro(_qt_export_header NAME)
+	qt_get_target(${NAME} _some_target)
+	qt_get_target(${NAME} _targets)
+	foreach(_t ${_targets})
+		set_target_properties(${_t} PROPERTIES DEFINE_SYMBOL ${NAME}_EXPORTS)
+	endforeach()
+	set_target_properties(${_some_target} PROPERTIES DEFINE_SYMBOL ${NAME}_EXPORTS)
+	generate_export_header(${_some_target} BASE_NAME "${NAME}")
+endmacro()
+
+
+macro(_qt_plugin NAME _MODULES _LIBS)
 	if (NOT STATIC_LIB)
 		if(DESIGNER_PLUGINS)
-			set(PROJ_NAME qad_${NAME}_plugin)
+			set(PROJ_NAME ${NAME}_plugin)
 			include_directories("..")
 			add_definitions(-DQT_PLUGIN)
 			add_definitions(-DQT_NO_DEBUG)
@@ -17,7 +28,7 @@ macro(qad_plugin NAME _MODULES _LIBS)
 			qt_sources(SRC)
 			qt_wrap(${SRC} CPPS out_CPP QMS out_QM)
 			qt_add_library(${PROJ_NAME} SHARED out_CPP)
-			qt_target_link_libraries(${PROJ_NAME} ${_LIBS} qad_${NAME} ${_${NAME}_PLUGIN_LIBS})
+			qt_target_link_libraries(${PROJ_NAME} ${_LIBS} ${_${NAME}_PLUGIN_LIBS})
 			if (WIN32)
 				qt_install(TARGETS ${PROJ_NAME} RUNTIME DESTINATION QtPlugins/designer)
 			else()
@@ -55,13 +66,7 @@ macro(_qt_project NAME IS_APP DOMAIN _MODULES _LIBS)
 		if(NOT STATIC_LIB)
 			qt_target_compile_definitions(${PROJ_NAME} PRIVATE ${DOMAIN}_SHARED_DEFINE)
 		endif()
-		qt_get_target(${PROJ_NAME} _some_target)
-		qt_get_target(${PROJ_NAME} _targets)
-		foreach(_t ${_targets})
-			set_target_properties(${_t} PROPERTIES DEFINE_SYMBOL ${PROJ_NAME}_EXPORTS)
-		endforeach()
-		set_target_properties(${_some_target} PROPERTIES DEFINE_SYMBOL ${PROJ_NAME}_EXPORTS)
-		generate_export_header(${_some_target} BASE_NAME "${PROJ_NAME}")
+		_qt_export_header(${PROJ_NAME})
 		list(APPEND out_HDR "${CMAKE_CURRENT_BINARY_DIR}/${PROJ_NAME}_export.h")
 	endif()
 	qt_target_link_libraries(${PROJ_NAME} ${_LIBS})
@@ -85,3 +90,8 @@ macro(qad_application NAME _MODULES _LIBS)
 	_qt_project(${NAME} TRUE "QAD" "${_MODULES}" "${_LIBS}")
 	_qt_install(${NAME} TRUE "qad" "" "out_QM")
 endmacro()
+
+
+macro(qad_plugin NAME _MODULES _LIBS)
+	_qt_plugin(qad_${NAME} "${_MODULES}" "qad_${NAME};${_LIBS}")
+endmacro()

qad/libs/doc/CMakeLists.txt

@@ -17,9 +17,11 @@ else()
 endif()
 find_library(MARKDOWN_LIBRARY markdown)
 if (MARKDOWN_LIBRARY)
-	if(_mkd_header_found)
-		qad_library(doc "Core" "${MARKDOWN_LIBRARY}")
-	else()
+	qad_library(doc "Core" "${MARKDOWN_LIBRARY}")
+	if(NOT _mkd_header_found)
 		message(STATUS "Found markdown library, but *.h missing!")
 	endif()
+else()
+	add_definitions("-DNO_MARKDOWN")
+	qad_library(doc "Core" "")
 endif()

qad/libs/doc/markdown.cpp

@@ -1,5 +1,6 @@
 #include "markdown.h"
 #include <QDebug>
+#ifndef NO_MARKDOWN
 extern "C" {
 #include MARKDOWN_HEADER
 }
@@ -77,3 +78,10 @@ QString md2html(const QByteArray & src) {
 	return ret;
 }
 
+#else
+
+QString md2html(const QByteArray & src) {
+	return src;
+}
+
+#endif