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
57f3b071
Commit
57f3b071
authored
12 years ago
by
Oz Linden
Browse files
Options
Downloads
Patches
Plain Diff
rearrange depends
parent
44ad4f0b
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/newview/CMakeLists.txt
+3
-4
3 additions, 4 deletions
indra/newview/CMakeLists.txt
with
3 additions
and
4 deletions
indra/newview/CMakeLists.txt
+
3
−
4
View file @
57f3b071
...
@@ -1230,15 +1230,14 @@ source_group("CMake Rules" FILES ViewerInstall.cmake)
...
@@ -1230,15 +1230,14 @@ source_group("CMake Rules" FILES ViewerInstall.cmake)
add_custom_command
(
OUTPUT
${
CMAKE_CURRENT_BINARY_DIR
}
/viewer_version.txt
add_custom_command
(
OUTPUT
${
CMAKE_CURRENT_BINARY_DIR
}
/viewer_version.txt
DEPENDS
${
CMAKE_CURRENT_SOURCE_DIR
}
/VIEWER_VERSION.txt
DEPENDS
${
CMAKE_CURRENT_SOURCE_DIR
}
/VIEWER_VERSION.txt
COMMAND echo
"
${
VIEWER_SHORT_VERSION
}
.
${
VIEWER_VERSION_REVISION
}
"
>
${
CMAKE_CURRENT_BINARY_DIR
}
/viewer_version.txt
COMMAND echo
"
${
VIEWER_SHORT_VERSION
}
.
${
VIEWER_VERSION_REVISION
}
"
>
${
CMAKE_CURRENT_BINARY_DIR
}
/viewer_version.txt
COMMENT
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Generating viewer_version.txt
COMMENT Generating viewer_version.txt
for manifest processing
)
)
add_custom_target
(
generate_viewer_version DEPENDS
"
${
CMAKE_CURRENT_BINARY_DIR
}
/viewer_version.txt"
)
add_custom_target
(
generate_viewer_version ALL DEPENDS
${
CMAKE_CURRENT_BINARY_DIR
}
/viewer_version.txt
)
add_dependencies
(
generate_viewer_version
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/VIEWER_VERSION.txt"
)
set_source_files_properties
(
set_source_files_properties
(
llversioninfo.cpp tests/llversioninfo_test.cpp
llversioninfo.cpp tests/llversioninfo_test.cpp
PROPERTIES
PROPERTIES
OBJECT_
DEPENDS
generate_viewer_version
DEPENDS
${
CMAKE_CURRENT_BINARY_DIR
}
/viewer_version.txt
# dummy dependency to force recompile every time
COMPILE_DEFINITIONS
"
${
VIEWER_CHANNEL_VERSION_DEFINES
}
"
# see BuildVersion.cmake
COMPILE_DEFINITIONS
"
${
VIEWER_CHANNEL_VERSION_DEFINES
}
"
# see BuildVersion.cmake
)
)
...
...
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