[vlmc-devel] commit: toolchain-win32: Allow variables to be overwritten ( Hugo Beauzée-Luyssen )

git at videolan.org git at videolan.org
Tue Sep 21 15:04:45 CEST 2010


vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Fri Sep 17 16:29:50 2010 +0200| [b527af7e876aa8cce56b5c0d3f78f715fb29d1b2] | committer: Hugo Beauzée-Luyssen 

toolchain-win32: Allow variables to be overwritten

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=b527af7e876aa8cce56b5c0d3f78f715fb29d1b2
---

 cmake/toolchain-win32.cmake |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/cmake/toolchain-win32.cmake b/cmake/toolchain-win32.cmake
index bc7fe61..642ede3 100644
--- a/cmake/toolchain-win32.cmake
+++ b/cmake/toolchain-win32.cmake
@@ -9,10 +9,15 @@ SET(CMAKE_SYSTEM_NAME Windows)
 SET(CMAKE_SYSTEM_VERSION 1)
 
 # specify the cross compiler
+IF(NOT CMAKE_C_COMPILER)
 SET(CMAKE_C_COMPILER   i586-mingw32msvc-gcc)
+ENDIF(NOT CMAKE_C_COMPILER)
+IF(NOT CMAKE_CXX_COMPILER)
 SET(CMAKE_CXX_COMPILER i586-mingw32msvc-g++)
+ENDIF(NOT CMAKE_CXX_COMPILER)
+IF(NOT CMAKE_WINDRES)
 SET(CMAKE_WINDRES      i586-mingw32msvc-windres)
-
+ENDIF(NOT CMAKE_WINDRES)
 
 # where is the target environment 
 SET(CMAKE_FIND_ROOT_PATH  ${CMAKE_SOURCE_DIR}/contribs)



More information about the Vlmc-devel mailing list