diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-06-21 12:51:29 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-06-21 12:51:29 -0500 |
| commit | 79029149a415a9f32e08d378653199a880d21e65 (patch) | |
| tree | 14b6f7d59c66602affd77b6e21f1981b28995fa8 /indra/llplugin | |
| parent | 80552a465e9169b7326c346f4685790ea459823a (diff) | |
| parent | 8511385a5407181ced7bb226d4054185c597d05e (diff) | |
Automated merge with file:///F:%5Cviewer-bear
Diffstat (limited to 'indra/llplugin')
| -rwxr-xr-x | indra/llplugin/slplugin/CMakeLists.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt index 03412d95d5..6e7fefeb21 100755 --- a/indra/llplugin/slplugin/CMakeLists.txt +++ b/indra/llplugin/slplugin/CMakeLists.txt @@ -50,10 +50,17 @@ add_executable(SLPlugin ${SLPlugin_SOURCE_FILES} ) +if (WINDOWS) +set_target_properties(SLPlugin + PROPERTIES + LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMTD\"" + ) +else () set_target_properties(SLPlugin PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/slplugin_info.plist ) +endif () target_link_libraries(SLPlugin ${LLPLUGIN_LIBRARIES} |