Skip to content

Commit 1ba711c

Browse files
authored
Merge pull request #841 from openstudiocoalition/werror_fixup
Fixup empty elsif preventing Werror
2 parents 5f08c17 + 9594ab8 commit 1ba711c

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if(CCACHE_PROGRAM)
1616
set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_PROGRAM} CACHE FILEPATH "C compiler cache used")
1717
endif()
1818

19-
project(OpenStudioApplication VERSION 1.10.0)
19+
project(OpenStudioApplication VERSION 1.11.0)
2020

2121
# Check system info globally so we can use it everywhere after: Has to be done before FindOpenStudioSDK.cmake
2222
if(APPLE)
@@ -272,7 +272,7 @@ endif()
272272

273273
# TODO: Modify the more specific variables as needed to indicate prerelease, etc
274274
# Keep in beta in-between release cycles. Set to empty string (or comment out) for official)
275-
set(PROJECT_VERSION_PRERELEASE "")
275+
set(PROJECT_VERSION_PRERELEASE "alpha")
276276

277277
# OpenStudio version: Only include Major.Minor.Patch, eg "3.0.0", even if you have a prerelease tag
278278
set(OPENSTUDIOAPPLICATION_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
@@ -691,7 +691,7 @@ include_directories("${PROJECT_BINARY_DIR}/src/")
691691
if(MSVC)
692692
# treat warnings as errors
693693
add_definitions(/WX)
694-
elseif()
694+
else()
695695
add_definitions(-Werror)
696696
endif()
697697

0 commit comments

Comments
 (0)