File FreeType.diff of Package viewer-release

Overview Repositories Revisions Requests Users Attributes Meta

File FreeType.diff of Package viewer-release (Revision d765c23e9106a783197e8915328f0a89)

Currently displaying revision d765c23e9106a783197e8915328f0a89 , Show latest

diff -burNE viewer-release_orig/autobuild.xml viewer-release/autobuild.xml
--- viewer-release_orig/autobuild.xml	2015-05-20 21:27:27.812620670 +0200
+++ viewer-release/autobuild.xml	2015-05-20 21:40:35.814914085 +0200
@@ -2484,10 +2484,6 @@
               <map>
                 <key>command</key>
                 <string>xcodebuild</string>
-                <key>filters</key>
-                <array>
-                  <string>setenv</string>
-                </array>
                 <key>options</key>
                 <array>
                   <string>-configuration RelWithDebInfo</string>
@@ -2540,10 +2536,6 @@
               <map>
                 <key>command</key>
                 <string>xcodebuild</string>
-                <key>filters</key>
-                <array>
-                  <string>setenv</string>
-                </array>
                 <key>options</key>
                 <array>
                   <string>-configuration Release</string>
diff -burNE viewer-release_orig/indra/cmake/FreeType.cmake viewer-release/indra/cmake/FreeType.cmake
--- viewer-release_orig/indra/cmake/FreeType.cmake	2015-05-20 21:27:27.607618974 +0200
+++ viewer-release/indra/cmake/FreeType.cmake	2015-05-20 21:40:35.814914085 +0200
@@ -8,7 +8,16 @@
 else (USESYSTEMLIBS)
   use_prebuilt_binary(freetype)
   set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/freetype2/)
+  if( NOT LINUX )
   set(FREETYPE_LIBRARIES freetype)
+  else( NOT LINUX )
+   # Nicky D.
+   # Force linking against prebuild freetype. Use find_library(...) instead of a simple set( ... ) so the configure step already fails. Otherwise everything
+   # might look golden until linking.
+   find_library( FREETYPE_LIBRARIES  freetype PATHS ${LIBS_PREBUILT_DIR}/lib/release/
+                 NO_DEFAULT_PATH NO_CMAKE_PATH NO_CMAKE_SYSTEM_PATH NO_CMAKE_ENVIRONMENT_PATH
+               )
+  endif( NOT LINUX )
 endif (USESYSTEMLIBS)
 
 link_directories(${FREETYPE_LIBRARY_DIRS})
diff -burNE viewer-release_orig/indra/cmake/UI.cmake viewer-release/indra/cmake/UI.cmake
--- viewer-release_orig/indra/cmake/UI.cmake	2015-05-20 21:27:27.607618974 +0200
+++ viewer-release/indra/cmake/UI.cmake	2015-05-20 21:40:35.814914085 +0200
@@ -39,6 +39,7 @@
   if (LINUX)
     set(UI_LIBRARIES
         atk-1.0
+	freetype
         gdk-x11-2.0
         gdk_pixbuf-2.0
         Xinerama

Places

File FreeType.diff of Package viewer-release (Revision d765c23e9106a783197e8915328f0a89)

Places