Переглянути джерело

Merge pull request #1930 from ux3d/fix/CMakeOptionalExternalBuild

find Python and add External subdir only if BUILD_EXTERNAL option was set
John Kessenich 6 роки тому
батько
коміт
8ba49b862c
1 змінених файлів з 5 додано та 4 видалено
  1. 5 4
      CMakeLists.txt

+ 5 - 4
CMakeLists.txt

@@ -13,6 +13,7 @@ include(GNUInstallDirs)
 include(CMakeDependentOption)
 include(CMakeDependentOption)
 
 
 option(BUILD_SHARED_LIBS "Build Shared Libraries" OFF)
 option(BUILD_SHARED_LIBS "Build Shared Libraries" OFF)
+option(BUILD_EXTERNAL "Build external dependencies in /External" ON)
 
 
 set(LIB_TYPE STATIC)
 set(LIB_TYPE STATIC)
 
 
@@ -148,13 +149,13 @@ endfunction(glslang_set_link_args)
 
 
 # CMake needs to find the right version of python, right from the beginning,
 # CMake needs to find the right version of python, right from the beginning,
 # otherwise, it will find the wrong version and fail later
 # otherwise, it will find the wrong version and fail later
-if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/External)
+if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/External)
     find_package(PythonInterp 3 REQUIRED)
     find_package(PythonInterp 3 REQUIRED)
+	
+	# We depend on these for later projects, so they should come first.
+	add_subdirectory(External)
 endif()
 endif()
 
 
-# We depend on these for later projects, so they should come first.
-add_subdirectory(External)
-
 if(NOT TARGET SPIRV-Tools-opt)
 if(NOT TARGET SPIRV-Tools-opt)
     set(ENABLE_OPT OFF)
     set(ENABLE_OPT OFF)
 endif()
 endif()