Default build with pre-generated source, use of MOZART_CACHED_BUILD

mozart · Aug 23, 2018 · 009e6fe · 009e6fe
1 parent d7cc1d4
commit 009e6fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/cmake_local/MozartProperties.cmake b/cmake_local/MozartProperties.cmake
@@ -17,11 +17,11 @@ target_architecture(MOZART_PROP_PLATFORM_ARCH)
 # For source tarballs, oz.version and os.date
 # are exported id MozartConfigVersion.cmake
 include(MozartConfigVersion
-  RESULT_VARIABLE MOZART_CACHED_BUILD OPTIONAL)
+	RESULT_VARIABLE MOZART_SOURCE_TARBALL_BUILD OPTIONAL)
 
 # oz.version
 
-if(NOT MOZART_CACHED_BUILD)
+if(NOT MOZART_SOURCE_TARBALL_BUILD)
   execute_process(
     COMMAND ${GIT_EXECUTABLE} describe --dirty
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
@@ -45,7 +45,7 @@ endif()
 
 # oz.date
 
-if(NOT MOZART_CACHED_BUILD)
+if(NOT MOZART_SOURCE_TARBALL_BUILD)
   execute_process(
     COMMAND ${GIT_EXECUTABLE} log "--format=%aD" -1
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"

diff --git a/vm/CMakeLists.txt b/vm/CMakeLists.txt
@@ -13,6 +13,8 @@ set(LLVM_BUILD_DIR ${DEFAULT_LLVM_BUILD_DIR} CACHE PATH "Path to LLVM build (wit
 set(MOZART_GENERATOR_FLAGS "${DEFAULT_MOZART_GENERATOR_FLAGS}" CACHE STRING
     "Additional flags for the generator parser (clang)")
 
+set(MOZART_CACHED_BUILD ON CACHE STRING "Use pre-generated sources")
+
 add_compile_options(-std=c++0x)
 
 add_subdirectory(generator)