Text archives Help
- From: abe@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r1192 - in trunk: CMake Core/Util include
- Date: Wed, 27 Sep 2006 11:29:26 -0600 (MDT)
Author: abe
Date: Wed Sep 27 11:29:25 2006
New Revision: 1192
Modified:
trunk/CMake/About.cmake
trunk/Core/Util/About.h
trunk/include/About.cc.CMakeTemplate
Log:
Explicitly added -fPIC to About static lib build.
M CMake/About.cmake
M include/About.cc.CMakeTemplate
M Core/Util/About.h
Modified: trunk/CMake/About.cmake
==============================================================================
--- trunk/CMake/About.cmake (original)
+++ trunk/CMake/About.cmake Wed Sep 27 11:29:25 2006
@@ -37,5 +37,10 @@
ADD_LIBRARY(About STATIC
${ABOUT_SRC}
)
+
+# Explicitly add the -fPIC flag.
+SET_SOURCE_FILES_PROPERTIES(${ABOUT_SRC} PROPERTIES COMPILE_FLAGS "-fPIC")
+
+
ADD_DEPENDENCIES(About SvnInfo)
Modified: trunk/Core/Util/About.h
==============================================================================
--- trunk/Core/Util/About.h (original)
+++ trunk/Core/Util/About.h Wed Sep 27 11:29:25 2006
@@ -35,9 +35,11 @@
namespace Manta {
// Return revision and build information.
+ extern "C"
const char *getAboutString();
// Return the software license.
+ extern "C"
const char *getLicenseString();
};
Modified: trunk/include/About.cc.CMakeTemplate
==============================================================================
--- trunk/include/About.cc.CMakeTemplate (original)
+++ trunk/include/About.cc.CMakeTemplate Wed Sep 27 11:29:25 2006
@@ -57,6 +57,7 @@
"FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER\n"
"DEALINGS IN THE SOFTWARE.\n";
+extern "C"
const char *Manta::getLicenseString() {
return license_string;
@@ -65,6 +66,7 @@
// This string is produced by a CMake CONFIGURE_FILE directive.
static char const *const about_string = "${ABOUT_STRING}";
+extern "C"
const char * Manta::getAboutString() {
return about_string;
- [MANTA] r1192 - in trunk: CMake Core/Util include, abe, 09/27/2006
Archive powered by MHonArc 2.6.16.