diff options
Diffstat (limited to 'indra/cmake')
100 files changed, 110 insertions, 13 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 8b0864a539..8b0864a539 100755..100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake index 180504d286..180504d286 100755..100644 --- a/indra/cmake/APR.cmake +++ b/indra/cmake/APR.cmake diff --git a/indra/cmake/Audio.cmake b/indra/cmake/Audio.cmake index d23bc2f9c6..d23bc2f9c6 100755..100644 --- a/indra/cmake/Audio.cmake +++ b/indra/cmake/Audio.cmake diff --git a/indra/cmake/BerkeleyDB.cmake b/indra/cmake/BerkeleyDB.cmake index d98e79179d..d98e79179d 100755..100644 --- a/indra/cmake/BerkeleyDB.cmake +++ b/indra/cmake/BerkeleyDB.cmake diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 7ce57a5572..7ce57a5572 100755..100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake diff --git a/indra/cmake/BuildVersion.cmake b/indra/cmake/BuildVersion.cmake index 60a519c9af..60a519c9af 100755..100644 --- a/indra/cmake/BuildVersion.cmake +++ b/indra/cmake/BuildVersion.cmake diff --git a/indra/cmake/CARes.cmake b/indra/cmake/CARes.cmake index 1850b706ac..1850b706ac 100755..100644 --- a/indra/cmake/CARes.cmake +++ b/indra/cmake/CARes.cmake diff --git a/indra/cmake/CMakeCopyIfDifferent.cmake b/indra/cmake/CMakeCopyIfDifferent.cmake index 55e71ff153..55e71ff153 100755..100644 --- a/indra/cmake/CMakeCopyIfDifferent.cmake +++ b/indra/cmake/CMakeCopyIfDifferent.cmake diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index cadd2608e2..cadd2608e2 100755..100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt diff --git a/indra/cmake/CSharpMacros.cmake b/indra/cmake/CSharpMacros.cmake index a4dd815043..a4dd815043 100755..100644 --- a/indra/cmake/CSharpMacros.cmake +++ b/indra/cmake/CSharpMacros.cmake diff --git a/indra/cmake/CURL.cmake b/indra/cmake/CURL.cmake index 6e5fed4d52..6e5fed4d52 100755..100644 --- a/indra/cmake/CURL.cmake +++ b/indra/cmake/CURL.cmake diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 76cb0553f3..7d227d3674 100755..100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -226,6 +226,7 @@ elseif(LINUX) libcrypto.so.0.9.7 libdb-4.2.so libexpat.so + libexpat.so.1 libgmock_main.so libgmock.so.0 libgmodule-2.0.so @@ -236,7 +237,8 @@ elseif(LINUX) libopenjpeg.so libssl.so libstacktrace.so - libtcmalloc.so + libtcmalloc_minimal.so + libtcmalloc_minimal.so.0 libuuid.so.1 libssl.so.0.9.7 ) diff --git a/indra/cmake/CopyBackToSource.cmake b/indra/cmake/CopyBackToSource.cmake index d217df9aec..d217df9aec 100755..100644 --- a/indra/cmake/CopyBackToSource.cmake +++ b/indra/cmake/CopyBackToSource.cmake diff --git a/indra/cmake/DBusGlib.cmake b/indra/cmake/DBusGlib.cmake index cfc4ccd404..cfc4ccd404 100755..100644 --- a/indra/cmake/DBusGlib.cmake +++ b/indra/cmake/DBusGlib.cmake diff --git a/indra/cmake/DeploySharedLibs.cmake b/indra/cmake/DeploySharedLibs.cmake index 663c272e50..663c272e50 100755..100644 --- a/indra/cmake/DeploySharedLibs.cmake +++ b/indra/cmake/DeploySharedLibs.cmake diff --git a/indra/cmake/DirectX.cmake b/indra/cmake/DirectX.cmake index 29724ee2fc..29724ee2fc 100755..100644 --- a/indra/cmake/DirectX.cmake +++ b/indra/cmake/DirectX.cmake diff --git a/indra/cmake/DragDrop.cmake b/indra/cmake/DragDrop.cmake index c0424396e5..c0424396e5 100755..100644 --- a/indra/cmake/DragDrop.cmake +++ b/indra/cmake/DragDrop.cmake diff --git a/indra/cmake/ELFIO.cmake b/indra/cmake/ELFIO.cmake index e51993b0f7..e51993b0f7 100755..100644 --- a/indra/cmake/ELFIO.cmake +++ b/indra/cmake/ELFIO.cmake diff --git a/indra/cmake/EXPAT.cmake b/indra/cmake/EXPAT.cmake index acb15dc623..acb15dc623 100755..100644 --- a/indra/cmake/EXPAT.cmake +++ b/indra/cmake/EXPAT.cmake diff --git a/indra/cmake/ExamplePlugin.cmake b/indra/cmake/ExamplePlugin.cmake index 599787ad21..599787ad21 100755..100644 --- a/indra/cmake/ExamplePlugin.cmake +++ b/indra/cmake/ExamplePlugin.cmake diff --git a/indra/cmake/Externals.cmake b/indra/cmake/Externals.cmake index 26f3b56049..26f3b56049 100755..100644 --- a/indra/cmake/Externals.cmake +++ b/indra/cmake/Externals.cmake diff --git a/indra/cmake/FMOD.cmake b/indra/cmake/FMOD.cmake index 759b8f1340..759b8f1340 100755..100644 --- a/indra/cmake/FMOD.cmake +++ b/indra/cmake/FMOD.cmake diff --git a/indra/cmake/FindAPR.cmake b/indra/cmake/FindAPR.cmake index 906b6c9452..906b6c9452 100755..100644 --- a/indra/cmake/FindAPR.cmake +++ b/indra/cmake/FindAPR.cmake diff --git a/indra/cmake/FindBerkeleyDB.cmake b/indra/cmake/FindBerkeleyDB.cmake index 2d633c74ec..2d633c74ec 100755..100644 --- a/indra/cmake/FindBerkeleyDB.cmake +++ b/indra/cmake/FindBerkeleyDB.cmake diff --git a/indra/cmake/FindCARes.cmake b/indra/cmake/FindCARes.cmake index 1ed5b32913..1ed5b32913 100755..100644 --- a/indra/cmake/FindCARes.cmake +++ b/indra/cmake/FindCARes.cmake diff --git a/indra/cmake/FindELFIO.cmake b/indra/cmake/FindELFIO.cmake index 8a5421ab9c..8a5421ab9c 100755..100644 --- a/indra/cmake/FindELFIO.cmake +++ b/indra/cmake/FindELFIO.cmake diff --git a/indra/cmake/FindGooglePerfTools.cmake b/indra/cmake/FindGooglePerfTools.cmake index bb125d538e..bb125d538e 100755..100644 --- a/indra/cmake/FindGooglePerfTools.cmake +++ b/indra/cmake/FindGooglePerfTools.cmake diff --git a/indra/cmake/FindJsonCpp.cmake b/indra/cmake/FindJsonCpp.cmake new file mode 100644 index 0000000000..9d16f2aaab --- /dev/null +++ b/indra/cmake/FindJsonCpp.cmake @@ -0,0 +1,55 @@ +# -*- cmake -*- + +# - Find JSONCpp +# Find the JSONCpp includes and library +# This module defines +# JSONCPP_INCLUDE_DIR, where to find json.h, etc. +# JSONCPP_LIBRARIES, the libraries needed to use jsoncpp. +# JSONCPP_FOUND, If false, do not try to use jsoncpp. +# also defined, but not for general use are +# JSONCPP_LIBRARY, where to find the jsoncpp library. + +FIND_PATH(JSONCPP_INCLUDE_DIR jsoncpp/json.h +/usr/local/include +/usr/include +) + +# Get the GCC compiler version +EXEC_PROGRAM(${CMAKE_CXX_COMPILER} + ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion + OUTPUT_VARIABLE _gcc_COMPILER_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + +SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so) +FIND_LIBRARY(JSONCPP_LIBRARY + NAMES ${JSONCPP_NAMES} + PATHS /usr/lib /usr/local/lib + ) + +IF (JSONCPP_LIBRARY AND JSONCPP_INCLUDE_DIR) + SET(JSONCPP_LIBRARIES ${JSONCPP_LIBRARY}) + SET(JSONCPP_FOUND "YES") +ELSE (JSONCPP_LIBRARY AND JSONCPP_INCLUDE_DIR) + SET(JSONCPP_FOUND "NO") +ENDIF (JSONCPP_LIBRARY AND JSONCPP_INCLUDE_DIR) + + +IF (JSONCPP_FOUND) + IF (NOT JSONCPP_FIND_QUIETLY) + MESSAGE(STATUS "Found JSONCpp: ${JSONCPP_LIBRARIES}") + ENDIF (NOT JSONCPP_FIND_QUIETLY) +ELSE (JSONCPP_FOUND) + IF (JSONCPP_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find JSONCpp library") + ENDIF (JSONCPP_FIND_REQUIRED) +ENDIF (JSONCPP_FOUND) + +# Deprecated declarations. +SET (NATIVE_JSONCPP_INCLUDE_PATH ${JSONCPP_INCLUDE_DIR} ) +GET_FILENAME_COMPONENT (NATIVE_JSONCPP_LIB_PATH ${JSONCPP_LIBRARY} PATH) + +MARK_AS_ADVANCED( + JSONCPP_LIBRARY + JSONCPP_INCLUDE_DIR + ) diff --git a/indra/cmake/FindMT.cmake b/indra/cmake/FindMT.cmake index 5239a4c2f5..5239a4c2f5 100755..100644 --- a/indra/cmake/FindMT.cmake +++ b/indra/cmake/FindMT.cmake diff --git a/indra/cmake/FindMono.cmake b/indra/cmake/FindMono.cmake index d956c48656..d956c48656 100755..100644 --- a/indra/cmake/FindMono.cmake +++ b/indra/cmake/FindMono.cmake diff --git a/indra/cmake/FindMySQL.cmake b/indra/cmake/FindMySQL.cmake index 431940328f..431940328f 100755..100644 --- a/indra/cmake/FindMySQL.cmake +++ b/indra/cmake/FindMySQL.cmake diff --git a/indra/cmake/FindOpenJPEG.cmake b/indra/cmake/FindOpenJPEG.cmake index 949384eec4..949384eec4 100755..100644 --- a/indra/cmake/FindOpenJPEG.cmake +++ b/indra/cmake/FindOpenJPEG.cmake diff --git a/indra/cmake/FindSCP.cmake b/indra/cmake/FindSCP.cmake index ea02102908..ea02102908 100755..100644 --- a/indra/cmake/FindSCP.cmake +++ b/indra/cmake/FindSCP.cmake diff --git a/indra/cmake/FindSVN.cmake b/indra/cmake/FindSVN.cmake index 3322be4ca9..3322be4ca9 100755..100644 --- a/indra/cmake/FindSVN.cmake +++ b/indra/cmake/FindSVN.cmake diff --git a/indra/cmake/FindXmlRpcEpi.cmake b/indra/cmake/FindXmlRpcEpi.cmake index ba217e7467..ba217e7467 100755..100644 --- a/indra/cmake/FindXmlRpcEpi.cmake +++ b/indra/cmake/FindXmlRpcEpi.cmake diff --git a/indra/cmake/FreeType.cmake b/indra/cmake/FreeType.cmake index 5f1aa26e89..5f1aa26e89 100755..100644 --- a/indra/cmake/FreeType.cmake +++ b/indra/cmake/FreeType.cmake diff --git a/indra/cmake/GLOD.cmake b/indra/cmake/GLOD.cmake index 77221d55ed..77221d55ed 100755..100644 --- a/indra/cmake/GLOD.cmake +++ b/indra/cmake/GLOD.cmake diff --git a/indra/cmake/GStreamer010Plugin.cmake b/indra/cmake/GStreamer010Plugin.cmake index 0ca432da18..0ca432da18 100755..100644 --- a/indra/cmake/GStreamer010Plugin.cmake +++ b/indra/cmake/GStreamer010Plugin.cmake diff --git a/indra/cmake/GetPrerequisites_2_8.cmake b/indra/cmake/GetPrerequisites_2_8.cmake index 5a24842c89..5a24842c89 100755..100644 --- a/indra/cmake/GetPrerequisites_2_8.cmake +++ b/indra/cmake/GetPrerequisites_2_8.cmake diff --git a/indra/cmake/Glui.cmake b/indra/cmake/Glui.cmake index f62a56856c..f62a56856c 100755..100644 --- a/indra/cmake/Glui.cmake +++ b/indra/cmake/Glui.cmake diff --git a/indra/cmake/Glut.cmake b/indra/cmake/Glut.cmake index 314da30652..314da30652 100755..100644 --- a/indra/cmake/Glut.cmake +++ b/indra/cmake/Glut.cmake diff --git a/indra/cmake/GoogleBreakpad.cmake b/indra/cmake/GoogleBreakpad.cmake index 8270c0fabb..8270c0fabb 100755..100644 --- a/indra/cmake/GoogleBreakpad.cmake +++ b/indra/cmake/GoogleBreakpad.cmake diff --git a/indra/cmake/GoogleMock.cmake b/indra/cmake/GoogleMock.cmake index ca5a8034ba..ca5a8034ba 100755..100644 --- a/indra/cmake/GoogleMock.cmake +++ b/indra/cmake/GoogleMock.cmake diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index dc6d013bf2..048f5a3235 100755..100644 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -13,7 +13,10 @@ else (STANDALONE) set(GOOGLE_PERFTOOLS_FOUND "YES") endif (WINDOWS) if (LINUX) - set(TCMALLOC_LIBRARIES tcmalloc) + use_prebuilt_binary(tcmalloc) + set(TCMALLOC_LIBRARIES + debug tcmalloc_minimal_debug + optimized tcmalloc_minimal) set(STACKTRACE_LIBRARIES stacktrace) set(PROFILER_LIBRARIES profiler) set(GOOGLE_PERFTOOLS_INCLUDE_DIR diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake index 9514d59f64..9514d59f64 100755..100644 --- a/indra/cmake/JPEG.cmake +++ b/indra/cmake/JPEG.cmake diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake new file mode 100644 index 0000000000..7dd565be7c --- /dev/null +++ b/indra/cmake/JsonCpp.cmake @@ -0,0 +1,22 @@ +# -*- cmake -*- + +include(Prebuilt) + +set(JSONCPP_FIND_QUIETLY ON) +set(JSONCPP_FIND_REQUIRED ON) + +if (STANDALONE) + include(FindJsonCpp) +else (STANDALONE) + use_prebuilt_binary(jsoncpp) + if (WINDOWS) + set(JSONCPP_LIBRARIES + debug json_vc80d + optimized json_vc80) + elseif (DARWIN) + set(JSONCPP_LIBRARIES json_mac-universal-gcc_libmt) + elseif (LINUX) + set(JSONCPP_LIBRARIES jsoncpp) + endif (WINDOWS) + set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/jsoncpp) +endif (STANDALONE) diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake index e8a0a949b6..e8a0a949b6 100755..100644 --- a/indra/cmake/LLAddBuildTest.cmake +++ b/indra/cmake/LLAddBuildTest.cmake diff --git a/indra/cmake/LLAudio.cmake b/indra/cmake/LLAudio.cmake index 7c248dfc72..7c248dfc72 100755..100644 --- a/indra/cmake/LLAudio.cmake +++ b/indra/cmake/LLAudio.cmake diff --git a/indra/cmake/LLCharacter.cmake b/indra/cmake/LLCharacter.cmake index 9b2f5c4956..9b2f5c4956 100755..100644 --- a/indra/cmake/LLCharacter.cmake +++ b/indra/cmake/LLCharacter.cmake diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake index d1ab264a41..d1ab264a41 100755..100644 --- a/indra/cmake/LLCommon.cmake +++ b/indra/cmake/LLCommon.cmake diff --git a/indra/cmake/LLConvexDecomposition.cmake b/indra/cmake/LLConvexDecomposition.cmake index f310a493fd..f310a493fd 100755..100644 --- a/indra/cmake/LLConvexDecomposition.cmake +++ b/indra/cmake/LLConvexDecomposition.cmake diff --git a/indra/cmake/LLCrashLogger.cmake b/indra/cmake/LLCrashLogger.cmake index f2cb83eb8b..f2cb83eb8b 100755..100644 --- a/indra/cmake/LLCrashLogger.cmake +++ b/indra/cmake/LLCrashLogger.cmake diff --git a/indra/cmake/LLDatabase.cmake b/indra/cmake/LLDatabase.cmake index 6526101386..6526101386 100755..100644 --- a/indra/cmake/LLDatabase.cmake +++ b/indra/cmake/LLDatabase.cmake diff --git a/indra/cmake/LLImage.cmake b/indra/cmake/LLImage.cmake index ec3da89081..ec3da89081 100755..100644 --- a/indra/cmake/LLImage.cmake +++ b/indra/cmake/LLImage.cmake diff --git a/indra/cmake/LLImageJ2COJ.cmake b/indra/cmake/LLImageJ2COJ.cmake index 1bcf205f2d..1bcf205f2d 100755..100644 --- a/indra/cmake/LLImageJ2COJ.cmake +++ b/indra/cmake/LLImageJ2COJ.cmake diff --git a/indra/cmake/LLInventory.cmake b/indra/cmake/LLInventory.cmake index c3dc077a2b..c3dc077a2b 100755..100644 --- a/indra/cmake/LLInventory.cmake +++ b/indra/cmake/LLInventory.cmake diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake index 27c8ada686..27c8ada686 100755..100644 --- a/indra/cmake/LLKDU.cmake +++ b/indra/cmake/LLKDU.cmake diff --git a/indra/cmake/LLLogin.cmake b/indra/cmake/LLLogin.cmake index 47d171876a..47d171876a 100755..100644 --- a/indra/cmake/LLLogin.cmake +++ b/indra/cmake/LLLogin.cmake diff --git a/indra/cmake/LLMath.cmake b/indra/cmake/LLMath.cmake index 893920ae6f..893920ae6f 100755..100644 --- a/indra/cmake/LLMath.cmake +++ b/indra/cmake/LLMath.cmake diff --git a/indra/cmake/LLMessage.cmake b/indra/cmake/LLMessage.cmake index 0143d04fd7..0143d04fd7 100755..100644 --- a/indra/cmake/LLMessage.cmake +++ b/indra/cmake/LLMessage.cmake diff --git a/indra/cmake/LLPlugin.cmake b/indra/cmake/LLPlugin.cmake index 9722f16c3c..9722f16c3c 100755..100644 --- a/indra/cmake/LLPlugin.cmake +++ b/indra/cmake/LLPlugin.cmake diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index 9f8d99a0bf..9f8d99a0bf 100755..100644 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake diff --git a/indra/cmake/LLRender.cmake b/indra/cmake/LLRender.cmake index c47e8878e9..c47e8878e9 100755..100644 --- a/indra/cmake/LLRender.cmake +++ b/indra/cmake/LLRender.cmake diff --git a/indra/cmake/LLScene.cmake b/indra/cmake/LLScene.cmake index 96ad5085a2..96ad5085a2 100755..100644 --- a/indra/cmake/LLScene.cmake +++ b/indra/cmake/LLScene.cmake diff --git a/indra/cmake/LLSharedLibs.cmake b/indra/cmake/LLSharedLibs.cmake index e29076c738..e29076c738 100755..100644 --- a/indra/cmake/LLSharedLibs.cmake +++ b/indra/cmake/LLSharedLibs.cmake diff --git a/indra/cmake/LLTestCommand.cmake b/indra/cmake/LLTestCommand.cmake index 554559edbd..554559edbd 100755..100644 --- a/indra/cmake/LLTestCommand.cmake +++ b/indra/cmake/LLTestCommand.cmake diff --git a/indra/cmake/LLUI.cmake b/indra/cmake/LLUI.cmake index 34de57108b..34de57108b 100755..100644 --- a/indra/cmake/LLUI.cmake +++ b/indra/cmake/LLUI.cmake diff --git a/indra/cmake/LLVFS.cmake b/indra/cmake/LLVFS.cmake index 0fe87cdea6..0fe87cdea6 100755..100644 --- a/indra/cmake/LLVFS.cmake +++ b/indra/cmake/LLVFS.cmake diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake index a5b9cf47a4..a5b9cf47a4 100755..100644 --- a/indra/cmake/LLWindow.cmake +++ b/indra/cmake/LLWindow.cmake diff --git a/indra/cmake/LLXML.cmake b/indra/cmake/LLXML.cmake index 64dfdb604f..64dfdb604f 100755..100644 --- a/indra/cmake/LLXML.cmake +++ b/indra/cmake/LLXML.cmake diff --git a/indra/cmake/LLXUIXML.cmake b/indra/cmake/LLXUIXML.cmake index b8bfe48c77..b8bfe48c77 100755..100644 --- a/indra/cmake/LLXUIXML.cmake +++ b/indra/cmake/LLXUIXML.cmake diff --git a/indra/cmake/LScript.cmake b/indra/cmake/LScript.cmake index 86bfcb7440..86bfcb7440 100755..100644 --- a/indra/cmake/LScript.cmake +++ b/indra/cmake/LScript.cmake diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake index bca99caf2a..bca99caf2a 100755..100644 --- a/indra/cmake/Linking.cmake +++ b/indra/cmake/Linking.cmake diff --git a/indra/cmake/MediaPluginBase.cmake b/indra/cmake/MediaPluginBase.cmake index 2be035b641..2be035b641 100755..100644 --- a/indra/cmake/MediaPluginBase.cmake +++ b/indra/cmake/MediaPluginBase.cmake diff --git a/indra/cmake/MonoDeps.cmake b/indra/cmake/MonoDeps.cmake index 52d5491563..52d5491563 100755..100644 --- a/indra/cmake/MonoDeps.cmake +++ b/indra/cmake/MonoDeps.cmake diff --git a/indra/cmake/MonoEmbed.cmake b/indra/cmake/MonoEmbed.cmake index 0f1f23309c..0f1f23309c 100755..100644 --- a/indra/cmake/MonoEmbed.cmake +++ b/indra/cmake/MonoEmbed.cmake diff --git a/indra/cmake/MySQL.cmake b/indra/cmake/MySQL.cmake index e591fbc3d8..e591fbc3d8 100755..100644 --- a/indra/cmake/MySQL.cmake +++ b/indra/cmake/MySQL.cmake diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake index dad74e99b1..dad74e99b1 100755..100644 --- a/indra/cmake/NDOF.cmake +++ b/indra/cmake/NDOF.cmake diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake index d01c680ed1..d01c680ed1 100755..100644 --- a/indra/cmake/OPENAL.cmake +++ b/indra/cmake/OPENAL.cmake diff --git a/indra/cmake/OpenGL.cmake b/indra/cmake/OpenGL.cmake index 6a2b6811af..6a2b6811af 100755..100644 --- a/indra/cmake/OpenGL.cmake +++ b/indra/cmake/OpenGL.cmake diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake index fcc82c2f49..fcc82c2f49 100755..100644 --- a/indra/cmake/OpenJPEG.cmake +++ b/indra/cmake/OpenJPEG.cmake diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake index 81584c09ea..81584c09ea 100755..100644 --- a/indra/cmake/OpenSSL.cmake +++ b/indra/cmake/OpenSSL.cmake diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake index 4d0b7b2d8d..f6522d9e2f 100755..100644 --- a/indra/cmake/PNG.cmake +++ b/indra/cmake/PNG.cmake @@ -9,5 +9,5 @@ if (STANDALONE) else (STANDALONE) use_prebuilt_binary(libpng) set(PNG_LIBRARIES png12) - set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) + set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng12) endif (STANDALONE) diff --git a/indra/cmake/PluginAPI.cmake b/indra/cmake/PluginAPI.cmake index d1649e8248..d1649e8248 100755..100644 --- a/indra/cmake/PluginAPI.cmake +++ b/indra/cmake/PluginAPI.cmake diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake index a91519278c..a91519278c 100755..100644 --- a/indra/cmake/Prebuilt.cmake +++ b/indra/cmake/Prebuilt.cmake diff --git a/indra/cmake/Pth.cmake b/indra/cmake/Pth.cmake index a28f6ec696..a28f6ec696 100755..100644 --- a/indra/cmake/Pth.cmake +++ b/indra/cmake/Pth.cmake diff --git a/indra/cmake/PulseAudio.cmake b/indra/cmake/PulseAudio.cmake index f8087a8083..f8087a8083 100755..100644 --- a/indra/cmake/PulseAudio.cmake +++ b/indra/cmake/PulseAudio.cmake diff --git a/indra/cmake/Python.cmake b/indra/cmake/Python.cmake index 0901c1b7a2..0901c1b7a2 100755..100644 --- a/indra/cmake/Python.cmake +++ b/indra/cmake/Python.cmake diff --git a/indra/cmake/QuickTimePlugin.cmake b/indra/cmake/QuickTimePlugin.cmake index 02f432e3c1..02f432e3c1 100755..100644 --- a/indra/cmake/QuickTimePlugin.cmake +++ b/indra/cmake/QuickTimePlugin.cmake diff --git a/indra/cmake/TemplateCheck.cmake b/indra/cmake/TemplateCheck.cmake index fa4e387dd5..fa4e387dd5 100755..100644 --- a/indra/cmake/TemplateCheck.cmake +++ b/indra/cmake/TemplateCheck.cmake diff --git a/indra/cmake/Tut.cmake b/indra/cmake/Tut.cmake index 7488e9dcb0..7488e9dcb0 100755..100644 --- a/indra/cmake/Tut.cmake +++ b/indra/cmake/Tut.cmake diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake index f529f5b644..f529f5b644 100755..100644 --- a/indra/cmake/UI.cmake +++ b/indra/cmake/UI.cmake diff --git a/indra/cmake/UnixInstall.cmake b/indra/cmake/UnixInstall.cmake index 139be0a008..139be0a008 100755..100644 --- a/indra/cmake/UnixInstall.cmake +++ b/indra/cmake/UnixInstall.cmake diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 28feb523ea..02fb4ea459 100755..100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -54,19 +54,20 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") set(LINUX ON BOOl FORCE) # If someone has specified a word size, use that to determine the - # architecture. Otherwise, let the architecture specify the word size. + # architecture. Otherwise, let the compiler specify the word size. + # Using uname will break under chroots and other cross arch compiles. RC if (WORD_SIZE EQUAL 32) set(ARCH i686) elseif (WORD_SIZE EQUAL 64) set(ARCH x86_64) else (WORD_SIZE EQUAL 32) - execute_process(COMMAND uname -m COMMAND sed s/i.86/i686/ - OUTPUT_VARIABLE ARCH OUTPUT_STRIP_TRAILING_WHITESPACE) - if (ARCH STREQUAL x86_64) - set(WORD_SIZE 64) - else (ARCH STREQUAL x86_64) + if(CMAKE_SIZEOF_VOID_P MATCHES 4) + set(ARCH i686) set(WORD_SIZE 32) - endif (ARCH STREQUAL x86_64) + else(CMAKE_SIZEOF_VOID_P MATCHES 4) + set(ARCH x86_64) + set(WORD_SIZE 64) + endif(CMAKE_SIZEOF_VOID_P MATCHES 4) endif (WORD_SIZE EQUAL 32) set(LL_ARCH ${ARCH}_linux) @@ -86,7 +87,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) # NOTE: setting -isysroot is NOT adequate: http://lists.apple.com/archives/Xcode-users/2007/Oct/msg00696.html # see http://public.kitware.com/Bug/view.php?id=9959 + poppy - set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk) + set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.4) endif (NOT CMAKE_OSX_DEPLOYMENT_TARGET) diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake index 32c4bc81df..32c4bc81df 100755..100644 --- a/indra/cmake/ViewerMiscLibs.cmake +++ b/indra/cmake/ViewerMiscLibs.cmake diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake index 1c572ab27f..1c572ab27f 100755..100644 --- a/indra/cmake/WebKitLibPlugin.cmake +++ b/indra/cmake/WebKitLibPlugin.cmake diff --git a/indra/cmake/XmlRpcEpi.cmake b/indra/cmake/XmlRpcEpi.cmake index 107d1926ba..107d1926ba 100755..100644 --- a/indra/cmake/XmlRpcEpi.cmake +++ b/indra/cmake/XmlRpcEpi.cmake diff --git a/indra/cmake/ZLIB.cmake b/indra/cmake/ZLIB.cmake index 48e5130ad5..48e5130ad5 100755..100644 --- a/indra/cmake/ZLIB.cmake +++ b/indra/cmake/ZLIB.cmake diff --git a/indra/cmake/cmake_dummy.cpp b/indra/cmake/cmake_dummy.cpp index 25191e2a18..25191e2a18 100755..100644 --- a/indra/cmake/cmake_dummy.cpp +++ b/indra/cmake/cmake_dummy.cpp diff --git a/indra/cmake/run_build_test.py b/indra/cmake/run_build_test.py index 1c57d5139c..b155044332 100755..100644 --- a/indra/cmake/run_build_test.py +++ b/indra/cmake/run_build_test.py @@ -65,10 +65,24 @@ def main(command, libpath=[], vars={}): dirs = os.environ.get(var, "").split(os.pathsep) # Append the sequence in libpath print "%s += %r" % (var, libpath) - dirs.extend(libpath) + for dir in libpath: + # append system paths at the end + if dir in ('/lib', '/usr/lib'): + dirs.append(dir) + # prepend non-system paths + else: + dirs.insert(0, dir) + + # Filter out some useless pieces + clean_dirs = [] + for dir in dirs: + if dir and dir not in ('', '.'): + clean_dirs.append(dir) + # Now rebuild the path string. This way we use a minimum of separators # -- and we avoid adding a pointless separator when libpath is empty. - os.environ[var] = os.pathsep.join(dirs) + os.environ[var] = os.pathsep.join(clean_dirs) + print "%s = %r" % (var, os.environ[var]) # Now handle arbitrary environment variables. The tricky part is ensuring # that all the keys and values we try to pass are actually strings. if vars: |