Added SCC and refactored CMake files
This commit is contained in:
		
							
								
								
									
										20
									
								
								cmake/Common.cmake
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										20
									
								
								cmake/Common.cmake
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,20 @@ | ||||
| # Function to link between sub-projects | ||||
| function(add_dependent_subproject subproject_name) | ||||
|     #if (NOT TARGET ${subproject_name}) # target unknown | ||||
|     if(NOT PROJECT_${subproject_name}) # var unknown because we build only this subproject | ||||
|         find_package(${subproject_name} CONFIG REQUIRED) | ||||
|     else () # we know the target thus we are doing a build from the top directory | ||||
|         include_directories(../${subproject_name}/incl) | ||||
|     endif () | ||||
| endfunction(add_dependent_subproject) | ||||
|  | ||||
| # Make sure we tell the topdir CMakeLists that we exist (if build from topdir) | ||||
| get_directory_property(hasParent PARENT_DIRECTORY) | ||||
| if(hasParent) | ||||
|     set(PROJECT_${PROJECT_NAME} true PARENT_SCOPE) | ||||
| endif() | ||||
|  | ||||
| # Function to link between sub-projects | ||||
| function(add_dependent_header subproject_name) | ||||
|     include_directories(../${subproject_name}/incl) | ||||
| endfunction(add_dependent_header) | ||||
							
								
								
									
										130
									
								
								cmake/GetGitRevisionDescription.cmake
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										130
									
								
								cmake/GetGitRevisionDescription.cmake
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,130 @@ | ||||
| # - Returns a version string from Git | ||||
| # | ||||
| # These functions force a re-configure on each git commit so that you can | ||||
| # trust the values of the variables in your build system. | ||||
| # | ||||
| #  get_git_head_revision(<refspecvar> <hashvar> [<additional arguments to git describe> ...]) | ||||
| # | ||||
| # Returns the refspec and sha hash of the current head revision | ||||
| # | ||||
| #  git_describe(<var> [<additional arguments to git describe> ...]) | ||||
| # | ||||
| # Returns the results of git describe on the source tree, and adjusting | ||||
| # the output so that it tests false if an error occurs. | ||||
| # | ||||
| #  git_get_exact_tag(<var> [<additional arguments to git describe> ...]) | ||||
| # | ||||
| # Returns the results of git describe --exact-match on the source tree, | ||||
| # and adjusting the output so that it tests false if there was no exact | ||||
| # matching tag. | ||||
| # | ||||
| # Requires CMake 2.6 or newer (uses the 'function' command) | ||||
| # | ||||
| # Original Author: | ||||
| # 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> | ||||
| # http://academic.cleardefinition.com | ||||
| # Iowa State University HCI Graduate Program/VRAC | ||||
| # | ||||
| # Copyright Iowa State University 2009-2010. | ||||
| # Distributed under the Boost Software License, Version 1.0. | ||||
| # (See accompanying file LICENSE_1_0.txt or copy at | ||||
| # http://www.boost.org/LICENSE_1_0.txt) | ||||
|  | ||||
| if(__get_git_revision_description) | ||||
| 	return() | ||||
| endif() | ||||
| set(__get_git_revision_description YES) | ||||
|  | ||||
| # We must run the following at "include" time, not at function call time, | ||||
| # to find the path to this module rather than the path to a calling list file | ||||
| get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH) | ||||
|  | ||||
| function(get_git_head_revision _refspecvar _hashvar) | ||||
| 	set(GIT_PARENT_DIR "${CMAKE_CURRENT_LIST_DIR}") | ||||
| 	set(GIT_DIR "${GIT_PARENT_DIR}/.git") | ||||
| 	while(NOT EXISTS "${GIT_DIR}")	# .git dir not found, search parent directories | ||||
| 		set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}") | ||||
| 		get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH) | ||||
| 		if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT) | ||||
| 			# We have reached the root directory, we are not in git | ||||
| 			set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE) | ||||
| 			set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE) | ||||
| 			return() | ||||
| 		endif() | ||||
| 		set(GIT_DIR "${GIT_PARENT_DIR}/.git") | ||||
| 	endwhile() | ||||
| 	# check if this is a submodule | ||||
| 	if(NOT IS_DIRECTORY ${GIT_DIR}) | ||||
| 		file(READ ${GIT_DIR} submodule) | ||||
| 		string(REGEX REPLACE "gitdir: (.*)\n$" "\\1" GIT_DIR_RELATIVE ${submodule}) | ||||
| 		get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH) | ||||
| 		get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE} ABSOLUTE) | ||||
| 	endif() | ||||
| 	set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data") | ||||
| 	if(NOT EXISTS "${GIT_DATA}") | ||||
| 		file(MAKE_DIRECTORY "${GIT_DATA}") | ||||
| 	endif() | ||||
|  | ||||
| 	if(NOT EXISTS "${GIT_DIR}/HEAD") | ||||
| 		return() | ||||
| 	endif() | ||||
| 	set(HEAD_FILE "${GIT_DATA}/HEAD") | ||||
| 	configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY) | ||||
|  | ||||
| 	configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in" | ||||
| 		"${GIT_DATA}/grabRef.cmake" | ||||
| 		@ONLY) | ||||
| 	include("${GIT_DATA}/grabRef.cmake") | ||||
|  | ||||
| 	set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE) | ||||
| 	set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE) | ||||
| endfunction() | ||||
|  | ||||
| function(git_describe _var) | ||||
| 	if(NOT GIT_FOUND) | ||||
| 		find_package(Git QUIET) | ||||
| 	endif() | ||||
| 	get_git_head_revision(refspec hash) | ||||
| 	if(NOT GIT_FOUND) | ||||
| 		set(${_var} "GIT-NOTFOUND" PARENT_SCOPE) | ||||
| 		return() | ||||
| 	endif() | ||||
| 	if(NOT hash) | ||||
| 		set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE) | ||||
| 		return() | ||||
| 	endif() | ||||
|  | ||||
| 	# TODO sanitize | ||||
| 	#if((${ARGN}" MATCHES "&&") OR | ||||
| 	#	(ARGN MATCHES "||") OR | ||||
| 	#	(ARGN MATCHES "\\;")) | ||||
| 	#	message("Please report the following error to the project!") | ||||
| 	#	message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}") | ||||
| 	#endif() | ||||
|  | ||||
| 	#message(STATUS "Arguments to execute_process: ${ARGN}") | ||||
|  | ||||
| 	execute_process(COMMAND | ||||
| 		"${GIT_EXECUTABLE}" | ||||
| 		describe | ||||
| 		${hash} | ||||
| 		${ARGN} | ||||
| 		WORKING_DIRECTORY | ||||
| 		"${CMAKE_SOURCE_DIR}" | ||||
| 		RESULT_VARIABLE | ||||
| 		res | ||||
| 		OUTPUT_VARIABLE | ||||
| 		out | ||||
| 		ERROR_QUIET | ||||
| 		OUTPUT_STRIP_TRAILING_WHITESPACE) | ||||
| 	if(NOT res EQUAL 0) | ||||
| 		set(out "${out}-${res}-NOTFOUND") | ||||
| 	endif() | ||||
|  | ||||
| 	set(${_var} "${out}" PARENT_SCOPE) | ||||
| endfunction() | ||||
|  | ||||
| function(git_get_exact_tag _var) | ||||
| 	git_describe(out --exact-match ${ARGN}) | ||||
| 	set(${_var} "${out}" PARENT_SCOPE) | ||||
| endfunction() | ||||
							
								
								
									
										41
									
								
								cmake/GetGitRevisionDescription.cmake.in
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										41
									
								
								cmake/GetGitRevisionDescription.cmake.in
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,41 @@ | ||||
| # | ||||
| # Internal file for GetGitRevisionDescription.cmake | ||||
| # | ||||
| # Requires CMake 2.6 or newer (uses the 'function' command) | ||||
| # | ||||
| # Original Author: | ||||
| # 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> | ||||
| # http://academic.cleardefinition.com | ||||
| # Iowa State University HCI Graduate Program/VRAC | ||||
| # | ||||
| # Copyright Iowa State University 2009-2010. | ||||
| # Distributed under the Boost Software License, Version 1.0. | ||||
| # (See accompanying file LICENSE_1_0.txt or copy at | ||||
| # http://www.boost.org/LICENSE_1_0.txt) | ||||
|  | ||||
| set(HEAD_HASH) | ||||
|  | ||||
| file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024) | ||||
|  | ||||
| string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS) | ||||
| if(HEAD_CONTENTS MATCHES "ref") | ||||
| 	# named branch | ||||
| 	string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}") | ||||
| 	if(EXISTS "@GIT_DIR@/${HEAD_REF}") | ||||
| 		configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY) | ||||
| 	else() | ||||
| 		configure_file("@GIT_DIR@/packed-refs" "@GIT_DATA@/packed-refs" COPYONLY) | ||||
| 		file(READ "@GIT_DATA@/packed-refs" PACKED_REFS) | ||||
| 		if(${PACKED_REFS} MATCHES "([0-9a-z]*) ${HEAD_REF}") | ||||
| 			set(HEAD_HASH "${CMAKE_MATCH_1}") | ||||
| 		endif() | ||||
| 	endif() | ||||
| else() | ||||
| 	# detached HEAD | ||||
| 	configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY) | ||||
| endif() | ||||
|  | ||||
| if(NOT HEAD_HASH) | ||||
| 	file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024) | ||||
| 	string(STRIP "${HEAD_HASH}" HEAD_HASH) | ||||
| endif() | ||||
							
								
								
									
										22
									
								
								cmake/GitFunctions.cmake
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										22
									
								
								cmake/GitFunctions.cmake
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,22 @@ | ||||
| if(__git_functions) | ||||
|     return() | ||||
| endif() | ||||
| set(__git_functions YES) | ||||
|  | ||||
| function( get_branch_from_git ) | ||||
|     execute_process( | ||||
|         COMMAND git rev-parse --abbrev-ref HEAD | ||||
|         WORKING_DIRECTORY   ${PROJECT_SOURCE_DIR} | ||||
|         RESULT_VARIABLE   git_result | ||||
|         OUTPUT_VARIABLE   git_branch | ||||
|         ERROR_VARIABLE    git_error | ||||
|         OUTPUT_STRIP_TRAILING_WHITESPACE | ||||
|         ERROR_STRIP_TRAILING_WHITESPACE | ||||
|     ) | ||||
|     if( NOT git_result EQUAL 0 ) | ||||
|         message( FATAL_ERROR "Failed to execute Git: ${git_error}" ) | ||||
|     endif() | ||||
|      | ||||
|     set( GIT_BRANCH ${git_branch} PARENT_SCOPE ) | ||||
| endfunction( get_branch_from_git ) | ||||
|  | ||||
							
								
								
									
										57
									
								
								cmake/Submodules.cmake
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										57
									
								
								cmake/Submodules.cmake
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,57 @@ | ||||
| if(EXISTS "${PROJECT_SOURCE_DIR}/.gitmodules") | ||||
| message(STATUS "Updating submodules to their latest/fixed versions") | ||||
| message(STATUS "(this can take a while, please be patient)") | ||||
|  | ||||
| ### First, get all submodules in | ||||
| if(${GIT_SUBMODULES_CHECKOUT_QUIET}) | ||||
|     execute_process( | ||||
|         COMMAND             git submodule update --init --recursive | ||||
|         WORKING_DIRECTORY   ${PROJECT_SOURCE_DIR} | ||||
|         OUTPUT_QUIET | ||||
|         ERROR_QUIET | ||||
|     ) | ||||
| else() | ||||
|     execute_process( | ||||
|         COMMAND             git submodule update --init --recursive | ||||
|         WORKING_DIRECTORY   ${PROJECT_SOURCE_DIR} | ||||
|     ) | ||||
| endif() | ||||
|  | ||||
| ### Then, checkout each submodule to the specified commit | ||||
| # Note: Execute separate processes here, to make sure each one is run, | ||||
| # should one crash (because of branch not existing, this, that ... whatever) | ||||
| foreach(GIT_SUBMODULE ${GIT_SUBMODULES}) | ||||
|  | ||||
|     if( "${GIT_SUBMODULE_VERSION_${GIT_SUBMODULE}}" STREQUAL "" ) | ||||
|         message(STATUS "no specific version given for submodule ${GIT_SUBMODULE}, checking out master") | ||||
|         if( "${GIT_SUBMODULE_BRANCH_${GIT_SUBMODULE}}" STREQUAL "" ) | ||||
|             set(GIT_SUBMODULE_VERSION_${GIT_SUBMODULE} "master") | ||||
|         else() | ||||
|             set(GIT_SUBMODULE_VERSION_${GIT_SUBMODULE} ${GIT_SUBMODULE_BRANCH_${GIT_SUBMODULE}}) | ||||
|         endif() | ||||
|     endif() | ||||
|  | ||||
|     if( "${GIT_SUBMODULE_DIR_${GIT_SUBMODULE}}" STREQUAL "" ) | ||||
|         set(GIT_SUBMODULES_DIRECTORY external) | ||||
|     else() | ||||
|         set(GIT_SUBMODULES_DIRECTORY ${GIT_SUBMODULE_DIR_${GIT_SUBMODULE}}) | ||||
|     endif() | ||||
|  | ||||
|     if(${GIT_SUBMODULES_CHECKOUT_QUIET}) | ||||
|         execute_process( | ||||
|             COMMAND             git checkout ${GIT_SUBMODULE_VERSION_${GIT_SUBMODULE}} | ||||
|             WORKING_DIRECTORY   ${PROJECT_SOURCE_DIR}/${GIT_SUBMODULES_DIRECTORY}/${GIT_SUBMODULE} | ||||
|             OUTPUT_QUIET | ||||
|             ERROR_QUIET | ||||
|         ) | ||||
|     else() | ||||
|         message(STATUS "checking out ${GIT_SUBMODULE}'s commit/tag ${GIT_SUBMODULE_VERSION_${GIT_SUBMODULE}}") | ||||
|         execute_process( | ||||
|             COMMAND             git checkout ${GIT_SUBMODULE_VERSION_${GIT_SUBMODULE}} | ||||
|             WORKING_DIRECTORY   ${PROJECT_SOURCE_DIR}/${GIT_SUBMODULES_DIRECTORY}/${GIT_SUBMODULE} | ||||
|         ) | ||||
|     endif() | ||||
|  | ||||
| endforeach(${GIT_SUBMODULE}) | ||||
|  | ||||
| endif() | ||||
		Reference in New Issue
	
	Block a user