diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-05-06 13:01:56 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-05-06 13:01:56 -0400 |
| commit | 2a59fef6beff7144085ea98ede4a3b4300248d7f (patch) | |
| tree | 96ac7748d02e437de34639a51772af2040ce7170 /indra/llplugin | |
| parent | f5e8457e4e4fad1d823c51d86c01fdc2ae08401c (diff) | |
| parent | 291b38717805f7de41af447c651c5b91352d0a51 (diff) | |
Merge. Pull from /lindenlab/viewer-cat prior to push.
Diffstat (limited to 'indra/llplugin')
| -rw-r--r-- | indra/llplugin/slplugin/CMakeLists.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt index 5d2b1d922e..6e7fefeb21 100644 --- a/indra/llplugin/slplugin/CMakeLists.txt +++ b/indra/llplugin/slplugin/CMakeLists.txt @@ -50,13 +50,17 @@ add_executable(SLPlugin ${SLPlugin_SOURCE_FILES} ) +if (WINDOWS) set_target_properties(SLPlugin PROPERTIES - MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/slplugin_info.plist -if (WINDOWS) LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMTD\"" -endif (WINDOWS) ) +else () +set_target_properties(SLPlugin + PROPERTIES + MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/slplugin_info.plist + ) +endif () target_link_libraries(SLPlugin ${LLPLUGIN_LIBRARIES} |