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

Fix up more prebuilt issues

Browse Source
This commit is contained in:
Drake Arconis
2016-01-19 01:47:58 -05:00
parent ae0ad8af92
commit a75ed131b7
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/cmake/CURL.cmake
View File

@@ -13,10 +13,8 @@ else (STANDALONE)
debug libcurld debug libcurld
optimized libcurl) optimized libcurl)
else (WINDOWS) else (WINDOWS)
set(CURL_LIBRARIES curl) use_prebuilt_binary(libidn)
if(LINUX AND WORD_SIZE EQUAL 64) set(CURL_LIBRARIES curl idn)
list(APPEND CURL_LIBRARIES idn)
endif(LINUX AND WORD_SIZE EQUAL 64)
endif (WINDOWS) endif (WINDOWS)
set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
endif (STANDALONE) endif (STANDALONE)

7
indra/cmake/DBusGlib.cmake
View File

@@ -7,12 +7,11 @@ if (STANDALONE)
pkg_check_modules(DBUSGLIB REQUIRED dbus-glib-1) pkg_check_modules(DBUSGLIB REQUIRED dbus-glib-1)
elseif (LINUX) elseif (LINUX)
use_prebuilt_binary(dbusglib) use_prebuilt_binary(dbus-glib)
set(DBUSGLIB_FOUND ON FORCE BOOL) set(DBUSGLIB_FOUND ON FORCE BOOL)
set(DBUSGLIB_INCLUDE_DIRS set(DBUSGLIB_INCLUDE_DIRS
${LIBS_PREBUILT_DIR}/include/dbus ${LIBS_PREBUILT_DIR}/include/dbus
${LIBS_PREBUILT_LEGACY_DIR}/include/dbus )
)
# We don't need to explicitly link against dbus-glib itself, because # We don't need to explicitly link against dbus-glib itself, because
# the viewer probes for the system's copy at runtime. # the viewer probes for the system's copy at runtime.
set(DBUSGLIB_LIBRARIES set(DBUSGLIB_LIBRARIES