Merge pull request ivansafrin#457 from Adnn/master

Dependencies: forwarding top-level CMAKE_CXX_FLAGS to each added external project
peterkinalex · Jun 23, 2014 · b370db1 · b370db1
2 parents e2cb65c + a71c6bb
commit b370db1
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 0 deletions.
diff --git a/CMake/ExternalAssimp.cmake b/CMake/ExternalAssimp.cmake
@@ -4,6 +4,7 @@ INCLUDE(ExternalProject)
 SET(assimp_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/assimp)
 
 SET(assimp_CMAKE_ARGS
+    -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 	-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}

diff --git a/CMake/ExternalBox2D.cmake b/CMake/ExternalBox2D.cmake
@@ -8,6 +8,7 @@ SET(box2d_PREFIX ${PROJECT_BINARY_DIR}/box2d)
 #ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
 SET(box2d_CMAKE_ARGS
+    -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 	-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}

diff --git a/CMake/ExternalBullet.cmake b/CMake/ExternalBullet.cmake
@@ -3,6 +3,7 @@ INCLUDE(ExternalProject)
 SET(bullet_PREFIX ${PROJECT_BINARY_DIR}/bullet)
 
 SET(bullet_CMAKE_ARGS 
+    -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 	-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}

diff --git a/CMake/ExternalFreetype.cmake b/CMake/ExternalFreetype.cmake
@@ -4,6 +4,7 @@ INCLUDE(ExternalProject)
 SET(freetype_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/freetype)
 
 SET(freetype_CMAKE_ARGS
+    -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> 
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 	-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}

diff --git a/CMake/ExternalLua51.cmake b/CMake/ExternalLua51.cmake
@@ -4,6 +4,7 @@ INCLUDE(ExternalProject)
 SET(lua51_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/lua51)
 
 SET(lua51_CMAKE_ARGS
+    -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> 
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 	-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}

diff --git a/CMake/ExternalOggVorbis.cmake b/CMake/ExternalOggVorbis.cmake
@@ -4,6 +4,7 @@ INCLUDE(ExternalProject)
 SET(oggvorbis_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/oggvorbis)
 
 SET(oggvorbis_CMAKE_ARGS
+    -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> 
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 	-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}

diff --git a/CMake/ExternalOpenAL.cmake b/CMake/ExternalOpenAL.cmake
@@ -4,6 +4,7 @@ INCLUDE(ExternalProject)
 SET(openal_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/openal)
 
 SET(openal_CMAKE_ARGS
+    -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> 
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
     -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}

diff --git a/CMake/ExternalPNG.cmake b/CMake/ExternalPNG.cmake
@@ -4,6 +4,7 @@ INCLUDE(ExternalProject)
 SET(libpng_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/libpng)
 
 SET(libpng_CMAKE_ARGS
+    -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> 
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 	-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}

diff --git a/CMake/ExternalPhysFS.cmake b/CMake/ExternalPhysFS.cmake
@@ -4,6 +4,7 @@ INCLUDE(ExternalProject)
 SET(physfs_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/physfs)
 
 SET(physfs_CMAKE_ARGS
+    -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> 
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 	-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}