Skip to content

Commit 93dd526

Browse files
committed
Fix issue SRombauts#92: force MSVC to use static runtime only if unit-tests are build
googletest recommend using this runtime
1 parent 2b36f52 commit 93dd526

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

CMakeLists.txt

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,14 @@ if (MSVC)
2020
set(CPPCHECK_ARG_TEMPLATE "--template=vs")
2121
# disable Visual Studio warnings for fopen() used in the example
2222
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
23-
# Flags for linking with multithread static C++ runtime
24-
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT")
25-
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
26-
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
27-
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
23+
# Flags for linking with multithread static C++ runtime, required by googletest
24+
if (SQLITECPP_BUILD_TESTS)
25+
message(STATUS "Linking against multithread static C++ runtime for unit tests with googletest")
26+
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT")
27+
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
28+
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
29+
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
30+
endif (SQLITECPP_BUILD_TESTS)
2831
else (MSVC)
2932
set(CPPLINT_ARG_OUTPUT "--output=eclipse")
3033
set(CPPCHECK_ARG_TEMPLATE "--template=gcc")
@@ -71,9 +74,9 @@ endif ()
7174

7275
# Options relative to SQLite and SQLiteC++ functions
7376

74-
option(SQLITE_ENABLE_COLUMN_METADATA "Enable Column::getName(). Require support from sqlite3 library." ON)
77+
option(SQLITE_ENABLE_COLUMN_METADATA "Enable Column::getColumnOriginName(). Require support from sqlite3 library." ON)
7578
if (SQLITE_ENABLE_COLUMN_METADATA)
76-
# Enable the use of SQLite column metadata and Column::getName() method,
79+
# Enable the use of SQLite column metadata and Column::getColumnOriginName() method,
7780
# Require that the sqlite3 library is also compiled with this flag (default under Debian/Ubuntu, but not on Mac OS X).
7881
add_definitions(-DSQLITE_ENABLE_COLUMN_METADATA)
7982
endif (SQLITE_ENABLE_COLUMN_METADATA)
@@ -187,7 +190,6 @@ if (SQLITECPP_RUN_CPPLINT)
187190
ALL
188191
COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/cpplint.py ${CPPLINT_ARG_OUTPUT} ${CPPLINT_ARG_VERBOSE} ${CPPLINT_ARG_LINELENGTH} ${SQLITECPP_SRC} ${SQLITECPP_INC}
189192
)
190-
message(STATUS "Found Python: ${PYTHON_EXECUTABLE}")
191193
endif (PYTHONINTERP_FOUND)
192194
else (SQLITECPP_RUN_CPPLINT)
193195
message(STATUS "SQLITECPP_RUN_CPPLINT OFF")

0 commit comments

Comments
 (0)