Skip to content
Snippets Groups Projects
Commit 2714ecea authored by Oz Linden's avatar Oz Linden
Browse files

adjust cmake not to attempt loads of packages on the wrong platforms

parent 680194de
No related branches found
No related tags found
No related merge requests found
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
include(Prebuilt) include(Prebuilt)
if (NOT USESYSTEMLIBS) if (NOT USESYSTEMLIBS)
use_prebuilt_binary(glext) if (LINUX OR WINDOWS)
use_prebuilt_binary(glext)
endif (LINUX OR WINDOWS)
use_prebuilt_binary(glh-linear) use_prebuilt_binary(glh-linear)
set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
endif (NOT USESYSTEMLIBS) endif (NOT USESYSTEMLIBS)
...@@ -8,7 +8,11 @@ if (NDOF) ...@@ -8,7 +8,11 @@ if (NDOF)
set(NDOF_FIND_REQUIRED ON) set(NDOF_FIND_REQUIRED ON)
include(FindNDOF) include(FindNDOF)
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
use_prebuilt_binary(libndofdev) if (WINDOWS OR DARWIN)
use_prebuilt_binary(libndofdev)
elseif (LINUX)
use_prebuilt_binary(open-libndofdev)
endif (WINDOWS OR DARWIN)
if (WINDOWS) if (WINDOWS)
set(NDOF_LIBRARY libndofdev) set(NDOF_LIBRARY libndofdev)
......
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
if(INSTALL_PROPRIETARY) if(INSTALL_PROPRIETARY)
include(Prebuilt) include(Prebuilt)
use_prebuilt_binary(quicktime) if (WINDOWS)
use_prebuilt_binary(quicktime)
endif (WINDOWS)
endif(INSTALL_PROPRIETARY) endif(INSTALL_PROPRIETARY)
if (DARWIN) if (DARWIN)
......
...@@ -32,7 +32,10 @@ if (USESYSTEMLIBS) ...@@ -32,7 +32,10 @@ if (USESYSTEMLIBS)
add_definitions(${${pkg}_CFLAGS_OTHERS}) add_definitions(${${pkg}_CFLAGS_OTHERS})
endforeach(pkg) endforeach(pkg)
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
use_prebuilt_binary(gtk-atk-pango-glib) if (LINUX OR WINDOWS)
use_prebuilt_binary(gtk-atk-pango-glib)
endif (LINUX OR WINDOWS)
if (LINUX) if (LINUX)
set(UI_LIBRARIES set(UI_LIBRARIES
atk-1.0 atk-1.0
......
...@@ -2,9 +2,11 @@ ...@@ -2,9 +2,11 @@
include(Prebuilt) include(Prebuilt)
if (NOT USESYSTEMLIBS) if (NOT USESYSTEMLIBS)
if (LINUX)
use_prebuilt_binary(libuuid)
use_prebuilt_binary(fontconfig)
endif (LINUX)
use_prebuilt_binary(libhunspell) use_prebuilt_binary(libhunspell)
use_prebuilt_binary(libuuid)
use_prebuilt_binary(slvoice) use_prebuilt_binary(slvoice)
use_prebuilt_binary(fontconfig)
endif(NOT USESYSTEMLIBS) endif(NOT USESYSTEMLIBS)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment