diff options
| author | Alain Linden <alain@lindenlab.com> | 2011-02-10 17:26:16 -0800 |
|---|---|---|
| committer | Alain Linden <alain@lindenlab.com> | 2011-02-10 17:26:16 -0800 |
| commit | 38a2af923561f8865976843c58a21f851695c9c2 (patch) | |
| tree | 45476e2e518b4aff6bc101221fdc271199de1cf1 /indra/cmake | |
| parent | 6dd41886b3dfbc2df4ccc6bb75722a5aaee23682 (diff) | |
various fixes to get the debug build working; don't look for or copy msvc*80.dll's.
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/JsonCpp.cmake | 2 | ||||
| -rw-r--r-- | indra/cmake/WebKitLibPlugin.cmake | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 4a129d7115..5e6672ecd4 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -11,7 +11,7 @@ else (STANDALONE) use_prebuilt_binary(jsoncpp) if (WINDOWS) set(JSONCPP_LIBRARIES -# debug json_vc100_libmt + debug json_vc100debug_libmt.lib optimized json_vc100_libmt) elseif (DARWIN) set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt) diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake index 1cc02c1cac..1f5b0f5d84 100644 --- a/indra/cmake/WebKitLibPlugin.cmake +++ b/indra/cmake/WebKitLibPlugin.cmake @@ -35,7 +35,6 @@ else (STANDALONE) endif (STANDALONE) if (WINDOWS) - use_prebuilt_binary(qt) set(WEBKIT_PLUGIN_LIBRARIES debug llqtwebkitd debug QtWebKitd4 |