-

aiekick · Sep 22, 2024 · 7140f35 · 7140f35
1 parent 31933da
commit 7140f35
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/.jenkins/Jenkinsfile_LINUX b/.jenkins/Jenkinsfile_LINUX
@@ -5,7 +5,7 @@ withCredentials([string(credentialsId: 'PIPELINES_REPO', variable: 'checkout_url
             [
                 $class: 'GitSCMSource',
                 remote: checkout_url,
-                credentialsId: 'CHECKOUT_TOKEN'
+                credentialsId: 'GITHUB_ACCESS_TOKEN'
             ]
         )
     )

diff --git a/.jenkins/Jenkinsfile_WINDOWS b/.jenkins/Jenkinsfile_WINDOWS
@@ -5,7 +5,7 @@ withCredentials([string(credentialsId: 'PIPELINES_REPO', variable: 'checkout_url
             [
                 $class: 'GitSCMSource',
                 remote: checkout_url,
-                credentialsId: 'CHECKOUT_TOKEN'
+                credentialsId: 'GITHUB_ACCESS_TOKEN'
             ]
         )
     )

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -64,9 +64,6 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 ## some defines for debug mode (before 3rdparty.cmake)
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
 
-## some defines for debug mode (before 3rdparty.cmake)
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
-
 set(FINAL_BIN_DIR ${CMAKE_SOURCE_DIR}/bin)
 set(CMAKE_PDB_OUTPUT_DIRECTORY "${FINAL_BIN_DIR}/debug")
 
@@ -318,6 +315,7 @@ if (EXISTS ${CMAKE_BINARY_DIR}/current_build_type)
 	string(STRIP ${CURRENT_BUILD_TYPE} CURRENT_BUILD_TYPE) ### removing end line wrote by echo command
 	set(PROJECT_BUILD_CONFIG_NAME ${CURRENT_BUILD_TYPE} CACHE STRING "" FORCE)
 	message(STATUS "CURRENT BUILD CONFIG is : ${PROJECT_BUILD_CONFIG_NAME}")
+	set(${PROJECT}_OUTPUT_NAME "${PROJECT}_${CMAKE_SYSTEM_NAME}_${PROJECT_BUILD_CONFIG_NAME}_${ARCH}")
 endif()
 
 #############################################################

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-NoodlesPlate_Windows_Debug_x64_v0.7.846 
+NoodlesPlate_Windows_Release_x64_v0.7.847
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		NoodlesPlate_Windows_Debug_x64_v0.7.846
		NoodlesPlate_Windows_Release_x64_v0.7.847