Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

python: only add python dir if we have the prerequisites

Browse Source 
This means we can depend on the directory existing to check if the
prerequisites are met in the tests/ section

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Brendan Le Foll
2017-06-13 16:48:37 +02:00
parent e1778c811d
commit 869f76c5c5
3 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/python/CMakeLists.txt
View File

@@ -1,5 +1,9 @@
set_source_files_properties (mraapython.i PROPERTIES CPLUSPLUS ON) set_source_files_properties (mraapython.i PROPERTIES CPLUSPLUS ON)
set_source_files_properties (mraapython.i PROPERTIES SWIG_FLAGS "-I${CMAKE_BINARY_DIR}/src") set_source_files_properties (mraapython.i PROPERTIES SWIG_FLAGS "-I${CMAKE_BINARY_DIR}/src")
if (PYTHON2_LIBRARY)
add_subdirectory (python2) add_subdirectory (python2)
endif ()
if (PYTHON3_LIBRARY)
add_subdirectory (python3) add_subdirectory (python3)
endif ()

2
src/python/python2/CMakeLists.txt
View File

@@ -1,7 +1,6 @@
set_source_files_properties (mraa2.i PROPERTIES CPLUSPLUS ON) set_source_files_properties (mraa2.i PROPERTIES CPLUSPLUS ON)
set_source_files_properties (mraa2.i PROPERTIES SWIG_FLAGS "-I${CMAKE_BINARY_DIR}/src") set_source_files_properties (mraa2.i PROPERTIES SWIG_FLAGS "-I${CMAKE_BINARY_DIR}/src")
if (PYTHON2_LIBRARY)
message ("PYTHON2 attempting to build!") message ("PYTHON2 attempting to build!")
swig_add_module (python2-mraa python mraa2.i ../mraapy.c) swig_add_module (python2-mraa python mraa2.i ../mraapy.c)
@@ -32,6 +31,5 @@ if (PYTHON2_LIBRARY)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/mraa.py install (FILES ${CMAKE_CURRENT_BINARY_DIR}/mraa.py
DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYTHON2_PACKAGES_PATH} DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYTHON2_PACKAGES_PATH}
) )
endif()
add_subdirectory (docs) add_subdirectory (docs)

2
src/python/python3/CMakeLists.txt
View File

@@ -1,7 +1,6 @@
set_source_files_properties (mraa3.i PROPERTIES CPLUSPLUS ON) set_source_files_properties (mraa3.i PROPERTIES CPLUSPLUS ON)
set_source_files_properties (mraa3.i PROPERTIES SWIG_FLAGS "-I${CMAKE_BINARY_DIR}/src") set_source_files_properties (mraa3.i PROPERTIES SWIG_FLAGS "-I${CMAKE_BINARY_DIR}/src")
if (PYTHON3_LIBRARY)
message ("PYTHON3 attempting to build!") message ("PYTHON3 attempting to build!")
swig_add_module (python3-mraa python mraa3.i ../mraapy.c) swig_add_module (python3-mraa python mraa3.i ../mraapy.c)
@@ -25,4 +24,3 @@ if (PYTHON3_LIBRARY)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/mraa.py install (FILES ${CMAKE_CURRENT_BINARY_DIR}/mraa.py
DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYTHON3_PACKAGES_PATH} DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYTHON3_PACKAGES_PATH}
) )
endif ()