Commit e0871803 authored by Dominik Charousset's avatar Dominik Charousset

Add python submodule

parent 3d3176da
...@@ -10,6 +10,9 @@ ...@@ -10,6 +10,9 @@
[submodule "libcaf_riac"] [submodule "libcaf_riac"]
path = libcaf_riac path = libcaf_riac
url = ../riac.git url = ../riac.git
[submodule "libcaf_python"]
path = libcaf_python
url = ../python.git
[submodule "cash"] [submodule "cash"]
path = cash path = cash
url = ../cash.git url = ../cash.git
...@@ -36,6 +36,10 @@ if(NOT CAF_NO_OPENCL) ...@@ -36,6 +36,10 @@ if(NOT CAF_NO_OPENCL)
set(CAF_NO_OPENCL no) set(CAF_NO_OPENCL no)
endif() endif()
if(NOT CAF_NO_PYTHON)
set(CAF_NO_PYTHON no)
endif()
if(NOT CAF_NO_TOOLS) if(NOT CAF_NO_TOOLS)
set(CAF_NO_TOOLS no) set(CAF_NO_TOOLS no)
endif() endif()
...@@ -49,6 +53,7 @@ if(NOT CAF_NO_IO) ...@@ -49,6 +53,7 @@ if(NOT CAF_NO_IO)
else() else()
set(CAF_NO_RIAC yes) set(CAF_NO_RIAC yes)
set(CAF_NO_TOOLS yes) set(CAF_NO_TOOLS yes)
set(CAF_NO_PYTHON yes)
endif() endif()
################################################################################ ################################################################################
...@@ -444,6 +449,11 @@ endif() ...@@ -444,6 +449,11 @@ endif()
# build RIAC library if not being told otherwise # build RIAC library if not being told otherwise
add_optional_caf_lib(riac) add_optional_caf_lib(riac)
# build Python binding if not being told otherwise
if(NOT CAF_NO_PYTHON AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/libcaf_python/CMakeLists.txt")
add_subdirectory(libcaf_python)
endif()
# build examples if not being told otherwise # build examples if not being told otherwise
add_optional_caf_binaries(examples) add_optional_caf_binaries(examples)
...@@ -599,6 +609,7 @@ invertYesNo(CAF_NO_CASH CAF_BUILD_CASH) ...@@ -599,6 +609,7 @@ invertYesNo(CAF_NO_CASH CAF_BUILD_CASH)
invertYesNo(CAF_NO_MEM_MANAGEMENT CAF_BUILD_MEM_MANAGEMENT) invertYesNo(CAF_NO_MEM_MANAGEMENT CAF_BUILD_MEM_MANAGEMENT)
invertYesNo(CAF_NO_BENCHMARKS CAF_BUILD_BENCHMARKS) invertYesNo(CAF_NO_BENCHMARKS CAF_BUILD_BENCHMARKS)
invertYesNo(CAF_NO_OPENCL CAF_BUILD_OPENCL) invertYesNo(CAF_NO_OPENCL CAF_BUILD_OPENCL)
invertYesNo(CAF_NO_PYTHON CAF_BUILD_PYTHON)
# collect all compiler flags # collect all compiler flags
string(TOUPPER "${CMAKE_BUILD_TYPE}" UPPER_BUILD_TYPE) string(TOUPPER "${CMAKE_BUILD_TYPE}" UPPER_BUILD_TYPE)
set(ALL_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${UPPER_BUILD_TYPE}}") set(ALL_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${UPPER_BUILD_TYPE}}")
...@@ -625,6 +636,7 @@ if(NOT CAF_NO_SUMMARY) ...@@ -625,6 +636,7 @@ if(NOT CAF_NO_SUMMARY)
"\nBuild cash: ${CAF_BUILD_CASH}" "\nBuild cash: ${CAF_BUILD_CASH}"
"\nBuild benchmarks: ${CAF_BUILD_BENCHMARKS}" "\nBuild benchmarks: ${CAF_BUILD_BENCHMARKS}"
"\nBuild opencl: ${CAF_BUILD_OPENCL}" "\nBuild opencl: ${CAF_BUILD_OPENCL}"
"\nBuild Python: ${CAF_BUILD_PYTHON}"
"\n" "\n"
"\nCXX: ${CMAKE_CXX_COMPILER}" "\nCXX: ${CMAKE_CXX_COMPILER}"
"\nCXXFLAGS: ${ALL_CXX_FLAGS}" "\nCXXFLAGS: ${ALL_CXX_FLAGS}"
......
...@@ -67,6 +67,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]... ...@@ -67,6 +67,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
--no-riac build without RIAC module --no-riac build without RIAC module
--no-tools build without CAF tools such as caf-run --no-tools build without CAF tools such as caf-run
--no-io build without I/O module --no-io build without I/O module
--no-python build without python binding
--no-summary do not print configuration before building --no-summary do not print configuration before building
Testing: Testing:
...@@ -87,6 +88,9 @@ Usage: $0 [OPTION]... [VAR=VALUE]... ...@@ -87,6 +88,9 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
CXX C++ compiler command CXX C++ compiler command
CXXFLAGS C++ compiler flags CXXFLAGS C++ compiler flags
Python Build Options:
--with-python-config=FILE Use python-conf binary to determine includes and libs
iOS Build Options (should be used with XCode generator): iOS Build Options (should be used with XCode generator):
--sysroot=DIR set system root for Clang --sysroot=DIR set system root for Clang
- iphoneos: for iOS device - iphoneos: for iOS device
...@@ -340,6 +344,9 @@ while [ $# -ne 0 ]; do ...@@ -340,6 +344,9 @@ while [ $# -ne 0 ]; do
--with-salsa=*) --with-salsa=*)
append_cache_entry CAF_SALSA_JAR FILEPATH "$optarg" append_cache_entry CAF_SALSA_JAR FILEPATH "$optarg"
;; ;;
--with-python-config=*)
append_cache_entry CAF_PYTHON_CONFIG_BIN FILEPATH "$optarg"
;;
--no-nexus) --no-nexus)
append_cache_entry CAF_NO_NEXUS BOOL yes append_cache_entry CAF_NO_NEXUS BOOL yes
;; ;;
...@@ -358,6 +365,9 @@ while [ $# -ne 0 ]; do ...@@ -358,6 +365,9 @@ while [ $# -ne 0 ]; do
--no-io) --no-io)
append_cache_entry CAF_NO_IO BOOL yes append_cache_entry CAF_NO_IO BOOL yes
;; ;;
--no-python)
append_cache_entry CAF_NO_PYTHON BOOL yes
;;
--no-summary) --no-summary)
append_cache_entry CAF_NO_SUMMARY BOOL yes append_cache_entry CAF_NO_SUMMARY BOOL yes
;; ;;
......
Subproject commit 9944c2beaae46230b7a0dd156c2e1a3347193bff
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment