From 0f0dbe4c830d0878d55d969a2bfa8a9015a497b7 Mon Sep 17 00:00:00 2001 From: Kevin Rocard Date: Tue, 3 Feb 2015 19:02:00 +0100 Subject: Fix cmake set_property in python bindings `SET_SOURCE_FILES_PROPERTIES(pfw.i PROPERTIES SWIG_FLAGS "-v" "-Wall" "-Werror")` sets 2 variables: - `SWIG_FLAGS="-v"` - `-Wall="-Werror"` which is obviously not what was wanted. Replace by `SET_PROPERTY(SOURCE pfw.i PROPERTY SWIG_FLAGS "-v" "-Wall" "-Werror")` that only sets `SWIG_FLAGS="-v -Wall -Werror"`. Signed-off-by: Kevin Rocard --- bindings/python/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bindings') diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt index e9016b1..d2ffb51 100644 --- a/bindings/python/CMakeLists.txt +++ b/bindings/python/CMakeLists.txt @@ -34,8 +34,8 @@ INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -SET_SOURCE_FILES_PROPERTIES(pfw.i PROPERTIES CPLUSPLUS ON) -SET_SOURCE_FILES_PROPERTIES(pfw.i PROPERTIES SWIG_FLAGS "-v" "-Wall" "-Werror") +SET_PROPERTY(SOURCE pfw.i PROPERTY CPLUSPLUS ON) +SET_PROPERTY(SOURCE pfw.i PROPERTY SWIG_FLAGS "-v" "-Wall" "-Werror") SWIG_ADD_MODULE(PyPfw python pfw.i) SWIG_LINK_LIBRARIES(PyPfw parameter ${PYTHON_LIBRARIES}) -- cgit v1.1 From 8a71db40e7e90829eb4b1db40f1eda7954d09489 Mon Sep 17 00:00:00 2001 From: Kevin Rocard Date: Tue, 3 Feb 2015 19:02:00 +0100 Subject: Remove CXX compiler verbose flag for swig binding When compiling swig generated files, the CXX compiler flag list included -v. This leaded to unnecessary log output during compilation. Remove the flag Signed-off-by: Kevin Rocard --- bindings/python/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bindings') diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt index d2ffb51..1ca4b0c 100644 --- a/bindings/python/CMakeLists.txt +++ b/bindings/python/CMakeLists.txt @@ -35,7 +35,7 @@ INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET_PROPERTY(SOURCE pfw.i PROPERTY CPLUSPLUS ON) -SET_PROPERTY(SOURCE pfw.i PROPERTY SWIG_FLAGS "-v" "-Wall" "-Werror") +SET_PROPERTY(SOURCE pfw.i PROPERTY SWIG_FLAGS "-Wall" "-Werror") SWIG_ADD_MODULE(PyPfw python pfw.i) SWIG_LINK_LIBRARIES(PyPfw parameter ${PYTHON_LIBRARIES}) -- cgit v1.1 From 67e1b82805fb5e1be2bd09e929f39e7e8fa1c7d9 Mon Sep 17 00:00:00 2001 From: Kevin Rocard Date: Mon, 16 Feb 2015 12:09:17 +0100 Subject: Low case cmake command in bindings for consistency Some cmake commands were in big case in the python binding cmake. As all others are in low case, put everything in low case. Signed-off-by: Kevin Rocard --- bindings/python/CMakeLists.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'bindings') diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt index 1ca4b0c..c159d96 100644 --- a/bindings/python/CMakeLists.txt +++ b/bindings/python/CMakeLists.txt @@ -26,25 +26,25 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -FIND_PACKAGE(SWIG REQUIRED) -INCLUDE(${SWIG_USE_FILE}) +find_package(SWIG REQUIRED) +include(${SWIG_USE_FILE}) -FIND_PACKAGE(PythonLibs) -INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}) +find_package(PythonLibs) +include_directories(${PYTHON_INCLUDE_PATH}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -SET_PROPERTY(SOURCE pfw.i PROPERTY CPLUSPLUS ON) -SET_PROPERTY(SOURCE pfw.i PROPERTY SWIG_FLAGS "-Wall" "-Werror") +set_property(SOURCE pfw.i PROPERTY CPLUSPLUS ON) +set_property(SOURCE pfw.i PROPERTY SWIG_FLAGS "-Wall" "-Werror") -SWIG_ADD_MODULE(PyPfw python pfw.i) -SWIG_LINK_LIBRARIES(PyPfw parameter ${PYTHON_LIBRARIES}) +swig_add_module(PyPfw python pfw.i) +swig_link_libraries(PyPfw parameter ${PYTHON_LIBRARIES}) include(FindPythonLibs) if(NOT PYTHONLIBS_FOUND) message(SEND_ERROR "python librarires not found. please instal python development packages") -endif(NOT PYTHONLIBS_FOUND) +endif() include_directories(${PROJECT_SOURCE_DIR}/parameter/include ${PYTHON_INCLUDE_DIRS}) -- cgit v1.1