Revision: 8332
http://playerstage.svn.sourceforge.net/playerstage/?rev=8332&view=rev
Author: thjc
Date: 2009-10-28 22:01:56 +0000 (Wed, 28 Oct 2009)
Log Message:
-----------
applied patch 2887703: Player 64 bit install path
Modified Paths:
--------------
code/player/trunk/client_libs/libplayerc/bindings/python/CMakeLists.txt
code/player/trunk/client_libs/libplayerc/bindings/ruby/CMakeLists.txt
code/player/trunk/client_libs/libplayerc++/bindings/python/CMakeLists.txt
code/player/trunk/client_libs/libplayerc++/bindings/ruby/CMakeLists.txt
code/player/trunk/cmake/UsePlayerC++.cmake.in
code/player/trunk/cmake/UsePlayerC.cmake.in
code/player/trunk/cmake/UsePlayerPlugin.cmake.in
code/player/trunk/cmake/internal/FindOS.cmake
code/player/trunk/cmake/internal/LibraryUtils.cmake
code/player/trunk/cmake/internal/SetupDirectories.cmake
code/player/trunk/cmake/pkgconfig.cmake
Modified:
code/player/trunk/client_libs/libplayerc/bindings/python/CMakeLists.txt
===================================================================
--- code/player/trunk/client_libs/libplayerc/bindings/python/CMakeLists.txt
2009-10-28 04:23:50 UTC (rev 8331)
+++ code/player/trunk/client_libs/libplayerc/bindings/python/CMakeLists.txt
2009-10-28 22:01:56 UTC (rev 8332)
@@ -54,7 +54,7 @@
ERROR_VARIABLE pythonVersionString
ERROR_STRIP_TRAILING_WHITESPACE)
STRING (REGEX REPLACE "^Python ([0-9]+\\.[0-9]+).*" "\\1"
pythonVersion ${pythonVersionString})
- SET (playercpyInstallDir
lib/python${pythonVersion}/site-packages)
+ SET (playercpyInstallDir
${PLAYER_LIBRARY_INSTALL_DIR}/python${pythonVersion}/site-packages)
ENDIF (PYTHON_OS_WIN)
SET (PYTHON_BINDINGS_INSTALL_DIR ${playercpyInstallDir} CACHE PATH
"Python bindings installation directory under $prefix")
MARK_AS_ADVANCED (PYTHON_BINDINGS_INSTALL_DIR)
Modified: code/player/trunk/client_libs/libplayerc/bindings/ruby/CMakeLists.txt
===================================================================
--- code/player/trunk/client_libs/libplayerc/bindings/ruby/CMakeLists.txt
2009-10-28 04:23:50 UTC (rev 8331)
+++ code/player/trunk/client_libs/libplayerc/bindings/ruby/CMakeLists.txt
2009-10-28 22:01:56 UTC (rev 8332)
@@ -56,12 +56,14 @@
STRING(REPLACE "/usr/" "" ruby_relative_sitelib_dir
${RUBY_SITELIB_DIR})
STRING(REPLACE "/opt/" "" ruby_relative_sitelib_dir
${ruby_relative_sitelib_dir})
STRING(REPLACE "local/" "" ruby_relative_sitelib_dir
${ruby_relative_sitelib_dir})
+ STRING(REPLACE "lib/" ${PLAYER_LIBRARY_INSTALL_DIR}/
ruby_relative_sitelib_dir ${ruby_relative_sitelib_dir} )
SET (RUBY_BINDINGS_INSTALL_DIR ${ruby_relative_sitelib_dir} CACHE
PATH "Ruby bindings installation directory under $RUBY_SITELIB_DIR")
MARK_AS_ADVANCED (RUBY_BINDINGS_INSTALL_DIR)
INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/playercr.so
DESTINATION ${RUBY_BINDINGS_INSTALL_DIR}
RENAME playerc.so)
+ MESSAGE (STATUS "Ruby bindings for C client will be installed to
${RUBY_BINDINGS_INSTALL_DIR}")
ELSE (SWIG_FOUND)
MESSAGE (STATUS "Ruby bindings for C client library will not be
built - could not find Swig")
ENDIF (SWIG_FOUND)
Modified:
code/player/trunk/client_libs/libplayerc++/bindings/python/CMakeLists.txt
===================================================================
--- code/player/trunk/client_libs/libplayerc++/bindings/python/CMakeLists.txt
2009-10-28 04:23:50 UTC (rev 8331)
+++ code/player/trunk/client_libs/libplayerc++/bindings/python/CMakeLists.txt
2009-10-28 22:01:56 UTC (rev 8332)
@@ -36,7 +36,7 @@
ERROR_VARIABLE pythonVersionString
ERROR_STRIP_TRAILING_WHITESPACE)
STRING (REGEX REPLACE "^Python ([0-9]+\\.[0-9]+).*" "\\1"
pythonVersion ${pythonVersionString})
- SET (playercpppyInstallDir
lib/python${pythonVersion}/site-packages)
+ SET (playercpppyInstallDir
${PLAYER_LIBRARY_INSTALL_DIR}/python${pythonVersion}/site-packages)
ENDIF (PYTHON_OS_WIN)
SET (PYTHON_BINDINGS_INSTALL_DIR ${playercpppyInstallDir}
CACHE PATH "Python bindings installation directory under $prefix")
MARK_AS_ADVANCED (PYTHON_BINDINGS_INSTALL_DIR)
@@ -55,4 +55,4 @@
ENDIF (PYTHONINTERP_FOUND)
ELSE (BUILD_PLAYERCC)
MESSAGE (STATUS "Python bindings for C++ client library will not be built -
playerc++ client library disabled")
-ENDIF (BUILD_PLAYERCC)
\ No newline at end of file
+ENDIF (BUILD_PLAYERCC)
Modified:
code/player/trunk/client_libs/libplayerc++/bindings/ruby/CMakeLists.txt
===================================================================
--- code/player/trunk/client_libs/libplayerc++/bindings/ruby/CMakeLists.txt
2009-10-28 04:23:50 UTC (rev 8331)
+++ code/player/trunk/client_libs/libplayerc++/bindings/ruby/CMakeLists.txt
2009-10-28 22:01:56 UTC (rev 8332)
@@ -34,6 +34,7 @@
STRING(REPLACE "/usr/" "" ruby_relative_sitelib_dir
${RUBY_SITELIB_DIR})
STRING(REPLACE "/opt/" "" ruby_relative_sitelib_dir
${ruby_relative_sitelib_dir})
STRING(REPLACE "local/" "" ruby_relative_sitelib_dir
${ruby_relative_sitelib_dir})
+ STRING(REPLACE "lib/" ${PLAYER_LIBRARY_INSTALL_DIR}/
ruby_relative_sitelib_dir ${ruby_relative_sitelib_dir})
SET (RUBY_BINDINGS_INSTALL_DIR ${ruby_relative_sitelib_dir}
CACHE PATH "Ruby bindings for the c++ library installation directory under
$RUBY_SITELIB_DIR")
MARK_AS_ADVANCED (RUBY_BINDINGS_INSTALL_DIR)
Modified: code/player/trunk/cmake/UsePlayerC++.cmake.in
===================================================================
--- code/player/trunk/cmake/UsePlayerC++.cmake.in 2009-10-28 04:23:50 UTC
(rev 8331)
+++ code/player/trunk/cmake/UsePlayerC++.cmake.in 2009-10-28 22:01:56 UTC
(rev 8332)
@@ -18,7 +18,7 @@
SET (PLAYERCPP_LINK_LIBS @PLAYERCC_EXTRA_LINK_LIBRARIES@)
LIST (APPEND PLAYERCPP_LINK_LIBS "playerc++")
SET (PLAYERCPP_LIBRARY_DIRS @PLAYERCC_EXTRA_LINK_DIRS@)
- LIST (APPEND PLAYERCPP_LIBRARY_DIRS "@CMAKE_INSTALL_PREFIX@/lib")
+ LIST (APPEND PLAYERCPP_LIBRARY_DIRS
"@CMAKE_INSTALL_PREFIX@/@PLAYER_LIBRARY_INSTALL_DIR@")
SET (PLAYERCPP_LINK_FLAGS "")
ELSE (NOT PKG_CONFIG_FOUND)
pkg_check_modules (PLAYERCPP_PKG REQUIRED playerc++)
Modified: code/player/trunk/cmake/UsePlayerC.cmake.in
===================================================================
--- code/player/trunk/cmake/UsePlayerC.cmake.in 2009-10-28 04:23:50 UTC (rev
8331)
+++ code/player/trunk/cmake/UsePlayerC.cmake.in 2009-10-28 22:01:56 UTC (rev
8332)
@@ -18,7 +18,7 @@
SET (PLAYERC_LINK_LIBS @PLAYERC_EXTRA_LINK_LIBRARIES@)
LIST (APPEND PLAYERC_LINK_LIBS "playerc")
SET (PLAYERC_LIBRARY_DIRS @PLAYERC_EXTRA_LINK_DIRS@)
- LIST (APPEND PLAYERC_LIBRARY_DIRS "@CMAKE_INSTALL_PREFIX@/lib")
+ LIST (APPEND PLAYERC_LIBRARY_DIRS
"@CMAKE_INSTALL_PREFIX@/@PLAYER_LIBRARY_INSTALL_DIR@")
SET (PLAYERC_LINK_FLAGS "")
ELSE (NOT PKG_CONFIG_FOUND)
pkg_check_modules (PLAYERC_PKG REQUIRED playerc)
Modified: code/player/trunk/cmake/UsePlayerPlugin.cmake.in
===================================================================
--- code/player/trunk/cmake/UsePlayerPlugin.cmake.in 2009-10-28 04:23:50 UTC
(rev 8331)
+++ code/player/trunk/cmake/UsePlayerPlugin.cmake.in 2009-10-28 22:01:56 UTC
(rev 8332)
@@ -18,7 +18,7 @@
SET (PLUGIN_PLAYERC_LINK_LIBS @PLAYERC_EXTRA_LINK_LIBRARIES@)
LIST (APPEND PLUGIN_PLAYERC_LINK_LIBS "playerc")
SET (PLUGIN_PLAYERC_LIBRARY_DIRS @PLAYERC_EXTRA_LINK_DIRS@)
- LIST (APPEND PLUGIN_PLAYERC_LIBRARY_DIRS "@CMAKE_INSTALL_PREFIX@/lib")
+ LIST (APPEND PLUGIN_PLAYERC_LIBRARY_DIRS
"@CMAKE_INSTALL_PREFIX@/@PLAYER_LIBRARY_INSTALL_DIR@")
SET (PLUGIN_PLAYERC_LINK_FLAGS "")
ELSE (NOT PKG_CONFIG_FOUND)
pkg_check_modules (PLUGIN_PLAYERC_PKG REQUIRED playerc)
@@ -45,7 +45,7 @@
SET (PLAYERCORE_LINK_LIBS @PLAYERCORE_EXTRA_LINK_LIBRARIES@)
LIST (APPEND PLAYERCORE_LINK_LIBS "playercore")
SET (PLAYERCORE_LIBRARY_DIRS @PLAYERCORE_EXTRA_LINK_DIRS@)
- LIST (APPEND PLAYERCORE_LIBRARY_DIRS "@CMAKE_INSTALL_PREFIX@/lib")
+ LIST (APPEND PLAYERCORE_LIBRARY_DIRS
"@CMAKE_INSTALL_PREFIX@/@PLAYER_LIBRARY_INSTALL_DIR@")
SET (PLAYERCORE_LINK_FLAGS "")
ELSE (NOT PKG_CONFIG_FOUND)
pkg_check_modules (PLAYERCORE_PKG REQUIRED playercore)
Modified: code/player/trunk/cmake/internal/FindOS.cmake
===================================================================
--- code/player/trunk/cmake/internal/FindOS.cmake 2009-10-28 04:23:50 UTC
(rev 8331)
+++ code/player/trunk/cmake/internal/FindOS.cmake 2009-10-28 22:01:56 UTC
(rev 8332)
@@ -43,3 +43,27 @@
ELSE (PLAYER_OS_LINUX)
MESSAGE (STATUS "Operating system is generic Unix")
ENDIF (PLAYER_OS_LINUX)
+
+
+##RJM 10/09
+#SET (PLAYER_PROC_64BIT FALSE BOOL INTERNAL)
+#SET (PLAYER_PROC_PPC64 FALSE BOOL INTERNAL)
+#SET (PLAYER_PROC_X86_64 FALSE BOOL INTERNAL)
+
+MESSAGE (STATUS "Got System Processor ${CMAKE_SYSTEM_PROCESSOR}")
+
+# 32 or 64 bit Linux
+IF (PLAYER_OS_LINUX)
+ # Set the library directory suffix accordingly
+ IF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+ SET (PLAYER_PROC_64BIT TRUE BOOL INTERNAL)
+ MESSAGE (STATUS "Linux x86_64 Detected")
+ ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64")
+ MESSAGE (STATUS "Linux ppc64 Detected")
+ SET (PLAYER_PROC_64BIT TRUE BOOL INTERNAL)
+ ENDIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+ENDIF (PLAYER_OS_LINUX)
+
+
+
+##/RJM 10/09
Modified: code/player/trunk/cmake/internal/LibraryUtils.cmake
===================================================================
--- code/player/trunk/cmake/internal/LibraryUtils.cmake 2009-10-28 04:23:50 UTC
(rev 8331)
+++ code/player/trunk/cmake/internal/LibraryUtils.cmake 2009-10-28 22:01:56 UTC
(rev 8332)
@@ -16,9 +16,9 @@
VERSION ${PLAYER_VERSION}
SOVERSION ${PLAYER_API_VERSION}
INSTALL_NAME_DIR ${RPATH_VAL}
- INSTALL_RPATH
"${INSTALL_RPATH};${CMAKE_INSTALL_PREFIX}/lib"
+ INSTALL_RPATH
"${INSTALL_RPATH};${CMAKE_INSTALL_PREFIX}/${PLAYER_LIBRARY_INSTALL_DIR}"
BUILD_WITH_INSTALL_RPATH TRUE)
- INSTALL (TARGETS ${_name} DESTINATION lib/ COMPONENT libraries)
+ INSTALL (TARGETS ${_name} DESTINATION ${PLAYER_LIBRARY_INSTALL_DIR}/
COMPONENT libraries)
ENDMACRO (PLAYER_ADD_LIBRARY)
@@ -28,7 +28,7 @@
MACRO (PLAYER_ADD_EXECUTABLE _name)
ADD_EXECUTABLE (${_name} ${ARGN})
SET_TARGET_PROPERTIES (${_name} PROPERTIES
- INSTALL_RPATH
"${INSTALL_RPATH};${CMAKE_INSTALL_PREFIX}/lib"
+ INSTALL_RPATH
"${INSTALL_RPATH};${CMAKE_INSTALL_PREFIX}/${PLAYER_LIBRARY_INSTALL_DIR}"
BUILD_WITH_INSTALL_RPATH TRUE)
INSTALL (TARGETS ${_name} RUNTIME DESTINATION bin/ COMPONENT applications)
ENDMACRO (PLAYER_ADD_EXECUTABLE)
@@ -191,7 +191,7 @@
ENDIF (${_intDeps})
CONFIGURE_FILE (${PLAYER_CMAKE_DIR}/pkgconfig.cmake
${CMAKE_CURRENT_BINARY_DIR}/${_name}.pc @ONLY)
- INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/${_name}.pc DESTINATION
lib/pkgconfig/ COMPONENT pkgconfig)
+ INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/${_name}.pc DESTINATION
${PLAYER_LIBRARY_INSTALL_DIR}/pkgconfig/ COMPONENT pkgconfig)
ENDMACRO (PLAYER_MAKE_PKGCONFIG)
Modified: code/player/trunk/cmake/internal/SetupDirectories.cmake
===================================================================
--- code/player/trunk/cmake/internal/SetupDirectories.cmake 2009-10-28
04:23:50 UTC (rev 8331)
+++ code/player/trunk/cmake/internal/SetupDirectories.cmake 2009-10-28
22:01:56 UTC (rev 8332)
@@ -10,3 +10,12 @@
# Installation prefix for include files
STRING (TOLOWER ${PROJECT_NAME} projectNameLower)
SET (PLAYER_INCLUDE_INSTALL_DIR
"include/${projectNameLower}-${PLAYER_MAJOR_VERSION}.${PLAYER_MINOR_VERSION}")
+
+IF (PLAYER_PROC_64BIT)
+ SET (PLAYER_LIBRARY_INSTALL_DIR "lib64")
+ MESSAGE (STATUS "Player libraries will be in lib64")
+ELSE (PLAYER_PROC_64BIT)
+ SET (PLAYER_LIBRARY_INSTALL_DIR "lib")
+ MESSAGE (STATUS "Player libraries will be in lib")
+ENDIF (PLAYER_PROC_64BIT)
+
Modified: code/player/trunk/cmake/pkgconfig.cmake
===================================================================
--- code/player/trunk/cmake/pkgconfig.cmake 2009-10-28 04:23:50 UTC (rev
8331)
+++ code/player/trunk/cmake/pkgconfig.cmake 2009-10-28 22:01:56 UTC (rev
8332)
@@ -1,7 +1,7 @@
# This file was generated by CMake for @PROJECT_NAME@ library @PKG_NAME@
pref...@cmake_install_prefix@
exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=${prefix}/@PLAYER_LIBRARY_INSTALL_DIR@
includedir=${prefix}/include
Name: @PKG_NAME@
@@ -9,4 +9,4 @@
Version: @PLAYER_VERSION@
Requires: @PKG_EXTERNAL_DEPS@
Libs: -L${libdir} -...@pkg_name@ @PKG_LIBFLAGS@ @PKG_INTERNAL_DEPS@
-Cflags:
-I${includedir}/play...@player_major_version@....@player_minor_version@
@PKG_CFLAGS@
\ No newline at end of file
+Cflags:
-I${includedir}/play...@player_major_version@....@player_minor_version@
@PKG_CFLAGS@
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
