refactor(examples): don't accumulate all binaries in same directory

ViennaTools · Mar 21, 2024 · c58ddd5 · c58ddd5
1 parent 5f5651f
commit c58ddd5
Show file tree

Hide file tree

Showing 17 changed files with 35 additions and 21 deletions.
diff --git a/cmake/bat.cmake b/cmake/bat.cmake
@@ -0,0 +1,12 @@
+macro(setup_windows_bat TARGET LIB_FOLDER)
+  if(WIN32)
+    return()
+  endif()
+
+  message(STATUS "[ViennaPS] Generating Bat file for ${TARGET}")
+
+  file(
+    GENERATE
+    OUTPUT "$<TARGET_FILE_DIR:${TARGET}>/${TARGET}.bat"
+    CONTENT "set \"PATH=${LIB_FOLDER};%PATH%\"\n${TARGET}.exe %*")
+endmacro()
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -1,17 +1,19 @@
 add_custom_target(ViennaPS_Examples ALL)
 
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${PROJECT_BINARY_DIR}/examples-bin>)
+include("../cmake/bat.cmake")
+
+set(VIENNAPS_EXAMPLES_LIB $<1:${PROJECT_BINARY_DIR}/example-libs>)
 
 if(WIN32 AND NOT VIENNARAY_SYSTEM_EMBREE)
-  setup_embree_env(ViennaPS_Examples ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+  setup_embree_env(ViennaPS_Examples ${VIENNAPS_EXAMPLES_LIB})
 endif()
 
 if(WIN32 AND NOT VIENNARAY_SYSTEM_TBB)
-  setup_tbb_env(ViennaPS_Examples ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+  setup_tbb_env(ViennaPS_Examples ${VIENNAPS_EXAMPLES_LIB})
 endif()
 
 if(WIN32 AND NOT VIENNALS_SYSTEM_VTK)
-  setup_vtk_env(ViennaPS_Examples ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+  setup_vtk_env(ViennaPS_Examples ${VIENNAPS_EXAMPLES_LIB})
 endif()
 
 file(

diff --git a/examples/GDSReader/CMakeLists.txt b/examples/GDSReader/CMakeLists.txt
@@ -7,4 +7,4 @@ configure_file(GDSReader.py ${CMAKE_CURRENT_BINARY_DIR}/GDSReader.py COPYONLY)
 configure_file(mask.gds ${CMAKE_CURRENT_BINARY_DIR}/mask.gds COPYONLY)
 
 add_dependencies(ViennaPS_Examples ${PROJECT_NAME})
-add_test(NAME ${PROJECT_NAME} COMMAND $<TARGET_FILE:${PROJECT_NAME}>)
+setup_windows_bat(${PROJECT_NAME} ${VIENNAPS_EXAMPLES_LIB})
diff --git a/examples/KDTreeBenchmark/CMakeLists.txt b/examples/KDTreeBenchmark/CMakeLists.txt
@@ -4,4 +4,4 @@ add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")
 target_link_libraries(${PROJECT_NAME} PRIVATE ViennaPS)
 
 add_dependencies(ViennaPS_Examples ${PROJECT_NAME})
-add_test(NAME ${PROJECT_NAME} COMMAND $<TARGET_FILE:${PROJECT_NAME}>)
+setup_windows_bat(${PROJECT_NAME} ${VIENNAPS_EXAMPLES_LIB})
diff --git a/examples/KDTreeBenchmark/KDTreeBenchmark.cpp b/examples/KDTreeBenchmark/KDTreeBenchmark.cpp
@@ -94,8 +94,8 @@ int main(int argc, char *argv[]) {
     std::cout << "Finding Nearest Neighbors...\n";
     startTime = getTime();
     for (unsigned i = 0; i < repetitions; ++i) {
-      for (const auto &pt : testPoints)
-        [[maybe_unused]] auto result = tree->findNearest(pt);
+      for (const auto &pt : testPoints) [[maybe_unused]]
+        auto result = tree->findNearest(pt);
     }
     endTime = getTime();
 

diff --git a/examples/TEOSTrenchDeposition/CMakeLists.txt b/examples/TEOSTrenchDeposition/CMakeLists.txt
@@ -7,7 +7,7 @@ configure_file(singleTEOS.py ${CMAKE_CURRENT_BINARY_DIR}/singleTEOS.py COPYONLY)
 configure_file(singleTEOS_config.txt ${CMAKE_CURRENT_BINARY_DIR}/singleTEOS_config.txt COPYONLY)
 
 add_dependencies(ViennaPS_Examples singleTEOS)
-add_test(NAME singleTEOS COMMAND $<TARGET_FILE:${PROJECT_NAME}>)
+setup_windows_bat(singleTEOS ${VIENNAPS_EXAMPLES_LIB})
 
 add_executable(multiTEOS "multiTEOS.cpp")
 target_link_libraries(multiTEOS PRIVATE ViennaPS)
@@ -16,4 +16,4 @@ configure_file(multiTEOS.py ${CMAKE_CURRENT_BINARY_DIR}/multiTEOS.py COPYONLY)
 configure_file(multiTEOS_config.txt ${CMAKE_CURRENT_BINARY_DIR}/multiTEOS_config.txt COPYONLY)
 
 add_dependencies(ViennaPS_Examples multiTEOS)
-add_test(NAME multiTEOS COMMAND $<TARGET_FILE:${PROJECT_NAME}>)
+setup_windows_bat(multiTEOS ${VIENNAPS_EXAMPLES_LIB})
diff --git a/examples/atomicLayerDeposition/CMakeLists.txt b/examples/atomicLayerDeposition/CMakeLists.txt
@@ -8,4 +8,4 @@ configure_file(atomicLayerDeposition.py ${CMAKE_CURRENT_BINARY_DIR}/atomicLayerD
                COPYONLY)
 
 add_dependencies(ViennaPS_Examples ${PROJECT_NAME})
-add_test(NAME ${PROJECT_NAME} COMMAND $<TARGET_FILE:${PROJECT_NAME}>)
+setup_windows_bat(${PROJECT_NAME} ${VIENNAPS_EXAMPLES_LIB})
diff --git a/examples/cantileverWetEtching/CMakeLists.txt b/examples/cantileverWetEtching/CMakeLists.txt
@@ -7,4 +7,4 @@ configure_file(cantileverWetEtching.py ${CMAKE_CURRENT_BINARY_DIR}/cantileverWet
 configure_file(cantilever_mask.gds ${CMAKE_CURRENT_BINARY_DIR}/cantilever_mask.gds COPYONLY)
 
 add_dependencies(ViennaPS_Examples ${PROJECT_NAME})
-add_test(NAME ${PROJECT_NAME} COMMAND $<TARGET_FILE:${PROJECT_NAME}>)
+setup_windows_bat(${PROJECT_NAME} ${VIENNAPS_EXAMPLES_LIB})
diff --git a/examples/exampleProcess/CMakeLists.txt b/examples/exampleProcess/CMakeLists.txt
@@ -4,4 +4,4 @@ add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")
 target_link_libraries(${PROJECT_NAME} PRIVATE ViennaPS)
 
 add_dependencies(ViennaPS_Examples ${PROJECT_NAME})
-add_test(NAME ${PROJECT_NAME} COMMAND $<TARGET_FILE:${PROJECT_NAME}>)
+setup_windows_bat(${PROJECT_NAME} ${VIENNAPS_EXAMPLES_LIB})
diff --git a/examples/holeEtching/CMakeLists.txt b/examples/holeEtching/CMakeLists.txt
@@ -7,4 +7,4 @@ configure_file(holeEtching.py ${CMAKE_CURRENT_BINARY_DIR}/holeEtching.py COPYONL
 configure_file(config.txt ${CMAKE_CURRENT_BINARY_DIR}/config.txt COPYONLY)
 
 add_dependencies(ViennaPS_Examples ${PROJECT_NAME})
-add_test(NAME ${PROJECT_NAME} COMMAND $<TARGET_FILE:${PROJECT_NAME}>)
+setup_windows_bat(${PROJECT_NAME} ${VIENNAPS_EXAMPLES_LIB})
diff --git a/examples/interpolationDemo/CMakeLists.txt b/examples/interpolationDemo/CMakeLists.txt
@@ -8,4 +8,4 @@ configure_file(scatterdata.csv ${CMAKE_CURRENT_BINARY_DIR}/scatterdata.csv COPYO
 configure_file(plot.py ${CMAKE_CURRENT_BINARY_DIR}/plot.py COPYONLY)
 
 add_dependencies(ViennaPS_Examples ${PROJECT_NAME})
-add_test(NAME ${PROJECT_NAME} COMMAND $<TARGET_FILE:${PROJECT_NAME}>)
+setup_windows_bat(${PROJECT_NAME} ${VIENNAPS_EXAMPLES_LIB})
diff --git a/examples/oxideRegrowth/CMakeLists.txt b/examples/oxideRegrowth/CMakeLists.txt
@@ -7,4 +7,4 @@ configure_file(oxideRegrowth.py ${CMAKE_CURRENT_BINARY_DIR}/oxideRegrowth.py COP
 configure_file(config.txt ${CMAKE_CURRENT_BINARY_DIR}/config.txt COPYONLY)
 
 add_dependencies(ViennaPS_Examples ${PROJECT_NAME})
-add_test(NAME ${PROJECT_NAME} COMMAND $<TARGET_FILE:${PROJECT_NAME}>)
+setup_windows_bat(${PROJECT_NAME} ${VIENNAPS_EXAMPLES_LIB})
diff --git a/examples/selectiveEpitaxy/CMakeLists.txt b/examples/selectiveEpitaxy/CMakeLists.txt
@@ -7,4 +7,4 @@ configure_file(selectiveEpitaxy.py ${CMAKE_CURRENT_BINARY_DIR}/selectiveEpitaxy.
 configure_file(config.txt ${CMAKE_CURRENT_BINARY_DIR}/config.txt COPYONLY)
 
 add_dependencies(ViennaPS_Examples ${PROJECT_NAME})
-add_test(NAME ${PROJECT_NAME} COMMAND $<TARGET_FILE:${PROJECT_NAME}>)
+setup_windows_bat(${PROJECT_NAME} ${VIENNAPS_EXAMPLES_LIB})
diff --git a/examples/stackEtching/CMakeLists.txt b/examples/stackEtching/CMakeLists.txt
@@ -7,4 +7,4 @@ configure_file(stackEtching.py ${CMAKE_CURRENT_BINARY_DIR}/stackEtching.py COPYO
 configure_file(config.txt ${CMAKE_CURRENT_BINARY_DIR}/config.txt COPYONLY)
 
 add_dependencies(ViennaPS_Examples ${PROJECT_NAME})
-add_test(NAME ${PROJECT_NAME} COMMAND $<TARGET_FILE:${PROJECT_NAME}>)
+setup_windows_bat(${PROJECT_NAME} ${VIENNAPS_EXAMPLES_LIB})
diff --git a/examples/trenchDeposition/CMakeLists.txt b/examples/trenchDeposition/CMakeLists.txt
@@ -7,4 +7,4 @@ configure_file(trenchDeposition.py ${CMAKE_CURRENT_BINARY_DIR}/trenchDeposition.
 configure_file(config.txt ${CMAKE_CURRENT_BINARY_DIR}/config.txt COPYONLY)
 
 add_dependencies(ViennaPS_Examples ${PROJECT_NAME})
-add_test(NAME ${PROJECT_NAME} COMMAND $<TARGET_FILE:${PROJECT_NAME}>)
+setup_windows_bat(${PROJECT_NAME} ${VIENNAPS_EXAMPLES_LIB})
diff --git a/examples/trenchDepositionGeometric/CMakeLists.txt b/examples/trenchDepositionGeometric/CMakeLists.txt
@@ -8,4 +8,4 @@ configure_file(trenchDepositionGeometric.py
 configure_file(config.txt ${CMAKE_CURRENT_BINARY_DIR}/config.txt COPYONLY)
 
 add_dependencies(ViennaPS_Examples ${PROJECT_NAME})
-add_test(NAME ${PROJECT_NAME} COMMAND $<TARGET_FILE:${PROJECT_NAME}>)
+setup_windows_bat(${PROJECT_NAME} ${VIENNAPS_EXAMPLES_LIB})
diff --git a/examples/volumeModel/CMakeLists.txt b/examples/volumeModel/CMakeLists.txt
@@ -7,4 +7,4 @@ configure_file(volumeModel.py ${CMAKE_CURRENT_BINARY_DIR}/volumeModel.py COPYONL
 configure_file(config.txt ${CMAKE_CURRENT_BINARY_DIR}/config.txt COPYONLY)
 
 add_dependencies(ViennaPS_Examples ${PROJECT_NAME})
-add_test(NAME ${PROJECT_NAME} COMMAND $<TARGET_FILE:${PROJECT_NAME}>)
+setup_windows_bat(${PROJECT_NAME} ${VIENNAPS_EXAMPLES_LIB})