diff options
| author | Brad King <brad.king@kitware.com> | 2016-03-10 14:16:23 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-03-10 14:16:23 (GMT) |
| commit | 1ed74b9d228a076b2b0ad4476ea9013cf143354e (patch) | |
| tree | 7cba7f480a54b612265b84dfa181c43801bbb0a4 /Tests/ObjectLibrary/B | |
| parent | 030ec94780b7aaf0c495bfb5d6c7e12071342dfd (diff) | |
| parent | b42866a34a742f89a35382d17d58070c73486d92 (diff) | |
| download | CMake-1ed74b9d228a076b2b0ad4476ea9013cf143354e.zip CMake-1ed74b9d228a076b2b0ad4476ea9013cf143354e.tar.gz CMake-1ed74b9d228a076b2b0ad4476ea9013cf143354e.tar.bz2 | |
Merge topic 'remove-vs6-generator'
b42866a3 Drop Visual Studio 6 generator
cd9ba3ec cmLocalVisualStudio7Generator: Fix name of helper function
Diffstat (limited to 'Tests/ObjectLibrary/B')
| -rw-r--r-- | Tests/ObjectLibrary/B/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | Tests/ObjectLibrary/B/b1_vs6.c | 1 | ||||
| -rw-r--r-- | Tests/ObjectLibrary/B/b2_vs6.c | 1 |
3 files changed, 1 insertions, 7 deletions
diff --git a/Tests/ObjectLibrary/B/CMakeLists.txt b/Tests/ObjectLibrary/B/CMakeLists.txt index 2158084..ecace4f 100644 --- a/Tests/ObjectLibrary/B/CMakeLists.txt +++ b/Tests/ObjectLibrary/B/CMakeLists.txt @@ -1,8 +1,4 @@ project(ObjectLibraryB C) -if("${CMAKE_GENERATOR}" MATCHES "Visual Studio 6") - # VS 6 generator does not use per-target object locations. - set(vs6 _vs6) -endif() # Add -fPIC so objects can be used in shared libraries. set(CMAKE_POSITION_INDEPENDENT_CODE ON) @@ -11,7 +7,7 @@ add_library(B OBJECT b1.c b2.c) target_include_directories(B PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_compile_definitions(B PUBLIC B_DEF) -add_library(Bexport OBJECT b1${vs6}.c b2${vs6}.c) +add_library(Bexport OBJECT b1.c b2.c) set_property(TARGET Bexport PROPERTY COMPILE_DEFINITIONS Bexport) target_include_directories(Bexport PRIVATE $<TARGET_PROPERTY:B,INTERFACE_INCLUDE_DIRECTORIES>) target_compile_definitions(Bexport PRIVATE $<TARGET_PROPERTY:B,INTERFACE_COMPILE_DEFINITIONS>) diff --git a/Tests/ObjectLibrary/B/b1_vs6.c b/Tests/ObjectLibrary/B/b1_vs6.c deleted file mode 100644 index b606e10..0000000 --- a/Tests/ObjectLibrary/B/b1_vs6.c +++ /dev/null @@ -1 +0,0 @@ -#include "b1.c" diff --git a/Tests/ObjectLibrary/B/b2_vs6.c b/Tests/ObjectLibrary/B/b2_vs6.c deleted file mode 100644 index d96a43e..0000000 --- a/Tests/ObjectLibrary/B/b2_vs6.c +++ /dev/null @@ -1 +0,0 @@ -#include "b2.c" |