mirror of
				https://github.com/facebook/zstd.git
				synced 2025-10-31 16:47:48 +02:00 
			
		
		
		
	Cmake now builds with CMAKE_BUILD_TYPE=Release by default, both while
being invoked from the main Makefile (via cmakebuild) or directly from the build/cmake directory. Suggested by @pdknsk (#1081).
This commit is contained in:
		
							
								
								
									
										2
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								Makefile
									
									
									
									
									
								
							| @@ -114,7 +114,7 @@ clean: | ||||
| ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD DragonFly NetBSD MSYS_NT)) | ||||
|  | ||||
| HOST_OS = POSIX | ||||
| CMAKE_PARAMS = -DZSTD_BUILD_CONTRIB:BOOL=ON -DZSTD_BUILD_STATIC:BOOL=ON -DZSTD_BUILD_TESTS:BOOL=ON -DZSTD_ZLIB_SUPPORT:BOOL=ON -DZSTD_LZMA_SUPPORT:BOOL=ON | ||||
| CMAKE_PARAMS = -DZSTD_BUILD_CONTRIB:BOOL=ON -DZSTD_BUILD_STATIC:BOOL=ON -DZSTD_BUILD_TESTS:BOOL=ON -DZSTD_ZLIB_SUPPORT:BOOL=ON -DZSTD_LZMA_SUPPORT:BOOL=ON -DCMAKE_BUILD_TYPE=Release  | ||||
|  | ||||
| .PHONY: list | ||||
| list: | ||||
|   | ||||
| @@ -121,6 +121,8 @@ A `cmake` project generator is provided within `build/cmake`. | ||||
| It can generate Makefiles or other build scripts | ||||
| to create `zstd` binary, and `libzstd` dynamic and static libraries. | ||||
|  | ||||
| By default, `CMAKE_BUILD_TYPE` is set to `Release`. | ||||
|  | ||||
| #### Meson | ||||
|  | ||||
| A Meson project is provided within `contrib/meson`. | ||||
|   | ||||
							
								
								
									
										11
									
								
								build/.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										11
									
								
								build/.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -18,3 +18,14 @@ Studio* | ||||
|  | ||||
| # CMake | ||||
| cmake/build/ | ||||
| CMakeCache.txt | ||||
| CMakeFiles | ||||
| CMakeScripts | ||||
| Testing | ||||
| Makefile | ||||
| cmake_install.cmake | ||||
| install_manifest.txt | ||||
| compile_commands.json | ||||
| CTestTestfile.cmake | ||||
| build | ||||
| lib | ||||
|   | ||||
| @@ -10,6 +10,10 @@ | ||||
| PROJECT(zstd) | ||||
| CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) | ||||
| SET(ZSTD_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../..") | ||||
|  | ||||
| # Ensure Release build even if not invoked via Makefile | ||||
| SET(CMAKE_BUILD_TYPE "Release") | ||||
|  | ||||
| LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules") | ||||
| INCLUDE(GNUInstallDirs) | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user