[asterisk-scf-commits] asterisk-scf/release/cmake.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  e9cf9f2e6dd03fe7bc39c363d72812aceed28367 (commit)
      from  e3488247f81dfae2695e778565a7c43182836313 (commit)

Summary of changes:
 modules/pjproject.cmake |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)


- Log -----------------------------------------------------------------
commit e9cf9f2e6dd03fe7bc39c363d72812aceed28367
Author: Joshua Colp <jcolp at digium.com>
Date:   Tue Oct 5 10:17:23 2010 -0300

    Pass -fPIC to pjproject on 64-bit so IceBox services can be built.

diff --git a/modules/pjproject.cmake b/modules/pjproject.cmake
index 5cd41fe..f2f5139 100644
--- a/modules/pjproject.cmake
+++ b/modules/pjproject.cmake
@@ -22,7 +22,13 @@ if(UNIX)
 endif()
 
 # These are global targets which exist for all pjproject components, they are used for initial running of configure plus cleanup
-add_custom_command(OUTPUT "${CMAKE_SOURCE_DIR}/pjproject/build.mak" COMMAND "./configure" "--disable-sound" "--disable-ssl" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/pjproject" COMMENT "Configuring pjproject")
+
+# This is a simple check to see if we are doing a 64-bit build, if so we need to get pjproject to use -fPIC so the icebox services can get built
+if (CMAKE_SIZEOF_VOID_P MATCHES 8)
+  set(ADDITIONAL_CONFIGURE_ARGUMENTS "CFLAGS=-fPIC")
+endif()
+
+add_custom_command(OUTPUT "${CMAKE_SOURCE_DIR}/pjproject/build.mak" COMMAND "./configure" "--disable-sound" "--disable-ssl" ${ADDITIONAL_CONFIGURE_ARGUMENTS} WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/pjproject" COMMENT "Configuring pjproject")
 add_custom_command(OUTPUT "${CMAKE_SOURCE_DIR}/pjproject/pjlib/include/pj/config_site.h" COMMAND "make" "dep" "TARGET_NAME=asteriskscf" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/pjproject" COMMENT "Dependency generating pjproject" DEPENDS "${CMAKE_SOURCE_DIR}/pjproject/build.mak")
 add_custom_target(pjproject-clean COMMAND "make" "clean" "TARGET_NAME=asteriskscf" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/pjproject" COMMENT "Cleaning pjproject")
 add_custom_target(pjproject-distclean COMMAND "make" "distclean" "TARGET_NAME=asteriskscf" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/pjproject" COMMENT "Deep cleaning pjproject")

-----------------------------------------------------------------------


-- 
asterisk-scf/release/cmake.git