Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Main Repositories
otb
Commits
7fafa359
Commit
7fafa359
authored
Jul 13, 2010
by
Julien Malik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG: tgz source package do not have Mercurial infos
parent
22fe6dbe
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
15 deletions
+19
-15
CMake/FindMercurial.cmake
CMake/FindMercurial.cmake
+4
-2
CMakeLists.txt
CMakeLists.txt
+15
-13
No files found.
CMake/FindMercurial.cmake
View file @
7fafa359
...
...
@@ -11,6 +11,7 @@
SET
(
Mercurial_FOUND FALSE
)
SET
(
Mercurial_HG_FOUND FALSE
)
SET
(
Mercurial_HG_PROJECT FALSE
)
FIND_PROGRAM
(
Mercurial_HG_EXECUTABLE hg
DOC
"mercurial command line client"
)
...
...
@@ -43,14 +44,15 @@ IF(Mercurial_HG_EXECUTABLE)
OUTPUT_STRIP_TRAILING_WHITESPACE
)
IF
(
NOT
${
Mercurial_hg_identify_result
}
EQUAL 0
)
MESSAGE
(
SEND_ERROR
"Command
\"
${
Mercurial_HG_EXECUTABLE
}
identify
${
dir
}
\"
failed with output:
\n
${
Mercurial_hg_identify_error
}
"
)
#MESSAGE(WARNING "Command \"${Mercurial_HG_EXECUTABLE} identify ${dir}\" failed with output:\n${Mercurial_hg_identify_error}")
SET
(
Mercurial_HG_PROJECT FALSE
)
ELSE
(
NOT
${
Mercurial_hg_identify_result
}
EQUAL 0
)
STRING
(
REGEX REPLACE
"^(.*
\n
)?Mercurial Distributed SCM [(]version ([.0-9]+).*"
"
\\
2"
Mercurial_VERSION_HG
"
${
Mercurial_VERSION_HG
}
"
)
STRING
(
REGEX REPLACE
"^(.*
\n
)?([0-9a-f]+).*"
"
\\
2"
${
prefix
}
_WC_REVISION
"
${${
prefix
}
_WC_IDENTIFY
}
"
)
SET
(
Mercurial_HG_PROJECT TRUE
)
ENDIF
(
NOT
${
Mercurial_hg_identify_result
}
EQUAL 0
)
# restore the previous LC_ALL
...
...
CMakeLists.txt
View file @
7fafa359
...
...
@@ -73,19 +73,21 @@ SET(OTB_VERSION_PATCH "0")
FIND_PACKAGE
(
Mercurial
)
IF
(
Mercurial_FOUND
)
Mercurial_WC_IDENTIFY
(
${
PROJECT_SOURCE_DIR
}
OTB
)
MESSAGE
(
STATUS
"Mercurial version is
${
Mercurial_VERSION_HG
}
"
)
MESSAGE
(
STATUS
"Repository revision is
${
OTB_WC_REVISION
}
"
)
SET
(
OTB_WC_REVISION
${
OTB_WC_REVISION
}
CACHE STRING
"Repository version"
FORCE
)
MARK_AS_ADVANCED
(
OTB_WC_REVISION
)
IF
(
OTB_WC_STATUS
)
MESSAGE
(
STATUS
"Local file modifications:"
)
MESSAGE
(
STATUS
${
OTB_WC_STATUS
}
)
ELSE
(
OTB_WC_STATUS
)
MESSAGE
(
STATUS
"No files modified locally"
)
ENDIF
(
OTB_WC_STATUS
)
STRING
(
REGEX REPLACE
"
\n
"
";"
OTB_WC_STATUS
"
${
OTB_WC_STATUS
}
"
)
SET
(
OTB_WC_STATUS
${
OTB_WC_STATUS
}
CACHE STRING
"Repository status"
FORCE
)
MARK_AS_ADVANCED
(
OTB_WC_STATUS
)
IF
(
Mercurial_HG_PROJECT
)
MESSAGE
(
STATUS
"Mercurial version is
${
Mercurial_VERSION_HG
}
"
)
MESSAGE
(
STATUS
"Repository revision is
${
OTB_WC_REVISION
}
"
)
SET
(
OTB_WC_REVISION
${
OTB_WC_REVISION
}
CACHE STRING
"Repository version"
FORCE
)
MARK_AS_ADVANCED
(
OTB_WC_REVISION
)
IF
(
OTB_WC_STATUS
)
MESSAGE
(
STATUS
"Local file modifications:"
)
MESSAGE
(
STATUS
${
OTB_WC_STATUS
}
)
ELSE
(
OTB_WC_STATUS
)
MESSAGE
(
STATUS
"No files modified locally"
)
ENDIF
(
OTB_WC_STATUS
)
STRING
(
REGEX REPLACE
"
\n
"
";"
OTB_WC_STATUS
"
${
OTB_WC_STATUS
}
"
)
SET
(
OTB_WC_STATUS
${
OTB_WC_STATUS
}
CACHE STRING
"Repository status"
FORCE
)
MARK_AS_ADVANCED
(
OTB_WC_STATUS
)
ENDIF
(
Mercurial_HG_PROJECT
)
ENDIF
(
Mercurial_FOUND
)
# Version string should not include patch level. The major.minor is
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment