Changeset 312:3a6ad8a59da0 in verona

Timestamp:

Sep 21, 2011 6:39:34 PM (20 months ago)

Author:

laurent <laurent@…>

Branch:

default

Message:

add option capabilities

Files:

• .hgsubstate (modified) (1 diff)
• CMakeLists.txt (modified) (4 diffs)
• DefineVeronaOptions.cmake (added)
• libeXosip2/CMakeLists.txt (modified) (1 diff)

.hgsubstate

@@ -2 +2 @@
 cb83411a9e6657814a3f0e0b5d96bbb132540511 libs/miniini
 901c9952b3bf2cfc29d30111e104b4971b739187 libs/srtp
-13e6d7b503cdd1a97d2caa420f3b7af41cd569cc mediastreamer2
+8917c1eaa724141c2399462b3344f1498b687468 mediastreamer2

CMakeLists.txt

@@ -9 +9 @@
 
 set(CMAKE_MODULE_PATH
-  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/cmake/Modules
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules
 )
 
 include(DefineCompilerFlags)
-include(CPackConfig)
+#include(CPackConfig)
 include(Macros)
 include(FindMercurial)
@@ -27 +27 @@
  set(LINUX True)
 endif(CMAKE_SYSTEM_NAME MATCHES Linux)
+
+include(DefineVeronaOptions.cmake)
 
 if(CMAKE_UNDER_CE)
@@ -43 +45 @@
 endif(NOT WIN32)
 
-subdirs(libs/miniini)
+if(USE_PHTEST OR USE_CSL)
+        subdirs(libs/miniini)
+endif(USE_PHTEST OR USE_CSL)
 
 if(USE_CSL)
@@ -62 +66 @@
 ENDIF(USE_CSL)
 
-subdirs(libs/codecs/gsm libs/codecs/speex libosip2 libeXosip2 oRTP mediastreamer2 phapi phcpp phtest)
+subdirs(libs/codecs/gsm libs/codecs/speex libosip2 libeXosip2 oRTP mediastreamer2 phapi)
 
-if(NOT IPHONE)
+if(USE_TESTPHCPP)
+        subdirs(phcpp)
+endif(USE_TESTPHCPP)
+
+if(USE_PHTEST)
+        subdirs(phtest)
+endif(USE_PHTEST)
+
+if(USE_SWIG AND NOT IPHONE)
         subdirs(swig)
-endif(NOT IPHONE)
+endif(USE_SWIG AND NOT IPHONE)
 
 

libeXosip2/CMakeLists.txt

@@ -108 +108 @@
 set(EXOSIP2_DEFINITIONS "-DOSIP_MT" CACHE STRING  "Defines of EXOSIP2 users")
 set(EXOSIP2_LIBRARIES exosip2 CACHE STRING "exosip2 libraries")
-if(NOT WIN32 AND NOT USE_CSL)
+if(NOT WIN32 AND NOT USE_CSL AND USE_SIP_REG)
   add_executable(sip_reg tools/sip_reg.c)
   target_link_libraries(sip_reg ${EXOSIP2_LIBRARIES} ${CMAKE_DL_LIBS})
-endif(NOT WIN32 AND NOT USE_CSL)
+endif(NOT WIN32 AND NOT USE_CSL AND USE_SIP_REG)