Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
Root
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
为了安全,强烈建议开启2FA双因子认证:User Settings -> Account -> Enable two-factor authentication!!!
Show more breadcrumbs
cxwx
Root
Commits
00006a2b
Commit
00006a2b
authored
6 years ago
by
Sergey Linev
Committed by
Axel Naumann
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
cmake: check more precisely if webui was disabled intentionally
parent
f86cefcc
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cmake/modules/RootBuildOptions.cmake
+4
-4
4 additions, 4 deletions
cmake/modules/RootBuildOptions.cmake
with
4 additions
and
4 deletions
cmake/modules/RootBuildOptions.cmake
+
4
−
4
View file @
00006a2b
...
@@ -20,7 +20,7 @@ endfunction()
...
@@ -20,7 +20,7 @@ endfunction()
function
(
ROOT_APPLY_OPTIONS
)
function
(
ROOT_APPLY_OPTIONS
)
foreach
(
opt
${
root_build_options
}
)
foreach
(
opt
${
root_build_options
}
)
option
(
${
opt
}
"
${${
opt
}
_description
}
"
${${
opt
}
_defvalue
}
)
option
(
${
opt
}
"
${${
opt
}
_description
}
"
${${
opt
}
_defvalue
}
)
endforeach
()
endforeach
()
endfunction
()
endfunction
()
#---------------------------------------------------------------------------------------------------
#---------------------------------------------------------------------------------------------------
...
@@ -273,7 +273,7 @@ endif()
...
@@ -273,7 +273,7 @@ endif()
#---Options depending of CMake Generator-------------------------------------------------------
#---Options depending of CMake Generator-------------------------------------------------------
if
(
CMAKE_GENERATOR STREQUAL Ninja
)
if
(
CMAKE_GENERATOR STREQUAL Ninja
)
set
(
fortran_defvalue OFF
)
set
(
fortran_defvalue OFF
)
endif
()
endif
()
#---Apply minimal or gminimal------------------------------------------------------------------
#---Apply minimal or gminimal------------------------------------------------------------------
...
@@ -293,7 +293,7 @@ if(NOT CMAKE_CXX_STANDARD GREATER 11)
...
@@ -293,7 +293,7 @@ if(NOT CMAKE_CXX_STANDARD GREATER 11)
set
(
webui_defvalue OFF
)
set
(
webui_defvalue OFF
)
endif
()
endif
()
if
(
"
${
webui
}
"
STREQUAL
"
OFF
"
)
if
(
NOT webui AND NOT
"
${
webui
}
"
STREQUAL
""
)
set
(
webui_disabled ON
)
set
(
webui_disabled ON
)
endif
()
endif
()
...
@@ -311,7 +311,7 @@ if(root7)
...
@@ -311,7 +311,7 @@ if(root7)
endif
()
endif
()
if
(
NOT webui AND NOT webui_disabled
)
if
(
NOT webui AND NOT webui_disabled
)
set
(
webui ON CACHE BOOL
"(webui build automatically when root7 is enabled)"
FORCE
)
set
(
webui ON CACHE BOOL
"(webui build automatically when root7 is enabled)"
FORCE
)
endif
()
endif
()
endif
()
endif
()
#---check if webui can be build-------------------------------
#---check if webui can be build-------------------------------
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment