File tree Expand file tree Collapse file tree 1 file changed +5
-11
lines changed Expand file tree Collapse file tree 1 file changed +5
-11
lines changed Original file line number Diff line number Diff line change @@ -171,6 +171,11 @@ if(BUILD_STATIC)
171
171
add_definitions (-DCONCPP_BUILD_STATIC )
172
172
else ()
173
173
message ("Building shared connector library" )
174
+
175
+ if (WIN32 AND STATIC_MSVCRT )
176
+ message (SEND_ERROR "Shared library should not use static runtime." )
177
+ endif ()
178
+
174
179
set (LIB_TYPE SHARED )
175
180
add_definitions (-DCONCPP_BUILD_SHARED )
176
181
set (CMAKE_POSITION_INDEPENDENT_CODE ON )
@@ -452,17 +457,6 @@ IF (WITH_TESTS)
452
457
# Unit tests declared with ADD_NG_TEST() (see cdk/cmake/testing.cmake)
453
458
ADD_TEST_TARGET ()
454
459
455
- #
456
- # !!!Warning!!! FIXME
457
- # This is temporary solution to a problem hit when linking our test driver
458
- # with dynamic version of DLL. Ignoring duplicate runtime symbols is potentially
459
- # dangerous. This should be replaced by some real solution.
460
- #
461
-
462
- if (MSVC )
463
- set_target_properties (run_unit_tests PROPERTIES LINK_FLAGS /FORCE:MULTIPLE )
464
- endif ()
465
-
466
460
# Test for public headers declared with ADD_HEADERS()
467
461
# (see cdk/cmake/headers.cmake)
468
462
ADD_HEADERS_TEST ()
You can’t perform that action at this time.
0 commit comments