Browse Source

Move GNU flags from SunOS.cmake to SunOS-GNU.cmake

The GNU-specific link-type flags do not belong in the platform-wide
file.
Brad King 16 years ago
parent
commit
3e37ca8ecc
2 changed files with 9 additions and 17 deletions
  1. 9 0
      Modules/Platform/SunOS-GNU.cmake
  2. 0 17
      Modules/Platform/SunOS.cmake

+ 9 - 0
Modules/Platform/SunOS-GNU.cmake

@@ -22,4 +22,13 @@ macro(__sunos_compiler_gnu lang)
   set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG "-Wl,-R")
   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()

+ 0 - 17
Modules/Platform/SunOS.cmake

@@ -21,23 +21,6 @@ IF("${CMAKE_C_COMPILER_ID} ${CMAKE_CXX_COMPILER_ID}" MATCHES SunPro)
     /opt/SUNWspro/lib /opt/SUNWspro/prod/lib /usr/ccs/lib)
 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.
 SET(CMAKE_LINK_DEPENDENT_LIBRARY_DIRS 1)