diff options
| author | Brad King <brad.king@kitware.com> | 2010-09-08 15:36:46 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-09-08 15:36:46 (GMT) |
| commit | f444b9555f87ec187bff51d48cd29c22ab4a6121 (patch) | |
| tree | 7c7722e4566970bdd76f361756b1ab7aab855d35 /Modules | |
| parent | 661d5166b06c30a7a490d28a8476989200744b87 (diff) | |
| parent | 7944e4e0ac37cb1423da2de7a203557b77372aac (diff) | |
| download | CMake-f444b9555f87ec187bff51d48cd29c22ab4a6121.zip CMake-f444b9555f87ec187bff51d48cd29c22ab4a6121.tar.gz CMake-f444b9555f87ec187bff51d48cd29c22ab4a6121.tar.bz2 | |
Merge topic 'allow_upper_case_cpp_and_others'
7944e4e Allow testing of .CPP on WIN32 as it is a case insensitive OS and should work.
ba0a890 Only test for .CPP on Microsoft compilers which will handle .CPP as c++.
d26cd46 Only use .CPP .CXX and .C++ do not work by default with g+++.
ced61f5 Let CMake recognize .CPP .CXX and .C++ as c++ files.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeCXXCompiler.cmake.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CMakeCXXCompiler.cmake.in b/Modules/CMakeCXXCompiler.cmake.in index b264da1..d7ae8d9 100644 --- a/Modules/CMakeCXXCompiler.cmake.in +++ b/Modules/CMakeCXXCompiler.cmake.in @@ -21,8 +21,8 @@ IF(CMAKE_COMPILER_IS_MINGW) SET(MINGW 1) ENDIF(CMAKE_COMPILER_IS_MINGW) SET(CMAKE_CXX_COMPILER_ID_RUN 1) -SET(CMAKE_CXX_IGNORE_EXTENSIONS inl;h;H;o;O;obj;OBJ;def;DEF;rc;RC) -SET(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;m;mm) +SET(CMAKE_CXX_IGNORE_EXTENSIONS inl;h;hpp;HPP;H;o;O;obj;OBJ;def;DEF;rc;RC) +SET(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;m;mm;CPP) SET(CMAKE_CXX_LINKER_PREFERENCE 30) SET(CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES 1) |