Modifying app resource files to ignore non-numeric build string

[#53337061]
NREL · Jul 13, 2013 · 3299e64 · 3299e64
1 parent 932bca9
commit 3299e64
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/openstudiocore/src/openstudio_app/CMakeLists.txt b/openstudiocore/src/openstudio_app/CMakeLists.txt
@@ -53,7 +53,7 @@ CONFIGURE_FILE(AboutBox.hpp.in "${CMAKE_CURRENT_BINARY_DIR}/AboutBox.hpp")
 
 IF( WIN32 )
   SET(RC_BUILD_STR "0")
-  IF( NOT CMAKE_VERSION_BUILD STREQUAL "Unknown" )
+  IF( NOT CMAKE_VERSION_BUILD MATCHES "([a-zA-Z]+)" )
     SET(RC_BUILD_STR "${CMAKE_VERSION_BUILD}")
   ENDIF()
   CONFIGURE_FILE(OpenStudioApp.rc.in "${CMAKE_CURRENT_BINARY_DIR}/OpenStudioApp.rc")

diff --git a/openstudiocore/src/pat_app/CMakeLists.txt b/openstudiocore/src/pat_app/CMakeLists.txt
@@ -204,7 +204,7 @@ CONFIGURE_FILE(AboutBox.hpp.in "${CMAKE_CURRENT_BINARY_DIR}/AboutBox.hpp")
 
 IF( WIN32 )
   SET(RC_BUILD_STR "0")
-  IF( NOT CMAKE_VERSION_BUILD STREQUAL "Unknown" )
+  IF( NOT CMAKE_VERSION_BUILD MATCHES "([a-zA-Z]+)" )
     SET(RC_BUILD_STR "${CMAKE_VERSION_BUILD}")
   ENDIF()
   CONFIGURE_FILE(PatApp.rc.in "${CMAKE_CURRENT_BINARY_DIR}/PatApp.rc")

diff --git a/openstudiocore/src/resultsviewer/CMakeLists.txt b/openstudiocore/src/resultsviewer/CMakeLists.txt
@@ -66,7 +66,7 @@ CONFIGURE_FILE(AboutBox.hpp.in "${CMAKE_CURRENT_BINARY_DIR}/AboutBox.hpp")
 # For Windows set the rc file pointing to the icon file
 IF( WIN32 )
   SET(RC_BUILD_STR "0")
-  IF( NOT CMAKE_VERSION_BUILD STREQUAL "Unknown" )
+  IF( NOT CMAKE_VERSION_BUILD MATCHES "([a-zA-Z]+)" )
     SET(RC_BUILD_STR "${CMAKE_VERSION_BUILD}")
   ENDIF()
   CONFIGURE_FILE(ResultsViewer.rc.in "${CMAKE_CURRENT_BINARY_DIR}/ResultsViewer.rc")

diff --git a/openstudiocore/src/runmanager/app/CMakeLists.txt b/openstudiocore/src/runmanager/app/CMakeLists.txt
@@ -47,7 +47,7 @@ CONFIGURE_FILE(AboutBox.hpp.in "${CMAKE_CURRENT_BINARY_DIR}/AboutBox.hpp")
 # For Windows set the rc file pointing to the icon file
 IF( WIN32 )
   SET(RC_BUILD_STR "0")
-  IF( NOT CMAKE_VERSION_BUILD STREQUAL "Unknown" )
+  IF( NOT CMAKE_VERSION_BUILD MATCHES "([a-zA-Z]+)" )
     SET(RC_BUILD_STR "${CMAKE_VERSION_BUILD}")
   ENDIF()
   CONFIGURE_FILE(RunManagerUI.rc.in "${CMAKE_CURRENT_BINARY_DIR}/RunManagerUI.rc")