Revision: 9077
http://playerstage.svn.sourceforge.net/playerstage/?rev=9077&view=rev
Author: jpgr87
Date: 2011-10-16 21:13:16 +0000 (Sun, 16 Oct 2011)
Log Message:
-----------
Fixed bug where playerc python bindings try to build when python development
libraries are not available. Now checks for swig AND the PythonLibs before
trying to enable python bindings
Modified Paths:
--------------
code/player/trunk/client_libs/libplayerc/bindings/python/CMakeLists.txt
code/player/trunk/client_libs/libplayerc++/bindings/python/CMakeLists.txt
Modified:
code/player/trunk/client_libs/libplayerc/bindings/python/CMakeLists.txt
===================================================================
--- code/player/trunk/client_libs/libplayerc/bindings/python/CMakeLists.txt
2011-10-16 20:58:09 UTC (rev 9076)
+++ code/player/trunk/client_libs/libplayerc/bindings/python/CMakeLists.txt
2011-10-16 21:13:16 UTC (rev 9077)
@@ -4,13 +4,13 @@
IF (BUILD_PYTHONC_BINDINGS)
FIND_PACKAGE (SWIG)
- IF (SWIG_FOUND)
+ FIND_PACKAGE (PythonLibs)
+ IF (SWIG_FOUND AND PYTHONLIBS_FOUND)
MESSAGE (STATUS "Python bindings for C client library will be
built")
#INCLUDE (${SWIG_USE_FILE})
INCLUDE (${PLAYER_CMAKE_DIR}/internal/UseSwig_Player.cmake)
- FIND_PACKAGE (PythonLibs)
INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR})
INCLUDE_DIRECTORIES (${PROJECT_BINARY_DIR})
@@ -61,13 +61,15 @@
INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/playerc.py
${CMAKE_CURRENT_BINARY_DIR}/_playerc.so
DESTINATION ${PYTHON_BINDINGS_INSTALL_DIR})
- ELSE (SWIG_FOUND)
+ ELSEIF ( PYTHONLIBS_FOUND )
MESSAGE (STATUS "Python bindings for C client library will not be
built - could not find Swig")
- ENDIF (SWIG_FOUND)
+ ELSEIF (SWIG_FOUND)
+ MESSAGE (STATUS "Python bindings for C client library will not be
build - could not find Python development libraries")
+ ENDIF (SWIG_FOUND AND PYTHONLIBS_FOUND)
ELSE (BUILD_PYTHONC_BINDINGS)
MESSAGE (STATUS "Python bindings for C client library will not be
built - disabled by user")
ENDIF (BUILD_PYTHONC_BINDINGS)
ELSE (PYTHONINTERP_FOUND)
- MESSAGE (STATUS "Python bindings for C client library will not be built -
could not find Python")
+ MESSAGE (STATUS "Python bindings for C client library will not be built -
could not find Python interpreter")
ENDIF (PYTHONINTERP_FOUND)
Modified:
code/player/trunk/client_libs/libplayerc++/bindings/python/CMakeLists.txt
===================================================================
--- code/player/trunk/client_libs/libplayerc++/bindings/python/CMakeLists.txt
2011-10-16 20:58:09 UTC (rev 9076)
+++ code/player/trunk/client_libs/libplayerc++/bindings/python/CMakeLists.txt
2011-10-16 21:13:16 UTC (rev 9077)
@@ -6,13 +6,13 @@
IF (BUILD_PYTHONCPP_BINDINGS)
FIND_PACKAGE (SWIG)
- IF (SWIG_FOUND)
+ FIND_PACKAGE (PythonLibs)
+ IF (SWIG_FOUND AND PYTHONLIBS_FOUND)
MESSAGE (STATUS "Python bindings for C++ client library will
be built")
#INCLUDE (${SWIG_USE_FILE})
INCLUDE (${PLAYER_CMAKE_DIR}/internal/UseSwig_Player.cmake)
- FIND_PACKAGE (PythonLibs)
INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
INCLUDE_DIRECTORIES (${PROJECT_BINARY_DIR}/client_libs)
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs)
@@ -42,14 +42,16 @@
INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/playercpp.py
${CMAKE_CURRENT_BINARY_DIR}/_playercpp.so
DESTINATION ${PYTHON_BINDINGS_INSTALL_DIR})
- ELSE (SWIG_FOUND)
+ ELSEIF (PYTHONLIBS_FOUND)
MESSAGE (STATUS "Python bindings for C++ client library will
not be built - could not find Swig")
- ENDIF (SWIG_FOUND)
+ ELSEIF (SWIG_FOUND)
+ MESSAGE (STATUS "Python bindings for C++ client library will
not be built - could not find Python development libraries")
+ ENDIF (SWIG_FOUND AND PYTHONLIBS_FOUND)
ELSE (BUILD_PYTHONCPP_BINDINGS)
MESSAGE (STATUS "Python bindings for C++ client library will not
be built - disabled by user")
ENDIF (BUILD_PYTHONCPP_BINDINGS)
ELSE (PYTHONINTERP_FOUND)
- MESSAGE (STATUS "Python bindings for C++ client library will not be
built - could not find Python")
+ MESSAGE (STATUS "Python bindings for C++ client library will not be
built - could not find Python interpreter")
ENDIF (PYTHONINTERP_FOUND)
ELSE (BUILD_PLAYERCC)
MESSAGE (STATUS "Python bindings for C++ client library will not be built -
playerc++ client library disabled")
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2d-oct
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
