Merge branch 'tizen_base' into tizen

[platform/upstream/expat.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1026938..504d087 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ project(expat)
 cmake_minimum_required(VERSION 2.6)\r
 set(PACKAGE_BUGREPORT "expat-bugs@libexpat.org")\r
 set(PACKAGE_NAME "expat")\r
-set(PACKAGE_VERSION "2.2.4")\r
+set(PACKAGE_VERSION "2.2.5")\r
 set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")\r
 set(PACKAGE_TARNAME "${PACKAGE_NAME}")\r
 \r
@@ -18,7 +18,7 @@ endif()
 if(MSVC OR NOT BUILD_tools_default)\r
     set(BUILD_doc_default OFF)\r
 else()\r
-    find_program(DOCBOOK_TO_MAN NAMES docbook2x-man)\r
+    find_program(DOCBOOK_TO_MAN NAMES docbook2x-man docbook2man docbook-to-man)\r
     if(DOCBOOK_TO_MAN)\r
         set(BUILD_doc_default ON)\r
     else()\r
@@ -113,7 +113,7 @@ if(USE_libbsd)
 endif()\r
 \r
 set(LIBCURRENT 7)   # sync\r
-set(LIBREVISION 6)  # with\r
+set(LIBREVISION 7)  # with\r
 set(LIBAGE 6)       # configure.ac!\r
 math(EXPR LIBCURRENT_MINUS_AGE "${LIBCURRENT} - ${LIBAGE}")\r
 \r
@@ -155,13 +155,7 @@ if(BUILD_tools)
     target_link_libraries(xmlwf expat)\r
     expat_install(TARGETS xmlwf DESTINATION bin)\r
     if(BUILD_doc)\r
-        if(CMAKE_GENERATOR STREQUAL "Unix Makefiles")\r
-            set(make_command "$(MAKE)")\r
-        else()\r
-            set(make_command "make")\r
-        endif()\r
-\r
-        add_custom_command(TARGET expat PRE_BUILD COMMAND "${make_command}" -f "${PROJECT_SOURCE_DIR}/doc/doc.mk" -C "${PROJECT_SOURCE_DIR}/doc" xmlwf.1 "DOCBOOK_TO_MAN=${DOCBOOK_TO_MAN}")\r
+        add_custom_command(TARGET expat PRE_BUILD COMMAND "${DOCBOOK_TO_MAN}" "${PROJECT_SOURCE_DIR}/doc/xmlwf.xml" && mv "XMLWF.1" "${PROJECT_SOURCE_DIR}/doc/xmlwf.1")\r
         expat_install(FILES "${PROJECT_SOURCE_DIR}/doc/xmlwf.1" DESTINATION share/man/man1)\r
     endif()\r
 endif()\r
@@ -178,12 +172,12 @@ endif(BUILD_examples)
 \r
 if(BUILD_tests)\r
     ## these are unittests that can be run on any platform\r
-    add_executable(runtests tests/runtests.c tests/chardata.c tests/minicheck.c tests/memcheck.c)\r
+    add_executable(runtests tests/runtests.c tests/chardata.c tests/structdata.c tests/minicheck.c tests/memcheck.c)\r
     set_property(TARGET runtests PROPERTY RUNTIME_OUTPUT_DIRECTORY tests)\r
     target_link_libraries(runtests expat)\r
     add_test(runtests tests/runtests)\r
 \r
-    add_executable(runtestspp tests/runtestspp.cpp tests/chardata.c tests/minicheck.c tests/memcheck.c)\r
+    add_executable(runtestspp tests/runtestspp.cpp tests/chardata.c tests/structdata.c tests/minicheck.c tests/memcheck.c)\r
     set_property(TARGET runtestspp PROPERTY RUNTIME_OUTPUT_DIRECTORY tests)\r
     target_link_libraries(runtestspp expat)\r
     add_test(runtestspp tests/runtestspp)\r