diff --git a/Matlab_3D/validation.m b/Matlab_3D/validation.m index 4c45605..aba2418 100644 --- a/Matlab_3D/validation.m +++ b/Matlab_3D/validation.m @@ -14,9 +14,9 @@ vote=7; std = [5 5]; gt_filename = 'gt-128.vol'; % out_filename = sprintf('128-128-128/0-nissl-std%d.%d-t0%d-r%d.%d-t%d-out%d.%d.vol',std(1), std(2),t0,r1,r2,t,itr,vote); -out_filename = sprintf('D:/build/ivote3-bld/0-out.%d.vol',t); +out_filename = sprintf('E:/build/ivote3-bld/0-out.%d.vol',t); % txt_filename = sprintf('128-128-128/0-validation-nissl-std%d.%d-r%d.%d-t%d-out%d.%d-D%d.txt',std(1), std(2),r1,r2,t,itr,vote,D); -txt_filename = sprintf('D:/build/ivote3-bld/0-t%d-atomic-aabb.txt',t); +txt_filename = sprintf('E:/build/ivote3-bld/0-t%d-atomic-aabb.txt',t); spec = sprintf('Nissl-std%d.%d-r%d.%d-t%d-out%d.%d',std(1), std(2),r1,r2,t,itr,vote); fid0 = fopen(gt_filename); gt = fread(fid0,[X Y*Z], 'single'); diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index ed32ace..8a5a3a0 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -22,6 +22,12 @@ find_package(Threads) #find the X11 package find_package(X11) +#build the executable in the binary directory on MS Visual Studio +if ( MSVC ) + SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${OUTPUT_DIRECTORY}") + SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${OUTPUT_DIRECTORY}") +endif ( MSVC ) + include_directories( ${STIM_INCLUDE_DIRS} ) @@ -49,6 +55,6 @@ target_link_libraries(ivote3 ) #copy an image test case -configure_file(nissl-raw-data/nissl-float-256.256.256.vol nissl-float-256.256.256.vol COPYONLY) -configure_file(nissl-raw-data/nissl-float-128.128.128.vol nissl-float-128.128.128.vol COPYONLY) -configure_file(nissl-raw-data/nissl-float-64.64.64.vol nissl-float-64.64.64.vol COPYONLY) +configure_file(nissl-raw-data/nissl-float-256.256.256.vol ${CMAKE_CURRENT_BINARY_DIR}/nissl-float-256.256.256.vol @ONLY) +configure_file(nissl-raw-data/nissl-float-128.128.128.vol ${CMAKE_CURRENT_BINARY_DIR}/nissl-float-128.128.128.vol @ONLY) +configure_file(nissl-raw-data/nissl-float-64.64.64.vol ${CMAKE_CURRENT_BINARY_DIR}/nissl-float-64.64.64.vol @ONLY) -- libgit2 0.21.4