summaryrefslogtreecommitdiffstats
path: root/contrib/cmake
diff options
context:
space:
mode:
authorStefan Radomski <github@mintwerk.de>2016-05-13 07:48:16 (GMT)
committerStefan Radomski <github@mintwerk.de>2016-05-13 07:48:16 (GMT)
commit6ccbc0b99f06a5cb209a45bcbeb7674a2c350c10 (patch)
treea6684057918a2fefc787fcd87c0a36273363a420 /contrib/cmake
parent6dcefb204493d7bb10957cd7f286bd133060853a (diff)
downloaduscxml-6ccbc0b99f06a5cb209a45bcbeb7674a2c350c10.zip
uscxml-6ccbc0b99f06a5cb209a45bcbeb7674a2c350c10.tar.gz
uscxml-6ccbc0b99f06a5cb209a45bcbeb7674a2c350c10.tar.bz2
uriparser builds on 64bit now
Diffstat (limited to 'contrib/cmake')
-rw-r--r--contrib/cmake/BuildURIParser.cmake7
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/cmake/BuildURIParser.cmake b/contrib/cmake/BuildURIParser.cmake
index 790ff5c..50211c3 100644
--- a/contrib/cmake/BuildURIParser.cmake
+++ b/contrib/cmake/BuildURIParser.cmake
@@ -14,7 +14,6 @@ if (UNIX)
"--prefix=<INSTALL_DIR>"
)
elseif(WIN32)
- set(VSPROJECT_PATH "win32/Visual_Studio_2005")
if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
externalproject_add(uriparser
@@ -22,11 +21,15 @@ elseif(WIN32)
URL_MD5 a24c9ba0fd1a2c6c75d02859bf337cfa
BUILD_IN_SOURCE 1
PREFIX ${CMAKE_BINARY_DIR}/deps/uriparser
+ PATCH_COMMAND
+ ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/contrib/patches/uriparser-vs2013 <SOURCE_DIR>/win32/uriparser-vs2013
CONFIGURE_COMMAND ""
- BUILD_COMMAND cd ${VSPROJECT_PATH} && devenv /Upgrade uriparser.vcproj && msbuild /p:Configuration=Release /p:Platform=Win32 /t:build uriparser.vcxproj
+ BUILD_COMMAND cd win32/uriparser-vs2013 && devenv /Upgrade uriparser.vcxproj && msbuild /p:Configuration=Release /p:Platform=x64 /t:build uriparser.vcxproj
INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/deps/uriparser/lib && ${CMAKE_COMMAND} -E copy win32/uriparser.lib ${CMAKE_BINARY_DIR}/deps/uriparser/lib && ${CMAKE_COMMAND} -E copy_directory include ${CMAKE_BINARY_DIR}/deps/uriparser/include
)
else()
+ set(VSPROJECT_PATH "win32/Visual_Studio_2005")
+
externalproject_add(uriparser
URL http://ufpr.dl.sourceforge.net/project/uriparser/Sources/0.8.4/uriparser-0.8.4.zip
URL_MD5 a24c9ba0fd1a2c6c75d02859bf337cfa