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

Unbreak non-debian derived and standalone linux

Browse Source
This commit is contained in:
Drake Arconis
2013-03-21 16:55:25 -04:00
parent 212faab988
commit 91b3cdde39
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/cmake/Variables.cmake
View File

@@ -60,6 +60,8 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(WORD_SIZE 64) set(WORD_SIZE 64)
endif(CMAKE_SIZEOF_VOID_P MATCHES 4) endif(CMAKE_SIZEOF_VOID_P MATCHES 4)
endif (WORD_SIZE EQUAL 32) endif (WORD_SIZE EQUAL 32)
if (NOT STANDALONE AND MULTIARCH_HACK)
if (WORD_SIZE EQUAL 32) if (WORD_SIZE EQUAL 32)
set(DEB_ARCHITECTURE i386) set(DEB_ARCHITECTURE i386)
set(FIND_LIBRARY_USE_LIB64_PATHS OFF) set(FIND_LIBRARY_USE_LIB64_PATHS OFF)
@@ -80,6 +82,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
endif (DPKG_RESULT EQUAL 0) endif (DPKG_RESULT EQUAL 0)
include(ConfigurePkgConfig) include(ConfigurePkgConfig)
endif (NOT STANDALONE AND MULTIARCH_HACK)
set(LL_ARCH ${ARCH}_linux) set(LL_ARCH ${ARCH}_linux)
set(LL_ARCH_DIR ${ARCH}-linux) set(LL_ARCH_DIR ${ARCH}-linux)