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

qad/doc/CMakeLists.txt

@@ -1,8 +1,3 @@
-set(_LIBS)
-find_library(MARKDOWN_LIBRARY markdown)
-if (MARKDOWN_LIBRARY)
-	list(APPEND _LIBS "${MARKDOWN_LIBRARY}")
-	add_definitions("-DUSE_MARKDOWN")
 include(CheckIncludeFileCXX)
 set(CHECK_INCLUDES "-include stdio.h")
 if(WIN32)
@@ -16,5 +11,7 @@ if (MARKDOWN_LIBRARY)
 if (MARKDOWN_HEADER_MARKDOWN)
 	add_definitions("-DMARKDOWN_HEADER=\"markdown/markdown.h\"")
 endif()
+find_library(MARKDOWN_LIBRARY markdown)
+if (MARKDOWN_LIBRARY)
+	qad_project(doc "Core" "${MARKDOWN_LIBRARY}")
 endif()
-qad_project(doc "Core" "${_LIBS}")

qad/doc/markdown.cpp

@@ -1,6 +1,5 @@
 #include "markdown.h"
 #include <QDebug>
-#ifdef USE_MARKDOWN
 extern "C" {
 #include MARKDOWN_HEADER
 }
@@ -12,11 +11,9 @@ extern "C" {
 #    define MKD_FENCEDCODE 0x02000000
 #  endif
 #endif
-#endif
 
 
 QString md2html(const QByteArray & src) {
-#ifdef USE_MARKDOWN
 	static bool _is_mkd_init = false;
 	if (src.isEmpty()) return QString();
 	if (!_is_mkd_init) {
@@ -60,8 +57,5 @@ QString md2html(const QByteArray & src) {
 	ret.prepend(header);
 	ret.append("</body>\n</html>\n");
 	return ret;
-#else
-	return QString();
-#endif
 }