diff options
-rw-r--r-- | CMakeLists.txt | 12 | ||||
-rw-r--r-- | intern/cycles/CMakeLists.txt | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d00b89ef3ed..199fe9d3eeb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1763,8 +1763,20 @@ if(WITH_BLENDER) # internal and external library information first, for test linking add_subdirectory(source) elseif(WITH_CYCLES_STANDALONE) + add_subdirectory(intern/glew-mx) + add_subdirectory(intern/guardedalloc) + add_subdirectory(intern/libc_compat) + add_subdirectory(intern/numaapi) + add_subdirectory(intern/sky) + add_subdirectory(intern/cycles) add_subdirectory(extern/clew) + if(WITH_CYCLES_LOGGING) + if(NOT WITH_SYSTEM_GFLAGS) + add_subdirectory(extern/gflags) + endif() + add_subdirectory(extern/glog) + endif() if(WITH_CUDA_DYNLOAD) add_subdirectory(extern/cuew) endif() diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 8167576a177..2a28d905144 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -14,7 +14,7 @@ # Standalone or with Blender if(NOT WITH_BLENDER AND WITH_CYCLES_STANDALONE) - set(CYCLES_INSTALL_PATH "") + set(CYCLES_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}) else() set(WITH_CYCLES_BLENDER ON) # WINDOWS_PYTHON_DEBUG needs to write into the user addons folder since it will |