diff options
author | 2015-11-08 15:00:26 +0100 | |
---|---|---|
committer | 2015-11-08 15:00:26 +0100 | |
commit | 44ffd8dd618651b0bdfa07502e76b9500cefabd1 (patch) | |
tree | 13de938c952020806e7db848b45638fbf4248bfe | |
parent | 0284402d1c683ee8c28d4c8cdef8b1b47ce1583e (diff) |
added make option to generate CMake files for CLion and root project file (nw)
also ignored CMakeLists.txt in root
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | makefile | 9 |
2 files changed, 11 insertions, 1 deletions
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 @@ -1075,6 +1075,15 @@ os2_x86: generate $(PROJECTDIR)/gmake-os2/Makefile #------------------------------------------------- +# 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 #------------------------------------------------- |