summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2007-08-09 15:31:35 -0400
committerBill Hoffman <bill.hoffman@kitware.com>2007-08-09 15:31:35 -0400
commit6b2db57504990aabc6c395e8989167da6b916cba (patch)
treec9cd3a49245a36b59df41bcd31b6a5c5358ab748
parent0846bdba097621b8982b73923c18e1b2fb6370eb (diff)
downloadcmake-6b2db57504990aabc6c395e8989167da6b916cba.tar.gz
ENH: merge in doc change from head
-rw-r--r--Modules/Platform/DragonFly.cmake5
-rw-r--r--Modules/Platform/GNU.cmake10
-rw-r--r--Source/cmSetSourceFilesPropertiesCommand.h5
3 files changed, 19 insertions, 1 deletions
diff --git a/Modules/Platform/DragonFly.cmake b/Modules/Platform/DragonFly.cmake
new file mode 100644
index 0000000000..f6e0f810f7
--- /dev/null
+++ b/Modules/Platform/DragonFly.cmake
@@ -0,0 +1,5 @@
+# DragonFly BSD was forked from FreeBSD and is still very close to it
+# http://www.dragonflybsd.org
+# see http://archive.netbsd.se/?ml=dfbsd-users&a=2007-07&m=4678361
+
+INCLUDE(Platform/FreeBSD)
diff --git a/Modules/Platform/GNU.cmake b/Modules/Platform/GNU.cmake
new file mode 100644
index 0000000000..26615e1283
--- /dev/null
+++ b/Modules/Platform/GNU.cmake
@@ -0,0 +1,10 @@
+# GCC is the default compiler on GNU/Hurd.
+SET(CMAKE_DL_LIBS "dl")
+SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
+SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")
+SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-rdynamic")
+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
+SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
+SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,")
+INCLUDE(Platform/UnixPaths)
diff --git a/Source/cmSetSourceFilesPropertiesCommand.h b/Source/cmSetSourceFilesPropertiesCommand.h
index 63d3f73e7f..b714726aca 100644
--- a/Source/cmSetSourceFilesPropertiesCommand.h
+++ b/Source/cmSetSourceFilesPropertiesCommand.h
@@ -74,7 +74,10 @@ public:
"only used by Makefiles). "
"OBJECT_DEPENDS (string) adds dependencies to the object file. "
"COMPILE_FLAGS (string) is passed to the compiler as additional "
- "command line arguments when the source file is compiled. "
+ "command line arguments when the source file is compiled. "
+ "LANGUAGE (string) CXX|C will change the default compiler used "
+ "to compile the source file. The languages used need to be enabled "
+ "in the PROJECT command. "
"If SYMBOLIC (boolean) is set to true the build system will be "
"informed that the source file is not actually created on disk but "
"instead used as a symbolic name for a build rule.";