Fix Win compile failure

* Revert c861f1b9d9, as it's breaking
  the MSVC 2013 compile.
* Move the new OUTPUT_NAME line slightly, so it's recognised
This commit is contained in:
Justin Clift
2018-07-13 00:28:25 +01:00
parent b37df2cf62
commit 9a76537aa4
2 changed files with 1 additions and 2 deletions

View File

@@ -31,7 +31,6 @@ if (POLICY CMP0025)
endif ()
if(WIN32 AND MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "DB Browser for SQLite")
if(CMAKE_CL_64)
# Paths for 64-bit windows builds
set(OPENSSL_PATH "C:/dev/OpenSSL-Win64")
@@ -399,6 +398,7 @@ else()
endif()
if(WIN32 AND MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "DB Browser for SQLite")
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE")
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS_DEBUG "_CONSOLE")
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:CONSOLE")

View File

@@ -61,7 +61,6 @@ void SqlTextEdit::reloadSettings()
case sqlb::GraveAccents:
sqlLexer->setQuotedIdentifiers(true);
// Fall through, treat quoted string as literal string
[[clang::fallthrough]];
case sqlb::SquareBrackets:
setupSyntaxHighlightingFormat(sqlLexer, "string", QsciLexerSQL::DoubleQuotedString);
break;