use bundled Vanetza by default

Change-Id: I6383aad3c9b65925ecfb4a119d80bc1ed727c81c
wendylee0901 · Apr 29, 2016 · 4972210 · 4972210
1 parent 7a01cea
commit 4972210
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -85,7 +85,7 @@ macro(add_opp_run _name _config _target)
         VERBATIM)
 endmacro()
 
-find_package(Vanetza REQUIRED)
+find_package(Vanetza PATHS extern/vanetza/build REQUIRED)
 option(Vanetza_STATIC "Link with static Vanetza libraries" OFF)
 
 find_path(Veins_DIR NAMES src/veins/package.ned PATHS extern/veins DOC "Veins root directory")

diff --git a/Makefile b/Makefile
@@ -1,8 +1,15 @@
 PYTHON ?= python
+VANETZA_DIR = extern/vanetza
 VEINS_DIR = extern/veins
 
 $(VEINS_DIR)/src/Makefile:
 	cd $(VEINS_DIR) && $(PYTHON) configure
 
 veins: $(VEINS_DIR)/src/Makefile
 	$(MAKE) -C $(VEINS_DIR)
+
+$(VANETZA_DIR)/build:
+	mkdir $(VANETZA_DIR)/build
+
+vanetza: $(VANETZA_DIR)/build
+	cd $(VANETZA_DIR)/build && cmake -DCMAKE_BUILD_TYPE=Release .. && cmake --build .