diff options
author | Dave Parks <davep@lindenlab.com> | 2013-06-27 16:16:56 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2013-06-27 16:16:56 -0500 |
commit | 380785e613b9823cb6160be5678e5f01783fee5f (patch) | |
tree | dce0f35d02994c861428683b91f64371e9a64ea0 /indra/llplugin | |
parent | 21b78d7368f969fdf0daf7994fb565da633b1e71 (diff) | |
parent | 4696eeeb30ce4d01c3bcbe74c9024f05d848968a (diff) |
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
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} |