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

Mac fixup.

Browse Source
This commit is contained in:
Shyotl
2014-12-22 02:08:18 -06:00
parent ca49db02df
commit e0fb73414b
9 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/cmake/CARes.cmake
View File

@@ -13,7 +13,7 @@ else (STANDALONE)
add_definitions("-DCARES_STATICLIB") add_definitions("-DCARES_STATICLIB")
set(CARES_LIBRARIES areslib) set(CARES_LIBRARIES areslib)
elseif (DARWIN) elseif (DARWIN)
set(APR_LIBRARIES set(CARES_LIBRARIES
debug libcares.a debug libcares.a
optimized libcares.a optimized libcares.a
) )

36
indra/cmake/Linking.cmake
View File

@@ -5,35 +5,35 @@ set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES")
include(Variables) include(Variables)
if (NOT STANDALONE) if (NOT STANDALONE)
set(ARCH_PREBUILT_DIRS
${LIBS_PREBUILT_DIR}/lib if(CMAKE_BUILD_TYPE)
${LIBS_PREBUILT_LEGACY_DIR}/lib string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
) endif(CMAKE_BUILD_TYPE)
set(ARCH_PREBUILT_DIRS_RELEASE
${LIBS_PREBUILT_DIR}/lib/release
${LIBS_PREBUILT_LEGACY_DIR}/lib/release
)
set(ARCH_PREBUILT_DIRS_DEBUG
${LIBS_PREBUILT_DIR}/lib/debug
${LIBS_PREBUILT_LEGACY_DIR}/lib/debug
)
if(WINDOWS OR ${CMAKE_GENERATOR} MATCHES "Xcode") if(WINDOWS OR ${CMAKE_GENERATOR} MATCHES "Xcode")
# the cmake xcode and VS generators implicitly append ${CMAKE_CFG_INTDIR} to the library paths for us # the cmake xcode and VS generators implicitly append ${CMAKE_CFG_INTDIR} to the library paths for us
# fortunately both windows and darwin are case insensitive filesystems so this works. # fortunately both windows and darwin are case insensitive filesystems so this works.
set(ARCH_PREBUILT_LINK_DIRS "${ARCH_PREBUILT_DIRS}") set(ARCH_PREBUILT_LINK_DIRS
${LIBS_PREBUILT_DIR}/lib
${LIBS_PREBUILT_LEGACY_DIR}/lib
)
else(WINDOWS OR ${CMAKE_GENERATOR} MATCHES "Xcode") else(WINDOWS OR ${CMAKE_GENERATOR} MATCHES "Xcode")
# else block is for linux and any other makefile based generators # else block is for linux and any other makefile based generators
string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER) set(ARCH_PREBUILT_LINK_DIRS
set(ARCH_PREBUILT_LINK_DIRS ${ARCH_PREBUILT_DIRS}/${CMAKE_BUILD_TYPE_LOWER}) ${LIBS_PREBUILT_DIR}/lib/${CMAKE_BUILD_TYPE_LOWER}
${LIBS_PREBUILT_LEGACY_DIR}/lib/${CMAKE_BUILD_TYPE_LOWER}
)
endif(WINDOWS OR ${CMAKE_GENERATOR} MATCHES "Xcode") endif(WINDOWS OR ${CMAKE_GENERATOR} MATCHES "Xcode")
if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release") if (NOT "${CMAKE_BUILD_TYPE_LOWER}" STREQUAL "release")
# When we're building something other than Release, append the # When we're building something other than Release, append the
# packages/lib/release directory to deal with autobuild packages that don't # packages/lib/release directory to deal with autobuild packages that don't
# provide (e.g.) lib/debug libraries. # provide (e.g.) lib/debug libraries.
list(APPEND ARCH_PREBUILT_LINK_DIRS ${ARCH_PREBUILT_DIRS_RELEASE}) list(APPEND ARCH_PREBUILT_LINK_DIRS
endif (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release") ${LIBS_PREBUILT_DIR}/lib/release
${LIBS_PREBUILT_LEGACY_DIR}/lib/release
)
endif (NOT "${CMAKE_BUILD_TYPE_LOWER}" STREQUAL "release")
endif (NOT STANDALONE) endif (NOT STANDALONE)
link_directories(${ARCH_PREBUILT_LINK_DIRS}) link_directories(${ARCH_PREBUILT_LINK_DIRS})

6
indra/develop.py
View File

@@ -112,14 +112,14 @@ class PlatformSetup(object):
def build_dirs(self): def build_dirs(self):
'''Return the top-level directories in which builds occur. '''Return the top-level directories in which builds occur.
This can return more than one directory, e.g. if doing a
32-bit viewer and server build on Linux.'''
if(os.path.basename(os.path.normpath(os.getcwd())) == 'indra'): if(os.path.basename(os.path.normpath(os.getcwd())) == 'indra'):
prefix = '../' prefix = '../'
else: else:
prefix = '' prefix = ''
This can return more than one directory, e.g. if doing a
32-bit viewer and server build on Linux.'''
return [prefix+'build-' + self.platform()] return [prefix+'build-' + self.platform()]
def cmake_commandline(self, src_dir, build_dir, opts, simple): def cmake_commandline(self, src_dir, build_dir, opts, simple):

1
indra/newview/viewer_manifest.py
View File

@@ -37,6 +37,7 @@ import re
import tarfile import tarfile
import time import time
import subprocess import subprocess
import errno
viewer_dir = os.path.dirname(__file__) viewer_dir = os.path.dirname(__file__)
# add llmanifest library to our path so we don't have to muck with PYTHONPATH # add llmanifest library to our path so we don't have to muck with PYTHONPATH
sys.path.append(os.path.join(viewer_dir, '../lib/python/indra/util')) sys.path.append(os.path.join(viewer_dir, '../lib/python/indra/util'))

2
indra/plugins/example_basic/CMakeLists.txt
View File

@@ -62,7 +62,7 @@ if (DARWIN)
PREFIX "" PREFIX ""
BUILD_WITH_INSTALL_RPATH 1 BUILD_WITH_INSTALL_RPATH 1
INSTALL_NAME_DIR "@executable_path" INSTALL_NAME_DIR "@executable_path"
LINK_FLAGS "-exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../base_basic/basic_plugin_base.exp" LINK_FLAGS "-exported_symbols_list '${CMAKE_CURRENT_SOURCE_DIR}/../base_basic/basic_plugin_base.exp'"
) )
endif (DARWIN) endif (DARWIN)

2
indra/plugins/example_media/CMakeLists.txt
View File

@@ -75,7 +75,7 @@ if (DARWIN)
PREFIX "" PREFIX ""
BUILD_WITH_INSTALL_RPATH 1 BUILD_WITH_INSTALL_RPATH 1
INSTALL_NAME_DIR "@executable_path" INSTALL_NAME_DIR "@executable_path"
LINK_FLAGS "-exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../base_media/media_plugin_base.exp" LINK_FLAGS "-exported_symbols_list '${CMAKE_CURRENT_SOURCE_DIR}/../base_media/media_plugin_base.exp'"
) )
endif (DARWIN) endif (DARWIN)

2
indra/plugins/filepicker/CMakeLists.txt
View File

@@ -102,7 +102,7 @@ if (DARWIN)
PREFIX "" PREFIX ""
BUILD_WITH_INSTALL_RPATH 1 BUILD_WITH_INSTALL_RPATH 1
INSTALL_NAME_DIR "@executable_path" INSTALL_NAME_DIR "@executable_path"
LINK_FLAGS "-exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../base_basic/basic_plugin_base.exp" LINK_FLAGS "-exported_symbols_list '${CMAKE_CURRENT_SOURCE_DIR}/../base_basic/basic_plugin_base.exp'"
) )
endif (DARWIN) endif (DARWIN)

2
indra/plugins/quicktime/CMakeLists.txt
View File

@@ -76,7 +76,7 @@ if (QUICKTIME)
PREFIX "" PREFIX ""
BUILD_WITH_INSTALL_RPATH 1 BUILD_WITH_INSTALL_RPATH 1
INSTALL_NAME_DIR "@executable_path" INSTALL_NAME_DIR "@executable_path"
LINK_FLAGS "-exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../base_media/media_plugin_base.exp" LINK_FLAGS "-exported_symbols_list '${CMAKE_CURRENT_SOURCE_DIR}/../base_media/media_plugin_base.exp'"
) )
# We use a bunch of deprecated system APIs. # We use a bunch of deprecated system APIs.

6
indra/plugins/webkit/CMakeLists.txt
View File

@@ -117,15 +117,15 @@ if (DARWIN)
PREFIX "" PREFIX ""
BUILD_WITH_INSTALL_RPATH 1 BUILD_WITH_INSTALL_RPATH 1
INSTALL_NAME_DIR "@executable_path" INSTALL_NAME_DIR "@executable_path"
LINK_FLAGS "-exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../base_media/media_plugin_base.exp" LINK_FLAGS "-exported_symbols_list '${CMAKE_CURRENT_SOURCE_DIR}/../base_media/media_plugin_base.exp'"
) )
# copy the webkit dylib to the build directory # copy the webkit dylib to the build directory
add_custom_command( add_custom_command(
TARGET media_plugin_webkit POST_BUILD TARGET media_plugin_webkit POST_BUILD
# OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libllqtwebkit.dylib # OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libllqtwebkit.dylib
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib/release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/packages/libraries/universal-darwin/lib/release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/
DEPENDS media_plugin_webkit ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib/release/libllqtwebkit.dylib DEPENDS media_plugin_webkit ${CMAKE_BINARY_DIR}/packages/libraries/universal-darwin/lib/release/libllqtwebkit.dylib
) )
endif (DARWIN) endif (DARWIN)