Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed doublequote issue with --extra_libraries

Browse Source
This commit is contained in:
Shyotl
2014-12-19 19:25:31 -06:00
parent 08db85fa99
commit ca49db02df
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/CMakeLists.txt
View File

@@ -1450,9 +1450,9 @@ if(FMOD_LIBRARY_RELEASE)
#viewer_manifest.py needs these libraries (for now its all dynlib) #viewer_manifest.py needs these libraries (for now its all dynlib)
if(MANIFEST_LIBRARIES) if(MANIFEST_LIBRARIES)
set(MANIFEST_LIBRARIES "${MANIFEST_LIBRARIES}|optimized ${fmod_lib_rel_name}|debug ${fmod_lib_deb_name}") set(MANIFEST_LIBRARIES ${MANIFEST_LIBRARIES}|optimized ${fmod_lib_rel_name}|debug ${fmod_lib_deb_name})
else(MANIFEST_LIBRARIES) else(MANIFEST_LIBRARIES)
set(MANIFEST_LIBRARIES "--extra_libraries=optimized ${fmod_lib_rel_name}|debug ${fmod_lib_deb_name}") set(MANIFEST_LIBRARIES optimized ${fmod_lib_rel_name}|debug ${fmod_lib_deb_name})
endif(MANIFEST_LIBRARIES) endif(MANIFEST_LIBRARIES)
if(WINDOWS) #If windows, fmod_lib_<config> points to a dll. The correct .lib needs to be linked (but copying is not necessary) if(WINDOWS) #If windows, fmod_lib_<config> points to a dll. The correct .lib needs to be linked (but copying is not necessary)
@@ -1530,7 +1530,7 @@ if (WINDOWS)
--login_channel=${VIEWER_LOGIN_CHANNEL} --login_channel=${VIEWER_LOGIN_CHANNEL}
--source=${CMAKE_CURRENT_SOURCE_DIR} --source=${CMAKE_CURRENT_SOURCE_DIR}
--touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/touched.bat --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/touched.bat
${MANIFEST_LIBRARIES} --extra_libraries="${MANIFEST_LIBRARIES}"
DEPENDS DEPENDS
${VIEWER_BINARY_NAME} ${VIEWER_BINARY_NAME}
${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
@@ -1553,7 +1553,7 @@ if (WINDOWS)
--login_channel=${VIEWER_LOGIN_CHANNEL} --login_channel=${VIEWER_LOGIN_CHANNEL}
--source=${CMAKE_CURRENT_SOURCE_DIR} --source=${CMAKE_CURRENT_SOURCE_DIR}
--touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/copy_touched.bat --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/copy_touched.bat
${MANIFEST_LIBRARIES} --extra_libraries="${MANIFEST_LIBRARIES}"
DEPENDS DEPENDS
${VIEWER_BINARY_NAME} ${VIEWER_BINARY_NAME}
${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
@@ -1652,7 +1652,7 @@ if (LINUX)
--source=${CMAKE_CURRENT_SOURCE_DIR} --source=${CMAKE_CURRENT_SOURCE_DIR}
--standalone=${STANDALONE} --standalone=${STANDALONE}
--touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched
${MANIFEST_LIBRARIES} --extra_libraries="${MANIFEST_LIBRARIES}"
DEPENDS DEPENDS
secondlife-stripped secondlife-stripped
${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
@@ -1676,7 +1676,7 @@ if (LINUX)
--login_channel=${VIEWER_LOGIN_CHANNEL} --login_channel=${VIEWER_LOGIN_CHANNEL}
--source=${CMAKE_CURRENT_SOURCE_DIR} --source=${CMAKE_CURRENT_SOURCE_DIR}
--standalone=${STANDALONE} --standalone=${STANDALONE}
${MANIFEST_LIBRARIES} --extra_libraries="${MANIFEST_LIBRARIES}"
DEPENDS DEPENDS
secondlife-stripped secondlife-stripped
${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py

10
indra/newview/viewer_manifest.py
View File

@@ -197,9 +197,15 @@ class ViewerManifest(LLManifest):
def add_extra_libraries(self): def add_extra_libraries(self):
found_libs = [] found_libs = []
if 'extra_libraries' in self.args: if 'extra_libraries' in self.args:
path_list = self.args['extra_libraries'].split('|') try:
path_list = self.args['extra_libraries'].strip('"').split('|')
except:
return None
for cur_path in path_list: for cur_path in path_list:
config, file = cur_path.split(' ', 1) try:
config, file = cur_path.split(' ', 1)
except:
config, file = (None, None)
if(config == 'optimized'): if(config == 'optimized'):
if(self.args['configuration'].lower() != 'release' and self.args['configuration'].lower() != 'relwithdebinfo'): if(self.args['configuration'].lower() != 'release' and self.args['configuration'].lower() != 'relwithdebinfo'):
continue continue