diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-03-17 21:14:04 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-03-17 21:14:04 (GMT) |
| commit | b507f8f0d1c1b678e1e9f01d2fd10a86bc4b5348 (patch) | |
| tree | 76f27d2303656292b57a7e7d8129056755beb0c8 | |
| parent | 84f1420d82e725cae6ca3873c52473046e4debef (diff) | |
| download | CMake-b507f8f0d1c1b678e1e9f01d2fd10a86bc4b5348.zip CMake-b507f8f0d1c1b678e1e9f01d2fd10a86bc4b5348.tar.gz CMake-b507f8f0d1c1b678e1e9f01d2fd10a86bc4b5348.tar.bz2 | |
ENH: Simplify the test
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Source/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | Source/cmSystemTools.cxx | 2 |
3 files changed, 5 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 840c5c1..a2ef87b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -125,6 +125,10 @@ IF(BUILD_CursesDialog) SUBDIRS(Source/CursesDialog/form) ENDIF(BUILD_CursesDialog) +INCLUDE(CheckSymbolExists) +CHECK_SYMBOL_EXISTS(unsetenv "stdlib.h" HAVE_UNSETENV) +CHECK_SYMBOL_EXISTS(environ "stdlib.h" HAVE_ENVIRON_NOT_REQUIRE_PROTOTYPE) + SUBDIRS(Source Modules Templates Utilities Tests/CMakeTests) ENABLE_TESTING() diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index a451e14..f176751 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -23,23 +23,6 @@ INCLUDE_DIRECTORIES( # let cmake know it is supposed to use it ADD_DEFINITIONS(-DCMAKE_BUILD_WITH_CMAKE) -INCLUDE(CheckSymbolExists) -CHECK_SYMBOL_EXISTS(unsetenv "stdlib.h" HAVE_UNSETENV) -INCLUDE("${CMAKE_SOURCE_DIR}/Modules/CheckCXXSourceCompiles.cmake") -CHECK_CXX_SOURCE_COMPILES( - "int main(int argc, char* argv[]) { return sizeof(environ); }" - HAVE_ENVIRON_WITHOUT_SIGNATURE) -IF(NOT HAVE_ENVIRON_WITHOUT_SIGNATURE) - CHECK_CXX_SOURCE_COMPILES( - " - #ifdef _WIN32 - extern __declspec( dllimport ) char** environ; - #else - extern char** environ; - #endif - int main(int argc, char* argv[]) { return sizeof(environ); }" - HAVE_ENVIRON_WITH_SIGNATURE) -ENDIF(NOT HAVE_ENVIRON_WITHOUT_SIGNATURE) OPTION(CMAKE_REGENERATE_YACCLEX "Regenerate YACC and LEXX files" OFF) diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 8903cc3..29fcd92 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -56,7 +56,7 @@ # pragma set woff 1375 /* base class destructor not virtual */ #endif -#if !defined(HAVE_ENVIRON_WITHOUT_SIGNATURE) +#if !defined(HAVE_ENVIRON_NOT_REQUIRE_PROTOTYPE) // For GetEnvironmentVariables # if defined(_WIN32) extern __declspec( dllimport ) char** environ; |