diff options
| author | Stefan Radomski <github@mintwerk.de> | 2016-05-20 22:53:44 (GMT) |
|---|---|---|
| committer | Stefan Radomski <github@mintwerk.de> | 2016-05-20 22:53:44 (GMT) |
| commit | f6714b1484b641ea61053350b7d156d2da760b8b (patch) | |
| tree | 28b04553dee7b2c21fdd7a414da57c38bb769b3d /contrib/cmake | |
| parent | 045db3f61f776f8472a6ce7bd2ddbeda77cae872 (diff) | |
| download | uscxml-f6714b1484b641ea61053350b7d156d2da760b8b.zip uscxml-f6714b1484b641ea61053350b7d156d2da760b8b.tar.gz uscxml-f6714b1484b641ea61053350b7d156d2da760b8b.tar.bz2 | |
uriparser builds for MSVC again
Diffstat (limited to 'contrib/cmake')
| -rw-r--r-- | contrib/cmake/BuildURIParser.cmake | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/contrib/cmake/BuildURIParser.cmake b/contrib/cmake/BuildURIParser.cmake index b6b228b..0c4d451 100644 --- a/contrib/cmake/BuildURIParser.cmake +++ b/contrib/cmake/BuildURIParser.cmake @@ -22,6 +22,34 @@ if (UNIX) "--enable-static" "--prefix=<INSTALL_DIR>" ) +elseif(MSVC) + if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) + # we cannot build 64bit with the given project -> patch + 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 + CONFIGURE_COMMAND "" + 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 + BUILD_IN_SOURCE 1 + PREFIX ${CMAKE_BINARY_DIR}/deps/uriparser + CONFIGURE_COMMAND "" + BUILD_COMMAND cd ${VSPROJECT_PATH} && devenv /Upgrade uriparser.vcproj && 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 + ) + endif() + else() externalproject_add(uriparser URL http://ufpr.dl.sourceforge.net/project/uriparser/Sources/0.8.4/uriparser-0.8.4.zip @@ -37,35 +65,7 @@ else() ) endif() - -# -# if(MSVC) -# -# if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) -# 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-vs2013 <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 -# 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 -# BUILD_IN_SOURCE 1 -# PREFIX ${CMAKE_BINARY_DIR}/deps/uriparser -# CONFIGURE_COMMAND "" -# BUILD_COMMAND cd ${VSPROJECT_PATH} && devenv /Upgrade uriparser.vcproj && 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 -# ) -# endif() # # elseif(MINGW) # # MinGW |