Merge topic 'test-ObjectLibrary-lang'
94c08b3
Tests/ObjectLibrary: Do not enable CXX in subdirectories
This commit is contained in:
commit
bc147d99ca
|
@ -1,4 +1,4 @@
|
||||||
project(ObjectLibraryA)
|
project(ObjectLibraryA C)
|
||||||
# Add -fPIC so objects can be used in shared libraries.
|
# Add -fPIC so objects can be used in shared libraries.
|
||||||
# TODO: Need property for this.
|
# TODO: Need property for this.
|
||||||
if(CMAKE_SHARED_LIBRARY_C_FLAGS AND NOT WATCOM)
|
if(CMAKE_SHARED_LIBRARY_C_FLAGS AND NOT WATCOM)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
project(ObjectLibraryB)
|
project(ObjectLibraryB C)
|
||||||
if("${CMAKE_GENERATOR}" MATCHES "Visual Studio 6")
|
if("${CMAKE_GENERATOR}" MATCHES "Visual Studio 6")
|
||||||
# VS 6 generator does not use per-target object locations.
|
# VS 6 generator does not use per-target object locations.
|
||||||
set(vs6 _vs6)
|
set(vs6 _vs6)
|
||||||
|
|
Loading…
Reference in New Issue