Cleanup: CMake indentation
This commit is contained in:
parent
163d4aa094
commit
9676dce317
|
@ -29,7 +29,7 @@ elseif(UNIX)
|
|||
set(USD_PLATFORM_FLAGS
|
||||
-DPYTHON_INCLUDE_DIR=${LIBDIR}/python/include/python${PYTHON_SHORT_VERSION}/
|
||||
-DPYTHON_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${SHAREDLIBEXT}
|
||||
)
|
||||
)
|
||||
|
||||
if(APPLE)
|
||||
set(USD_SHARED_LINKER_FLAGS "-Xlinker -undefined -Xlinker dynamic_lookup")
|
||||
|
|
|
@ -1115,7 +1115,7 @@ function(find_python_package
|
|||
# endif()
|
||||
# Not set, so initialize.
|
||||
else()
|
||||
string(REPLACE "." ";" _PY_VER_SPLIT "${PYTHON_VERSION}")
|
||||
string(REPLACE "." ";" _PY_VER_SPLIT "${PYTHON_VERSION}")
|
||||
list(GET _PY_VER_SPLIT 0 _PY_VER_MAJOR)
|
||||
|
||||
# re-cache
|
||||
|
@ -1275,7 +1275,7 @@ macro(add_bundled_libraries library_dir)
|
|||
list(APPEND PLATFORM_BUNDLED_LIBRARY_DIRS ${_library_dir})
|
||||
unset(_all_library_versions)
|
||||
unset(_library_dir)
|
||||
endif()
|
||||
endif()
|
||||
endmacro()
|
||||
|
||||
macro(windows_install_shared_manifest)
|
||||
|
|
|
@ -732,25 +732,25 @@ if(WITH_CYCLES_DEVICE_ONEAPI)
|
|||
endif()
|
||||
# SYCL_CPP_FLAGS is a variable that the user can set to pass extra compiler options
|
||||
set(sycl_compiler_flags
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/${SRC_KERNEL_DEVICE_ONEAPI}
|
||||
-fsycl
|
||||
-fsycl-unnamed-lambda
|
||||
-fdelayed-template-parsing
|
||||
-mllvm -inlinedefault-threshold=250
|
||||
-mllvm -inlinehint-threshold=350
|
||||
-fsycl-device-code-split=per_kernel
|
||||
-fsycl-max-parallel-link-jobs=${SYCL_OFFLINE_COMPILER_PARALLEL_JOBS}
|
||||
-shared
|
||||
-DWITH_ONEAPI
|
||||
-ffast-math
|
||||
-DNDEBUG
|
||||
-O2
|
||||
-o ${cycles_kernel_oneapi_lib}
|
||||
-I${CMAKE_CURRENT_SOURCE_DIR}/..
|
||||
${SYCL_CPP_FLAGS}
|
||||
)
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/${SRC_KERNEL_DEVICE_ONEAPI}
|
||||
-fsycl
|
||||
-fsycl-unnamed-lambda
|
||||
-fdelayed-template-parsing
|
||||
-mllvm -inlinedefault-threshold=250
|
||||
-mllvm -inlinehint-threshold=350
|
||||
-fsycl-device-code-split=per_kernel
|
||||
-fsycl-max-parallel-link-jobs=${SYCL_OFFLINE_COMPILER_PARALLEL_JOBS}
|
||||
-shared
|
||||
-DWITH_ONEAPI
|
||||
-ffast-math
|
||||
-DNDEBUG
|
||||
-O2
|
||||
-o ${cycles_kernel_oneapi_lib}
|
||||
-I${CMAKE_CURRENT_SOURCE_DIR}/..
|
||||
${SYCL_CPP_FLAGS}
|
||||
)
|
||||
|
||||
if (WITH_CYCLES_ONEAPI_HOST_TASK_EXECUTION)
|
||||
if(WITH_CYCLES_ONEAPI_HOST_TASK_EXECUTION)
|
||||
list(APPEND sycl_compiler_flags -DWITH_ONEAPI_SYCL_HOST_TASK)
|
||||
endif()
|
||||
|
||||
|
|
|
@ -617,16 +617,16 @@ if(UNIX AND NOT APPLE)
|
|||
# Remove from old location, so existing builds don't start with software
|
||||
# OpenGL now that the lib/ folder is used for other libraries.
|
||||
install(
|
||||
CODE
|
||||
"file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGL.so)\n
|
||||
file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGL.so.1)\n
|
||||
file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGL.so.1.5.0)\n
|
||||
file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGLU.so)\n
|
||||
file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGLU.so.1)\n
|
||||
file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGLU.so.1.3.1)\n
|
||||
file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libglapi.so)\n
|
||||
file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libglapi.so.0)\n
|
||||
file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libglapi.so.0.0.0)\n
|
||||
CODE "\
|
||||
file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGL.so)\n
|
||||
file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGL.so.1)\n
|
||||
file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGL.so.1.5.0)\n
|
||||
file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGLU.so)\n
|
||||
file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGLU.so.1)\n
|
||||
file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGLU.so.1.3.1)\n
|
||||
file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libglapi.so)\n
|
||||
file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libglapi.so.0)\n
|
||||
file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libglapi.so.0.0.0)\n
|
||||
"
|
||||
)
|
||||
endif()
|
||||
|
@ -1071,7 +1071,7 @@ elseif(WIN32)
|
|||
)
|
||||
|
||||
if(EXISTS ${LIBDIR}/openimageio/lib/python${PYTHON_VERSION}/site-packages) #this will only exist for 3.5+
|
||||
install(
|
||||
install(
|
||||
DIRECTORY ${LIBDIR}/openimageio/lib/python${PYTHON_VERSION}/site-packages/
|
||||
DESTINATION ${TARGETDIR_VER}/python/lib/site-packages/
|
||||
CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
|
||||
|
|
Loading…
Reference in New Issue