refactor: more logging, don't use early return in macro

* early return behavior in macro may vary in different cmake versions
ViennaTools · Dec 2, 2023 · 0a440c9 · 0a440c9
1 parent a8acd4c
commit 0a440c9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt
@@ -15,5 +15,6 @@ foreach(entry ${entries})
     continue()
   endif()
 
+  message(STATUS "[ViennaLS] Adding Example ${entry}")
   add_subdirectory(${entry})
 endforeach()
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
@@ -15,5 +15,6 @@ foreach(entry ${entries})
     continue()
   endif()
 
+  message(STATUS "[ViennaLS] Adding Test ${entry}")
   add_subdirectory(${entry})
 endforeach()
diff --git a/cmake/vtk.cmake b/cmake/vtk.cmake
@@ -1,16 +1,14 @@
 macro(setup_vtk_env TARGET OUTPUT)
-
   if(NOT WIN32)
     message(
       STATUS "[ViennaLS] Skipping VTK-Environment setup for ${TARGET} (Only required on Windows)")
-    return()
-  endif()
+  else()
+    message(STATUS "[ViennaLS] Setting up VTK for ${TARGET}")
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${PROJECT_BINARY_DIR}/${OUTPUT}>)
 
-  message(STATUS "[ViennaLS] Setting up VTK for ${TARGET}")
-  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${PROJECT_BINARY_DIR}/${OUTPUT}>)
-
-  add_custom_command(
-    TARGET ${TARGET}
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${VTK_LIBS} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+    add_custom_command(
+      TARGET ${TARGET}
+      POST_BUILD
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${VTK_LIBS} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+  endif()
 endmacro()