Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,6 @@ jobs:
cmake -G "Visual Studio 17 2022" -A x64 `
-DCMAKE_INSTALL_PREFIX="C:\Program Files\Open3D" `
-DDEVELOPER_BUILD="$Env:DEVELOPER_BUILD" `
-DBUILD_SHARED_LIBS=OFF `
-DSTATIC_WINDOWS_RUNTIME=ON `
-DBUILD_COMMON_ISPC_ISAS=ON `
-DBUILD_AZURE_KINECT=ON `
-DBUILD_LIBREALSENSE=ON `
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ endif()
include(CMakeDependentOption)

# Open3D build options
option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
option(BUILD_SHARED_LIBS "Build shared libraries" ON )
option(BUILD_EXAMPLES "Build Open3D examples programs" ON )
option(BUILD_UNIT_TESTS "Build Open3D unit tests" OFF)
option(BUILD_BENCHMARKS "Build the micro benchmarks" OFF)
Expand Down
5 changes: 2 additions & 3 deletions cpp/pybind/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,9 @@ set(PYTHON_EXTRA_LIBRARIES $<TARGET_FILE:TBB::tbb>)
if (BUILD_GUI AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
list(APPEND PYTHON_EXTRA_LIBRARIES ${CPP_LIBRARY}.1 ${CPPABI_LIBRARY})
endif()
if (WITH_OPENMP AND APPLE AND NOT BUILD_SHARED_LIBS)
if (WITH_OPENMP AND APPLE)
# Package libomp v11.1.0, if it is not installed. Later version cause crash on
# x86_64 if PyTorch is already imported. Case of shared libopen3d.dylib is not
# handled.
# x86_64 if PyTorch is already imported.
# https://github.com/microsoft/LightGBM/issues/4229
list(APPEND PYTHON_EXTRA_LIBRARIES ${OpenMP_libomp_LIBRARY})
execute_process(COMMAND brew list --versions libomp
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.wheel
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ COPY . /root/Open3D
WORKDIR /root/Open3D

# Build python wheel
# Note: BUILD_SHARED_LIBS defaults to ON, which is required for Python wheels
RUN export NPROC=$(($(nproc)+2)) \
&& export BUILD_SHARED_LIBS=OFF \
&& source /root/Open3D/util/ci_utils.sh \
&& build_pip_package build_azure_kinect build_jupyter \
&& if [ ${CI:-}a != a ]; then cd /root/Open3D/build/ && ls | grep -Ev '^lib$' | xargs rm -rf ; fi
Expand Down
3 changes: 1 addition & 2 deletions util/ci_utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,7 @@ build_pip_package() {
echo Building with CPU only...
mkdir -p build
pushd build # PWD=Open3D/build
cmakeOptions=("-DBUILD_SHARED_LIBS=OFF"
"-DDEVELOPER_BUILD=$DEVELOPER_BUILD"
cmakeOptions=("-DDEVELOPER_BUILD=$DEVELOPER_BUILD"
"-DBUILD_COMMON_ISPC_ISAS=ON"
"-DBUILD_AZURE_KINECT=$BUILD_AZURE_KINECT"
"-DBUILD_LIBREALSENSE=ON"
Expand Down
Loading