Merge branch 'master' of https://github.com/mooch443/trex into master

Application/src/tracker/misc/CMakeLists.txt

@@ -24,7 +24,9 @@ target_link_libraries(tracker_misc PRIVATE
 add_dependencies(tracker_misc TRex::OpenCV)
 
 if(TREX_CONDA_PACKAGE_INSTALL)
-    target_compile_definitions(tracker_misc PRIVATE TREX_PYTHON_PATH="$ENV{CONDA_PREFIX}")
+	set(CONDA_PREFIX_VAR "$ENV{CONDA_PREFIX}")
+	string(REPLACE "\\" "\\\\" CONDA_PREFIX_VAR "${CONDA_PREFIX_VAR}")
+    target_compile_definitions(tracker_misc PRIVATE TREX_PYTHON_PATH="${CONDA_PREFIX_VAR}")
 else()
     message(STATUS "Adding compile definitions: ${PYTHON_EXECUTABLE}")
     target_compile_definitions(tracker_misc PRIVATE

Application/trex_build_windows.bat

@@ -15,7 +15,7 @@ echo Python %PYTHON%
 
 git submodule update --recursive --init
 
-cmake .. -DWITH_GITSHA1=ON -DPYTHON_INCLUDE_DIR:FILEPATH=%pythoninclude% -DPYTHON_LIBRARY:FILEPATH=%findlib% -DPYTHON_EXECUTABLE:FILEPATH=%var% -DWITH_PYLON=OFF -DTREX_BUILD_OPENCV=ON -DCMAKE_SKIP_RPATH=ON -DTREX_BUILD_PNG=ON -DTREX_BUILD_ZIP=ON -DTREX_CONDA_PACKAGE_INSTALL=ON -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=TRUE -DTREX_WITH_TESTS:BOOL=OFF -DTREX_BUILD_GLFW=ON -DTREX_BUILD_ZLIB=ON
+cmake .. -DWITH_GITSHA1=ON -DPYTHON_INCLUDE_DIR:FILEPATH=%pythoninclude% -DPYTHON_LIBRARY:FILEPATH=%findlib% -DPYTHON_EXECUTABLE:FILEPATH=%var% -DWITH_PYLON=OFF -DTREX_BUILD_OPENCV=ON -DCMAKE_SKIP_RPATH=ON -DTREX_BUILD_PNG=ON -DTREX_BUILD_ZIP=ON -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=TRUE -DTREX_WITH_TESTS:BOOL=OFF -DTREX_BUILD_GLFW=ON -DTREX_BUILD_ZLIB=ON
 
 cmake --build . --target Z_LIB --config Release
 cmake --build . --target libzip --config Release