Merge pull request #1177 from malin1993ml/master

Fix the -fPIC flag setting for external projects.

Author: pervazea

cmake/External/capnproto.cmake

@@ -20,8 +20,8 @@ if (NOT __CAPNP_INCLUDED) # guard against multiple includes
         set(CAPNP_EXTRA_COMPILER_FLAGS "-fPIC")
     endif()
 
-    set(CAPNP_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${CAPNP_EXTRA_COMPILER_FLAGS})
-    set(CAPNP_C_FLAGS ${CMAKE_C_FLAGS} ${CAPNP_EXTRA_COMPILER_FLAGS})
+    set(CAPNP_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CAPNP_EXTRA_COMPILER_FLAGS}")
+    set(CAPNP_C_FLAGS "${CMAKE_C_FLAGS} ${CAPNP_EXTRA_COMPILER_FLAGS}")
 
     ExternalProject_Add(capnp
       PREFIX ${capnp_PREFIX}

cmake/External/gflags.cmake

@@ -20,8 +20,8 @@ if (NOT __GFLAGS_INCLUDED) # guard against multiple includes
         set(GFLAGS_EXTRA_COMPILER_FLAGS "-fPIC")
     endif()
 
-    set(GFLAGS_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${GFLAGS_EXTRA_COMPILER_FLAGS})
-    set(GFLAGS_C_FLAGS ${CMAKE_C_FLAGS} ${GFLAGS_EXTRA_COMPILER_FLAGS})
+    set(GFLAGS_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GFLAGS_EXTRA_COMPILER_FLAGS}")
+    set(GFLAGS_C_FLAGS "${CMAKE_C_FLAGS} ${GFLAGS_EXTRA_COMPILER_FLAGS}")
 
     ExternalProject_Add(gflags
       PREFIX ${gflags_PREFIX}

cmake/External/glog.cmake

@@ -22,8 +22,8 @@ if (NOT __GLOG_INCLUDED)
       set(GLOG_EXTRA_COMPILER_FLAGS "-fPIC")
     endif()
 
-    set(GLOG_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${GLOG_EXTRA_COMPILER_FLAGS})
-    set(GLOG_C_FLAGS ${CMAKE_C_FLAGS} ${GLOG_EXTRA_COMPILER_FLAGS})
+    set(GLOG_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GLOG_EXTRA_COMPILER_FLAGS}")
+    set(GLOG_C_FLAGS "${CMAKE_C_FLAGS} ${GLOG_EXTRA_COMPILER_FLAGS}")
 
     # depend on gflags if we're also building it
     if (GFLAGS_EXTERNAL)