From 33b8a893edd3dadc960e5060044cc35a141324fd Mon Sep 17 00:00:00 2001 From: inikep Date: Tue, 24 May 2016 17:44:14 +0200 Subject: [PATCH] CMake project moved to projects --- Makefile | 2 +- projects/README.md | 1 + {contrib => projects}/cmake/CMakeLists.txt | 0 .../cmake/CMakeModules/AddExtraCompilationFlags.cmake | 0 projects/cmake/build/.keep | 0 {contrib => projects}/cmake/cmake_uninstall.cmake.in | 0 {contrib => projects}/cmake/lib/CMakeLists.txt | 0 {contrib => projects}/cmake/programs/CMakeLists.txt | 0 8 files changed, 2 insertions(+), 1 deletion(-) rename {contrib => projects}/cmake/CMakeLists.txt (100%) rename {contrib => projects}/cmake/CMakeModules/AddExtraCompilationFlags.cmake (100%) create mode 100644 projects/cmake/build/.keep rename {contrib => projects}/cmake/cmake_uninstall.cmake.in (100%) rename {contrib => projects}/cmake/lib/CMakeLists.txt (100%) rename {contrib => projects}/cmake/programs/CMakeLists.txt (100%) diff --git a/Makefile b/Makefile index 95ecc007c..0894f75d7 100644 --- a/Makefile +++ b/Makefile @@ -76,7 +76,7 @@ travis-install: $(MAKE) install PREFIX=~/install_test_dir cmaketest: - cd contrib/cmake ; cmake . ; $(MAKE) + cd projects/cmake/build ; cmake .. ; $(MAKE) clangtest: clean clang -v diff --git a/projects/README.md b/projects/README.md index d69c71b14..b6831ce29 100644 --- a/projects/README.md +++ b/projects/README.md @@ -4,5 +4,6 @@ projects for various integrated development environments (IDE) #### Included projects The following projects are included with the zstd distribution: +- cmake - CMake project contributed by Artyom Dymchenko - VS2008 - Visual Studio 2008 project - VS2010 - Visual Studio 2010 project (which also works well with Visual Studio 2012, 2013, 2015) diff --git a/contrib/cmake/CMakeLists.txt b/projects/cmake/CMakeLists.txt similarity index 100% rename from contrib/cmake/CMakeLists.txt rename to projects/cmake/CMakeLists.txt diff --git a/contrib/cmake/CMakeModules/AddExtraCompilationFlags.cmake b/projects/cmake/CMakeModules/AddExtraCompilationFlags.cmake similarity index 100% rename from contrib/cmake/CMakeModules/AddExtraCompilationFlags.cmake rename to projects/cmake/CMakeModules/AddExtraCompilationFlags.cmake diff --git a/projects/cmake/build/.keep b/projects/cmake/build/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/contrib/cmake/cmake_uninstall.cmake.in b/projects/cmake/cmake_uninstall.cmake.in similarity index 100% rename from contrib/cmake/cmake_uninstall.cmake.in rename to projects/cmake/cmake_uninstall.cmake.in diff --git a/contrib/cmake/lib/CMakeLists.txt b/projects/cmake/lib/CMakeLists.txt similarity index 100% rename from contrib/cmake/lib/CMakeLists.txt rename to projects/cmake/lib/CMakeLists.txt diff --git a/contrib/cmake/programs/CMakeLists.txt b/projects/cmake/programs/CMakeLists.txt similarity index 100% rename from contrib/cmake/programs/CMakeLists.txt rename to projects/cmake/programs/CMakeLists.txt -- 2.47.2