Merge pull request #306 from layus/fix-dist-target

Properly disable the dist target

Author: sjmackenzie

CMakeLists.txt

@@ -73,9 +73,11 @@ endif()
 
 if("${MOZART_BUILD_DIR}/" MATCHES "${MOZART_DIR}/.*")
     message(STATUS "Building inside the source tree: 'dist' target disabled")
+    set(DIST_TARGET_ENABLED FALSE)
 else()
     message(STATUS "Building outside the source tree: 'dist' target enabled")
     add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+    set(DIST_TARGET_ENABLED TRUE)
     configure_file(cmake_local/MozartConfigVersion.cmake.in
         ${CMAKE_CURRENT_BINARY_DIR}/cmake_local/MozartConfigVersion.cmake @ONLY)
     define_property(GLOBAL PROPERTY SRCS_INSTALLED_DIRS

vm/boostenv/main/CMakeLists.txt

@@ -103,7 +103,9 @@ add_custom_target(genboostsources
 set_property(GLOBAL APPEND PROPERTY SRCS_INSTALLED_DIRS
     "${GENERATED_BOOSTSOURCES_DIR}" "/vm/boostenv/main/cached/")
 
-add_dependencies(dist genboostsources)
+if(DIST_TARGET_ENABLED)
+    add_dependencies(dist genboostsources)
+endif()
 
 # Boost environment library
 include_directories(${GENERATED_BOOSTSOURCES_DIR})

vm/vm/main/CMakeLists.txt

@@ -72,7 +72,9 @@ add_custom_target(gensources
 set_property(GLOBAL APPEND PROPERTY SRCS_INSTALLED_DIRS
     "${GENERATED_SOURCES_DIR}" "/vm/vm/main/cached/")
 
-add_dependencies(dist gensources)
+if (DIST_TARGET_ENABLED)
+    add_dependencies(dist gensources)
+endif()
 
 
 # Build the library