livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake 4.10 compatibility fixes (#4548)

master
Brad Linden 2025-08-14 09:47:22 -07:00 committed by GitHub
parent 6f072c2121
commit 4c65a43e17
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
autobuild.xml
View File

@ -1435,11 +1435,11 @@
<key>creds</key> <key>creds</key>
<string>github</string> <string>github</string>
<key>hash</key> <key>hash</key>
<string>9e59c93c7110e87b4ff3db330f11a23c50e5000f</string> <string>7facda95e2f00c260513f3d4db42588fa8ba703c</string>
<key>hash_algorithm</key> <key>hash_algorithm</key>
<string>sha1</string> <string>sha1</string>
<key>url</key> <key>url</key>
<string>https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/178910560</string> <string>https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/196289774</string>
</map> </map>
<key>name</key> <key>name</key>
<string>darwin64</string> <string>darwin64</string>
@ -1451,11 +1451,11 @@
<key>creds</key> <key>creds</key>
<string>github</string> <string>github</string>
<key>hash</key> <key>hash</key>
<string>7ed994db5bafa9a7ad09a1b53da850a84715c65e</string> <string>01d08f13c7bc8d1b95b0330fa6833b7d8274e4d0</string>
<key>hash_algorithm</key> <key>hash_algorithm</key>
<string>sha1</string> <string>sha1</string>
<key>url</key> <key>url</key>
<string>https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/178910561</string> <string>https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/196289775</string>
</map> </map>
<key>name</key> <key>name</key>
<string>linux64</string> <string>linux64</string>
@ -1467,24 +1467,24 @@
<key>creds</key> <key>creds</key>
<string>github</string> <string>github</string>
<key>hash</key> <key>hash</key>
<string>66824c02e0e5eabbfbe37bfb173360195f89697c</string> <string>6d00345c7d3471bc5f7c1218e014dd0f1a2c069b</string>
<key>hash_algorithm</key> <key>hash_algorithm</key>
<string>sha1</string> <string>sha1</string>
<key>url</key> <key>url</key>
<string>https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/178910562</string> <string>https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/196289778</string>
</map> </map>
<key>name</key> <key>name</key>
<string>windows64</string> <string>windows64</string>
</map> </map>
</map> </map>
<key>copyright</key>
<string>Copyright (c) 2010, Linden Research, Inc.</string>
<key>license</key> <key>license</key>
<string>internal</string> <string>internal</string>
<key>license_file</key> <key>license_file</key>
<string>LICENSES/llphysicsextensions.txt</string> <string>LICENSES/llphysicsextensions.txt</string>
<key>copyright</key>
<string>Copyright (c) 2010, Linden Research, Inc.</string>
<key>version</key> <key>version</key>
<string>1.0.66e6919</string> <string>1.0.11137145495</string>
<key>name</key> <key>name</key>
<string>llphysicsextensions_source</string> <string>llphysicsextensions_source</string>
</map> </map>

25
indra/newview/CMakeLists.txt
View File

@ -1420,7 +1420,7 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt"
"${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}\n") "${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}\n")
set_source_files_properties( set_source_files_properties(
llversioninfo.cpp tests/llversioninfo_test.cpp llversioninfo.cpp tests/llversioninfo_test.cpp
PROPERTIES PROPERTIES
COMPILE_DEFINITIONS "${VIEWER_CHANNEL_VERSION_DEFINES}" # see BuildVersion.cmake COMPILE_DEFINITIONS "${VIEWER_CHANNEL_VERSION_DEFINES}" # see BuildVersion.cmake
) )
@ -1635,7 +1635,7 @@ endif (WINDOWS)
file(GLOB_RECURSE viewer_XUI_FILES LIST_DIRECTORIES FALSE file(GLOB_RECURSE viewer_XUI_FILES LIST_DIRECTORIES FALSE
${CMAKE_CURRENT_SOURCE_DIR}/skins/*.xml) ${CMAKE_CURRENT_SOURCE_DIR}/skins/*.xml)
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/skins PREFIX "XUI Files" FILES ${viewer_XUI_FILES}) source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/skins PREFIX "XUI Files" FILES ${viewer_XUI_FILES})
set_source_files_properties(${viewer_XUI_FILES} set_source_files_properties(${viewer_XUI_FILES}
PROPERTIES HEADER_FILE_ONLY TRUE) PROPERTIES HEADER_FILE_ONLY TRUE)
list(APPEND viewer_SOURCE_FILES ${viewer_XUI_FILES}) list(APPEND viewer_SOURCE_FILES ${viewer_XUI_FILES})
@ -1643,7 +1643,7 @@ list(APPEND viewer_SOURCE_FILES ${viewer_XUI_FILES})
file(GLOB_RECURSE viewer_SHADER_FILES LIST_DIRECTORIES FALSE file(GLOB_RECURSE viewer_SHADER_FILES LIST_DIRECTORIES FALSE
${CMAKE_CURRENT_SOURCE_DIR}/app_settings/shaders/*.glsl) ${CMAKE_CURRENT_SOURCE_DIR}/app_settings/shaders/*.glsl)
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/app_settings/shaders PREFIX "Shaders" FILES ${viewer_SHADER_FILES}) source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/app_settings/shaders PREFIX "Shaders" FILES ${viewer_SHADER_FILES})
set_source_files_properties(${viewer_SHADER_FILES} set_source_files_properties(${viewer_SHADER_FILES}
PROPERTIES HEADER_FILE_ONLY TRUE) PROPERTIES HEADER_FILE_ONLY TRUE)
list(APPEND viewer_SOURCE_FILES ${viewer_SHADER_FILES}) list(APPEND viewer_SOURCE_FILES ${viewer_SHADER_FILES})
@ -1970,7 +1970,7 @@ endif (WINDOWS)
# one of these being libz where you can find four or more versions in play # one of these being libz where you can find four or more versions in play
# at once. On Linux, libz can be found at link and run time via a number # at once. On Linux, libz can be found at link and run time via a number
# of paths: # of paths:
# #
# => -lfreetype # => -lfreetype
# => libz.so.1 (on install machine, not build) # => libz.so.1 (on install machine, not build)
# => -lSDL # => -lSDL
@ -2046,7 +2046,7 @@ foreach(elem ${country_codes})
set(emoji_mapping_src_file set(emoji_mapping_src_file
"${emoji_mapping_src_folder}/${elem}/emoji_characters.xml") "${emoji_mapping_src_folder}/${elem}/emoji_characters.xml")
set(emoji_mapping_dst_file set(emoji_mapping_dst_file
"${emoji_mapping_dst_folder}/${elem}/emoji_characters.xml") "${emoji_mapping_dst_folder}/${elem}/emoji_characters.xml")
configure_file(${emoji_mapping_src_file} ${emoji_mapping_dst_file} COPYONLY) configure_file(${emoji_mapping_src_file} ${emoji_mapping_dst_file} COPYONLY)
endforeach() endforeach()
@ -2148,7 +2148,7 @@ if (DARWIN)
# https://blog.kitware.com/upcoming-in-cmake-2-8-12-osx-rpath-support/ # https://blog.kitware.com/upcoming-in-cmake-2-8-12-osx-rpath-support/
set(CMAKE_MACOSX_RPATH 1) set(CMAKE_MACOSX_RPATH 1)
set_target_properties( set_target_properties(
${VIEWER_BINARY_NAME} ${VIEWER_BINARY_NAME}
PROPERTIES PROPERTIES
@ -2191,9 +2191,6 @@ if (DARWIN)
--grid=${GRID} --grid=${GRID}
--source=${CMAKE_CURRENT_SOURCE_DIR} --source=${CMAKE_CURRENT_SOURCE_DIR}
--versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt --versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt
DEPENDS
${VIEWER_BINARY_NAME}
${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
) )
add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_libvlc media_plugin_cef) add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_libvlc media_plugin_cef)
@ -2228,8 +2225,6 @@ if (DARWIN)
--touch=${CMAKE_CURRENT_BINARY_DIR}/$<IF:$<BOOL:${LL_GENERATOR_IS_MULTI_CONFIG}>,$<CONFIG>,>/.${product}.bat --touch=${CMAKE_CURRENT_BINARY_DIR}/$<IF:$<BOOL:${LL_GENERATOR_IS_MULTI_CONFIG}>,$<CONFIG>,>/.${product}.bat
--versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt --versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt
${SIGNING_SETTING} ${SIGNING_SETTING}
DEPENDS
${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
) )
endif (PACKAGE) endif (PACKAGE)
endif (DARWIN) endif (DARWIN)
@ -2269,7 +2264,7 @@ if (PACKAGE AND (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND VIE
PROPERTIES PROPERTIES
XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "dwarf-with-dsym" XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "dwarf-with-dsym"
XCODE_ATTRIBUTE_DWARF_DSYM_FOLDER_PATH "${SYMBOLS_STAGING_DIR}/dSYMs") XCODE_ATTRIBUTE_DWARF_DSYM_FOLDER_PATH "${SYMBOLS_STAGING_DIR}/dSYMs")
add_custom_command(OUTPUT "${VIEWER_APP_XCARCHIVE}" add_custom_command(OUTPUT "${VIEWER_APP_XCARCHIVE}"
COMMAND "zip" COMMAND "zip"
ARGS ARGS
@ -2304,7 +2299,7 @@ if (LL_TESTS)
# llremoteparcelrequest.cpp # llremoteparcelrequest.cpp
llviewerhelputil.cpp llviewerhelputil.cpp
llversioninfo.cpp llversioninfo.cpp
# llvocache.cpp # llvocache.cpp
llworldmap.cpp llworldmap.cpp
llworldmipmap.cpp llworldmipmap.cpp
) )
@ -2313,7 +2308,7 @@ if (LL_TESTS)
llworldmap.cpp llworldmap.cpp
llworldmipmap.cpp llworldmipmap.cpp
PROPERTIES PROPERTIES
LL_TEST_ADDITIONAL_SOURCE_FILES LL_TEST_ADDITIONAL_SOURCE_FILES
tests/llviewertexture_stub.cpp tests/llviewertexture_stub.cpp
#llviewertexturelist.cpp #llviewertexturelist.cpp
) )
@ -2347,7 +2342,7 @@ if (LL_TESTS)
llworldmap.cpp llworldmap.cpp
llworldmipmap.cpp llworldmipmap.cpp
PROPERTIES PROPERTIES
LL_TEST_ADDITIONAL_SOURCE_FILES LL_TEST_ADDITIONAL_SOURCE_FILES
tests/llviewertexture_stub.cpp tests/llviewertexture_stub.cpp
) )