[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.123 1.124
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Oct 8 11:56:11 EDT 2009
Update of /cvsroot/CMake/CMake/Tests
In directory public:/mounts/ram/cvs-serv18882/Tests
Modified Files:
CMakeLists.txt
Log Message:
Split Borland compiler information files
This commit re-writes Borland compiler build rules. We split the rules
into modern <os>-<id>-<lang> information modules but share a common
macro between languages to avoid duplication.
We also address a bug in the previous rules that would build some target
types against the static Borland runtime and others against the shared
Borland runtime in one build tree. Now we always use the shared runtime
as is the default in the rules for MS tools.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.123
retrieving revision 1.124
diff -C 2 -d -r1.123 -r1.124
*** CMakeLists.txt 7 Oct 2009 20:11:51 -0000 1.123
--- CMakeLists.txt 8 Oct 2009 15:56:07 -0000 1.124
***************
*** 491,494 ****
--- 491,497 ----
SET(COMPLEX_TEST_CMAKELIB 0)
ENDIF(CMAKE_TEST_DIFFERENT_GENERATOR OR CMAKE_TEST_SYSTEM_LIBRARIES)
+ IF(BORLAND)
+ SET(COMPLEX_TEST_CMAKELIB 0)
+ ENDIF(BORLAND)
ADD_TEST(complex ${CMAKE_CTEST_COMMAND}
--build-and-test
More information about the Cmake-commits
mailing list