[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi scripts/Toolchain-cross-mingw32-linux.cma...
From: |
CERTI CVS commits |
Subject: |
[certi-cvs] certi scripts/Toolchain-cross-mingw32-linux.cma... |
Date: |
Tue, 20 Dec 2011 07:43:24 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 11/12/20 07:43:24
Modified files:
scripts : Toolchain-cross-mingw32-linux.cmake
. : CMakeLists.txt
Log message:
Enhance mingw32 toolchain file
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/Toolchain-cross-mingw32-linux.cmake?cvsroot=certi&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/certi/CMakeLists.txt?cvsroot=certi&r1=1.112&r2=1.113
Patches:
Index: scripts/Toolchain-cross-mingw32-linux.cmake
===================================================================
RCS file: /sources/certi/certi/scripts/Toolchain-cross-mingw32-linux.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- scripts/Toolchain-cross-mingw32-linux.cmake 18 Dec 2011 16:01:36 -0000
1.3
+++ scripts/Toolchain-cross-mingw32-linux.cmake 20 Dec 2011 07:43:24 -0000
1.4
@@ -1,14 +1,20 @@
# the name of the target operating system
SET(CMAKE_SYSTEM_NAME Windows)
+set(COMPILER_PREFIX "i586-mingw32msvc")
+
# which compilers to use for C and C++
-SET(CMAKE_RC_COMPILER i586-mingw32msvc-windres)
-SET(CMAKE_C_COMPILER i586-mingw32msvc-gcc)
-SET(CMAKE_CXX_COMPILER i586-mingw32msvc-g++)
+find_program(CMAKE_RC_COMPILER NAMES ${COMPILER_PREFIX}-windres)
+#SET(CMAKE_RC_COMPILER ${COMPILER_PREFIX}-windres)
+find_program(CMAKE_C_COMPILER NAMES ${COMPILER_PREFIX}-gcc)
+#SET(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
+find_program(CMAKE_CXX_COMPILER NAMES ${COMPILER_PREFIX}-g++)
+#SET(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
+
# here is the target environment located
SET(USER_ROOT_PATH /home/erk/erk-win32-dev)
-SET(CMAKE_FIND_ROOT_PATH /usr/i586-mingw32msvc ${USER_ROOT_PATH})
+SET(CMAKE_FIND_ROOT_PATH /usr/${COMPILER_PREFIX} ${USER_ROOT_PATH})
# adjust the default behaviour of the FIND_XXX() commands:
# search headers and libraries in the target environment, search
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- CMakeLists.txt 18 Dec 2011 16:02:22 -0000 1.112
+++ CMakeLists.txt 20 Dec 2011 07:43:24 -0000 1.113
@@ -485,11 +485,11 @@
# Try to build a relocatable package (for CPackRPM)
SET(CPACK_RPM_PACKAGE_RELOCATABLE TRUE)
SET(CPACK_SOURCE_GENERATOR "TGZ;ZIP")
-IF(APPLE)
+ IF(APPLE)
SET(CPACK_GENERATOR "TGZ;PackageMaker")
-ELSE(APPLE)
+ ELSE(APPLE)
SET(CPACK_GENERATOR "TGZ;RPM;DEB")
-ENDIF(APPLE)
+ ENDIF(APPLE)
ENDIF (WIN32)
include(SystemSpecificInformations)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi scripts/Toolchain-cross-mingw32-linux.cma...,
CERTI CVS commits <=