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

Resolved header conflict between linux/darwin/win32 by moving ares and curl headers relevant target subdirectories.

Browse Source 
Stemmed around the downloaded archives having differing headers and overwriting eachother.
This commit is contained in:
Shyotl
2011-02-15 04:11:47 -06:00
parent 796ea0db88
commit dfc99b4165
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/cmake/CARes.cmake
View File

@@ -19,5 +19,5 @@ else (STANDALONE)
else (WINDOWS)
set(CARES_LIBRARIES cares)
endif (WINDOWS)
set(CARES_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/ares)
set(CARES_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/ares)
endif (STANDALONE)

2
indra/cmake/CURL.cmake
View File

@@ -15,5 +15,5 @@ else (STANDALONE)
else (WINDOWS)
set(CURL_LIBRARIES curl)
endif (WINDOWS)
set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
endif (STANDALONE)