Fix 64-bit build for DALi physics

Change-Id: Ib0b1d1f9fa87af119af45f7b4132f268a5235425

diff --git a/dali-physics/third-party/bullet3/CMakeLists.txt b/dali-physics/third-party/bullet3/CMakeLists.txt
index 2045410..1f331c9 100644 (file)
--- a/dali-physics/third-party/bullet3/CMakeLists.txt
+++ b/dali-physics/third-party/bullet3/CMakeLists.txt
@@ -21,6 +21,9 @@ endif()
 # Build options
 option(BULLET3_BUILD_SHARED "Build bullet3 as a shared library" ON)
 
+set(prefix ${CMAKE_INSTALL_PREFIX})
+option(ENABLE_PKG_CONFIGURE "Use pkgconfig" ON)
+
 ADD_DEFINITIONS(-DB3_USE_CLEW)
 
 if (WIN32)
@@ -95,20 +98,25 @@ endif()
 
 target_link_libraries(bullet3 ${COVERAGE})
 
-# Installation
-set (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
-set (LIB_DESTINATION "lib${LIB_SUFFIX}" CACHE STRING "Library directory name")
-## the following are directories where stuff will be installed to
-set(INCLUDE_INSTALL_DIR "include/bullet/" CACHE PATH "The subdirectory to the header prefix")
-set(PKGCONFIG_INSTALL_PREFIX "lib${LIB_SUFFIX}/pkgconfig/" CACHE STRING "Base directory for pkgconfig files")
-if(NOT MSVC)
-  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/bullet3.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/bullet3.pc @ONLY)
-install(
-  FILES
-  ${CMAKE_CURRENT_BINARY_DIR}/bullet3.pc
-  DESTINATION
-  ${PKGCONFIG_INSTALL_PREFIX})
-endif(NOT MSVC)
+if(ENABLE_PKG_CONFIGURE)
+    find_package(PkgConfig REQUIRED)
+
+    set( LIB_DIR $ENV{libdir} )
+    if( NOT LIB_DIR )
+        set( LIB_DIR ${CMAKE_INSTALL_LIBDIR} )
+    endif()
+    if( NOT LIB_DIR )
+        set( LIB_DIR ${prefix}/lib )
+    endif()
+
+    set(bullet_pkg_cfg_file bullet3.pc)
+    configure_file(${CMAKE_CURRENT_LIST_DIR}/${bullet_pkg_cfg_file}.cmake ${bullet_pkg_cfg_file} @ONLY)
+
+    # Installation
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${bullet_pkg_cfg_file}
+        DESTINATION ${LIB_DIR}/pkgconfig
+    )
+endif(ENABLE_PKG_CONFIGURE)
 
 install(
     TARGETS bullet3

diff --git a/dali-physics/third-party/bullet3/bullet3.pc.cmake b/dali-physics/third-party/bullet3/bullet3.pc.cmake
index fc0d549..9e7a760 100644 (file)
--- a/dali-physics/third-party/bullet3/bullet3.pc.cmake
+++ b/dali-physics/third-party/bullet3/bullet3.pc.cmake
@@ -1,11 +1,12 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/@LIB_DESTINATION@
-includedir=${prefix}/@INCLUDE_INSTALL_DIR@
+prefix=@PREFIX@
+exec_prefix=@EXEC_PREFIX@
+apiversion=@BULLET_VERSION@
+libdir=@LIB_DIR@
+includedir=@DEV_INCLUDE_PATH@
 
 Name: bullet
 Description: Bullet Continuous Collision Detection and Physics Library
-Version: @BULLET_VERSION@
+Version: ${apiversion}
 Requires:
 Libs: -L${libdir} -lbullet3
-Cflags: -I${includedir} -I${prefix}/include
+Cflags: -I${includedir}
\ No newline at end of file

diff --git a/dali-physics/third-party/chipmunk2d/src/CMakeLists.txt b/dali-physics/third-party/chipmunk2d/src/CMakeLists.txt
index 3f43b1d..1c45355 100644 (file)
--- a/dali-physics/third-party/chipmunk2d/src/CMakeLists.txt
+++ b/dali-physics/third-party/chipmunk2d/src/CMakeLists.txt
@@ -94,7 +94,7 @@ if(BUILD_SHARED OR INSTALL_STATIC)
 endif(BUILD_SHARED OR INSTALL_STATIC)
 
 if (ENABLE_PKG_CONFIGURE)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${chipmunk_pkg_cfg_file} ${CMAKE_CURRENT_BINARY_DIR}/${chipmunk_pkg_cfg_file}
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${chipmunk_pkg_cfg_file}
         DESTINATION ${LIB_DIR}/pkgconfig
     )
 endif()