diff options
| author | Dimitri Staessens <dimitri@ouroboros.rocks> | 2019-03-21 12:15:45 +0100 |
|---|---|---|
| committer | Sander Vrijders <sander@ouroboros.rocks> | 2019-03-21 12:33:54 +0100 |
| commit | d6bd976b2456104a56f039ee5c5b83e82a5daa77 (patch) | |
| tree | 384d4cc4a95eb0b63489a53fe8f646399b5e790d /include | |
| parent | 0164e81987eab940e5374b026a38a18ea94c53f9 (diff) | |
| download | ouroboros-d6bd976b2456104a56f039ee5c5b83e82a5daa77.tar.gz ouroboros-d6bd976b2456104a56f039ee5c5b83e82a5daa77.zip | |
build: Set specific compiler flags for SWIG target0.15.2
The compiler flags for the SWIG target were added to the global
CMAKE_C_FLAGS used for the entire project. This sets the flags
uniquely for the SWIG target. The eth has a similar case for the c99
flag. There was a lingering include in dev.c that was removed.
Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks>
Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ouroboros/wrap/CMakeLists.txt | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/include/ouroboros/wrap/CMakeLists.txt b/include/ouroboros/wrap/CMakeLists.txt index 9a5e1075..b11f89de 100644 --- a/include/ouroboros/wrap/CMakeLists.txt +++ b/include/ouroboros/wrap/CMakeLists.txt @@ -20,12 +20,6 @@ else () message(STATUS "Python found: Python bindings will be built") include_directories(${PYTHON_INCLUDE_PATH}) - # Python assumes C99 since Python 3.6 - test_and_set_c_compiler_flag_global(-std=c99) - # SWIG generates code for varargs with an unused parameter - test_and_set_c_compiler_flag_global(-Wno-unused-parameter) - # SWIG generates code with unsafe strncpy() - test_and_set_c_compiler_flag_global(-Wno-stringop-truncation) # CMake > 3.8 deprecates swig_add_module if (${CMAKE_VERSION} VERSION_LESS 3.8.0) swig_add_module(ouroboros python ouroboros.i) @@ -36,6 +30,12 @@ else () TYPE MODULE) endif() + # Python assumes C99 since Python 3.6 + # SWIG generates code for varargs with an unused parameter + # SWIG generates code with unsafe strncpy() + set_target_properties(ouroboros PROPERTIES + COMPILE_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wno-unused-parameter \ + -Wno-stringop-truncation") swig_link_libraries(ouroboros ${PYTHON_LIBRARIES} ouroboros-common ouroboros-dev ouroboros-irm) @@ -58,9 +58,14 @@ else () ${CMAKE_INSTALL_PREFIX} ${_ABS_PYTHON_MODULE_PATH}) endif () - install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/_${SWIG_MODULE_ouroboros_REAL_NAME}.so - DESTINATION ${PYTHON_MODULE_PATH}) + if (${CMAKE_VERSION} VERSION_LESS "3.13") + install ( + ${CMAKE_CURRENT_BINARY_DIR}/${SWIG_MODULE_${ouroboros}_REAL_NAME}.so + DESTINATION ${PYTHON_MODULE_PATH}) + else () + install (TARGETS ouroboros + DESTINATION ${PYTHON_MODULE_PATH}) + endif () install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ouroboros.py DESTINATION ${PYTHON_MODULE_PATH}) endif () |