From 71ed3686430c8e47a9d1a7576382f6c7de2c0cee Mon Sep 17 00:00:00 2001
From: Arnstein Ressem <aressem@gmail.com>
Date: Wed, 27 Sep 2017 18:00:09 +0200
Subject: Revert "Revert "Aressem/remove post install script""

---
 CMakeLists.txt | 44 ++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 40 insertions(+), 4 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 413d232c00d..f7752d5915e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,6 @@ find_package(JNI REQUIRED)
 
 include(functions.cmake)
 include(build_settings.cmake)
-include(install_java.cmake)
 
 # Enable CTest unit testing
 enable_testing()
@@ -24,12 +23,36 @@ enable_testing()
 # Include vespa config definitions in every target
 include_directories(BEFORE ${CMAKE_BINARY_DIR}/configdefinitions/src)
 
+add_subdirectory(application-preprocessor)
+add_subdirectory(chain)
+add_subdirectory(component)
+add_subdirectory(config-bundle)
+add_subdirectory(config-model)
+add_subdirectory(config-model-api)
+add_subdirectory(config-provisioning)
+add_subdirectory(config-proxy)
 add_subdirectory(config)
+add_subdirectory(config-model-fat)
 add_subdirectory(configd)
 add_subdirectory(configdefinitions)
 add_subdirectory(configserver)
 add_subdirectory(configutil)
+add_subdirectory(container-accesslogging)
+add_subdirectory(container-core)
+add_subdirectory(container-di)
+add_subdirectory(container-disc)
+add_subdirectory(container-jersey2)
+add_subdirectory(container-messagebus)
+add_subdirectory(container-search)
+add_subdirectory(container-search-and-docproc)
+add_subdirectory(clustercontroller-apps)
+add_subdirectory(clustercontroller-apputil)
+add_subdirectory(clustercontroller-utils)
+add_subdirectory(clustercontroller-core)
 add_subdirectory(defaults)
+add_subdirectory(docker-api)
+add_subdirectory(docproc)
+add_subdirectory(docprocs)
 add_subdirectory(document)
 add_subdirectory(documentapi)
 add_subdirectory(eval)
@@ -41,14 +64,20 @@ add_subdirectory(filedistribution)
 add_subdirectory(fnet)
 add_subdirectory(frtstream)
 add_subdirectory(fsa)
+add_subdirectory(jdisc_core)
+add_subdirectory(jdisc_http_service)
+add_subdirectory(jdisc_jetty)
 add_subdirectory(jrt_test)
 add_subdirectory(juniper)
 add_subdirectory(logd)
+add_subdirectory(logserver)
 add_subdirectory(lowercasing_test)
 add_subdirectory(memfilepersistence)
 add_subdirectory(messagebus)
 add_subdirectory(messagebus_test)
 add_subdirectory(metrics)
+add_subdirectory(node-repository)
+add_subdirectory(orchestrator)
 add_subdirectory(persistence)
 add_subdirectory(persistencetypes)
 add_subdirectory(searchcommon)
@@ -56,25 +85,32 @@ add_subdirectory(searchcore)
 add_subdirectory(searchcorespi)
 add_subdirectory(searchlib)
 add_subdirectory(searchsummary)
+add_subdirectory(simplemetrics)
 add_subdirectory(slobrok)
 add_subdirectory(staging_vespalib)
+add_subdirectory(standalone-container)
 add_subdirectory(storage)
 add_subdirectory(storageapi)
 add_subdirectory(storageframework)
 add_subdirectory(storageserver)
+add_subdirectory(statistics)
 add_subdirectory(streamingvisitors)
 add_subdirectory(vbench)
 add_subdirectory(vdslib)
 add_subdirectory(vdstestlib)
+add_subdirectory(vespa-http-client)
+add_subdirectory(vespa_jersey2)
 add_subdirectory(vespabase)
 add_subdirectory(vespaclient)
+add_subdirectory(vespaclient-core)
+add_subdirectory(vespaclient-container-plugin)
+add_subdirectory(vespaclient-java)
+add_subdirectory(vespajlib)
 add_subdirectory(vespalib)
 add_subdirectory(vespalog)
 add_subdirectory(vespamalloc)
 add_subdirectory(vsm)
-# Note: Change when cmake gets proper post-install support.
-# Post installation steps are run from dist subdirectory which needs to be the last add_subdirectory(...) call in this file.
-add_subdirectory(dist)
+add_subdirectory(zkfacade)
 
 # Create module targets with name ${MODULE}+module depending on every target defined within that module
 __create_module_targets(TARGETS "module")
-- 
cgit v1.2.3