diff options
author | Stefan Radomski <github@mintwerk.de> | 2016-05-13 06:44:56 (GMT) |
---|---|---|
committer | Stefan Radomski <github@mintwerk.de> | 2016-05-13 06:44:56 (GMT) |
commit | 6dcefb204493d7bb10957cd7f286bd133060853a (patch) | |
tree | 86d20ad07e365256cdc8d2919f6a0ebc0c51138e | |
parent | 280b5072b35cb9658ad4e6be0203a587c0593b1c (diff) | |
download | uscxml-6dcefb204493d7bb10957cd7f286bd133060853a.zip uscxml-6dcefb204493d7bb10957cd7f286bd133060853a.tar.gz uscxml-6dcefb204493d7bb10957cd7f286bd133060853a.tar.bz2 |
Builds on Windows again
-rw-r--r-- | contrib/cmake/BuildLibCurl.cmake | 2 | ||||
-rw-r--r-- | contrib/cmake/BuildLibEvent.cmake | 6 | ||||
-rw-r--r-- | contrib/cmake/BuildURIParser.cmake | 2 | ||||
-rw-r--r-- | contrib/cmake/BuildXercesC.cmake | 2 | ||||
-rw-r--r-- | contrib/cmake/FindV8.cmake | 24 |
5 files changed, 19 insertions, 17 deletions
diff --git a/contrib/cmake/BuildLibCurl.cmake b/contrib/cmake/BuildLibCurl.cmake index 8f0a030..4682a65 100644 --- a/contrib/cmake/BuildLibCurl.cmake +++ b/contrib/cmake/BuildLibCurl.cmake @@ -47,7 +47,7 @@ elseif (WIN32) PREFIX ${CMAKE_BINARY_DIR}/deps/libcurl CONFIGURE_COMMAND "" BUILD_COMMAND cd winbuild && nmake /f Makefile.vc mode=static MACHINE=x64 VC=${VC_VERSION} - INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory builds/libcurl-vc-x64-release-static-ipv6-sspi-winssl ${CMAKE_BINARY_DIR}/deps/libcurl/ + INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory builds/libcurl-vc${VC_VERSION}-x64-release-static-ipv6-sspi-winssl ${CMAKE_BINARY_DIR}/deps/libcurl/ ) else() externalproject_add(libcurl diff --git a/contrib/cmake/BuildLibEvent.cmake b/contrib/cmake/BuildLibEvent.cmake index 98ea99e..486d4fb 100644 --- a/contrib/cmake/BuildLibEvent.cmake +++ b/contrib/cmake/BuildLibEvent.cmake @@ -11,8 +11,8 @@ if (UNIX) CONFIGURE_COMMAND CFLAGS=-fPIC <SOURCE_DIR>/configure --enable-static --enable-shared --disable-openssl --prefix=<INSTALL_DIR> ) -elseif (WIN32) +elseif (WIN32) externalproject_add(libevent URL https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz @@ -24,8 +24,8 @@ elseif (WIN32) INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/deps/libevent/lib && ${CMAKE_COMMAND} -E copy libevent.lib libevent_core.lib libevent_extras.lib ${CMAKE_BINARY_DIR}/deps/libevent/lib/ && - ${CMAKE_COMMAND} -E copy_directory include ${CMAKE_BINARY_DIR}/deps/libevent/include - ${CMAKE_COMMAND} -E copy Win32-Code/event2 ${CMAKE_BINARY_DIR}/deps/libevent/include/event2 + ${CMAKE_COMMAND} -E copy_directory include ${CMAKE_BINARY_DIR}/deps/libevent/include && + ${CMAKE_COMMAND} -E copy Win32-Code/event2/event-config.h ${CMAKE_BINARY_DIR}/deps/libevent/include/event2/ ) endif() diff --git a/contrib/cmake/BuildURIParser.cmake b/contrib/cmake/BuildURIParser.cmake index d48916d..790ff5c 100644 --- a/contrib/cmake/BuildURIParser.cmake +++ b/contrib/cmake/BuildURIParser.cmake @@ -23,7 +23,7 @@ elseif(WIN32) BUILD_IN_SOURCE 1 PREFIX ${CMAKE_BINARY_DIR}/deps/uriparser CONFIGURE_COMMAND "" - BUILD_COMMAND cd ${VSPROJECT_PATH} && devenv /build Release|x64 uriparser.sln + 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 ) else() diff --git a/contrib/cmake/BuildXercesC.cmake b/contrib/cmake/BuildXercesC.cmake index 0e3353c..60a8897 100644 --- a/contrib/cmake/BuildXercesC.cmake +++ b/contrib/cmake/BuildXercesC.cmake @@ -48,7 +48,7 @@ elseif(WIN32) PREFIX ${CMAKE_BINARY_DIR}/deps/xerces-c CONFIGURE_COMMAND "" BUILD_COMMAND cd ${VSPROJECT_PATH} && msbuild /p:Configuration=Release /p:Platform=x64 /t:build XercesLib.vcxproj - INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory Build/x64/${VC_VERSION}/Release/ ${CMAKE_BINARY_DIR}/deps/xerces-c/ + INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory Build/Win64/${VC_VERSION}/Release/ ${CMAKE_BINARY_DIR}/deps/xerces-c/lib/ && ${CMAKE_COMMAND} -E copy_directory src/ ${CMAKE_BINARY_DIR}/deps/xerces-c/include/ ) else() externalproject_add(xerces-c diff --git a/contrib/cmake/FindV8.cmake b/contrib/cmake/FindV8.cmake index 725d9d1..575836e 100644 --- a/contrib/cmake/FindV8.cmake +++ b/contrib/cmake/FindV8.cmake @@ -51,18 +51,20 @@ else() endif() # I have no idea how we would find the version otherwise :( -include(CheckCXXSourceCompiles) -set(CMAKE_REQUIRED_INCLUDES ${V8_INCLUDE_DIR}) -set(CMAKE_REQUIRED_LIBRARIES ${V8_LIBRARY}) -check_cxx_source_compiles(" - #include <v8.h> - int main(){ v8::Local<v8::Value> foo = v8::Array::New(v8::Isolate::GetCurrent()); } -" V8_VER_GREATER_032317) +if (V8_LIBRARY AND V8_INCLUDE_DIR) + include(CheckCXXSourceCompiles) + set(CMAKE_REQUIRED_INCLUDES ${V8_INCLUDE_DIR}) + set(CMAKE_REQUIRED_LIBRARIES ${V8_LIBRARY}) + check_cxx_source_compiles(" + #include <v8.h> + int main(){ v8::Local<v8::Value> foo = v8::Array::New(v8::Isolate::GetCurrent()); } + " V8_VER_GREATER_032317) -if (NOT V8_VER_GREATER_032317) - message(STATUS "Your V8 installation is too old - we need >= 3.23.17") - unset(V8_LIBRARY) - unset(V8_INCLUDE_DIR) + if (NOT V8_VER_GREATER_032317) + message(STATUS "Your V8 installation is too old - we need >= 3.23.17") + unset(V8_LIBRARY) + unset(V8_INCLUDE_DIR) + endif() endif() INCLUDE(FindPackageHandleStandardArgs) |