[celix] 10/22: CELIX-438: Updates external project configuration, so that building of external libs do not generated compiler warnings

[pn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

pnoltes pushed a commit to branch feature/cxx
in repository https://gitbox.apache.org/repos/asf/celix.git

commit fa43b32e961103b8bae6f9152694b26756d8c933
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Sat Jan 5 18:37:40 2019 +0100

    CELIX-438: Updates external project configuration, so that building of external libs do not generated compiler warnings
---
 cmake/celix_project/AddCppUTest.cmake | 4 ++--
 cmake/celix_project/AddGLog.cmake     | 4 ++--
 cmake/celix_project/AddLibzip.cmake   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cmake/celix_project/AddCppUTest.cmake b/cmake/celix_project/AddCppUTest.cmake
index f989e73..b6a0285 100644
--- a/cmake/celix_project/AddCppUTest.cmake
+++ b/cmake/celix_project/AddCppUTest.cmake
@@ -22,14 +22,14 @@ ExternalProject_Add(
         GIT_TAG v3.8
         UPDATE_DISCONNECTED TRUE
         PREFIX ${CMAKE_BINARY_DIR}/cpputest
-        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/cpputest
+        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/cpputest -DCMAKE_C_FLAGS=-w -DCMAKE_CXX_FLAGS=-w
 )
 
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/cpputest/include)
 
 set(CPPUTEST_LIBRARY cpputest::cpputest)
 set(CPPUTEST_EXT_LIBRARY cpputest::ext)
-set(CPPUTEST_INCLUDE_DIR ${binary_dir}/cpputest)
+set(CPPUTEST_INCLUDE_DIR ${CMAKE_BINARY_DIR}/cpputest/include)
 
 add_library(cpputest::cpputest IMPORTED STATIC GLOBAL)
 add_dependencies(cpputest::cpputest cpputest_project)
diff --git a/cmake/celix_project/AddGLog.cmake b/cmake/celix_project/AddGLog.cmake
index fe0137f..bdc6532 100644
--- a/cmake/celix_project/AddGLog.cmake
+++ b/cmake/celix_project/AddGLog.cmake
@@ -23,10 +23,10 @@ ExternalProject_Add(
         GIT_TAG v0.3.5
         UPDATE_DISCONNECTED TRUE
         PREFIX ${CMAKE_BINARY_DIR}/glog
-        CMAKE_ARGS -DWITH_GFLAGS=OFF -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/glog -DCMAKE_CXX_FLAGS=-w
+        CMAKE_ARGS -DWITH_GFLAGS=OFF -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/glog -DCMAKE_C_FLAGS=-w -DCMAKE_CXX_FLAGS=-w
 )
 
-file(MAKE_DIRECTORY ${source_dir}/glog/include)
+file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/glog/include)
 
 add_library(glog::glog IMPORTED STATIC GLOBAL)
 add_dependencies(glog::glog googlelog_project)
diff --git a/cmake/celix_project/AddLibzip.cmake b/cmake/celix_project/AddLibzip.cmake
index 19f8f15..5b31a79 100644
--- a/cmake/celix_project/AddLibzip.cmake
+++ b/cmake/celix_project/AddLibzip.cmake
@@ -22,10 +22,10 @@ ExternalProject_Add(
         GIT_TAG rel-1-5-1
         UPDATE_DISCONNECTED TRUE
         PREFIX ${CMAKE_BINARY_DIR}/libzip
-        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/libzip -DCMAKE_C_FLAGS=-fPIC -DBUILD_SHARED_LIBS=OFF -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_OPENSSL=OFF -Wno-dev
+        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/libzip -DCMAKE_C_FLAGS=-w\ -fPIC  -DBUILD_SHARED_LIBS=OFF -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_OPENSSL=OFF
 )
 
-file(MAKE_DIRECTORY ${source_dir}/libzip/include)
+file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/libzip/include)
 
 add_library(libzip::libzip IMPORTED STATIC GLOBAL)
 add_dependencies(libzip::libzip libzip_project)