Module: sems
Branch: 1.3
Commit: 6383c327e20297857bc078bddfdac5bdfa2fb2b1
URL:    
http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=6383c327e20297857bc078bddfdac5bdfa2fb2b1

Author: Peter Lemenkov <[email protected]>
Committer: Peter Lemenkov <[email protected]>
Date:   Sat Oct  2 13:45:06 2010 +0400

Split SIp detection code into is own CMake module

Signed-off-by: Peter Lemenkov <[email protected]>

---

 CMakeLists.txt      |   13 ++++---------
 cmake/FindSIP.cmake |   26 ++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fff9fb7..f851dd5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -168,25 +168,20 @@ ENDIF(SEMS_USE_OPENSSL)
 FIND_PACKAGE(PythonLibs)
 IF(PYTHONLIBS_FOUND OR PYTHON_LIBRARIES)
        SET(PYTHONLIBS_FOUND TRUE)
-       GET_FILENAME_COMPONENT(PYTHON_LD_PATH ${PYTHON_LIBRARIES} PATH)
        MESSAGE(STATUS "Found Python includes:  
${PYTHON_INCLUDE_PATH}/Python.h")
        MESSAGE(STATUS "Found Python library: ${PYTHON_LIBRARIES}")
-       MESSAGE(STATUS "Found Python library path: ${PYTHON_LD_PATH}")
        MESSAGE(STATUS "Using Python: YES")
 ELSE(PYTHONLIBS_FOUND OR PYTHON_LIBRARIES)
        MESSAGE(STATUS "Using Python: NO")
 ENDIF(PYTHONLIBS_FOUND OR PYTHON_LIBRARIES)
 
 # Let's try to find SIP (Python bindings generator) development files
-FIND_PATH(SIP_INCLUDE_DIR sip.h PATHS ${PYTHON_INCLUDE_PATH})
-IF(SIP_INCLUDE_DIR)
-       SET(SIP_FOUND TRUE)
-       MESSAGE(STATUS "Found SIP includes:     ${SIP_INCLUDE_DIR}/sip.h")
+FIND_PACKAGE(SIP)
+IF(SIP_FOUND)
        MESSAGE(STATUS "Using SIP: YES")
-ELSE(SIP_INCLUDE_DIR)
-       SET(SIP_FOUND FALSE)
+ELSE(SIP_FOUND)
        MESSAGE(STATUS "Using SIP: NO")
-ENDIF(SIP_INCLUDE_DIR)
+ENDIF(SIP_FOUND)
 
 # Let's try to find MySQL++ development files
 FIND_PACKAGE(MySQLpp)
diff --git a/cmake/FindSIP.cmake b/cmake/FindSIP.cmake
new file mode 100644
index 0000000..5bad413
--- /dev/null
+++ b/cmake/FindSIP.cmake
@@ -0,0 +1,26 @@
+FIND_PACKAGE(PythonLibs)
+
+IF(PYTHONLIBS_FOUND OR PYTHON_LIBRARIES)
+
+       GET_FILENAME_COMPONENT(PYTHON_LD_PATH ${PYTHON_LIBRARIES} PATH)
+
+       FIND_PATH(SIP_INCLUDE_DIR sip.h PATHS ${PYTHON_INCLUDE_PATH})
+       FIND_PROGRAM(SIP_BINARY sip)
+
+       IF(SIP_INCLUDE_DIR AND SIP_BINARY)
+               SET(SIP_FOUND TRUE)
+       ENDIF(SIP_INCLUDE_DIR AND SIP_BINARY)
+
+       IF(SIP_FOUND)
+               IF (NOT SIP_FIND_QUIETLY)
+                       MESSAGE(STATUS "Found sip includes:     
${SIP_INCLUDE_DIR}/speex/speex.h")
+                       MESSAGE(STATUS "Found sip binary:       ${SIP_BINARY}")
+               ENDIF (NOT SIP_FIND_QUIETLY)
+       ELSE(SIP_FOUND)
+               IF (SIP_FIND_REQUIRED)
+                       MESSAGE(FATAL_ERROR "Could NOT find sip development 
files")
+               ENDIF (SIP_FIND_REQUIRED)
+       ENDIF(SIP_FOUND)
+
+ENDIF(PYTHONLIBS_FOUND OR PYTHON_LIBRARIES)
+

_______________________________________________
Semsdev mailing list
[email protected]
http://lists.iptel.org/mailman/listinfo/semsdev

Reply via email to