diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-02 18:40:59 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-07-07 12:58:08 (GMT) |
| commit | 54bf5858cd4153f41a2414dbe8d1278268eccb58 (patch) | |
| tree | 81f5e466652631241c55d8544f83a7f6fcd99071 /Tests/ObjectLibrary | |
| parent | 61be345115b5f2c402286be7fa3e6df0c2f5f0ac (diff) | |
| download | CMake-54bf5858cd4153f41a2414dbe8d1278268eccb58.zip CMake-54bf5858cd4153f41a2414dbe8d1278268eccb58.tar.gz CMake-54bf5858cd4153f41a2414dbe8d1278268eccb58.tar.bz2 | |
Tests: Resolve TODO comment left in ObjectLibrary test
We now have a generic way to add -fPIC without explicitly modifying
CMAKE_C_FLAGS, so use it.
Diffstat (limited to 'Tests/ObjectLibrary')
| -rw-r--r-- | Tests/ObjectLibrary/A/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Tests/ObjectLibrary/B/CMakeLists.txt | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/Tests/ObjectLibrary/A/CMakeLists.txt b/Tests/ObjectLibrary/A/CMakeLists.txt index 55778ea..1b40e8a 100644 --- a/Tests/ObjectLibrary/A/CMakeLists.txt +++ b/Tests/ObjectLibrary/A/CMakeLists.txt @@ -1,9 +1,6 @@ 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) - set(CMAKE_C_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${CMAKE_C_FLAGS}") -endif() +set(CMAKE_POSITION_INDEPENDENT_CODE ON) add_definitions(-DA_DEF) diff --git a/Tests/ObjectLibrary/B/CMakeLists.txt b/Tests/ObjectLibrary/B/CMakeLists.txt index a567f96..2158084 100644 --- a/Tests/ObjectLibrary/B/CMakeLists.txt +++ b/Tests/ObjectLibrary/B/CMakeLists.txt @@ -5,10 +5,7 @@ if("${CMAKE_GENERATOR}" MATCHES "Visual Studio 6") endif() # Add -fPIC so objects can be used in shared libraries. -# TODO: Need property for this. -if(CMAKE_SHARED_LIBRARY_C_FLAGS AND NOT WATCOM) - set(CMAKE_C_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${CMAKE_C_FLAGS}") -endif() +set(CMAKE_POSITION_INDEPENDENT_CODE ON) add_library(B OBJECT b1.c b2.c) target_include_directories(B PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) |