[Bf-blender-cvs] [86bee87edac] temp-benchmark: Benchmark: rename executable to blender-benchmark and disable argument parsing.

Brecht Van Lommel noreply at git.blender.org
Fri Aug 3 15:59:14 CEST 2018


Commit: 86bee87edacdada7f4de1b2adb39ffba6a2128b5
Author: Brecht Van Lommel
Date:   Fri Aug 3 15:09:11 2018 +0200
Branches: temp-benchmark
https://developer.blender.org/rB86bee87edacdada7f4de1b2adb39ffba6a2128b5

Benchmark: rename executable to blender-benchmark and disable argument parsing.

===================================================================

M	source/creator/CMakeLists.txt
M	source/creator/creator.c

===================================================================

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index ef78d23875b..f9b978fe1ea 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -248,6 +248,9 @@ if(WITH_PYTHON_MODULE)
 else()
 	add_executable(blender ${EXETYPE} ${SRC})
 	WINDOWS_SIGN_TARGET(blender)
+
+	# Benchmark: rename executable
+	SET_TARGET_PROPERTIES(blender PROPERTIES OUTPUT_NAME blender-benchmark)
 endif()
 
 if(WITH_BUILDINFO)
@@ -316,7 +319,7 @@ elseif(APPLE)
 	if(WITH_PYTHON_MODULE)
 		set(TARGETDIR_VER ${BLENDER_VERSION})
 	else()
-		set(TARGETDIR_VER blender.app/Contents/Resources/${BLENDER_VERSION})
+		set(TARGETDIR_VER blender-benchmark.app/Contents/Resources/${BLENDER_VERSION})
 	endif()
 	# Skip relinking on cpack / install
 	set_target_properties(blender PROPERTIES BUILD_WITH_INSTALL_RPATH true)
@@ -874,7 +877,7 @@ elseif(APPLE)
 
 	# Give the bundle actual creation/modification date
 	execute_process(COMMAND SetFile -d ${SETFILE_DATE} -m ${SETFILE_DATE}
-	                ${EXECUTABLE_OUTPUT_PATH}/blender.app)
+	                ${EXECUTABLE_OUTPUT_PATH}/blender-benchmark.app)
 
 	install(
 		TARGETS blender
@@ -886,18 +889,18 @@ elseif(APPLE)
 
 	install(
 		FILES ${OSX_APP_SOURCEDIR}/Contents/PkgInfo
-		DESTINATION blender.app/Contents
+		DESTINATION blender-benchmark.app/Contents
 	)
 
 	install_dir(
 		${OSX_APP_SOURCEDIR}/Contents/Resources
-		blender.app/Contents/
+		blender-benchmark.app/Contents/
 	)
 
 	if(WITH_LLVM AND NOT LLVM_STATIC)
 		install(
 			FILES ${LIBDIR}/llvm/lib/libLLVM-3.4.dylib
-			DESTINATION blender.app/Contents/MacOS
+			DESTINATION blender-benchmark.app/Contents/MacOS
 		)
 	endif()
 
diff --git a/source/creator/creator.c b/source/creator/creator.c
index b4aa3739969..2252763862a 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -390,7 +390,8 @@ int main(
 	/* ensure we free on early exit */
 	app_init_data.ba = ba;
 
-	main_args_setup(C, ba);
+	/* Benchmark: disable arguments
+	main_args_setup(C, ba); */
 
 	BLI_argsParse(ba, 1, NULL, NULL);
 
@@ -483,7 +484,8 @@ int main(
 
 	/* OK we are ready for it */
 #ifndef WITH_PYTHON_MODULE
-	main_args_setup_post(C, ba);
+	/* Benchmark: disable arguments
+	main_args_setup_post(C, ba); */
 
 	if (G.background == 0) {
 		if (!G.file_loaded)



More information about the Bf-blender-cvs mailing list