cmake: rename PNG,JPEG options to WITH_* (66caf1c1) · Commits · 郑智淋 / lammps

cmake/CMakeLists.txt

+7 −7

Original line number	Diff line number	Diff line
		@@ -234,11 +234,11 @@ endif()
		find_package(PNG QUIET)
		find_package(ZLIB QUIET)
		if(PNG_FOUND AND ZLIB_FOUND)
		option(ENABLE_PNG "Enable PNG support" ON)
		option(WITH_PNG "Enable PNG support" ON)
		else()
		option(ENABLE_PNG "Enable PNG support" OFF)
		option(WITH_PNG "Enable PNG support" OFF)
		endif()
		if(ENABLE_PNG)
		if(WITH_PNG)
		find_package(PNG REQUIRED)
		find_package(ZLIB REQUIRED)
		include_directories(${PNG_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
		@@ -248,8 +248,8 @@ endif()

		find_program(GZIP_EXECUTABLE gzip)
		find_package_handle_standard_args(GZIP REQUIRED_VARS GZIP_EXECUTABLE)
		option(ENABLE_GZIP "Enable GZIP support" ${GZIP_FOUND})
		if(ENABLE_GZIP)
		option(WITH_GZIP "Enable GZIP support" ${GZIP_FOUND})
		if(WITH_GZIP)
		if(NOT GZIP_FOUND)
		message(FATAL_ERROR "gzip executable not found")
		endif()
		@@ -258,8 +258,8 @@ endif()

		find_program(FFMPEG_EXECUTABLE ffmpeg)
		find_package_handle_standard_args(FFMPEG REQUIRED_VARS FFMPEG_EXECUTABLE)
		option(ENABLE_FFMPEG "Enable FFMPEG support" ${FFMPEG_FOUND})
		if(ENABLE_FFMPEG)
		option(WITH_FFMPEG "Enable FFMPEG support" ${FFMPEG_FOUND})
		if(WITH_FFMPEG)
		if(NOT FFMPEG_FOUND)
		message(FATAL_ERROR "ffmpeg executable not found")
		endif()