diff -up ./client_libs/libplayerc/bindings/python/CMakeLists.txt.fixcmake64 ./client_libs/libplayerc/bindings/python/CMakeLists.txt
--- ./client_libs/libplayerc/bindings/python/CMakeLists.txt.fixcmake64 2009-10-10 16:16:36.034486739 -0400
+++ ./client_libs/libplayerc/bindings/python/CMakeLists.txt 2009-10-10 16:16:52.346770896 -0400
@@ -54,7 +54,7 @@ IF (PYTHONINTERP_FOUND)
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)
diff -up ./client_libs/libplayerc++/bindings/python/CMakeLists.txt.fixcmake64 ./client_libs/libplayerc++/bindings/python/CMakeLists.txt
--- ./client_libs/libplayerc++/bindings/python/CMakeLists.txt.fixcmake64 2009-10-10 16:34:48.741962339 -0400
+++ ./client_libs/libplayerc++/bindings/python/CMakeLists.txt 2009-10-10 16:35:13.234691459 -0400
@@ -36,7 +36,7 @@ IF(BUILD_PLAYERCC)
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 @@ IF(BUILD_PLAYERCC)
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)
diff -up ./client_libs/libplayerc/bindings/ruby/CMakeLists.txt.fixcmake64 ./client_libs/libplayerc/bindings/ruby/CMakeLists.txt
--- ./client_libs/libplayerc/bindings/ruby/CMakeLists.txt.fixcmake64 2009-10-10 16:17:34.182093303 -0400
+++ ./client_libs/libplayerc/bindings/ruby/CMakeLists.txt 2009-10-10 16:28:56.154495502 -0400
@@ -56,12 +56,14 @@ IF(RUBY_FOUND)
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)
diff -up ./client_libs/libplayerc++/bindings/ruby/CMakeLists.txt.fixcmake64 ./client_libs/libplayerc++/bindings/ruby/CMakeLists.txt
--- ./client_libs/libplayerc++/bindings/ruby/CMakeLists.txt.fixcmake64 2009-10-10 16:35:23.641448030 -0400
+++ ./client_libs/libplayerc++/bindings/ruby/CMakeLists.txt 2009-10-10 16:36:32.493355921 -0400
@@ -34,6 +34,7 @@ IF(BUILD_PLAYERCC)
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)
diff -up ./cmake/internal/FindOS.cmake.fixcmake64 ./cmake/internal/FindOS.cmake
--- ./cmake/internal/FindOS.cmake.fixcmake64 2009-10-10 15:53:53.131535547 -0400
+++ ./cmake/internal/FindOS.cmake 2009-10-10 19:47:42.942189730 -0400
@@ -43,3 +43,27 @@ ELSEIF (PLAYER_OS_SOLARIS)
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
diff -up ./cmake/internal/LibraryUtils.cmake.fixcmake64 ./cmake/internal/LibraryUtils.cmake
--- ./cmake/internal/LibraryUtils.cmake.fixcmake64 2009-10-10 15:54:16.859529600 -0400
+++ ./cmake/internal/LibraryUtils.cmake 2009-10-10 15:37:02.555826489 -0400
@@ -16,9 +16,9 @@ MACRO (PLAYER_ADD_LIBRARY _name)
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 @@ ENDMACRO (PLAYER_ADD_LIBRARY)
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 @@ MACRO (PLAYER_MAKE_PKGCONFIG _name _desc
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)
diff -up ./cmake/internal/SetupDirectories.cmake.fixcmake64 ./cmake/internal/SetupDirectories.cmake
--- ./cmake/internal/SetupDirectories.cmake.fixcmake64 2009-10-10 15:54:35.998544437 -0400
+++ ./cmake/internal/SetupDirectories.cmake 2009-10-10 19:39:31.492830576 -0400
@@ -10,3 +10,12 @@ MESSAGE (STATUS "Player will be installe
# 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)
+
diff -up ./CMakeLists.txt.fixcmake64 ./CMakeLists.txt
diff -up ./cmake/pkgconfig.cmake.fixcmake64 ./cmake/pkgconfig.cmake
--- ./cmake/pkgconfig.cmake.fixcmake64 2009-10-10 15:53:12.368520431 -0400
+++ ./cmake/pkgconfig.cmake 2009-10-10 15:34:39.638615068 -0400
@@ -1,7 +1,7 @@
# This file was generated by CMake for @PROJECT_NAME@ library @PKG_NAME@
prefix=@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 @@ Description: @PKG_DESC@
Version: @PLAYER_VERSION@
Requires: @PKG_EXTERNAL_DEPS@
Libs: -L${libdir} -l@PKG_NAME@ @PKG_LIBFLAGS@ @PKG_INTERNAL_DEPS@
-Cflags: -I${includedir}/player-@PLAYER_MAJOR_VERSION@.@PLAYER_MINOR_VERSION@ @PKG_CFLAGS@
\ No newline at end of file
+Cflags: -I${includedir}/player-@PLAYER_MAJOR_VERSION@.@PLAYER_MINOR_VERSION@ @PKG_CFLAGS@
diff -up ./cmake/UsePlayerC.cmake.in.fixcmake64 ./cmake/UsePlayerC.cmake.in
--- ./cmake/UsePlayerC.cmake.in.fixcmake64 2009-10-10 16:07:01.819944914 -0400
+++ ./cmake/UsePlayerC.cmake.in 2009-10-10 16:09:55.354540506 -0400
@@ -14,7 +14,7 @@ IF (NOT PKG_CONFIG_FOUND)
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)
diff -up ./cmake/UsePlayerC++.cmake.in.fixcmake64 ./cmake/UsePlayerC++.cmake.in
--- ./cmake/UsePlayerC++.cmake.in.fixcmake64 2009-10-10 16:07:08.168926125 -0400
+++ ./cmake/UsePlayerC++.cmake.in 2009-10-10 16:09:54.554318560 -0400
@@ -14,7 +14,7 @@ IF (NOT PKG_CONFIG_FOUND)
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++)
diff -up ./cmake/UsePlayerPlugin.cmake.in.fixcmake64 ./cmake/UsePlayerPlugin.cmake.in
--- ./cmake/UsePlayerPlugin.cmake.in.fixcmake64 2009-10-10 16:06:46.901602884 -0400
+++ ./cmake/UsePlayerPlugin.cmake.in 2009-10-10 16:09:55.983149732 -0400
@@ -14,7 +14,7 @@ IF (NOT PKG_CONFIG_FOUND)
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)
@@ -41,7 +41,7 @@ IF (NOT PKG_CONFIG_FOUND)
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)