mirror of
https://github.com/WiVRn/WiVRn.git
synced 2026-11-20 00:51:32 -08:00
Fix build when not under the source dir
This commit is contained in:
1 parent
045b39a4e3
commit
4261477840
2 files changed
+4
-5
No files matched your search
@@ -298,6 +298,7 @@ add_custom_target(wivrn-version ALL
|
||||
-P ${CMAKE_SOURCE_DIR}/cmake/GitVersion.cmake
|
||||
BYPRODUCTS ${CMAKE_BINARY_DIR}/version.cpp ${CMAKE_BINARY_DIR}/u_git_tag.cpp
|
||||
SOURCES common/version.cpp.in server/u_git_tag.cpp.in
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||
)
|
||||
|
||||
add_subdirectory(external)
|
||||
|
||||
@@ -8,7 +8,7 @@ if (NOT (GIT_TAG OR GIT_DESC OR GIT_COMMIT))
|
||||
OUTPUT_VARIABLE GIT_TAG
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
ERROR_QUIET
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
|
||||
)
|
||||
endif()
|
||||
|
||||
if (GIT_TAG)
|
||||
@@ -23,8 +23,7 @@ else()
|
||||
COMMAND ${GIT_EXECUTABLE} describe --tags --always
|
||||
OUTPUT_VARIABLE GIT_DESC
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
ERROR_QUIET
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
|
||||
)
|
||||
message(STATUS "Setting version to ${GIT_DESC} from git")
|
||||
else()
|
||||
message(STATUS "Setting version to ${GIT_DESC} from parameters")
|
||||
@@ -34,8 +33,7 @@ else()
|
||||
execute_process(
|
||||
COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
|
||||
OUTPUT_VARIABLE GIT_COMMIT
|
||||
ERROR_QUIET
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
|
||||
)
|
||||
string(STRIP "${GIT_COMMIT}" GIT_COMMIT)
|
||||
endif()
|
||||
|
||||
|
||||
Reference in new issue
Block a user