Force windows to use find() for deps when conda enabled

FLAMEGPU · Nov 1, 2023 · 34bc4b2 · 34bc4b2
1 parent d41958f
commit 34bc4b2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/cmake/dependencies/devil.cmake b/cmake/dependencies/devil.cmake
@@ -1,6 +1,6 @@
 # DevIL
 # Ensure that DevIL is available, either by finding DevIL, or by downloading DevIL if required (on windows) 
-if(UNIX)
+if(UNIX OR FLAMEGPU_BUILD_PYTHON_CONDA)
     # On Linux, if DevIL is not available the user is instructed to install it themselves.
     find_package(DevIL)
     if (NOT DevIL_FOUND)

diff --git a/cmake/dependencies/freetype.cmake b/cmake/dependencies/freetype.cmake
@@ -1,7 +1,7 @@
 # Freetype
 # Ensure that freetype is available, either by finding freetype, or dowloadin it if required (on windows). 
 
-if(UNIX)
+if(UNIX OR FLAMEGPU_BUILD_PYTHON_CONDA)
     find_package(Freetype)
     if (NOT FREETYPE_FOUND)
         message(FATAL_ERROR "freetype is required for building, install it via your package manager.\n"

diff --git a/cmake/dependencies/glew.cmake b/cmake/dependencies/glew.cmake
@@ -1,7 +1,7 @@
 # GLEW
 # Ensure that GLEW is available, either by finding GLEW, or by downloading GLEW if required (on windows) 
 
-if(UNIX)
+if(UNIX OR FLAMEGPU_BUILD_PYTHON_CONDA)
     # On Linux, if glew is not available the user is instructed to install it themselves.
     # Users can opt-into static glew, by setting -DGLEW_USE_STATIC_LIBS=ON
     find_package(GLEW)

diff --git a/cmake/dependencies/sdl2.cmake b/cmake/dependencies/sdl2.cmake
@@ -1,6 +1,6 @@
 # SDL2 
 # Ensure that SDL2 is available, either by finding it, or downloading it if required (on windows)
-if(UNIX)
+if(UNIX OR FLAMEGPU_BUILD_PYTHON_CONDA)
     # On Linux, if SDL2 is not available the user is instructed to install it themselves.
     find_package(SDL2)
     if (NOT SDL2_FOUND)