From 44ffd8dd618651b0bdfa07502e76b9500cefabd1 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sun, 8 Nov 2015 15:00:26 +0100 Subject: [PATCH] added make option to generate CMake files for CLion and root project file (nw) also ignored CMakeLists.txt in root --- .gitignore | 3 ++- makefile | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3a4bc649e5e..b20b719d9cf 100644 --- a/.gitignore +++ b/.gitignore @@ -22,4 +22,5 @@ /.idea src/regtests/chdman/temp src/regtests/jedutil/output -*.pyc \ No newline at end of file +*.pyc +/CMakeLists.txt \ No newline at end of file diff --git a/makefile b/makefile index 3702c46797a..4468b14df5a 100644 --- a/makefile +++ b/makefile @@ -1074,6 +1074,15 @@ os2_x86: generate $(PROJECTDIR)/gmake-os2/Makefile $(SILENT) $(MAKE) -C $(PROJECTDIR)/gmake-os2 config=$(CONFIG)32 +#------------------------------------------------- +# cmake +#------------------------------------------------- +cmake: generate + $(SILENT) $(GENIE) $(PARAMS) cmake + $(SILENT)echo cmake_minimum_required(VERSION 2.8.4) > CMakeLists.txt + $(SILENT)echo add_subdirectory($(PROJECTDIR)/cmake) >> CMakeLists.txt + + #------------------------------------------------- # Clean/bootstrap #-------------------------------------------------