diff options
| author | David Cole <david.cole@kitware.com> | 2012-08-24 18:23:33 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-08-24 18:23:33 (GMT) |
| commit | bc147d99caa9186b2dc0a431bd6c0f49a1ded594 (patch) | |
| tree | 416c9fcae403eebd820fa7ad391fd78a38177ff1 /Tests | |
| parent | 6dab13c56e731d3d8ed6a751a6e0735835acc76f (diff) | |
| parent | 94c08b368c40da4f39a506440d0c5cf3c4c23c48 (diff) | |
| download | CMake-bc147d99caa9186b2dc0a431bd6c0f49a1ded594.zip CMake-bc147d99caa9186b2dc0a431bd6c0f49a1ded594.tar.gz CMake-bc147d99caa9186b2dc0a431bd6c0f49a1ded594.tar.bz2 | |
Merge topic 'test-ObjectLibrary-lang'
94c08b3 Tests/ObjectLibrary: Do not enable CXX in subdirectories
Diffstat (limited to 'Tests')
| -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) |