diff --git a/3rd_party/sapien-vulkan-2 b/3rd_party/sapien-vulkan-2 index f0a094d0..76aa31b8 160000 --- a/3rd_party/sapien-vulkan-2 +++ b/3rd_party/sapien-vulkan-2 @@ -1 +1 @@ -Subproject commit f0a094d013249d00d8b05a5b5d312077b9a644dc +Subproject commit 76aa31b8b646c3bb3f54d45d35bc8efb2398f486 diff --git a/python/CMakeLists.txt.old b/python/CMakeLists.txt.old deleted file mode 100644 index 50be796b..00000000 --- a/python/CMakeLists.txt.old +++ /dev/null @@ -1,45 +0,0 @@ -cmake_minimum_required(VERSION 3.18 FATAL_ERROR) -project(sapien LANGUAGES C CXX) - -set(CMAKE_CXX_STANDARD 20) - -if (MSVC) - set(CMAKE_CXX_FLAGS_RELEASE "/O2 /bigobj") -else() - set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -Wall") - set(CMAKE_CXX_FLAGS_RELEASE "-O3 -g0 -Wall") -endif() - - -if (CMAKE_BUILD_TYPE STREQUAL "Debug") - add_definitions(-D_DEBUG) -else () - add_definitions(-DNDEBUG) -endif () - -macro(FetchContent_MakeAvailableExclude) - FetchContent_GetProperties(${ARGV}) - if(NOT ${ARGV}_POPULATED) - FetchContent_Populate(${ARGV}) - add_subdirectory(${${ARGV}_SOURCE_DIR} ${${ARGV}_BINARY_DIR} EXCLUDE_FROM_ALL) - endif() -endmacro() - -list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") -include(eigen) -include(pybind11) - -find_package(sapien REQUIRED) - -pybind11_add_module(pysapien "pysapien.cpp" NO_EXTRAS) -target_link_libraries(pysapien PRIVATE sapien::sapien eigen) - -if (MSVC) - set_target_properties(pysapien PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) - set_target_properties(pysapien PROPERTIES LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) - set_target_properties(pysapien PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) -endif () - -if (TARGET sapien::simsense) - target_link_libraries(pysapien PRIVATE sapien::simsense) -endif () diff --git a/python/py_package/__init__.pyi b/python/py_package/__init__.pyi index 9ac6bec4..717be871 100644 --- a/python/py_package/__init__.pyi +++ b/python/py_package/__init__.pyi @@ -61,5 +61,5 @@ __all__ = [ def set_log_level(level: str) -> None: pass -__version__ = '3.0.0.dev20231102' +__version__ = '3.0.0.dev20231103' SceneConfig = sapien.pysapien.physx.PhysxSceneConfig diff --git a/setup.py b/setup.py index b8217b79..c2bde545 100644 --- a/setup.py +++ b/setup.py @@ -160,8 +160,8 @@ def build_pinocchio(self, ext): extdir = os.path.abspath(os.path.dirname(original_full_path)) extdir = os.path.join(extdir, self.distribution.get_name()) cmake_args = [ - "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=" + extdir, - "-DPYTHON_EXECUTABLE=" + sys.executable, + f"-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$<1:{extdir}>", + f"-DPYTHON_EXECUTABLE={sys.executable}", ] if args.debug: cfg = "Debug" @@ -191,8 +191,8 @@ def build_pybind(self, ext): extdir = os.path.abspath(os.path.dirname(original_full_path)) extdir = os.path.join(extdir, self.distribution.get_name()) cmake_args = [ - "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=" + extdir, - "-DPYTHON_EXECUTABLE=" + sys.executable, + f"-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$<1:{extdir}>", + f"-DPYTHON_EXECUTABLE={sys.executable}", ] if args.debug: cfg = "Debug"