[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  ec38712437f096a79e60c198b092da3c785139b8 (commit)
       via  5a1de206a9b427871189c29f16bc3b67ee634191 (commit)
      from  6ccba8133c57ab68078e17ef445973ce93064b51 (commit)

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


- Log -----------------------------------------------------------------
commit ec38712437f096a79e60c198b092da3c785139b8
Merge: 5a1de20 6ccba81
Author: Joshua Colp <jcolp at digium.com>
Date:   Tue May 10 17:03:55 2011 -0300

    Merge branch 'master' of git.asterisk.org:asterisk-scf/release/cmake


commit 5a1de206a9b427871189c29f16bc3b67ee634191
Author: Joshua Colp <jcolp at digium.com>
Date:   Tue May 10 17:02:20 2011 -0300

    Do not explicit disable SSL support when configuring pjproject.

diff --git a/modules/pjproject.cmake b/modules/pjproject.cmake
index 2185143..5bd04f5 100644
--- a/modules/pjproject.cmake
+++ b/modules/pjproject.cmake
@@ -28,7 +28,7 @@ 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/build.mak" COMMAND "./configure" "--disable-sound" ${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