summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorStefan Radomski <github@mintwerk.de>2016-08-02 20:52:26 (GMT)
committerStefan Radomski <github@mintwerk.de>2016-08-02 20:52:26 (GMT)
commit41a65bd4e3d946c42825813836e58ba1030dcdd9 (patch)
treee422110392974ac7d0c008ae1810396196613054 /contrib
parent9c0b89a29168d46b58712ec3634ecea4d9a7a681 (diff)
downloaduscxml-41a65bd4e3d946c42825813836e58ba1030dcdd9.zip
uscxml-41a65bd4e3d946c42825813836e58ba1030dcdd9.tar.gz
uscxml-41a65bd4e3d946c42825813836e58ba1030dcdd9.tar.bz2
Fixed 64bit MSVC builds
Diffstat (limited to 'contrib')
-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 0c4d451..25bd475 100644
--- a/contrib/cmake/BuildURIParser.cmake
+++ b/contrib/cmake/BuildURIParser.cmake
@@ -25,15 +25,18 @@ if (UNIX)
elseif(MSVC)
if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
# we cannot build 64bit with the given project -> patch
+ set(VSPROJECT_PATH "win32/uriparser-vs2013")
+
externalproject_add(uriparser
URL http://ufpr.dl.sourceforge.net/project/uriparser/Sources/0.8.4/uriparser-0.8.4.zip
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/uriparser.vcxproj <SOURCE_DIR>/win32/uriparser-vs2013
+ ${CMAKE_COMMAND} -E make_directory <SOURCE_DIR>/win32/uriparser-vs2013/ &&
+ ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/contrib/patches/uriparser/uriparser.vcxproj <SOURCE_DIR>/win32/uriparser-vs2013/
CONFIGURE_COMMAND ""
- BUILD_COMMAND cd win32/uriparser-vs2013 && devenv /Upgrade uriparser.vcxproj && msbuild /p:Configuration=Release /p:Platform=x64 /t:build uriparser.vcxproj
+ BUILD_COMMAND cd ${VSPROJECT_PATH} && devenv /Upgrade uriparser.vcxproj && msbuild /p:Configuration=Release /p:Platform=Win32 /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()