Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
liblinphone
Commits
fc7c3963
Commit
fc7c3963
authored
Aug 12, 2014
by
Ghislain MARY
Browse files
Fix git revision when compiling with CMake.
parent
581c9b29
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
config.h.cmake
config.h.cmake
+1
-0
coreapi/CMakeLists.txt
coreapi/CMakeLists.txt
+1
-1
coreapi/gitversion.cmake
coreapi/gitversion.cmake
+3
-2
No files found.
config.h.cmake
View file @
fc7c3963
...
...
@@ -24,6 +24,7 @@
#define LINPHONE_MINOR_VERSION ${LINPHONE_MINOR_VERSION}
#define LINPHONE_MICRO_VERSION ${LINPHONE_MICRO_VERSION}
#define LINPHONE_VERSION "${LINPHONE_VERSION}"
#define LIBLINPHONE_VERSION "${LINPHONE_VERSION}"
#define LINPHONE_PLUGINS_DIR "${LINPHONE_PLUGINS_DIR}"
#define PACKAGE_LOCALE_DIR "${PACKAGE_LOCALE_DIR}"
...
...
coreapi/CMakeLists.txt
View file @
fc7c3963
...
...
@@ -94,7 +94,7 @@ set(GENERATED_SOURCE_FILES
set_source_files_properties
(
${
GENERATED_SOURCE_FILES
}
PROPERTIES GENERATED TRUE
)
find_package
(
Git
)
add_custom_command
(
OUTPUT
${
CMAKE_CURRENT_BINARY_DIR
}
/liblinphone_gitversion.h
COMMAND
${
CMAKE_COMMAND
}
-DGIT_EXECUTABLE=
${
GIT_EXECUTABLE
}
-DOUTPUT_DIR=
${
CMAKE_CURRENT_BINARY_DIR
}
-P
${
CMAKE_CURRENT_SOURCE_DIR
}
/gitversion.cmake
)
COMMAND
${
CMAKE_COMMAND
}
-DGIT_EXECUTABLE=
${
GIT_EXECUTABLE
}
-DWORK_DIR=
${
CMAKE_CURRENT_SOURCE_DIR
}
-DOUTPUT_DIR=
${
CMAKE_CURRENT_BINARY_DIR
}
-P
${
CMAKE_CURRENT_SOURCE_DIR
}
/gitversion.cmake
)
add_definitions
(
-DIN_LINPHONE
...
...
coreapi/gitversion.cmake
View file @
fc7c3963
...
...
@@ -23,16 +23,17 @@
if
(
GIT_EXECUTABLE
)
execute_process
(
COMMAND
${
GIT_EXECUTABLE
}
describe --always
WORKING_DIRECTORY
${
WORK_DIR
}
OUTPUT_VARIABLE GIT_REVISION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
execute_process
(
COMMAND
${
CMAKE_COMMAND
}
-E echo
"#define GIT_VERSION
\"
${
GIT_REVISION
}
\"
"
COMMAND
${
CMAKE_COMMAND
}
-E echo
"#define
LIBLINPHONE_
GIT_VERSION
\"
${
GIT_REVISION
}
\"
"
OUTPUT_FILE
${
OUTPUT_DIR
}
/liblinphone_gitversion.h
)
else
()
execute_process
(
COMMAND
${
CMAKE_COMMAND
}
-E echo
"#define GIT_VERSION
\"
unknown
\"
"
COMMAND
${
CMAKE_COMMAND
}
-E echo
"#define
LIBLINPHONE_
GIT_VERSION
\"
unknown
\"
"
OUTPUT_FILE
${
OUTPUT_DIR
}
/liblinphone_gitversion.h
)
endif
()
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