Update submodules

This commit is contained in:
Jack Andersen 2015-12-24 15:10:39 -10:00
parent cd2016942a
commit da630143b6
3 changed files with 5 additions and 3 deletions

View File

@ -1,4 +1,5 @@
cmake_minimum_required(VERSION 3.0) cmake_minimum_required(VERSION 3.0)
cmake_policy(SET CMP0054 NEW)
project(PathShagged) project(PathShagged)
if(MSVC) if(MSVC)
# Shaddup MSVC # Shaddup MSVC
@ -68,11 +69,12 @@ add_subdirectory(Editor)
add_subdirectory(Runtime) add_subdirectory(Runtime)
endif() endif()
unset(GIT_EXECUTABLE CACHE)
find_package(Git) find_package(Git)
if(GIT_FOUND) if(GIT_FOUND)
message("git found: ${GIT_EXECUTABLE}") message("git found: ${GIT_EXECUTABLE}")
# Get the current working branch # Get the current working branch
execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE GIT_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE ) execute_process(COMMAND "${GIT_EXECUTABLE}" rev-parse --abbrev-ref HEAD WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE GIT_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE )
# Get the latest abbreviated commit hash of the working branch # Get the latest abbreviated commit hash of the working branch
execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --format=%h WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE GIT_COMMIT_HASH OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --format=%h WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE GIT_COMMIT_HASH OUTPUT_STRIP_TRAILING_WHITESPACE)

2
hecl

@ -1 +1 @@
Subproject commit eac2ceed6729423a0be485041501124a4292df40 Subproject commit 239806060918b7d1eaa59add2f0486ae59963d42

@ -1 +1 @@
Subproject commit 3178faa67d423be7606d118e4c3e4d78996a935c Subproject commit 9dc2406fe39a2b30a4ded1af3ec460e47dbd7776