diff options
| author | Stefan Radomski <github@mintwerk.de> | 2016-05-13 08:38:17 (GMT) |
|---|---|---|
| committer | Stefan Radomski <github@mintwerk.de> | 2016-05-13 08:38:17 (GMT) |
| commit | e384dfb778400392d30a098e08ba81e809e383ca (patch) | |
| tree | d05f13593c3d0df34ef8bf933e3432e147a05558 | |
| parent | 7181462cf3c8e700476119e5243d355e136e71f7 (diff) | |
| download | uscxml-e384dfb778400392d30a098e08ba81e809e383ca.zip uscxml-e384dfb778400392d30a098e08ba81e809e383ca.tar.gz uscxml-e384dfb778400392d30a098e08ba81e809e383ca.tar.bz2 | |
Windows fixes broke the unix builds
| -rw-r--r-- | contrib/cmake/BuildXercesC.cmake | 4 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/contrib/cmake/BuildXercesC.cmake b/contrib/cmake/BuildXercesC.cmake index 4de0655..34be8eb 100644 --- a/contrib/cmake/BuildXercesC.cmake +++ b/contrib/cmake/BuildXercesC.cmake @@ -47,7 +47,7 @@ elseif(WIN32) BUILD_IN_SOURCE 1 PREFIX ${CMAKE_BINARY_DIR}/deps/xerces-c CONFIGURE_COMMAND "" - BUILD_COMMAND cd ${VSPROJECT_PATH} && msbuild /p:Configuration=Static\ Release /p:Platform=x64 /t:build XercesLib.vcxproj + BUILD_COMMAND cd ${VSPROJECT_PATH} && devenv /Upgrade XercesLib.vcxproj && msbuild /p:Configuration=Static\ Release /p:Platform=x64 /t:build XercesLib.vcxproj INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory Build/Win64/${VC_VERSION}/Static\ Release/ ${CMAKE_BINARY_DIR}/deps/xerces-c/lib/ && ${CMAKE_COMMAND} -E copy_directory src/ ${CMAKE_BINARY_DIR}/deps/xerces-c/include/ ) else() @@ -57,7 +57,7 @@ elseif(WIN32) BUILD_IN_SOURCE 1 PREFIX ${CMAKE_BINARY_DIR}/deps/xerces-c CONFIGURE_COMMAND "" - BUILD_COMMAND cd ${VSPROJECT_PATH} && msbuild /p:Configuration=Static\ Release /p:Platform=Win32 /t:build XercesLib.vcxproj + BUILD_COMMAND cd ${VSPROJECT_PATH} && devenv /Upgrade XercesLib.vcxproj && msbuild /p:Configuration=Static\ Release /p:Platform=Win32 /t:build XercesLib.vcxproj INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory Build/Win32/${VC_VERSION}/Static\ Release/ ${CMAKE_BINARY_DIR}/deps/xerces-c/lib/ && ${CMAKE_COMMAND} -E copy_directory src/ ${CMAKE_BINARY_DIR}/deps/xerces-c/include/ ) endif() diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index fdb912d..43b89c0 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -30,7 +30,11 @@ USCXML_TEST_COMPILE(NAME test-lifecycle LABEL general/test-lifecycle FILES src/t USCXML_TEST_COMPILE(NAME test-validating LABEL general/test-validating FILES src/test-validating.cpp) # the one binary to test for pass / fail final states -add_executable(test-state-pass src/test-state-pass.cpp ${PROJECT_SOURCE_DIR}/contrib/src/getopt/getopt.c) +if (WIN32) + add_executable(test-state-pass src/test-state-pass.cpp ${PROJECT_SOURCE_DIR}/contrib/src/getopt/getopt.c) +else() + add_executable(test-state-pass src/test-state-pass.cpp) +endif() target_link_libraries(test-state-pass uscxml) set_target_properties(test-state-pass PROPERTIES FOLDER "Tests") |