diff --git a/Makefile b/Makefile index 95ecc007..0894f75d 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 d69c71b1..b6831ce2 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 00000000..e69de29b 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