unify output dirs

Author: d-led

CMakeLists.txt

@@ -220,6 +220,34 @@ if(USE_CONAN)
 endif()
 target_compile_definitions(influx-c-rest PRIVATE BUILDING_INFLUX_C_REST)
 
+# Put DLL in bin directory (matching test executable location) so tests can find it
+# This ensures test-influx-c-rest and test-influxdb-cpp-auth can find influx-c-rest.dll
+# On Windows/MSVC (multi-config): bin/Release or bin/Debug via $<CONFIG>
+# On Unix (single-config): bin/Release or bin/Debug via CMAKE_BUILD_TYPE
+if(CMAKE_CONFIGURATION_TYPES)
+    # Multi-config generator (Visual Studio, Xcode) - use generator expression directly
+    set_target_properties(influx-c-rest
+        PROPERTIES
+        RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/$<CONFIG>"
+        LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/$<CONFIG>"
+    )
+else()
+    # Single-config generator (Unix Makefiles, Ninja) - use CMAKE_BUILD_TYPE if set
+    if(CMAKE_BUILD_TYPE)
+        set_target_properties(influx-c-rest
+            PROPERTIES
+            RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}"
+            LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}"
+        )
+    else()
+        set_target_properties(influx-c-rest
+            PROPERTIES
+            RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+            LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+        )
+    endif()
+endif()
+
 # Demo application
 if(BUILD_DEMO)
     add_executable(demo
@@ -323,17 +351,50 @@ add_test(NAME test-influxdb-cpp-rest COMMAND ${CMAKE_BINARY_DIR}/bin/test-influx
 add_test(NAME test-influx-c-rest COMMAND ${CMAKE_BINARY_DIR}/bin/test-influx-c-rest)
 add_test(NAME test-influxdb-cpp-auth COMMAND ${CMAKE_BINARY_DIR}/bin/test-influxdb-cpp-auth)
 
-# Set output directories for executables
-set_target_properties(test-influxdb-cpp-rest test-influx-c-rest test-influxdb-cpp-auth
-    PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
-)
-
-if(BUILD_DEMO)
-    set_target_properties(demo
+# Set output directories for executables - match influx-c-rest DLL location
+if(CMAKE_CONFIGURATION_TYPES)
+    # Multi-config generator (Visual Studio, Xcode)
+    set_target_properties(test-influxdb-cpp-rest test-influx-c-rest test-influxdb-cpp-auth
         PROPERTIES
-        RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+        RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/$<CONFIG>"
     )
+else()
+    # Single-config generator
+    if(CMAKE_BUILD_TYPE)
+        set_target_properties(test-influxdb-cpp-rest test-influx-c-rest test-influxdb-cpp-auth
+            PROPERTIES
+            RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}"
+        )
+    else()
+        set_target_properties(test-influxdb-cpp-rest test-influx-c-rest test-influxdb-cpp-auth
+            PROPERTIES
+            RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+        )
+    endif()
+endif()
+
+if(BUILD_DEMO)
+    # Demo output directory - match test executables location
+    if(CMAKE_CONFIGURATION_TYPES)
+        # Multi-config generator (Visual Studio, Xcode)
+        set_target_properties(demo
+            PROPERTIES
+            RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/$<CONFIG>"
+        )
+    else()
+        # Single-config generator
+        if(CMAKE_BUILD_TYPE)
+            set_target_properties(demo
+                PROPERTIES
+                RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}"
+            )
+        else()
+            set_target_properties(demo
+                PROPERTIES
+                RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+            )
+        endif()
+    endif()
 endif()
 
 # Installation

scripts/test.bat

@@ -13,7 +13,9 @@ set BIN_DIR_ALT=%BUILD_DIR%\bin
 echo Running tests...
 echo Searching in: %BIN_DIR% and %BIN_DIR_ALT%
 
-set PATH=%BIN_DIR%;%BIN_DIR_ALT%;%BUILD_DIR%;%PATH%
+REM Add build directories to PATH so DLLs can be found
+REM influx-c-rest.dll is needed by test-influx-c-rest and test-influxdb-cpp-auth
+set PATH=%BIN_DIR%;%BIN_DIR_ALT%;%BUILD_DIR%;%BUILD_DIR%\Release;%BUILD_DIR%\bin\Release;%PATH%
 
 REM Test executables
 set TEST_FILES=test-influxdb-cpp-rest test-influx-c-rest test-influxdb-cpp-auth