Commit: 236e46835908f05a54e09cf2774386e5a8ef8be1
Author: Jens Verwiebe
Date: Sun Feb 2 23:35:00 2014 +0100
https://developer.blender.org/rB236e46835908f05a54e09cf2774386e5a8ef8be1
Assure test works in all OSX buildenvironments/build-types
===================================================================
M source/tests/CMakeLists.txt
===================================================================
diff --git a/source/tests/CMakeLists.txt b/source/tests/CMakeLists.txt
index 3af8865..8543a3c 100644
--- a/source/tests/CMakeLists.txt
+++ b/source/tests/CMakeLists.txt
@@ -35,7 +35,10 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory
${TEST_OUT_DIR})
# all calls to blender use this
if(APPLE)
- set(TEST_BLENDER_EXE
${EXECUTABLE_OUTPUT_PATH}/Debug/blender.app/Contents/MacOS/blender)
+ if(${CMAKE_GENERATOR} MATCHES "Xcode")
+ set(TEST_BLENDER_EXE
${EXECUTABLE_OUTPUT_PATH}/$(CONFIGURATION)/blender.app/Contents/MacOS/blender)
+ else()
+ set(TEST_BLENDER_EXE
${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/blender.app/Contents/MacOS/blender)
else()
set(TEST_BLENDER_EXE ${EXECUTABLE_OUTPUT_PATH}/blender)
endif()
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
