ENH: add some OS/compiler variables

This commit is contained in:
Bill Hoffman 2002-03-01 09:00:31 -05:00
parent 9ee6b07295
commit 3da299a796
7 changed files with 36 additions and 1 deletions

View File

@ -8,6 +8,12 @@ FIND_PATH(BCB_BIN_PATH bcc32.exe
[HKEY_LOCAL_MACHINE/SOFTWARE/Borland/C++Builder/5.0/RootDir]/Bin [HKEY_LOCAL_MACHINE/SOFTWARE/Borland/C++Builder/5.0/RootDir]/Bin
) )
SET (CMAKE_BUILD_TOOL borlandmake CACHE INTERNAL
"What is the target build tool cmake is generating for.")
SET (CMAKE_SYSTEM "Win32" CACHE INTERNAL
"What system is this. Result of uname.")
SET (BORLAND 1 CACHE INTERNAL "This is the borland generator") SET (BORLAND 1 CACHE INTERNAL "This is the borland generator")
SET (CMAKE_C_COMPILER ${BCB_BIN_PATH}/bcc32 CACHE FILEPATH SET (CMAKE_C_COMPILER ${BCB_BIN_PATH}/bcc32 CACHE FILEPATH

View File

@ -10,6 +10,12 @@ FIND_PROGRAM(MICROSOFT_DEVENV
"c:/Program Files/Microsoft Visual Studio.NET/Common7/IDE" "c:/Program Files/Microsoft Visual Studio.NET/Common7/IDE"
) )
SET (CMAKE_BUILD_TOOL devenv CACHE INTERNAL
"What is the target build tool cmake is generating for.")
SET (CMAKE_SYSTEM "Win32" CACHE INTERNAL
"What system is this. Result of uname.")
SET (CMAKE_CXX_COMPILER cl CACHE STRING SET (CMAKE_CXX_COMPILER cl CACHE STRING
"Name of C++ compiler used.") "Name of C++ compiler used.")
@ -37,7 +43,6 @@ SET (BUILDNAME "Win32-DotNET-devenv" CACHE STRING
SET (CMAKE_CONFIGURATION_TYPES "Debug Release MinSizeRel RelWithDebInfo" CACHE STRING SET (CMAKE_CONFIGURATION_TYPES "Debug Release MinSizeRel RelWithDebInfo" CACHE STRING
"Space separated list of supported configuration types, only supports Debug, Release, MinSizeRel, and RelWithDebInfo, anything else will be ignored.") "Space separated list of supported configuration types, only supports Debug, Release, MinSizeRel, and RelWithDebInfo, anything else will be ignored.")
# We will hardcode them for now. Make sure to fix that in the future # We will hardcode them for now. Make sure to fix that in the future
SET (CMAKE_SIZEOF_INT 4 CACHE INTERNAL "Size of int data type") SET (CMAKE_SIZEOF_INT 4 CACHE INTERNAL "Size of int data type")
SET (CMAKE_SIZEOF_LONG 4 CACHE INTERNAL "Size of long data type") SET (CMAKE_SIZEOF_LONG 4 CACHE INTERNAL "Size of long data type")

View File

@ -4,6 +4,12 @@
# Suffixes # Suffixes
SET (CMAKE_SYSTEM "Win32" CACHE INTERNAL
"What system is this. Result of uname.")
SET (CMAKE_BUILD_TOOL nmake CACHE INTERNAL
"What is the target build tool cmake is generating for.")
SET (CMAKE_EXECUTABLE_SUFFIX ".exe" CACHE STRING SET (CMAKE_EXECUTABLE_SUFFIX ".exe" CACHE STRING
"Executable suffix.") "Executable suffix.")

View File

@ -111,6 +111,12 @@ SET (CMAKE_NO_ANSI_FOR_SCOPE @CMAKE_NO_ANSI_FOR_SCOPE@ CACHE INTERNAL
SET (CMAKE_COMPILER_IS_GNUCXX @CMAKE_COMPILER_IS_GNUCXX@ CACHE INTERNAL SET (CMAKE_COMPILER_IS_GNUCXX @CMAKE_COMPILER_IS_GNUCXX@ CACHE INTERNAL
"Is the compile GNU C++.") "Is the compile GNU C++.")
SET (CMAKE_SYSTEM @CMAKE_SYSTEM@ CACHE INTERNAL
"What system is this. Result of uname.")
SET (CMAKE_BUILD_TOOL make CACHE INTERNAL
"What is the target build tool cmake is generating for.")
SET (CMAKE_ANSI_CFLAGS @CMAKE_ANSI_CFLAGS@ CACHE INTERNAL SET (CMAKE_ANSI_CFLAGS @CMAKE_ANSI_CFLAGS@ CACHE INTERNAL
"What flags are required by the c++ compiler to make it ansi.") "What flags are required by the c++ compiler to make it ansi.")

View File

@ -1,5 +1,10 @@
# Microsoft specific config file # Microsoft specific config file
SET (CMAKE_BUILD_TOOL msdev CACHE INTERNAL
"What is the target build tool cmake is generating for.")
SET (CMAKE_SYSTEM "Win32" CACHE INTERNAL
"What system is this. Result of uname.")
SET (CMAKE_CXX_COMPILER cl CACHE STRING SET (CMAKE_CXX_COMPILER cl CACHE STRING
"Name of C++ compiler used.") "Name of C++ compiler used.")

4
Templates/configure vendored
View File

@ -3502,6 +3502,9 @@ if test $ac_cv_prog_gxx = yes; then
CMAKE_COMPILER_IS_GNUCXX=1 CMAKE_COMPILER_IS_GNUCXX=1
fi fi
CMAKE_SYSTEM="$system"
# generate output files. # generate output files.
# create mkdir files just to make some of the directories # create mkdir files just to make some of the directories
@ -3702,6 +3705,7 @@ s%@RUNMAKE@%$RUNMAKE%g
s%@CMAKE_AR_TMP@%$CMAKE_AR_TMP%g s%@CMAKE_AR_TMP@%$CMAKE_AR_TMP%g
s%@CMAKE_AR@%$CMAKE_AR%g s%@CMAKE_AR@%$CMAKE_AR%g
s%@CMAKE_AR_ARGS@%$CMAKE_AR_ARGS%g s%@CMAKE_AR_ARGS@%$CMAKE_AR_ARGS%g
s%@CMAKE_SYSTEM@%$CMAKE_SYSTEM%g
s%@CMAKE_COMPILER_IS_GNUCXX@%$CMAKE_COMPILER_IS_GNUCXX%g s%@CMAKE_COMPILER_IS_GNUCXX@%$CMAKE_COMPILER_IS_GNUCXX%g
CEOF CEOF

View File

@ -731,6 +731,9 @@ CMAKE_COMPILER_IS_GNUGXX=0
if test $ac_cv_prog_gxx = yes; then if test $ac_cv_prog_gxx = yes; then
CMAKE_COMPILER_IS_GNUCXX=1 CMAKE_COMPILER_IS_GNUCXX=1
fi fi
CMAKE_SYSTEM="$system"
AC_SUBST(CMAKE_SYSTEM)
AC_SUBST(CMAKE_COMPILER_IS_GNUCXX) AC_SUBST(CMAKE_COMPILER_IS_GNUCXX)
# generate output files. # generate output files.
# create mkdir files just to make some of the directories # create mkdir files just to make some of the directories