Forráskód Böngészése

#IQRV #comment [CMake] 更新编译脚本

gifur 4 éve
szülő
commit
c33aa26705
2 módosított fájl, 9 hozzáadás és 7 törlés
  1. 8 6
      CMakeLists.txt
  2. 1 1
      addin/cmake/BuildMakeSettings.cmake

+ 8 - 6
CMakeLists.txt

@@ -250,13 +250,15 @@ if(MSVC)
 	STRING(REGEX REPLACE "^([A-Z]*.)([/\\].*)" "\\1" CURRENT_DISK "${CMAKE_CURRENT_SOURCE_DIR}")
 	set(OUTPUT_CUR_DISK_PATH "${CURRENT_DISK}\\")
 else(MSVC)
-		STRING(REGEX MATCH "^/home/([A-Za-z0-9_]*)/" CURRENT_DISK "${CMAKE_CURRENT_SOURCE_DIR}")
-		STRING(LENGTH ${CURRENT_DISK} disk_length)
-		if(${disk_length})
-			set(OUTPUT_CUR_DISK_PATH "${CURRENT_DISK}")
-		else()
+		if(FALSE AND WITH_CI_NUMBER)
 			set(CURRENT_DISK "/opt/")
-		endif()
+		else()
+			STRING(REGEX MATCH "^/home/([A-Za-z0-9_]*)/" CURRENT_DISK "${CMAKE_CURRENT_SOURCE_DIR}")
+			STRING(LENGTH ${CURRENT_DISK} disk_length)
+			if(NOT ${disk_length})
+				set(CURRENT_DISK "/opt/")
+			endif()
+		endif(WITH_CI_NUMBER)
 		set(OUTPUT_CUR_DISK_PATH "${CURRENT_DISK}")
 		message(STATUS "OUTPUT_CUR_DISK_PATH: ${OUTPUT_CUR_DISK_PATH}")
 endif(MSVC)

+ 1 - 1
addin/cmake/BuildMakeSettings.cmake

@@ -68,7 +68,7 @@ macro(rvc_record_build_number)
 				endif(THE_SAME_DAY)
 			endif(BUILD_STORE_NUMBER)
 		endif()
-		set(BUILD_NUMBER ${DAYS}${CURRENT_BUILD_TIMES})
+		set(BUILD_NUMBER ${DAYS})
 		file(WRITE "${PROJECT_BINARY_DIR}/BuildNumber.txt" "${DAYS}-${CURRENT_BUILD_TIMES}")
 	endif(WITH_CI_NUMBER)
 endmacro(rvc_record_build_number)