Vcpkg: Environment

Iswenzz · Sep 24, 2023 · c1b520a · c1b520a
1 parent 5195e66
commit c1b520a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.vcpkg/cmake/env.cmake b/.vcpkg/cmake/env.cmake
diff --git a/.vcpkg/linux.cmake b/.vcpkg/linux.cmake
@@ -1,4 +1,3 @@
-include(.vcpkg/cmake/env.cmake)
 set(VCPKG_TARGET_TRIPLET x64-linux)
 
 option(BUILD_CLI "Build CLI" OFF)
@@ -11,4 +10,8 @@ if(BUILD_TESTING)
 	list(APPEND VCPKG_MANIFEST_FEATURES "tests")
 endif()
 
+if(NOT DEFINED ENV{VCPKG_ROOT})
+	message(FATAL_ERROR "ERROR: VCPKG_ROOT environment variable is not defined. Please set it to the root directory of your vcpkg installation.")
+endif()
+file(TO_CMAKE_PATH $ENV{VCPKG_ROOT} VCPKG_ROOT)
 include(${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake)
diff --git a/.vcpkg/windows.cmake b/.vcpkg/windows.cmake
@@ -1,4 +1,3 @@
-include(.vcpkg/cmake/env.cmake)
 set(VCPKG_TARGET_TRIPLET x64-windows-static)
 
 option(BUILD_CLI "Build CLI" OFF)
@@ -11,4 +10,8 @@ if(BUILD_TESTING)
 	list(APPEND VCPKG_MANIFEST_FEATURES "tests")
 endif()
 
+if(NOT DEFINED ENV{VCPKG_ROOT})
+	message(FATAL_ERROR "ERROR: VCPKG_ROOT environment variable is not defined. Please set it to the root directory of your vcpkg installation.")
+endif()
+file(TO_CMAKE_PATH $ENV{VCPKG_ROOT} VCPKG_ROOT)
 include(${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake)