diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-08-27 06:37:48 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-08-27 06:37:48 +0400 |
| commit | ff4e0187531b577a12484c82774fc4229dd2a76a (patch) | |
| tree | f5272b74793d98558a342819ee0bf851a699abf8 /intern/cycles | |
| parent | defb8812a7c3fbd05bd644009fda442cdd795b74 (diff) | |
Cycles / Standalone:
* Rename test to standalone.
Note: New CMAKE flag is WITH_CYCLES_STANDALONE.
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/cycles/app/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | intern/cycles/app/cycles_standalone.cpp (renamed from intern/cycles/app/cycles_test.cpp) | 2 | ||||
| -rw-r--r-- | intern/cycles/cmake/external_libs.cmake | 2 | ||||
| -rw-r--r-- | intern/cycles/util/CMakeLists.txt | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index d83ff20f538..43829a110cf 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -76,7 +76,7 @@ if(WITH_CYCLES_BLENDER) add_subdirectory(blender) endif() -if(WITH_CYCLES_TEST OR WITH_CYCLES_NETWORK) +if(WITH_CYCLES_STANDALONE OR WITH_CYCLES_NETWORK) add_subdirectory(app) endif() diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt index 3fb8aaf934f..347da075d05 100644 --- a/intern/cycles/app/CMakeLists.txt +++ b/intern/cycles/app/CMakeLists.txt @@ -27,7 +27,7 @@ set(LIBRARIES link_directories(${OPENIMAGEIO_LIBPATH} ${BOOST_LIBPATH}) -if(WITH_CYCLES_TEST) +if(WITH_CYCLES_STANDALONE) list(APPEND LIBRARIES ${GLUT_LIBRARIES}) endif() @@ -38,17 +38,17 @@ endif() include_directories(${INC}) include_directories(SYSTEM ${INC_SYS}) -if(WITH_CYCLES_TEST) +if(WITH_CYCLES_STANDALONE) set(SRC - cycles_test.cpp + cycles_standalone.cpp cycles_xml.cpp cycles_xml.h ) - add_executable(cycles_test ${SRC}) - target_link_libraries(cycles_test ${LIBRARIES}) + add_executable(cycles ${SRC}) + target_link_libraries(cycles ${LIBRARIES}) if(UNIX AND NOT APPLE) - set_target_properties(cycles_test PROPERTIES INSTALL_RPATH $ORIGIN/lib) + set_target_properties(cycles PROPERTIES INSTALL_RPATH $ORIGIN/lib) endif() unset(SRC) endif() diff --git a/intern/cycles/app/cycles_test.cpp b/intern/cycles/app/cycles_standalone.cpp index df655b536ec..9a193548d7a 100644 --- a/intern/cycles/app/cycles_test.cpp +++ b/intern/cycles/app/cycles_standalone.cpp @@ -229,7 +229,7 @@ static void options_parse(int argc, const char **argv) ArgParse ap; bool help = false; - ap.options ("Usage: cycles_test [options] file.xml", + ap.options ("Usage: cycles [options] file.xml", "%*", files_parse, "", "--device %s", &devicename, ("Devices to use: " + device_names).c_str(), "--shadingsys %s", &ssname, "Shading system to use: svm, osl", diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake index 790049898ff..6164572c264 100644 --- a/intern/cycles/cmake/external_libs.cmake +++ b/intern/cycles/cmake/external_libs.cmake @@ -2,7 +2,7 @@ ########################################################################### # GLUT -if(WITH_CYCLES_TEST) +if(WITH_CYCLES_STANDALONE) set(GLUT_ROOT_PATH ${CYCLES_GLUT}) find_package(GLUT) diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt index 8a0366b19e4..36c89b979e2 100644 --- a/intern/cycles/util/CMakeLists.txt +++ b/intern/cycles/util/CMakeLists.txt @@ -22,7 +22,7 @@ set(SRC util_transform.cpp ) -if(WITH_CYCLES_TEST) +if(WITH_CYCLES_STANDALONE) list(APPEND SRC util_view.cpp ) |