try to use CMAKE_INTDIR definition

Author: freddy77

misc/appveyor.yml

@@ -26,43 +26,12 @@ environment:
     WIN_ICONV_VER: master
 
   matrix:
-  - PLAT: Win64
-    VS_VERSION: "2022"
-    TDSVER: "7.4"
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
-
-  - PLAT: Win64
-    VS_VERSION: "2019"
-    TDSVER: "7.4"
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-
-  - PLAT: Win32
-    VS_VERSION: "2017"
-    TDSVER: "7.3"
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    ODBC_MARS: "1"
-
-  - PLAT: Win64
-    VS_VERSION: "2015"
-    TDSVER: "7.2"
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-
   - PLAT: Win64
     VS_VERSION: "2013"
     TDSVER: "auto"
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
     ODBC_MARS: "1"
 
-  - PLAT: Win32
-    VS_VERSION: "2010"
-    TDSVER: "7.1"
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
-  - PLAT: Win32
-    VS_VERSION: "2008"
-    TDSVER: "7.0"
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
 configuration:
   - release
 
@@ -174,7 +143,7 @@ test_script:
   # Add dirs of our just built DLLs to PATH envvar so everything works with older cmake
   - >-
     if %VS_VERSION% lss 2019 set
-    PATH=%CD%\src\ctlib%CONFIG_DEBUG:~1,-1%;%CD%\src\dblib%CONFIG_DEBUG:~1,-1%;%CD%\src\apps%CONFIG_DEBUG:~1,-1%;%PATH%
+    PATH=%CD%\src\ctlib%CONFIG_DEBUG:~1,-1%;%CD%\src\dblib%CONFIG_DEBUG:~1,-1%;%PATH%
   # register ODBC driver
   - >-
     %WINDIR%\SysWOW64\regsvr32 /s src\odbc\%CONFIG_DEBUG:~2%tdsodbc.dll ||

src/apps/unittests/defncopy.c

@@ -396,18 +396,27 @@ update_path(void)
 	assert(len > 0);
 	setenv(name, path, 1);
 #else
+	const tds_dir_char only = L"PATH=..";
+	const tds_dir_char start = L"PATH=..;%s";
 	tds_dir_char *p;
 	size_t len;
 
+#ifdef CMAKE_INTDIR
+	if (CMAKE_INTDIR[0]) {
+		only = L"PATH=..\\..\\" TDS_DIR(CMAKE_INTDIR);
+		start = L"PATH=..\\..\\" TDS_DIR(CMAKE_INTDIR) L";%s";
+	}
+#endif
+
 	if (!path) {
-		_wputenv(L"PATH=..");
+		_wputenv(only);
 		return;
 	}
 
-	len = tds_dir_len(path) + 10;
+	len = tds_dir_len(path) + 100;
 	p = tds_new(tds_dir_char, len);
 	assert(p);
-	tds_dir_snprintf(p, len, TDS_DIR("PATH=..;%s"), path);
+	tds_dir_snprintf(p, len, start, path);
 	path = p;
 	_wputenv(path);
 #endif