Skip to content

Commit 0cd6a30

Browse files
KernelAKernelA
KernelA
authored and
KernelA
committed
Fixed run commands
1 parent 535d376 commit 0cd6a30

File tree

2 files changed

+19
-6
lines changed

2 files changed

+19
-6
lines changed

.github/workflows/autobuild.yml

+10-6
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ jobs:
4646
../cmake/bin/cmake -DTrimesh2_INCLUDE_DIR="../../trimesh2/include" -DTrimesh2_LINK_DIR="../../trimesh2/lib.Linux64" -DCUDA_ARCH=${CUDA_ARCH} ..
4747
../cmake/bin/cmake --build . -j $(nproc)
4848
- name: Test
49-
run: ./build/cuda_voxelizer -i ./test_models/bunny.OBJ -s 64 -cpu
49+
run: |
50+
cd ./build
51+
./cuda_voxelizer -i ../test_models/bunny.OBJ -s 64 --cpu
5052
5153
windows-build:
5254
runs-on: windows-2019
@@ -56,8 +58,7 @@ jobs:
5658
steps:
5759
- name: Checkout
5860
uses: actions/checkout@v2
59-
with:
60-
ref: universal-cmake
61+
6162
- name: Install CUDA 10.1
6263
run: |
6364
Invoke-WebRequest http://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.243_426.00_win10.exe -OutFile .\cuda.exe
@@ -91,7 +92,10 @@ jobs:
9192
run: |
9293
$trimeshDir = "..\trimesh2-build"
9394
mkdir .\build
94-
& cmake -A x64 -DBoost_DIR="$BOOST_ROOT_1_72_0\lib\cmake\Boost-1.72.0" -DCMAKE_TOOLCHAIN_FILE:FILEPATH="C:\vcpkg\scripts\buildsystems\vcpkg.cmake" -DTrimesh2_INCLUDE_DIR:PATH="$trimeshDir\include" -DTrimesh2_LINK_DIR:PATH="$trimeshDir\lib.Win64.vs142" -DCUDA_ARCH:STRING=$env:CUDA_ARCH -DCMAKE_BUILD_TYPE=Release -S . -B .\build
95-
& cmake --build .\build -j 2 --target ALL_BUILD --config Release
95+
& cmake -A x64 -DBoost_DIR="$BOOST_ROOT_1_72_0\lib\cmake\Boost-1.72.0" -DCMAKE_TOOLCHAIN_FILE:FILEPATH="C:\vcpkg\scripts\buildsystems\vcpkg.cmake" -DTrimesh2_INCLUDE_DIR:PATH="$trimeshDir\include" -DTrimesh2_LINK_DIR:PATH="$trimeshDir\lib.Win64.vs142" -DCUDA_ARCH:STRING="$env:CUDA_ARCH" -DCMAKE_BUILD_TYPE=Debug -S . -B .\build
96+
& cmake --build .\build -j 2 --target ALL_BUILD --config Debug
97+
cd .\build\Debug
9698
- name: Test cuda_voxelizer
97-
run: .\build\Release\cuda_voxelizer.exe -i .\test_models\bunny.OBJ -s 64 -cpu
99+
run: |
100+
cd .\build\Debug
101+
.\cuda_voxelizer.exe -i ...\..\test_models\bunny.OBJ -s 64 --cpu

CMakeLists.txt

+9
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,12 @@ TARGET_COMPILE_FEATURES(${CUDA_VOXELIZER_EXECUTABLE} PUBLIC cxx_std_14)
8080
TARGET_INCLUDE_DIRECTORIES( ${CUDA_VOXELIZER_EXECUTABLE} PRIVATE ${Trimesh2_INCLUDE_DIR})
8181
TARGET_LINK_LIBRARIES ( ${CUDA_VOXELIZER_EXECUTABLE} PRIVATE ${Trimesh2_LIBRARY} Boost::log_setup PRIVATE Boost::log PRIVATE Boost::dynamic_linking PRIVATE glm PRIVATE OpenMP::OpenMP_CXX PRIVATE Boost::filesystem PRIVATE Boost::program_options PRIVATE CUDA::cudart)
8282
TARGET_COMPILE_OPTIONS(${CUDA_VOXELIZER_EXECUTABLE} PRIVATE $<$<COMPILE_LANGUAGE:CUDA>:-gencode arch=compute_${CUDA_ARCH},code=sm_${CUDA_ARCH}>)
83+
84+
add_custom_command(TARGET ${CUDA_VOXELIZER_EXECUTABLE} POST_BUILD
85+
COMMAND "${CMAKE_COMMAND}" -E copy
86+
${CMAKE_CURRENT_SOURCE_DIR}/src/logsettings.ini
87+
"${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>/logsettings.ini"
88+
COMMAND "${CMAKE_COMMAND}" -E copy
89+
${CMAKE_CURRENT_SOURCE_DIR}/src/logsettings.ini
90+
"${CMAKE_CURRENT_BINARY_DIR}>/logsettings.ini"
91+
COMMENT "Copying logsettings")

0 commit comments

Comments
 (0)