You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2015/09/28 01:27:46 UTC
[07/20] mesos git commit: Generated make batch file to build project
in windows.
Generated make batch file to build project in windows.
Original review: https://reviews.apache.org/r/37275
Review: https://reviews.apache.org/r/38540
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8125f40f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8125f40f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8125f40f
Branch: refs/heads/master
Commit: 8125f40f04907809f1150d27f649eb576da6a006
Parents: 4661200
Author: haosdent huang <ha...@gmail.com>
Authored: Sun Sep 27 15:41:20 2015 -0700
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Sun Sep 27 16:09:12 2015 -0700
----------------------------------------------------------------------
CMakeLists.txt | 1 +
cmake/MesosConfigure.cmake | 13 +++++++++++++
2 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/8125f40f/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4b684f6..8136acb 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,6 +43,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/3rdparty/libprocess/cmake/macr
include(Common)
include(External)
include(PatchCommand)
+include(VsBuildCommand)
# Configuration.
include(MesosConfigure)
http://git-wip-us.apache.org/repos/asf/mesos/blob/8125f40f/cmake/MesosConfigure.cmake
----------------------------------------------------------------------
diff --git a/cmake/MesosConfigure.cmake b/cmake/MesosConfigure.cmake
index e1d53a1..be14dc7 100755
--- a/cmake/MesosConfigure.cmake
+++ b/cmake/MesosConfigure.cmake
@@ -116,6 +116,19 @@ endif (WIN32)
# throughout the project, so it's important that this config script goes here.
include(ProcessConfigure)
+# Generate a batch script that will build Mesos. Any project referencing Mesos
+# can then build it by calling this script.
+if (WIN32)
+ VS_BUILD_CMD(
+ MESOS
+ ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.sln
+ ${CMAKE_BUILD_TYPE}
+ "")
+
+ string(REPLACE ";" " " MESOS_BUILD_CMD "${MESOS_BUILD_CMD}")
+ file(WRITE ${CMAKE_BINARY_DIR}/make.bat ${MESOS_BUILD_CMD})
+endif (WIN32)
+
# Add preprocessor definitions required to build third-party libraries.
#######################################################################
# Enable the INT64 support for PicoJSON.