Revision: 8845
          http://playerstage.svn.sourceforge.net/playerstage/?rev=8845&view=rev
Author:   jpgr87
Date:     2010-08-07 04:31:39 +0000 (Sat, 07 Aug 2010)

Log Message:
-----------
Added configurable library install dir suffix to override architecture detection

Modified Paths:
--------------
    code/player/trunk/cmake/internal/SetupDirectories.cmake

Modified: code/player/trunk/cmake/internal/SetupDirectories.cmake
===================================================================
--- code/player/trunk/cmake/internal/SetupDirectories.cmake     2010-08-06 
14:51:55 UTC (rev 8844)
+++ code/player/trunk/cmake/internal/SetupDirectories.cmake     2010-08-07 
04:31:39 UTC (rev 8845)
@@ -12,10 +12,13 @@
 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")
+    SET (LIB_SUFFIX "64" CACHE STRING "Suffix for library installation 
directory")
 ELSE (PLAYER_PROC_64BIT)
-    SET (PLAYER_LIBRARY_INSTALL_DIR "lib")
-    MESSAGE (STATUS "Player libraries will be in lib")
+    SET (LIB_SUFFIX "" CACHE STRING "Suffix for library installation 
directory")
 ENDIF (PLAYER_PROC_64BIT)
 
+SET (PLAYER_LIBRARY_INSTALL_DIR "lib${LIB_SUFFIX}")
+
+MESSAGE (STATUS "Headers will be installed to 
${CMAKE_INSTALL_PREFIX}/${PLAYER_INCLUDE_INSTALL_DIR}")
+MESSAGE (STATUS "Libraries will be installed to 
${CMAKE_INSTALL_PREFIX}/${PLAYER_LIBRARY_INSTALL_DIR}")
+


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

------------------------------------------------------------------------------
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit

Reply via email to