[Gearbox-commit] SF.net SVN: gearbox:[451] gearbox/trunk/cmake/TargetUtils.cmake

[<rus...@us...>]

Revision: 451
          http://gearbox.svn.sourceforge.net/gearbox/?rev=451&view=rev
Author:   russo2503v
Date:     2009-11-06 07:04:22 +0000 (Fri, 06 Nov 2009)

Log Message:
-----------
correct installs for 64bit systems

Modified Paths:
--------------
    gearbox/trunk/cmake/TargetUtils.cmake

Modified: gearbox/trunk/cmake/TargetUtils.cmake
===================================================================
--- gearbox/trunk/cmake/TargetUtils.cmake	2009-11-06 06:58:26 UTC (rev 450)
+++ gearbox/trunk/cmake/TargetUtils.cmake	2009-11-06 07:04:22 UTC (rev 451)
@@ -90,9 +90,16 @@
         SOVERSION ${soversion} )
 #         INSTALL_RPATH "${INSTALL_RPATH};${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}"
 #         BUILD_WITH_INSTALL_RPATH TRUE )
+    
+    if (GBX_PROC_64BIT)
     install( TARGETS ${name}
+             DESTINATION lib64/${PROJECT_NAME}
+             EXPORT ${PROJECT_NAME}-targets )
+    else (GBX_PROC_64BIT)
+    install( TARGETS ${name}
              DESTINATION lib/${PROJECT_NAME}
              EXPORT ${PROJECT_NAME}-targets )
+    ENDIF (GBX_PROC_64BIT)
 
     set( templist ${LIB_LIST} )
     list( APPEND templist ${name}-${soversion} )
@@ -187,7 +194,11 @@
     configure_file( ${GBX_CMAKE_DIR}/pkgconfig.in ${CMAKE_CURRENT_BINARY_DIR}/${name}.pc @ONLY)
 
     if( GBX_INSTALL_PKGCONFIGS )
-        install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${name}.pc DESTINATION lib/pkgconfig/ )
+        IF (GBX_PROC_64BIT)
+            install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${name}.pc DESTINATION lib64/pkgconfig/ )
+        ELSE (GBX_PROC_64BIT)
+            install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${name}.pc DESTINATION lib/pkgconfig/ )
+        ENDIF(GBX_PROC_64BIT)
     endif()
 endmacro( GBX_ADD_PKGCONFIG name desc cflags deps libflags libs )
 


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