diff options
| -rw-r--r-- | indra/cmake/00-Common.cmake | 8 | ||||
| -rw-r--r-- | indra/cmake/UI.cmake | 25 |
2 files changed, 21 insertions, 12 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index ec0e195b56..5320fc193c 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -190,11 +190,3 @@ if (LINUX OR DARWIN) endif (LINUX OR DARWIN) -set(${ARCH}_linux_INCLUDES - atk-1.0 - glib-2.0 - gstreamer-0.10 - gtk-2.0 - pango-1.0 - ) - diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake index c12dca2ab9..ee95547136 100644 --- a/indra/cmake/UI.cmake +++ b/indra/cmake/UI.cmake @@ -28,10 +28,27 @@ endif (LINUX) include_directories ( ${LIBS_PREBUILT_DIR}/include ${LIBS_PREBUILT_DIR}/include -) -foreach(include ${${LL_ARCH}_INCLUDES}) - include_directories(${LIBS_PREBUILT_DIR}/include/${include}) -endforeach(include) + ) + + +# The following made no real sense +# - ${ARCH}_linux_INCLUDES was set in 00-Common.cmake, +# - Here ist is used, but as ${${LL_ARCH}_INCLUDES} +# It would make more sense to use one form ($LL_ARCH) +# Leave this out for the moment, but come back when looking at the Linux build + +#set(${ARCH}_linux_INCLUDES +# atk-1.0 +# glib-2.0 +# gstreamer-0.10 +# gtk-2.0 +# pango-1.0 +# ) +#foreach(include ${${LL_ARCH}_INCLUDES}) +# set_target_include_dirs( ll::uilibraries +# ${LIBS_PREBUILT_DIR}/include/${include} +# ) +#endforeach(include) if (LINUX) add_definitions(-DLL_GTK=1 -DLL_X11=1) |