diff options
| author | leyla_linden <none@none> | 2010-12-03 15:44:39 -0800 |
|---|---|---|
| committer | leyla_linden <none@none> | 2010-12-03 15:44:39 -0800 |
| commit | 35c67ca7fb9964ee3eabeb66ec441ded94256951 (patch) | |
| tree | e70ab4204e8284f201ada83dca884ad8091146bb /indra/cmake | |
| parent | 35d50fe36e83a0b76816c693dc89219041393ae5 (diff) | |
| parent | 32db8988ffab8778de106dc769228089bec8aad1 (diff) | |
Merge
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/TemplateCheck.cmake | 2 | ||||
| -rw-r--r-- | indra/cmake/Variables.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/cmake/TemplateCheck.cmake b/indra/cmake/TemplateCheck.cmake index 90d58d93ad..c43e235f20 100644 --- a/indra/cmake/TemplateCheck.cmake +++ b/indra/cmake/TemplateCheck.cmake @@ -8,7 +8,7 @@ macro (check_message_template _target) POST_BUILD COMMAND ${PYTHON_EXECUTABLE} ARGS ${SCRIPTS_DIR}/md5check.py - 3f19d130400c547de36278a6b6f9b028 + 0441fea513458ade4b81607acf481692 ${SCRIPTS_DIR}/messages/message_template.msg COMMENT "Verifying message template - See http://wiki.secondlife.com/wiki/Template_verifier.py" ) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index bc517cde49..c543710d6c 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -88,7 +88,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.5.sdk) + set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.4) endif (NOT CMAKE_OSX_DEPLOYMENT_TARGET) |