Merge pico_sdk_version.cmake changes from develop branch into develop-1.1.1 branch
This commit is contained in:
		
				
					committed by
					
						
						Graham Sanderson
					
				
			
			
				
	
			
			
			
						parent
						
							304ab7dd92
						
					
				
				
					commit
					f76567eb7f
				
			@ -1,14 +1,14 @@
 | 
			
		||||
# PICO_BUILD_DEFINE: PICO_SDK_VERSION_MAJOR, SDK major version number, type=int, pico_base
 | 
			
		||||
# PICO_CONFIG: PICO_SDK_VERSION_MAJOR, SDK major version number, type=int, pico_base
 | 
			
		||||
# PICO_BUILD_DEFINE: PICO_SDK_VERSION_MAJOR, SDK major version number, type=int, group=pico_base
 | 
			
		||||
# PICO_CONFIG: PICO_SDK_VERSION_MAJOR, SDK major version number, type=int, group=pico_base
 | 
			
		||||
set(PICO_SDK_VERSION_MAJOR 1)
 | 
			
		||||
# PICO_BUILD_DEFINE: PICO_SDK_VERSION_MINOR, SDK minor version number, type=int, pico_base
 | 
			
		||||
# PICO_CONFIG: PICO_SDK_VERSION_MINOR, SDK minor version number, type=int, pico_base
 | 
			
		||||
# PICO_BUILD_DEFINE: PICO_SDK_VERSION_MINOR, SDK minor version number, type=int, group=pico_base
 | 
			
		||||
# PICO_CONFIG: PICO_SDK_VERSION_MINOR, SDK minor version number, type=int, group=pico_base
 | 
			
		||||
set(PICO_SDK_VERSION_MINOR 1)
 | 
			
		||||
# PICO_BUILD_DEFINE: PICO_SDK_VERSION_REVISION, SDK version revision, type=int, pico_base
 | 
			
		||||
# PICO_CONFIG: PICO_SDK_VERSION_REVISION, SDK version revision, type=int, pico_base
 | 
			
		||||
# PICO_BUILD_DEFINE: PICO_SDK_VERSION_REVISION, SDK version revision, type=int, group=pico_base
 | 
			
		||||
# PICO_CONFIG: PICO_SDK_VERSION_REVISION, SDK version revision, type=int, group=pico_base
 | 
			
		||||
set(PICO_SDK_VERSION_REVISION 1)
 | 
			
		||||
# PICO_BUILD_DEFINE: PICO_SDK_VERSION_PRE_RELEASE_ID, optional SDK pre-release version identifier, type=string, pico_base
 | 
			
		||||
# PICO_CONFIG: PICO_SDK_VERSION_PRE_RELEASE_ID, optional SDK pre-release version identifier, type=string, pico_base
 | 
			
		||||
# PICO_BUILD_DEFINE: PICO_SDK_VERSION_PRE_RELEASE_ID, optional SDK pre-release version identifier, type=string, group=pico_base
 | 
			
		||||
# PICO_CONFIG: PICO_SDK_VERSION_PRE_RELEASE_ID, optional SDK pre-release version identifier, type=string, group=pico_base
 | 
			
		||||
set(PICO_SDK_VERSION_PRE_RELEASE_ID develop)
 | 
			
		||||
 | 
			
		||||
# PICO_BUILD_DEFINE: PICO_SDK_VERSION_STRING, SDK version, type=string, group=pico_base
 | 
			
		||||
@ -17,4 +17,4 @@ set(PICO_SDK_VERSION_STRING "${PICO_SDK_VERSION_MAJOR}.${PICO_SDK_VERSION_MINOR}
 | 
			
		||||
 | 
			
		||||
if (PICO_SDK_VERSION_PRE_RELEASE_ID)
 | 
			
		||||
    set(PICO_SDK_VERSION_STRING "${PICO_SDK_VERSION_STRING}-${PICO_SDK_VERSION_PRE_RELEASE_ID}")
 | 
			
		||||
endif()
 | 
			
		||||
endif()
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user