From: <ai...@us...> - 2009-02-01 00:46:57
|
Revision: 9421 http://plplot.svn.sourceforge.net/plplot/?rev=9421&view=rev Author: airwin Date: 2009-02-01 00:46:46 +0000 (Sun, 01 Feb 2009) Log Message: ----------- Install Lua wrapper shared object with correct RPATH, etc., information into $prefix/lib. This install location is a temporary measure to help get the installed Lua examples working. Some additional research needed to figure out the best install location. Modified Paths: -------------- trunk/bindings/lua/CMakeLists.txt Modified: trunk/bindings/lua/CMakeLists.txt =================================================================== --- trunk/bindings/lua/CMakeLists.txt 2009-02-01 00:17:21 UTC (rev 9420) +++ trunk/bindings/lua/CMakeLists.txt 2009-02-01 00:46:46 UTC (rev 9421) @@ -45,4 +45,31 @@ swig_add_module(plplotluac lua plplotluac.i) swig_link_libraries(plplotluac plplot${LIB_TAG} ${LUA_LIBRARIES}) +if(USE_RPATH) + get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH) + set_target_properties( + plplotluac + PROPERTIES + INSTALL_RPATH "${LIB_INSTALL_RPATH}" + INSTALL_NAME_DIR "${LIB_DIR}" + ) +else(USE_RPATH) + set_target_properties( + plplotluac + PROPERTIES + INSTALL_NAME_DIR "${LIB_DIR}" + ) +endif(USE_RPATH) + +# Ensure we get the correct suffix for OS-X +if(APPLE) + set_target_properties( + plplotluac + PROPERTIES + SUFFIX ".dylib" + ) +endif(APPLE) + +install(TARGETS plplotluac LIBRARY DESTINATION ${LIB_DIR}) + endif(ENABLE_lua) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-08-25 17:33:37
|
Revision: 10330 http://plplot.svn.sourceforge.net/plplot/?rev=10330&view=rev Author: airwin Date: 2009-08-25 17:33:31 +0000 (Tue, 25 Aug 2009) Log Message: ----------- Whitespace. Export plplotluac target. Modified Paths: -------------- trunk/bindings/lua/CMakeLists.txt Modified: trunk/bindings/lua/CMakeLists.txt =================================================================== --- trunk/bindings/lua/CMakeLists.txt 2009-08-25 17:05:16 UTC (rev 10329) +++ trunk/bindings/lua/CMakeLists.txt 2009-08-25 17:33:31 UTC (rev 10330) @@ -20,57 +20,62 @@ if(ENABLE_lua) -# This is currently the include list for swig. -set(lua_interface_INCLUDE_PATHS -${CMAKE_SOURCE_DIR}/include -${CMAKE_SOURCE_DIR}/lib/qsastime -${CMAKE_BINARY_DIR} -${CMAKE_BINARY_DIR}/include -${CMAKE_CURRENT_BINARY_DIR} -${LUA_INCLUDE_DIR} -${CMAKE_SOURCE_DIR}/bindings/swig-support -) -include_directories(${lua_interface_INCLUDE_PATHS}) + # This is currently the include list for swig. + set(lua_interface_INCLUDE_PATHS + ${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/lib/qsastime + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}/include + ${CMAKE_CURRENT_BINARY_DIR} + ${LUA_INCLUDE_DIR} + ${CMAKE_SOURCE_DIR}/bindings/swig-support + ) + include_directories(${lua_interface_INCLUDE_PATHS}) -set(CMAKE_SWIG_FLAGS -DSWIG_LUA) -set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}) + set(CMAKE_SWIG_FLAGS -DSWIG_LUA) + set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}) -set_source_files_properties(plplotluac.i -PROPERTIES SWIG_MODULE_NAME plplotluac -) + set_source_files_properties(plplotluac.i + PROPERTIES SWIG_MODULE_NAME plplotluac + ) -set(SWIG_MODULE_plplotluac_EXTRA_DEPS -${CMAKE_SOURCE_DIR}/bindings/swig-support/plplotcapi.i) + set(SWIG_MODULE_plplotluac_EXTRA_DEPS + ${CMAKE_SOURCE_DIR}/bindings/swig-support/plplotcapi.i) -# Set up swig + c wrapper. -swig_add_module(plplotluac lua plplotluac.i) -swig_link_libraries(plplotluac plplot${LIB_TAG} ${LUA_LIBRARIES}) + # Set up swig + c wrapper. + swig_add_module(plplotluac lua plplotluac.i) + swig_link_libraries(plplotluac plplot${LIB_TAG} ${LUA_LIBRARIES}) -if(USE_RPATH) - get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH) - set_target_properties( - plplotluac - PROPERTIES - INSTALL_RPATH "${LIB_INSTALL_RPATH}" - INSTALL_NAME_DIR "${LUA_DIR}" - ) -else(USE_RPATH) - set_target_properties( - plplotluac - PROPERTIES - INSTALL_NAME_DIR "${LUA_DIR}" - ) -endif(USE_RPATH) + if(USE_RPATH) + get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH) + set_target_properties( + plplotluac + PROPERTIES + INSTALL_RPATH "${LIB_INSTALL_RPATH}" + INSTALL_NAME_DIR "${LUA_DIR}" + ) + else(USE_RPATH) + set_target_properties( + plplotluac + PROPERTIES + INSTALL_NAME_DIR "${LUA_DIR}" + ) + endif(USE_RPATH) -# Ensure we get the correct suffix for OS-X -if(APPLE) - set_target_properties( - plplotluac - PROPERTIES - SUFFIX ".dylib" - ) -endif(APPLE) + # Ensure we get the correct suffix for OS-X + if(APPLE) + set_target_properties( + plplotluac + PROPERTIES + SUFFIX ".dylib" + ) + endif(APPLE) -install(TARGETS plplotluac LIBRARY DESTINATION ${LUA_DIR}) + install(TARGETS plplotluac + EXPORT export_plplot + LIBRARY DESTINATION ${LUA_DIR} + ) + install(EXPORT export_plplot DESTINATION ${DATA_DIR}/examples/cmake/modules) + endif(ENABLE_lua) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-08-25 17:47:33
|
Revision: 10331 http://plplot.svn.sourceforge.net/plplot/?rev=10331&view=rev Author: airwin Date: 2009-08-25 17:47:25 +0000 (Tue, 25 Aug 2009) Log Message: ----------- Tweak white space. Modified Paths: -------------- trunk/bindings/lua/CMakeLists.txt Modified: trunk/bindings/lua/CMakeLists.txt =================================================================== --- trunk/bindings/lua/CMakeLists.txt 2009-08-25 17:33:31 UTC (rev 10330) +++ trunk/bindings/lua/CMakeLists.txt 2009-08-25 17:47:25 UTC (rev 10331) @@ -73,7 +73,8 @@ install(TARGETS plplotluac EXPORT export_plplot - LIBRARY DESTINATION ${LUA_DIR} + LIBRARY + DESTINATION ${LUA_DIR} ) install(EXPORT export_plplot DESTINATION ${DATA_DIR}/examples/cmake/modules) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |