[Cmake-commits] CMake branch, next, updated. v2.8.8-2681-gde22852
Brad King
brad.king at kitware.com
Tue Apr 24 10:07:13 EDT 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via de22852abf150c86a259dc27eb8e7973a13025b7 (commit)
via 1a25d0ee78e0a9ece106c14837b307560b4fb2f2 (commit)
from 0009f0d64cb722c417f7373215a9285bb6561b3f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de22852abf150c86a259dc27eb8e7973a13025b7
commit de22852abf150c86a259dc27eb8e7973a13025b7
Merge: 0009f0d 1a25d0e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 24 10:07:07 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 24 10:07:07 2012 -0400
Merge topic 'module-no-soname' into next
1a25d0e Revert topic 'module-no-soname' (#13155)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a25d0ee78e0a9ece106c14837b307560b4fb2f2
commit 1a25d0ee78e0a9ece106c14837b307560b4fb2f2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 24 09:56:13 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Apr 24 10:02:43 2012 -0400
Revert topic 'module-no-soname' (#13155)
Revert commit 6ad39679 (OS X: Fix Framework install-name after NO_SONAME
change, 2012-04-23), commit 69626f02 (Test NO_SONAME property,
2012-04-23), and commit 2d951c1d (Support building shared libraries or
modules without soname, 2012-04-22). The topic has some subtle
problems.
(1) The implementation on the Ninja generator does not work. The
generator performs rule variable substitution only once globally per
rule to put its own placeholders. Final substitution is performed by
ninja at build time. Therefore we cannot conditionally replace the
soname placeholders on a per-target basis.
(2) The interface does not define behavior for OS X install-name but it
needs to because CMake implements soname as install-name there.
(3) Some projects may set their own rule variables and depend on
placeholders like
<CMAKE_SHARED_LIBRARY_SONAME_C_FLAG><TARGET_SONAME>
to work. We cannot remove the implementation of this substitution.
In order to fix the above we need to refactor the implementation of both
soname and install-name handling. The flags to set them need to be
moved to the <LINK_FLAGS> placeholder, so the C++ code needs to be
taught exactly when to add the flags. The placeholders mentioned in
problem (3) must be removed from CMake's platform files, but if a
project adds them they must be honored AND suppress addition of the
flags to <LINK_FLAGS>.
diff --git a/Modules/CMakeCInformation.cmake b/Modules/CMakeCInformation.cmake
index afac7a4..6b5efba 100644
--- a/Modules/CMakeCInformation.cmake
+++ b/Modules/CMakeCInformation.cmake
@@ -164,7 +164,7 @@ INCLUDE(CMakeCommonLanguageInclude)
# create a C shared library
IF(NOT CMAKE_C_CREATE_SHARED_LIBRARY)
SET(CMAKE_C_CREATE_SHARED_LIBRARY
- "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+ "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_C_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
ENDIF(NOT CMAKE_C_CREATE_SHARED_LIBRARY)
# create a C shared module just copy the shared library rule
diff --git a/Modules/CMakeCXXInformation.cmake b/Modules/CMakeCXXInformation.cmake
index 608b833..25abb8c 100644
--- a/Modules/CMakeCXXInformation.cmake
+++ b/Modules/CMakeCXXInformation.cmake
@@ -242,7 +242,7 @@ INCLUDE(CMakeCommonLanguageInclude)
# create a shared C++ library
IF(NOT CMAKE_CXX_CREATE_SHARED_LIBRARY)
SET(CMAKE_CXX_CREATE_SHARED_LIBRARY
- "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+ "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
ENDIF(NOT CMAKE_CXX_CREATE_SHARED_LIBRARY)
# create a c++ shared module copy the shared library rule by default
diff --git a/Modules/CMakeFortranInformation.cmake b/Modules/CMakeFortranInformation.cmake
index 2cbd7f8..76cf34e 100644
--- a/Modules/CMakeFortranInformation.cmake
+++ b/Modules/CMakeFortranInformation.cmake
@@ -171,7 +171,7 @@ INCLUDE(CMakeCommonLanguageInclude)
# create a Fortran shared library
IF(NOT CMAKE_Fortran_CREATE_SHARED_LIBRARY)
SET(CMAKE_Fortran_CREATE_SHARED_LIBRARY
- "<CMAKE_Fortran_COMPILER> <CMAKE_SHARED_LIBRARY_Fortran_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS> <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+ "<CMAKE_Fortran_COMPILER> <CMAKE_SHARED_LIBRARY_Fortran_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
ENDIF(NOT CMAKE_Fortran_CREATE_SHARED_LIBRARY)
# create a Fortran shared module just copy the shared library rule
diff --git a/Modules/Compiler/XL.cmake b/Modules/Compiler/XL.cmake
index d293610..d2567d5 100644
--- a/Modules/Compiler/XL.cmake
+++ b/Modules/Compiler/XL.cmake
@@ -47,7 +47,7 @@ macro(__compiler_xl lang)
# files so that we export only the symbols actually provided by the sources.
set(CMAKE_${lang}_CREATE_SHARED_LIBRARY
"${CMAKE_XL_CreateExportList} <OBJECT_DIR>/objects.exp <OBJECTS>"
- "<CMAKE_${lang}_COMPILER> <CMAKE_SHARED_LIBRARY_${lang}_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS> -Wl,-bE:<OBJECT_DIR>/objects.exp <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>"
+ "<CMAKE_${lang}_COMPILER> <CMAKE_SHARED_LIBRARY_${lang}_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS> -Wl,-bE:<OBJECT_DIR>/objects.exp <CMAKE_SHARED_LIBRARY_SONAME_${lang}_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>"
)
endif()
endmacro()
diff --git a/Modules/Platform/SunOS.cmake b/Modules/Platform/SunOS.cmake
index 2291c34..9f2ee2e 100644
--- a/Modules/Platform/SunOS.cmake
+++ b/Modules/Platform/SunOS.cmake
@@ -8,7 +8,7 @@ ENDIF(CMAKE_SYSTEM MATCHES "SunOS-4.*")
IF(CMAKE_COMPILER_IS_GNUCXX)
IF(CMAKE_COMPILER_IS_GNUCC)
SET(CMAKE_CXX_CREATE_SHARED_LIBRARY
- "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+ "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
ELSE(CMAKE_COMPILER_IS_GNUCC)
# Take default rule from CMakeDefaultMakeRuleVariables.cmake.
ENDIF(CMAKE_COMPILER_IS_GNUCC)
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index eb19df5..c4f5dfb 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -137,20 +137,10 @@ cmExportFileGenerator
(mf->IsOn("WIN32") || mf->IsOn("CYGWIN") || mf->IsOn("MINGW"));
if(!dll_platform)
{
- std::string prop;
- std::string value;
- if(target->HasSOName(config))
- {
- prop = "IMPORTED_SONAME";
- value = target->GetSOName(config);
- }
- else
- {
- prop = "IMPORTED_NO_SONAME";
- value = "TRUE";
- }
+ std::string soname = target->GetSOName(config);
+ std::string prop = "IMPORTED_SONAME";
prop += suffix;
- properties[prop] = value;
+ properties[prop] = soname;
}
}
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 9d82b6f..13ede5d 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -783,6 +783,7 @@ static const char* ruleReplaceVars[] =
"CMAKE_SHARED_MODULE_${LANG}_FLAGS",
"CMAKE_SHARED_LIBRARY_${LANG}_FLAGS",
"CMAKE_${LANG}_LINK_FLAGS",
+ "CMAKE_SHARED_LIBRARY_SONAME_${LANG}_FLAG",
"CMAKE_${LANG}_ARCHIVE",
"CMAKE_AR",
"CMAKE_CURRENT_SOURCE_DIR",
@@ -953,20 +954,22 @@ cmLocalGenerator::ExpandRuleVariable(std::string const& variable,
}
}
}
- if(variable == "TARGET_SONAME" || variable == "SONAME_FLAG")
+ if(replaceValues.TargetSOName)
{
- if(replaceValues.TargetSOName && replaceValues.Language)
+ if(variable == "TARGET_SONAME")
{
- std::string name = "CMAKE_SHARED_LIBRARY_SONAME_";
- name += replaceValues.Language;
- name += "_FLAG";
- if(const char *flag = this->Makefile->GetDefinition(name.c_str()))
+ if(replaceValues.Language)
{
- return ((variable == "TARGET_SONAME") ?
- replaceValues.TargetSOName : flag);
+ std::string name = "CMAKE_SHARED_LIBRARY_SONAME_";
+ name += replaceValues.Language;
+ name += "_FLAG";
+ if(this->Makefile->GetDefinition(name.c_str()))
+ {
+ return replaceValues.TargetSOName;
+ }
}
+ return "";
}
- return "";
}
if(replaceValues.TargetInstallNameDir)
{
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index e0ef4dd..38aa59d 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -714,10 +714,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
std::string linkString = linklibs.str();
vars.LinkLibraries = linkString.c_str();
vars.ObjectsQuoted = buildObjs.c_str();
- if (this->Target->HasSOName(this->ConfigName))
- {
- vars.TargetSOName= targetNameSO.c_str();
- }
+ vars.TargetSOName= targetNameSO.c_str();
vars.LinkFlags = linkFlags.c_str();
// Compute the directory portion of the install_name setting.
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 8975e0f..2bad32c 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -152,10 +152,7 @@ cmNinjaNormalTargetGenerator
cmLocalGenerator::SHELL);
vars.ObjectDir = objdir.c_str();
vars.Target = "$out";
- if (this->GetTarget()->HasSOName(this->GetConfigName()))
- {
- vars.TargetSOName = "$SONAME";
- }
+ vars.TargetSOName = "$SONAME";
vars.TargetInstallNameDir = "$INSTALLNAME_DIR";
vars.TargetPDB = "$TARGET_PDB";
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index c96ca94..cfa9976 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -823,19 +823,6 @@ void cmTarget::DefineProperties(cmake *cm)
"CMAKE_SKIP_BUILD_RPATH if it is set when a target is created.");
cm->DefineProperty
- ("NO_SONAME", cmProperty::TARGET,
- "Whether to set \"soname\" when linking a shared library or module.",
- "Enable this boolean property if a generated shared library or module "
- "should not have \"soname\" set. Default is to set \"soname\" on all "
- "shared libraries and modules as long as the platform supports it. "
- "Generally, use this property only for leaf private libraries or "
- "plugins. If you use it on normal shared libraries which other targets "
- "link against, on some platforms a linker will insert a full path to "
- "the library (as specified at link time) into the dynamic section of "
- "the dependant binary. Therefore, once installed, dynamic linker may "
- "eventually fail to locate the library for the binary.");
-
- cm->DefineProperty
("SOVERSION", cmProperty::TARGET,
"What version number is this target.",
"For shared libraries VERSION and SOVERSION can be used to specify "
@@ -844,7 +831,6 @@ void cmTarget::DefineProperties(cmake *cm)
"supports symlinks and the linker supports so-names. "
"If only one of both is specified the missing is assumed to have "
"the same version number. "
- "SOVERSION is ignored if NO_SONAME property is set. "
"For shared libraries and executables on Windows the VERSION "
"attribute is parsed to extract a \"major.minor\" version number. "
"These numbers are used as the image version of the binary. ");
@@ -3009,26 +2995,6 @@ std::string cmTarget::GetPDBName(const char* config)
}
//----------------------------------------------------------------------------
-bool cmTarget::HasSOName(const char* config)
-{
- // Construct the name of the soname flag variable for this language.
- const char* ll = this->GetLinkerLanguage(config);
- std::string sonameFlag = "CMAKE_SHARED_LIBRARY_SONAME";
- if(ll)
- {
- sonameFlag += "_";
- sonameFlag += ll;
- }
- sonameFlag += "_FLAG";
- // soname is supported only for shared libraries and modules,
- // and then only when the platform supports an soname flag.
- return ((this->GetType() == cmTarget::SHARED_LIBRARY ||
- this->GetType() == cmTarget::MODULE_LIBRARY) &&
- !this->GetPropertyAsBool("NO_SONAME") &&
- this->Makefile->GetDefinition(sonameFlag.c_str()));
-}
-
-//----------------------------------------------------------------------------
std::string cmTarget::GetSOName(const char* config)
{
if(this->IsImported())
@@ -3361,10 +3327,22 @@ void cmTarget::GetLibraryNames(std::string& name,
return;
}
+ // Construct the name of the soname flag variable for this language.
+ const char* ll = this->GetLinkerLanguage(config);
+ std::string sonameFlag = "CMAKE_SHARED_LIBRARY_SONAME";
+ if(ll)
+ {
+ sonameFlag += "_";
+ sonameFlag += ll;
+ }
+ sonameFlag += "_FLAG";
+
// Check for library version properties.
const char* version = this->GetProperty("VERSION");
const char* soversion = this->GetProperty("SOVERSION");
- if(!this->HasSOName(config) ||
+ if((this->GetType() != cmTarget::SHARED_LIBRARY &&
+ this->GetType() != cmTarget::MODULE_LIBRARY) ||
+ !this->Makefile->GetDefinition(sonameFlag.c_str()) ||
this->IsFrameworkOnApple())
{
// Versioning is supported only for shared libraries and modules,
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index d70cacd..d41c827 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -347,9 +347,6 @@ public:
/** Get the name of the pdb file for the target. */
std::string GetPDBName(const char* config=0);
- /** Whether this library has soname enabled and platform supports it. */
- bool HasSOName(const char* config);
-
/** Get the soname of the target. Allowed only for a shared library. */
std::string GetSOName(const char* config);
diff --git a/Tests/Plugin/CMakeLists.txt b/Tests/Plugin/CMakeLists.txt
index 31ca59c..b0942c0 100644
--- a/Tests/Plugin/CMakeLists.txt
+++ b/Tests/Plugin/CMakeLists.txt
@@ -39,50 +39,6 @@ TARGET_LINK_LIBRARIES(example_exe kwsys)
ADD_LIBRARY(example_mod_1 MODULE src/example_mod_1.c)
TARGET_LINK_LIBRARIES(example_mod_1 example_exe)
-
-IF(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG AND
- "${CMAKE_C_CREATE_SHARED_MODULE}" MATCHES "SONAME_FLAG")
- # Add a second plugin that should not have any soname.
- ADD_LIBRARY(example_mod_2 MODULE src/example_mod_1.c)
- TARGET_LINK_LIBRARIES(example_mod_2 example_exe)
- SET_PROPERTY(TARGET example_mod_2 PROPERTY NO_SONAME 1)
-
- # Verify that targets export with proper IMPORTED SONAME properties.
- EXPORT(TARGETS example_mod_1 example_mod_2 NAMESPACE exp_
- FILE ${CMAKE_CURRENT_BINARY_DIR}/mods.cmake)
- INCLUDE(${CMAKE_CURRENT_BINARY_DIR}/mods.cmake)
- GET_PROPERTY(configs TARGET exp_example_mod_1 PROPERTY IMPORTED_CONFIGURATIONS)
- FOREACH(c ${configs})
- STRING(TOUPPER "${c}" CONFIG)
- GET_PROPERTY(soname1 TARGET exp_example_mod_1 PROPERTY IMPORTED_SONAME_${CONFIG})
- GET_PROPERTY(soname2 TARGET exp_example_mod_2 PROPERTY IMPORTED_NO_SONAME_${CONFIG})
- IF(soname1)
- MESSAGE(STATUS "exp_example_mod_1 has IMPORTED_SONAME_${CONFIG} as expected: ${soname1}")
- ELSE()
- MESSAGE(SEND_ERROR "exp_example_mod_1 does not have IMPORTED_SONAME_${CONFIG} but should")
- ENDIF()
- IF(soname2)
- MESSAGE(STATUS "exp_example_mod_2 has IMPORTED_NO_SONAME_${CONFIG} as expected: ${soname2}")
- ELSE()
- MESSAGE(SEND_ERROR "exp_example_mod_2 does not have IMPORTED_NO_SONAME_${CONFIG} but should")
- ENDIF()
- ENDFOREACH()
-
- # Parse the binary to check for SONAME if possible.
- IF("${CMAKE_EXECUTABLE_FORMAT}" MATCHES "ELF")
- FIND_PROGRAM(READELF_EXE readelf)
- IF(READELF_EXE)
- ADD_CUSTOM_TARGET(check_mod_soname ALL COMMAND
- ${CMAKE_COMMAND} -Dreadelf=${READELF_EXE}
- -Dmod1=$<TARGET_FILE:example_mod_1>
- -Dmod2=$<TARGET_FILE:example_mod_2>
- -P ${CMAKE_CURRENT_SOURCE_DIR}/check_mod_soname.cmake
- )
- ADD_DEPENDENCIES(check_mod_soname example_mod_1 example_mod_2)
- ENDIF()
- ENDIF()
-ENDIF()
-
# TODO:
# - create a plugin that links to a static lib
# - create a plugin that links to a shared lib
diff --git a/Tests/Plugin/check_mod_soname.cmake b/Tests/Plugin/check_mod_soname.cmake
deleted file mode 100644
index 3737b45..0000000
--- a/Tests/Plugin/check_mod_soname.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-execute_process(COMMAND ${readelf} -d ${mod1} OUTPUT_FILE ${mod1}.readelf.txt)
-execute_process(COMMAND ${readelf} -d ${mod2} OUTPUT_FILE ${mod2}.readelf.txt)
-file(STRINGS ${mod1}.readelf.txt soname1 REGEX "\\(SONAME\\)")
-file(STRINGS ${mod2}.readelf.txt soname2 REGEX "\\(SONAME\\)")
-if(soname1)
- message(STATUS "${mod1} has soname as expected: ${soname1}")
-else()
- message(FATAL_ERROR "${mod1} has no soname but should:\n ${soname1}")
-endif()
-if(soname2)
- message(FATAL_ERROR "${mod2} has soname but should not:\n ${soname2}")
-else()
- message(STATUS "${mod2} has no soname as expected")
-endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeCInformation.cmake | 2 +-
Modules/CMakeCXXInformation.cmake | 2 +-
Modules/CMakeFortranInformation.cmake | 2 +-
Modules/Compiler/XL.cmake | 2 +-
Modules/Platform/SunOS.cmake | 2 +-
Source/cmExportFileGenerator.cxx | 16 ++-------
Source/cmLocalGenerator.cxx | 21 +++++++-----
Source/cmMakefileLibraryTargetGenerator.cxx | 5 +--
Source/cmNinjaNormalTargetGenerator.cxx | 5 +--
Source/cmTarget.cxx | 48 +++++++-------------------
Source/cmTarget.h | 3 --
Tests/Plugin/CMakeLists.txt | 44 ------------------------
Tests/Plugin/check_mod_soname.cmake | 14 --------
13 files changed, 35 insertions(+), 131 deletions(-)
delete mode 100644 Tests/Plugin/check_mod_soname.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list