[Cmake-commits] [cmake-commits] king committed SunOS-GNU.cmake 1.1 1.2 SunOS.cmake 1.27 1.28

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules/Platform
In directory public:/mounts/ram/cvs-serv17339/Modules/Platform

Modified Files:
	SunOS-GNU.cmake SunOS.cmake 
Log Message:
Move GNU flags from SunOS.cmake to SunOS-GNU.cmake

The GNU-specific link-type flags do not belong in the platform-wide
file.


Index: SunOS.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/SunOS.cmake,v
retrieving revision 1.27
retrieving revision 1.28
diff -C 2 -d -r1.27 -r1.28
*** SunOS.cmake	2 Dec 2009 14:52:00 -0000	1.27
--- SunOS.cmake	2 Dec 2009 21:58:52 -0000	1.28
***************
*** 22,42 ****
  ENDIF("${CMAKE_C_COMPILER_ID} ${CMAKE_CXX_COMPILER_ID}" MATCHES SunPro)
  
- # Initialize C link type selection flags.  These flags are used when
- # building a shared library, shared module, or executable that links
- # to other libraries to select whether to use the static or shared
- # versions of the libraries.
- IF(CMAKE_COMPILER_IS_GNUCC)
-   FOREACH(type SHARED_LIBRARY SHARED_MODULE EXE)
-     SET(CMAKE_${type}_LINK_STATIC_C_FLAGS "-Wl,-Bstatic")
-     SET(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic")
-   ENDFOREACH(type)
- ENDIF(CMAKE_COMPILER_IS_GNUCC)
- IF(CMAKE_COMPILER_IS_GNUCXX)
-   FOREACH(type SHARED_LIBRARY SHARED_MODULE EXE)
-     SET(CMAKE_${type}_LINK_STATIC_CXX_FLAGS "-Wl,-Bstatic")
-     SET(CMAKE_${type}_LINK_DYNAMIC_CXX_FLAGS "-Wl,-Bdynamic")
-   ENDFOREACH(type)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
  # The Sun linker needs to find transitive shared library dependencies
  # in the -L path.
--- 22,25 ----

Index: SunOS-GNU.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/SunOS-GNU.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** SunOS-GNU.cmake	2 Dec 2009 14:52:00 -0000	1.1
--- SunOS-GNU.cmake	2 Dec 2009 21:58:52 -0000	1.2
***************
*** 23,25 ****
--- 23,34 ----
    set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG_SEP ":")
    set(CMAKE_SHARED_LIBRARY_SONAME_${lang}_FLAG "-Wl,-h")
+ 
+   # Initialize C link type selection flags.  These flags are used when
+   # building a shared library, shared module, or executable that links
+   # to other libraries to select whether to use the static or shared
+   # versions of the libraries.
+   foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
+     set(CMAKE_${type}_LINK_STATIC_${lang}_FLAGS "-Wl,-Bstatic")
+     set(CMAKE_${type}_LINK_DYNAMIC_${lang}_FLAGS "-Wl,-Bdynamic")
+   endforeach()
  endmacro()