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

Fix linux64 config and cmake up

Browse Source
This commit is contained in:
Drake Arconis
2016-01-20 07:22:34 -05:00
parent 01bf430b1a
commit 35c409f744
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
autobuild.xml
View File

@@ -2867,6 +2867,7 @@
<array> <array>
<string>-G</string> <string>-G</string>
<string>'Unix Makefiles'</string> <string>'Unix Makefiles'</string>
<string>-DWORD_SIZE:STRING=64</string>
</array> </array>
</map> </map>
<key>default</key> <key>default</key>
@@ -2891,6 +2892,7 @@
<array> <array>
<string>-G</string> <string>-G</string>
<string>'Unix Makefiles'</string> <string>'Unix Makefiles'</string>
<string>-DWORD_SIZE:STRING=64</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>

1
indra/cmake/LLCommon.cmake
View File

@@ -12,6 +12,7 @@ endif (DARWIN)
set(LLCOMMON_INCLUDE_DIRS set(LLCOMMON_INCLUDE_DIRS
${LIBS_OPEN_DIR}/cwdebug
${LIBS_OPEN_DIR}/llcommon ${LIBS_OPEN_DIR}/llcommon
${APRUTIL_INCLUDE_DIR} ${APRUTIL_INCLUDE_DIR}
${APR_INCLUDE_DIR} ${APR_INCLUDE_DIR}

3
indra/llcommon/CMakeLists.txt
View File

@@ -2,6 +2,7 @@
project(llcommon) project(llcommon)
include(Cwdebug)
include(00-Common) include(00-Common)
include(LLCommon) include(LLCommon)
include(APR) include(APR)
@@ -250,6 +251,8 @@ set(llcommon_HEADER_FILES
set_source_files_properties(${llcommon_HEADER_FILES} set_source_files_properties(${llcommon_HEADER_FILES}
PROPERTIES HEADER_FILE_ONLY TRUE) PROPERTIES HEADER_FILE_ONLY TRUE)
list(APPEND llcommon_SOURCE_FILES ${cwdebug_SOURCE_FILES})
list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES}) list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES})
if(NOT WORD_SIZE EQUAL 32) if(NOT WORD_SIZE EQUAL 32)