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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
raas
BlenderPhi
Commits
1243992f
Commit
1243992f
authored
Jun 14, 2011
by
Campbell Barton
Browse files
Options
Downloads
Patches
Plain Diff
cmake: correct uninitialized vars
parent
51911151
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+3
-3
3 additions, 3 deletions
CMakeLists.txt
build_files/cmake/FindPythonLibsUnix.cmake
+19
-11
19 additions, 11 deletions
build_files/cmake/FindPythonLibsUnix.cmake
build_files/cmake/macros.cmake
+2
-2
2 additions, 2 deletions
build_files/cmake/macros.cmake
with
24 additions
and
16 deletions
CMakeLists.txt
+
3
−
3
View file @
1243992f
...
@@ -223,9 +223,6 @@ if(WITH_PYTHON_MODULE)
...
@@ -223,9 +223,6 @@ if(WITH_PYTHON_MODULE)
set
(
WITH_HEADLESS ON
)
set
(
WITH_HEADLESS ON
)
endif
()
endif
()
# remove old vars
unset
(
WITH_INSTALL CACHE
)
TEST_SSE_SUPPORT
()
TEST_SSE_SUPPORT
()
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
...
@@ -234,6 +231,9 @@ TEST_SSE_SUPPORT()
...
@@ -234,6 +231,9 @@ TEST_SSE_SUPPORT()
# linux only, not cached
# linux only, not cached
set
(
WITH_BINRELOC OFF
)
set
(
WITH_BINRELOC OFF
)
# MAXOSX only, set to avoid uninitialized
set
(
EXETYPE
""
)
# these are added to later on.
# these are added to later on.
set
(
C_WARNINGS
""
)
set
(
C_WARNINGS
""
)
set
(
CXX_WARNINGS
""
)
set
(
CXX_WARNINGS
""
)
...
...
This diff is collapsed.
Click to expand it.
build_files/cmake/FindPythonLibsUnix.cmake
+
19
−
11
View file @
1243992f
...
@@ -18,10 +18,18 @@ set(_Python_ABI_FLAGS
...
@@ -18,10 +18,18 @@ set(_Python_ABI_FLAGS
"m;mu;u; "
)
"m;mu;u; "
)
string
(
REPLACE
"."
""
_PYTHON_VERSION_NO_DOTS
${
PYTHON_VERSION
}
)
string
(
REPLACE
"."
""
_PYTHON_VERSION_NO_DOTS
${
PYTHON_VERSION
}
)
set
(
_Python_PATHS
set
(
_Python_PATHS
"$ENV{HOME}/py
${
_PYTHON_VERSION_NO_DOTS
}
"
"/opt/py
${
_PYTHON_VERSION_NO_DOTS
}
"
"/usr"
"/usr/local"
)
"$ENV{HOME}/py
${
_PYTHON_VERSION_NO_DOTS
}
"
"/opt/py
${
_PYTHON_VERSION_NO_DOTS
}
"
"/usr"
"/usr/local"
)
if
(
NOT DEFINED PYTHON_INCLUDE_DIRS OR
NOT DEFINED PYTHON_LIBRARY OR
NOT DEFINED PYTHON_LIBPATH
)
if
(
NOT DEFINED PYTHON_INCLUDE_DIRS
)
message
(
STATUS
"Looking for include Python.h"
)
message
(
STATUS
"Looking for include Python.h"
)
set
(
_Found_PYTHON_H OFF
)
set
(
_Found_PYTHON_H OFF
)
...
@@ -59,14 +67,6 @@ if(NOT DEFINED PYTHON_INCLUDE_DIRS)
...
@@ -59,14 +67,6 @@ if(NOT DEFINED PYTHON_INCLUDE_DIRS)
unset
(
_CURRENT_ABI_FLAGS
)
unset
(
_CURRENT_ABI_FLAGS
)
unset
(
_CURRENT_PATH
)
unset
(
_CURRENT_PATH
)
endif
()
unset
(
_Python_ABI_FLAGS
)
unset
(
_Python_PATHS
)
#=============================================================================
# now the python versions are found
set
(
PYTHON_INCLUDE_DIRS
"
${
PYTHON
}
/include/python
${
PYTHON_VERSION
}${
PYTHON_ABI_FLAGS
}
"
CACHE STRING
""
)
set
(
PYTHON_INCLUDE_DIRS
"
${
PYTHON
}
/include/python
${
PYTHON_VERSION
}${
PYTHON_ABI_FLAGS
}
"
CACHE STRING
""
)
mark_as_advanced
(
PYTHON_INCLUDE_DIRS
)
mark_as_advanced
(
PYTHON_INCLUDE_DIRS
)
...
@@ -75,6 +75,14 @@ mark_as_advanced(PYTHON_LIBRARY)
...
@@ -75,6 +75,14 @@ mark_as_advanced(PYTHON_LIBRARY)
set
(
PYTHON_LIBPATH
${
PYTHON
}
/lib CACHE STRING
""
)
set
(
PYTHON_LIBPATH
${
PYTHON
}
/lib CACHE STRING
""
)
mark_as_advanced
(
PYTHON_LIBPATH
)
mark_as_advanced
(
PYTHON_LIBPATH
)
# set(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
# set(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
endif
()
unset
(
_Python_ABI_FLAGS
)
unset
(
_Python_PATHS
)
#=============================================================================
# now the python versions are found
if
(
NOT EXISTS
"
${
PYTHON_INCLUDE_DIRS
}
/Python.h"
)
if
(
NOT EXISTS
"
${
PYTHON_INCLUDE_DIRS
}
/Python.h"
)
message
(
FATAL_ERROR
" Missing python header:
${
PYTHON_INCLUDE_DIRS
}
/Python.h"
)
message
(
FATAL_ERROR
" Missing python header:
${
PYTHON_INCLUDE_DIRS
}
/Python.h"
)
...
...
This diff is collapsed.
Click to expand it.
build_files/cmake/macros.cmake
+
2
−
2
View file @
1243992f
...
@@ -484,8 +484,8 @@ macro(blender_project_hack_post)
...
@@ -484,8 +484,8 @@ macro(blender_project_hack_post)
unset
(
_reset_standard_cflags_rel
)
unset
(
_reset_standard_cflags_rel
)
unset
(
_reset_standard_cxxflags_rel
)
unset
(
_reset_standard_cxxflags_rel
)
# --------------------------------------------------
# --------------------------------------------------
----------------
# workaround for omission in cmake 2.8.4's GNU.cmake
# workaround for omission in cmake 2.8.4's GNU.cmake
, fixed in 2.8.5
if
(
CMAKE_COMPILER_IS_GNUCC
)
if
(
CMAKE_COMPILER_IS_GNUCC
)
if
(
NOT DARWIN
)
if
(
NOT DARWIN
)
set
(
CMAKE_INCLUDE_SYSTEM_FLAG_C
"-isystem "
)
set
(
CMAKE_INCLUDE_SYSTEM_FLAG_C
"-isystem "
)
...
...
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