diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-10-04 09:19:25 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-10-04 09:19:25 -0700 |
| commit | c2c060d4401d3a79a9ae0076af0c9b86d14f7f37 (patch) | |
| tree | b7efcf3c2e38aa9de488342b3379b4bde0a6bc47 /indra/llplugin | |
| parent | d44c85c6dc575c0c67019ce1bffecfaa5bc275d1 (diff) | |
| parent | f7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff) | |
Merge with 3.6.7
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} |