diff options
| author | Brad King <brad.king@kitware.com> | 2012-08-20 18:45:48 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-08-20 18:47:33 (GMT) |
| commit | 94c08b368c40da4f39a506440d0c5cf3c4c23c48 (patch) | |
| tree | 9ee84e45100d2e5de2be331804307364a4aa0784 | |
| parent | addefc2ae3b33a75a7152730146b46b319118a24 (diff) | |
| download | CMake-94c08b368c40da4f39a506440d0c5cf3c4c23c48.zip CMake-94c08b368c40da4f39a506440d0c5cf3c4c23c48.tar.gz CMake-94c08b368c40da4f39a506440d0c5cf3c4c23c48.tar.bz2 | |
Tests/ObjectLibrary: Do not enable CXX in subdirectories
In commit b237dbd8 (Xcode: Fix object library references in
multi-project trees, 2012-08-03) we accidentally enabled CXX in the
subdiretories of this test by invoking project() with only one argument.
The top-level directory of the test enables only C, so do this in the
subdirectories too.
| -rw-r--r-- | Tests/ObjectLibrary/A/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/ObjectLibrary/B/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Tests/ObjectLibrary/A/CMakeLists.txt b/Tests/ObjectLibrary/A/CMakeLists.txt index 04ab02f..36c86e7 100644 --- a/Tests/ObjectLibrary/A/CMakeLists.txt +++ b/Tests/ObjectLibrary/A/CMakeLists.txt @@ -1,4 +1,4 @@ -project(ObjectLibraryA) +project(ObjectLibraryA C) # Add -fPIC so objects can be used in shared libraries. # TODO: Need property for this. if(CMAKE_SHARED_LIBRARY_C_FLAGS AND NOT WATCOM) diff --git a/Tests/ObjectLibrary/B/CMakeLists.txt b/Tests/ObjectLibrary/B/CMakeLists.txt index 4b0b07d..32d8ceb 100644 --- a/Tests/ObjectLibrary/B/CMakeLists.txt +++ b/Tests/ObjectLibrary/B/CMakeLists.txt @@ -1,4 +1,4 @@ -project(ObjectLibraryB) +project(ObjectLibraryB C) if("${CMAKE_GENERATOR}" MATCHES "Visual Studio 6") # VS 6 generator does not use per-target object locations. set(vs6 _vs6) |