[Jahshaka-cvs] SF.net SVN: openlibraries: [1396] trunk

[<re...@us...>]

Revision: 1396
          http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1396&view=rev
Author:   rexbron
Date:     2008-06-20 04:36:57 -0700 (Fri, 20 Jun 2008)

Log Message:
-----------
Make make install work.

Modified Paths:
--------------
    trunk/CMakeLists.txt
    trunk/src/openimagelib/plugins/jpg/CMakeLists.txt

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2008-06-20 12:35:16.835999966 +0100
committer: Andrew Hunter <an...@ae...>
properties: 
	branch-nick: trunk

   + timestamp: 2008-06-20 12:36:37.913000107 +0100
committer: Andrew Hunter <an...@ae...>
properties: 
	branch-nick: trunk

Name: bzr:ancestry:v3-trunk0
   - an...@ae...-20080613162705-8emncakb7nkknsbj
an...@ae...-20080614133032-vef9lmcgxyrauqss
an...@ae...-20080614141409-u4z2pzco7bmhavlb
an...@ae...-20080616112610-ky0ylmbwjn9w1mzm
an...@ae...-20080616122604-vyn3c4elr33ehlai
an...@ae...-20080616222235-pb4vb2oeu6cj88m4
an...@ae...-20080618110236-pfuxsos8x3wd285v
an...@ae...-20080618113925-cjg8er4jn4tmc0dm
an...@ae...-20080618182841-z2to60sr79wfdq9o
an...@ae...-20080618190025-f4tqmfnhagk3glij
an...@ae...-20080618195823-74quloizraz2fwj2
an...@ae...-20080619122406-jnh8jzrryfz26k5d
an...@ae...-20080619124658-ma0osj6o1ys7khec
an...@ae...-20080619134156-uy4fm1k8kygexnbq
an...@ae...-20080619134821-m149jig6bmpq41hx
an...@ae...-20080619141005-75220r6w2cvqbj8f
an...@ae...-20080620064802-8b2g4wfk32dn8mmz
an...@ae...-20080620070000-xodqay60ukgg300p

   + an...@ae...-20080613162705-8emncakb7nkknsbj
an...@ae...-20080614133032-vef9lmcgxyrauqss
an...@ae...-20080614141409-u4z2pzco7bmhavlb
an...@ae...-20080616112610-ky0ylmbwjn9w1mzm
an...@ae...-20080616122604-vyn3c4elr33ehlai
an...@ae...-20080616222235-pb4vb2oeu6cj88m4
an...@ae...-20080618110236-pfuxsos8x3wd285v
an...@ae...-20080618113925-cjg8er4jn4tmc0dm
an...@ae...-20080618182841-z2to60sr79wfdq9o
an...@ae...-20080618190025-f4tqmfnhagk3glij
an...@ae...-20080618195823-74quloizraz2fwj2
an...@ae...-20080619122406-jnh8jzrryfz26k5d
an...@ae...-20080619124658-ma0osj6o1ys7khec
an...@ae...-20080619134156-uy4fm1k8kygexnbq
an...@ae...-20080619134821-m149jig6bmpq41hx
an...@ae...-20080619141005-75220r6w2cvqbj8f
an...@ae...-20080620064802-8b2g4wfk32dn8mmz
an...@ae...-20080620070000-xodqay60ukgg300p
an...@ae...-20080620074105-20wzobu0xbnadzsc

Name: bzr:file-ids
   - src/openeffectslib/CMakeLists.txt	cmakelists.txt-20080620065821-lx20brr9ray4embr-1
src/openeffectslib/plugins/CMakeLists.txt	cmakelists.txt-20080620065821-lx20brr9ray4embr-2
src/openeffectslib/plugins/tonemap/CMakeLists.txt	cmakelists.txt-20080620065821-lx20brr9ray4embr-3

   + 
Name: bzr:revision-id:v3-trunk0
   - 1373 an...@ae...-20080614130206-thshu8ln95djpgng
1374 an...@ae...-20080616113201-cexl9qhreccah10e
1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7
1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8
1377 an...@ae...-20080616122853-cwqokea7hkf82eo1
1378 an...@ae...-20080616222400-9q0vwtkk6091txce
1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs
1381 an...@ae...-20080618114001-2574od4etx4v8p9h
1382 an...@ae...-20080618200208-ysmuaq2p7bfh7km4
1383 an...@ae...-20080618200623-29djr6bh81pmu2mu
1384 an...@ae...-20080618201105-neebgl19i1lbskta
1386 an...@ae...-20080619122646-zgt191pytyx46daj
1387 an...@ae...-20080619134508-jiifnq0kk4kskv4o
1388 an...@ae...-20080619134737-wcqb6ptssduanj6y
1389 an...@ae...-20080619134857-7k2kawpsxgqb9ss6
1390 an...@ae...-20080619141046-tgdq69hsumw4x55z
1391 an...@ae...-20080620113224-d5thhgo782mw0rjo
1392 an...@ae...-20080620113516-xdm7bt94xjmnlkme

   + 1373 an...@ae...-20080614130206-thshu8ln95djpgng
1374 an...@ae...-20080616113201-cexl9qhreccah10e
1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7
1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8
1377 an...@ae...-20080616122853-cwqokea7hkf82eo1
1378 an...@ae...-20080616222400-9q0vwtkk6091txce
1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs
1381 an...@ae...-20080618114001-2574od4etx4v8p9h
1382 an...@ae...-20080618200208-ysmuaq2p7bfh7km4
1383 an...@ae...-20080618200623-29djr6bh81pmu2mu
1384 an...@ae...-20080618201105-neebgl19i1lbskta
1386 an...@ae...-20080619122646-zgt191pytyx46daj
1387 an...@ae...-20080619134508-jiifnq0kk4kskv4o
1388 an...@ae...-20080619134737-wcqb6ptssduanj6y
1389 an...@ae...-20080619134857-7k2kawpsxgqb9ss6
1390 an...@ae...-20080619141046-tgdq69hsumw4x55z
1391 an...@ae...-20080620113224-d5thhgo782mw0rjo
1392 an...@ae...-20080620113516-xdm7bt94xjmnlkme
1393 an...@ae...-20080620113637-naxle4ehjs3kcwdf


Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2008-06-20 11:35:38 UTC (rev 1395)
+++ trunk/CMakeLists.txt	2008-06-20 11:36:57 UTC (rev 1396)
@@ -95,4 +95,9 @@
 option ( WITH_PYTHON_EXTENTIONS "Compile the python extentions for OpenLibraries." TRUE )
 option ( WITH_OPENFX_PLUGIN "Compile the OpenFX plugin for openmedialib." FALSE ) 
 
+# Install .so files with execcuteable permissions
+if ( not win32 )
+    set ( CMAKE_INSTALL_SO_NO_EXE FALSE )
+endif ( not win32 )
+
 add_subdirectory( src )

Modified: trunk/src/openimagelib/plugins/jpg/CMakeLists.txt
===================================================================
--- trunk/src/openimagelib/plugins/jpg/CMakeLists.txt	2008-06-20 11:35:38 UTC (rev 1395)
+++ trunk/src/openimagelib/plugins/jpg/CMakeLists.txt	2008-06-20 11:36:57 UTC (rev 1396)
@@ -11,7 +11,7 @@
     INCLUDE_DIRECTORIES ( ${JPEG_INCLUDE_DIR} )
     LINK_DIRECTORIES ( ${JPEG_LIBRAIES} ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/)
     TARGET_LINK_LIBRARIES ( ${NAME} ${JPEG_LIBRAIES} "openpluginlib_pl${LIBRARY_IDENTIFIER}" "openimagelib_il${LIBRARY_IDENTIFIER}" )
-    INSTALL ( FILES jpg_plugins.opl DESTINATION "lib/${PACKAGE}/openimagelib/plugins/" )
+    INSTALL ( FILES jpg_plugin.opl DESTINATION "lib/${PACKAGE}/openimagelib/plugins/" )
     INSTALL( TARGETS ${NAME} DESTINATION "lib/${PACKAGE}/openimagelib/plugins" )
 ELSE ( JPEG_FOUND )
     MESSAGE ( "libJPEG not found, skipping jpg plugin." )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.