Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
b9853f8e
Commit
b9853f8e
authored
14 years ago
by
Aimee Linden
Browse files
Options
Downloads
Patches
Plain Diff
VWR-20809 (SNOW-504) Do not depend on stage_thirds_party_libs for a standalone build.
parent
d568a368
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
doc/contributions.txt
+2
-1
2 additions, 1 deletion
doc/contributions.txt
indra/cmake/Copy3rdPartyLibs.cmake
+7
-5
7 additions, 5 deletions
indra/cmake/Copy3rdPartyLibs.cmake
with
9 additions
and
6 deletions
doc/contributions.txt
+
2
−
1
View file @
b9853f8e
...
...
@@ -520,10 +520,11 @@ Robin Cornelius
SNOW-108
SNOW-204
SNOW-484
SNOW-504
SNOW-506
SNOW-507
SNOW-514
SNOW-520
SNOW-507
SNOW-585
VWR-2488
VWR-9557
...
...
This diff is collapsed.
Click to expand it.
indra/cmake/Copy3rdPartyLibs.cmake
+
7
−
5
View file @
b9853f8e
...
...
@@ -286,7 +286,7 @@ copy_if_different(
${
vivox_src_dir
}
"
${
SHARED_LIB_STAGING_DIR_DEBUG
}
"
out_targets
${
vivox_files
}
${
vivox_files
}
)
set
(
third_party_targets
${
third_party_targets
}
${
out_targets
}
)
...
...
@@ -391,7 +391,9 @@ if(NOT EXISTS ${internal_llkdu_path})
endif
(
NOT EXISTS
${
internal_llkdu_path
}
)
add_custom_target
(
stage_third_party_libs ALL
DEPENDS
${
third_party_targets
}
)
if
(
NOT STANDALONE
)
add_custom_target
(
stage_third_party_libs ALL
DEPENDS
${
third_party_targets
}
)
endif
(
NOT STANDALONE
)
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