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

Prebuilt fetch now honors CMake-specified plattform

Browse Source
This commit is contained in:
Siana Gearz
2011-12-25 05:21:37 +01:00
parent 2c8e3bb0a3
commit 23b97efb69
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/cmake/00-Common.cmake
View File

@@ -274,10 +274,6 @@ if(1 EQUAL 1)
add_definitions(-DMESH_ENABLED=1) add_definitions(-DMESH_ENABLED=1)
endif(1 EQUAL 1) endif(1 EQUAL 1)
if(SERVER)
include_directories(${LIBS_PREBUILT_DIR}/include/havok)
endif(SERVER)
SET( CMAKE_EXE_LINKER_FLAGS_RELEASESSE2 SET( CMAKE_EXE_LINKER_FLAGS_RELEASESSE2
"${CMAKE_EXE_LINKER_FLAGS_RELEASE}" CACHE STRING "${CMAKE_EXE_LINKER_FLAGS_RELEASE}" CACHE STRING
"Flags used for linking binaries under SSE2 build." "Flags used for linking binaries under SSE2 build."

3
indra/cmake/DownloadPrebuilt.cmake.in
View File

@@ -6,6 +6,7 @@ set(install_dir "@CMAKE_SOURCE_DIR@/..")
set(scp "@SCP_EXECUTABLE@") set(scp "@SCP_EXECUTABLE@")
set(scripts_dir "@SCRIPTS_DIR@") set(scripts_dir "@SCRIPTS_DIR@")
set(sentinel_dir "@CMAKE_BINARY_DIR@/prepare") set(sentinel_dir "@CMAKE_BINARY_DIR@/prepare")
set(prebuilt_type "@PREBUILT_TYPE@")
# In proprietary mode we use scp for download. # In proprietary mode we use scp for download.
set(proprietary "@INSTALL_PROPRIETARY@") set(proprietary "@INSTALL_PROPRIETARY@")
@@ -19,7 +20,7 @@ foreach(package ${packages})
# This package is missing or out of date. # This package is missing or out of date.
message(STATUS "Obtaining${proprietary_message} prebuilt '${package}'") message(STATUS "Obtaining${proprietary_message} prebuilt '${package}'")
execute_process( execute_process(
COMMAND ${python} install.py --install-dir=${install_dir} ${scp_option} ${package} COMMAND ${python} install.py -p${prebuilt_type} --install-dir=${install_dir} ${scp_option} ${package}
WORKING_DIRECTORY ${scripts_dir} WORKING_DIRECTORY ${scripts_dir}
RESULT_VARIABLE result RESULT_VARIABLE result
) )

11
indra/cmake/Variables.cmake
View File

@@ -110,6 +110,17 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
if (WINDOWS)
set(PREBUILT_TYPE windows)
elseif(DARWIN)
set(PREBUILT_TYPE darwin)
elseif(LINUX AND WORD_SIZE EQUAL 32)
set(PREBUILT_TYPE linux)
elseif(LINUX AND WORD_SIZE EQUAL 64)
set(PREBUILT_TYPE linux64)
endif(WINDOWS)
# Default deploy grid # Default deploy grid
set(GRID agni CACHE STRING "Target Grid") set(GRID agni CACHE STRING "Target Grid")