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
c4bad686
Commit
c4bad686
authored
Sep 25, 2013
by
Campbell Barton
Browse files
Options
Downloads
Patches
Plain Diff
cmake - cached LLVM values would be overwritten on every execution.
parent
124f32a2
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+20
-15
20 additions, 15 deletions
CMakeLists.txt
with
20 additions
and
15 deletions
CMakeLists.txt
+
20
−
15
View file @
c4bad686
...
@@ -798,15 +798,25 @@ if(UNIX AND NOT APPLE)
...
@@ -798,15 +798,25 @@ if(UNIX AND NOT APPLE)
find_program
(
LLVM_CONFIG llvm-config
)
find_program
(
LLVM_CONFIG llvm-config
)
endif
()
endif
()
endif
()
endif
()
if
(
NOT DEFINED LLVM_VERSION
)
execute_process
(
COMMAND
${
LLVM_CONFIG
}
--version
execute_process
(
COMMAND
${
LLVM_CONFIG
}
--version
OUTPUT_VARIABLE LLVM_VERSION
OUTPUT_VARIABLE LLVM_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
OUTPUT_STRIP_TRAILING_WHITESPACE
)
set
(
LLVM_VERSION
${
LLVM_VERSION
}
CACHE STRING
"Version of LLVM to use"
)
endif
()
if
(
NOT DEFINED LLVM_DIRECTORY
)
execute_process
(
COMMAND
${
LLVM_CONFIG
}
--prefix
execute_process
(
COMMAND
${
LLVM_CONFIG
}
--prefix
OUTPUT_VARIABLE LLVM_DIRECTORY
OUTPUT_VARIABLE LLVM_DIRECTORY
OUTPUT_STRIP_TRAILING_WHITESPACE
)
OUTPUT_STRIP_TRAILING_WHITESPACE
)
set
(
LLVM_DIRECTORY
${
LLVM_DIRECTORY
}
CACHE PATH
"Path to the LLVM installation"
)
endif
()
if
(
NOT DEFINED LLVM_LIBPATH
)
execute_process
(
COMMAND
${
LLVM_CONFIG
}
--libdir
execute_process
(
COMMAND
${
LLVM_CONFIG
}
--libdir
OUTPUT_VARIABLE LLVM_LIBPATH
OUTPUT_VARIABLE LLVM_LIBPATH
OUTPUT_STRIP_TRAILING_WHITESPACE
)
OUTPUT_STRIP_TRAILING_WHITESPACE
)
set
(
LLVM_LIBPATH
${
LLVM_LIBPATH
}
CACHE PATH
"Path to the LLVM library path"
)
endif
()
if
(
LLVM_STATIC
)
if
(
LLVM_STATIC
)
find_library
(
LLVM_LIBRARY
find_library
(
LLVM_LIBRARY
...
@@ -818,11 +828,6 @@ if(UNIX AND NOT APPLE)
...
@@ -818,11 +828,6 @@ if(UNIX AND NOT APPLE)
PATHS
${
LLVM_LIBPATH
}
)
PATHS
${
LLVM_LIBPATH
}
)
endif
()
endif
()
message
(
STATUS
"LLVM version =
${
LLVM_VERSION
}
"
)
message
(
STATUS
"LLVM dir =
${
LLVM_DIRECTORY
}
"
)
message
(
STATUS
"LLVM lib dir =
${
LLVM_LIBPATH
}
"
)
set
(
LLVM_VERSION
${
LLVM_VERSION
}
CACHE STRING
"Version of LLVM to use"
)
set
(
LLVM_DIRECTORY
${
LLVM_DIRECTORY
}
CACHE PATH
"Path to the LLVM installation"
)
if
(
LLVM_LIBRARY AND LLVM_DIRECTORY AND LLVM_LIBPATH
)
if
(
LLVM_LIBRARY AND LLVM_DIRECTORY AND LLVM_LIBPATH
)
if
(
LLVM_STATIC
)
if
(
LLVM_STATIC
)
...
@@ -832,7 +837,7 @@ if(UNIX AND NOT APPLE)
...
@@ -832,7 +837,7 @@ if(UNIX AND NOT APPLE)
execute_process
(
COMMAND
${
LLVM_CONFIG
}
--libfiles
execute_process
(
COMMAND
${
LLVM_CONFIG
}
--libfiles
OUTPUT_VARIABLE LLVM_LIBRARY
OUTPUT_VARIABLE LLVM_LIBRARY
OUTPUT_STRIP_TRAILING_WHITESPACE
)
OUTPUT_STRIP_TRAILING_WHITESPACE
)
string
(
REPLACE
" "
";"
LLVM_LIBRARY
${
LLVM_LIBRARY
}
)
string
(
REPLACE
" "
";"
LLVM_LIBRARY
"
${
LLVM_LIBRARY
}
"
)
endif
()
endif
()
else
()
else
()
message
(
FATAL_ERROR
"LLVM not found."
)
message
(
FATAL_ERROR
"LLVM not found."
)
...
...
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