Merge pull request #496 from pascal-bach/cmake

Cmake Fixes
This commit is contained in:
Aleksandar Fabijanic 2014-07-13 11:56:32 -05:00
commit 570811b345
2 changed files with 7 additions and 1 deletions

View File

@ -96,7 +96,7 @@ else ()
endif ()
# Set local include path
include_directories( CppUnit/include Foundation/include XML/include Net/include NetSSL_OpenSSL/include Util/include Data/include WebWidgets/include Zip/include Crypto/include Web/include JSON/include MongoDB/include PDF/include)
include_directories( CppUnit/include Foundation/include XML/include Net/include NetSSL_OpenSSL/include Util/include Data/include Data/MySQL/include Data/SQLite/include Data/ODBC/include Zip/include Crypto/include Web/include JSON/include MongoDB/include PDF/include SevenZip/include)
include(CheckTypeSize)
find_package(Cygwin)

View File

@ -185,6 +185,12 @@ if (POCO_UNBUNDLED)
set(SYSLIBS ${SYSLIBS} ${PCRE_LIBRARIES})
include_directories(${PCRE_INCLUDE_DIRS})
#HACK: Unicode.cpp requires functions from these files. The can't be taken from the library
list(APPEND BASE_SRCS
src/pcre_ucd.c
src/pcre_tables.c
)
find_package(ZLIB REQUIRED)
set(SYSLIBS ${SYSLIBS} ${ZLIB_LIBRARIES})
include_directories(${ZLIB_INCLUDE_DIRS})