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.3")\r
+set(PACKAGE_VERSION "2.2.5")\r
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")\r
set(PACKAGE_TARNAME "${PACKAGE_NAME}")\r
\r
-option(BUILD_tools "build the xmlwf tool for expat library" ON)\r
+if(WINCE)\r
+ set(BUILD_tools_default OFF)\r
+else()\r
+ set(BUILD_tools_default ON)\r
+endif()\r
+if(MSVC OR NOT BUILD_tools_default)\r
+ set(BUILD_doc_default OFF)\r
+else()\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
+ set(BUILD_doc_default OFF)\r
+ endif()\r
+endif()\r
+\r
+option(BUILD_tools "build the xmlwf tool for expat library" ${BUILD_tools_default})\r
option(BUILD_examples "build the examples for expat library" ON)\r
option(BUILD_tests "build the tests for expat library" ON)\r
option(BUILD_shared "build a shared expat library" ON)\r
-option(BUILD_doc "build man page for xmlwf" ON)\r
+option(BUILD_doc "build man page for xmlwf" ${BUILD_doc_default})\r
+option(USE_libbsd "utilize libbsd (for arc4random_buf)" OFF)\r
option(INSTALL "install expat files in cmake install target" ON)\r
\r
+if(USE_libbsd)\r
+ find_library(LIB_BSD NAMES bsd)\r
+ if(NOT LIB_BSD)\r
+ message(FATAL_ERROR "USE_libbsd option is enabled, but libbsd was not found")\r
+ else()\r
+ set(HAVE_LIBBSD TRUE)\r
+ endif()\r
+endif()\r
+\r
# configuration options\r
set(XML_CONTEXT_BYTES 1024 CACHE STRING "Define to specify how much context to retain around the current parse point")\r
option(XML_DTD "Define to make parameter entity parsing functionality available" ON)\r
option(XML_NS "Define to make XML Namespaces functionality available" ON)\r
+if(NOT WIN32)\r
+ option(XML_DEV_URANDOM "Define to include code reading entropy from `/dev/urandom'." ON)\r
+ if(XML_DEV_URANDOM)\r
+ add_definitions(-DXML_DEV_URANDOM)\r
+ endif()\r
+endif()\r
\r
if(XML_DTD)\r
set(XML_DTD 1)\r
\r
include(${CMAKE_CURRENT_LIST_DIR}/ConfigureChecks.cmake)\r
\r
-set(EXTRA_LINK_AND_COMPILE_FLAGS "-fno-strict-aliasing")\r
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_LINK_AND_COMPILE_FLAGS}")\r
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_LINK_AND_COMPILE_FLAGS}")\r
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${EXTRA_LINK_AND_COMPILE_FLAGS}")\r
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${EXTRA_LINK_AND_COMPILE_FLAGS}")\r
+set(EXTRA_COMPILE_FLAGS)\r
+if(FLAG_NO_STRICT_ALIASING)\r
+ set(EXTRA_COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS} -fno-strict-aliasing")\r
+endif()\r
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_COMPILE_FLAGS}")\r
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_COMPILE_FLAGS}")\r
\r
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/lib)\r
if(MSVC)\r
endif(BUILD_shared)\r
\r
add_library(expat ${_SHARED} ${expat_SRCS})\r
+if(USE_libbsd)\r
+ target_link_libraries(expat ${LIB_BSD})\r
+endif()\r
\r
set(LIBCURRENT 7) # sync\r
-set(LIBREVISION 5) # with\r
+set(LIBREVISION 7) # with\r
set(LIBAGE 6) # configure.ac!\r
math(EXPR LIBCURRENT_MINUS_AGE "${LIBCURRENT} - ${LIBAGE}")\r
\r
expat_install(FILES lib/expat.h lib/expat_external.h DESTINATION include)\r
expat_install(FILES ${CMAKE_CURRENT_BINARY_DIR}/expat.pc DESTINATION lib/pkgconfig)\r
\r
-if(BUILD_tools AND NOT WINCE)\r
+if(BUILD_tools)\r
set(xmlwf_SRCS\r
xmlwf/xmlwf.c\r
xmlwf/xmlfile.c\r
set_property(TARGET xmlwf PROPERTY RUNTIME_OUTPUT_DIRECTORY xmlwf)\r
target_link_libraries(xmlwf expat)\r
expat_install(TARGETS xmlwf DESTINATION bin)\r
- if(BUILD_doc AND NOT MSVC)\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}" -C "${PROJECT_SOURCE_DIR}/doc" xmlwf.1)\r
+ if(BUILD_doc)\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(BUILD_tools AND NOT WINCE)\r
+endif()\r
\r
if(BUILD_examples)\r
add_executable(elements examples/elements.c)\r
\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