Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BlenderPhi
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
Container 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
Show more breadcrumbs
raas
BlenderPhi
Commits
7cb8b6f5
Commit
7cb8b6f5
authored
11 years ago
by
Campbell Barton
Browse files
Options
Downloads
Patches
Plain Diff
Build system: add cmake option to install requests
parent
9ecf73f7
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+15
-0
15 additions, 0 deletions
CMakeLists.txt
source/creator/CMakeLists.txt
+13
-1
13 additions, 1 deletion
source/creator/CMakeLists.txt
with
28 additions
and
1 deletion
CMakeLists.txt
+
15
−
0
View file @
7cb8b6f5
...
@@ -265,6 +265,10 @@ option(WITH_PYTHON_INSTALL_NUMPY "Copy system numpy into the blender install fol
...
@@ -265,6 +265,10 @@ option(WITH_PYTHON_INSTALL_NUMPY "Copy system numpy into the blender install fol
set
(
PYTHON_NUMPY_PATH
""
CACHE PATH
"Python to python site-packages or dist-packages containing 'numpy' module"
)
set
(
PYTHON_NUMPY_PATH
""
CACHE PATH
"Python to python site-packages or dist-packages containing 'numpy' module"
)
mark_as_advanced
(
PYTHON_NUMPY_PATH
)
mark_as_advanced
(
PYTHON_NUMPY_PATH
)
if
(
UNIX AND NOT APPLE
)
option
(
WITH_PYTHON_INSTALL_REQUESTS
"Copy system requests into the blender install folder"
ON
)
endif
()
# Cycles
# Cycles
option
(
WITH_CYCLES
"Enable cycles Render Engine"
ON
)
option
(
WITH_CYCLES
"Enable cycles Render Engine"
ON
)
option
(
WITH_CYCLES_STANDALONE
"Build cycles standalone application"
OFF
)
option
(
WITH_CYCLES_STANDALONE
"Build cycles standalone application"
OFF
)
...
@@ -2255,6 +2259,17 @@ if(WITH_PYTHON)
...
@@ -2255,6 +2259,17 @@ if(WITH_PYTHON)
unset
(
_PY_VER_MAJOR
)
unset
(
_PY_VER_MAJOR
)
endif
()
endif
()
endif
()
endif
()
if
(
WIN32 OR APPLE
)
# pass, we have this in lib/python/site-packages
elseif
(
WITH_PYTHON_INSTALL_REQUESTS
)
if
(
NOT EXISTS
${
PYTHON_LIBPATH
}
/python
${
PYTHON_VERSION
}
/site-packages/requests
)
message
(
WARNING
"'requests' path could not be found in:
\n
"
"'
${
PYTHON_LIBPATH
}
/python
${
PYTHON_VERSION
}
/site-packages/requests'
\n
"
"WITH_PYTHON_INSTALL_REQUESTS option will be ignored when installing python"
)
set
(
WITH_PYTHON_INSTALL_REQUESTS OFF
)
endif
()
endif
()
endif
()
endif
()
if
(
WITH_GCC_MUDFLAP
)
if
(
WITH_GCC_MUDFLAP
)
...
...
This diff is collapsed.
Click to expand it.
source/creator/CMakeLists.txt
+
13
−
1
View file @
7cb8b6f5
...
@@ -522,7 +522,19 @@ if(UNIX AND NOT APPLE)
...
@@ -522,7 +522,19 @@ if(UNIX AND NOT APPLE)
PATTERN
"*.a"
EXCLUDE
# ./core/lib/libnpymath.a - for linking, we dont need.
PATTERN
"*.a"
EXCLUDE
# ./core/lib/libnpymath.a - for linking, we dont need.
)
)
endif
()
endif
()
# Copy requests, we need to generalize site-packages
if
(
WITH_PYTHON_INSTALL_REQUESTS
)
install
(
DIRECTORY
${
PYTHON_LIBPATH
}
/python
${
PYTHON_VERSION
}
/site-packages/requests
DESTINATION
${
TARGETDIR_VER
}
/python/
${
_target_LIB
}
/python
${
PYTHON_VERSION
}
/site-packages
PATTERN
".svn"
EXCLUDE
PATTERN
"__pycache__"
EXCLUDE
# * any cache *
PATTERN
"*.pyc"
EXCLUDE
# * any cache *
PATTERN
"*.pyo"
EXCLUDE
# * any cache *
PATTERN
"cacert.pem"
EXCLUDE
# for now we don't deal with security
)
endif
()
unset
(
_target_LIB
)
unset
(
_target_LIB
)
endif
()
endif
()
...
...
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