@@ -20,11 +20,14 @@ if (MSVC)
20
20
set (CPPCHECK_ARG_TEMPLATE "--template=vs" )
21
21
# disable Visual Studio warnings for fopen() used in the example
22
22
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)
28
31
else (MSVC )
29
32
set (CPPLINT_ARG_OUTPUT "--output=eclipse" )
30
33
set (CPPCHECK_ARG_TEMPLATE "--template=gcc" )
@@ -71,9 +74,9 @@ endif ()
71
74
72
75
# Options relative to SQLite and SQLiteC++ functions
73
76
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 )
75
78
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,
77
80
# Require that the sqlite3 library is also compiled with this flag (default under Debian/Ubuntu, but not on Mac OS X).
78
81
add_definitions (-DSQLITE_ENABLE_COLUMN_METADATA)
79
82
endif (SQLITE_ENABLE_COLUMN_METADATA)
@@ -187,7 +190,6 @@ if (SQLITECPP_RUN_CPPLINT)
187
190
ALL
188
191
COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR} /cpplint.py ${CPPLINT_ARG_OUTPUT} ${CPPLINT_ARG_VERBOSE} ${CPPLINT_ARG_LINELENGTH} ${SQLITECPP_SRC} ${SQLITECPP_INC}
189
192
)
190
- message (STATUS "Found Python: ${PYTHON_EXECUTABLE} " )
191
193
endif (PYTHONINTERP_FOUND)
192
194
else (SQLITECPP_RUN_CPPLINT)
193
195
message (STATUS "SQLITECPP_RUN_CPPLINT OFF" )
0 commit comments