Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
glslang
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
glslang
Commits
8ba49b86
Unverified
Commit
8ba49b86
authored
Oct 15, 2019
by
John Kessenich
Committed by
GitHub
Oct 15, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1930 from ux3d/fix/CMakeOptionalExternalBuild
find Python and add External subdir only if BUILD_EXTERNAL option was set
parents
765cee84
03be018a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
CMakeLists.txt
CMakeLists.txt
+5
-4
No files found.
CMakeLists.txt
View file @
8ba49b86
...
@@ -13,6 +13,7 @@ include(GNUInstallDirs)
...
@@ -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)
...
@@ -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
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment