[Cmake-commits] [cmake-commits] hoffman committed AIX-VisualAge-C.cmake NONE 1.1.2.2 AIX-VisualAge-CXX.cmake NONE 1.1.2.2 AIX-XL-C.cmake NONE 1.1.2.2 AIX-XL-CXX.cmake NONE 1.1.2.2 AIX-XL-Fortran.cmake NONE 1.1.2.2 AIX.cmake 1.21 1.21.4.1 Darwin-VisualAge-C.cmake NONE 1.1.2.2 Darwin-VisualAge-CXX.cmake NONE 1.1.2.2 Darwin-XL-C.cmake NONE 1.1.2.2 Darwin-XL-CXX.cmake NONE 1.1.2.2 Darwin-xlc.cmake 1.3 NONE Haiku.cmake 1.3 1.3.2.1 Linux-XL-C.cmake 1.1 1.1.2.1 Linux-XL-CXX.cmake 1.1 1.1.2.1 Linux-XL-Fortran.cmake 1.1 1.1.2.1
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Oct 1 17:20:37 EDT 2009
Update of /cvsroot/CMake/CMake/Modules/Platform
In directory public:/mounts/ram/cvs-serv11203/Modules/Platform
Modified Files:
Tag: CMake-2-8
AIX.cmake Haiku.cmake Linux-XL-C.cmake Linux-XL-CXX.cmake
Linux-XL-Fortran.cmake
Added Files:
Tag: CMake-2-8
AIX-VisualAge-C.cmake AIX-VisualAge-CXX.cmake AIX-XL-C.cmake
AIX-XL-CXX.cmake AIX-XL-Fortran.cmake Darwin-VisualAge-C.cmake
Darwin-VisualAge-CXX.cmake Darwin-XL-C.cmake
Darwin-XL-CXX.cmake
Removed Files:
Tag: CMake-2-8
Darwin-xlc.cmake
Log Message:
Merge in changes to CMake-2-8 RC 2
Index: Linux-XL-C.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-XL-C.cmake,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** Linux-XL-C.cmake 7 Aug 2009 14:13:07 -0000 1.1
--- Linux-XL-C.cmake 1 Oct 2009 21:20:35 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,3 ----
SET(CMAKE_SHARED_LIBRARY_C_FLAGS "")
SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
+ SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-qmkshrobj")
--- NEW FILE: Darwin-VisualAge-C.cmake ---
include(Platform/Darwin-XL-C)
Index: Haiku.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Haiku.cmake,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C 2 -d -r1.3 -r1.3.2.1
*** Haiku.cmake 29 Jan 2009 16:42:07 -0000 1.3
--- Haiku.cmake 1 Oct 2009 21:20:35 -0000 1.3.2.1
***************
*** 20,21 ****
--- 20,26 ----
LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty)
LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86)
+
+ IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+ SET(CMAKE_INSTALL_PREFIX "/boot/common" CACHE PATH
+ "Install path prefix, prepended onto install directories." FORCE)
+ ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
--- NEW FILE: Darwin-XL-C.cmake ---
SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-qmkshrobj")
SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle")
# Enable shared library versioning.
SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-install_name")
--- NEW FILE: Darwin-XL-CXX.cmake ---
SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "-qmkshrobj")
SET(CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS "-bundle")
# Enable shared library versioning.
SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-install_name")
--- NEW FILE: AIX-VisualAge-CXX.cmake ---
include(Platform/AIX-XL-CXX)
--- Darwin-xlc.cmake DELETED ---
Index: Linux-XL-Fortran.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-XL-Fortran.cmake,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** Linux-XL-Fortran.cmake 7 Aug 2009 14:13:07 -0000 1.1
--- Linux-XL-Fortran.cmake 1 Oct 2009 21:20:35 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,3 ----
SET(CMAKE_SHARED_LIBRARY_C_FLAGS "")
SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
+ SET(CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS "-qmkshrobj")
Index: AIX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/AIX.cmake,v
retrieving revision 1.21
retrieving revision 1.21.4.1
diff -C 2 -d -r1.21 -r1.21.4.1
*** AIX.cmake 4 Feb 2008 20:22:09 -0000 1.21
--- AIX.cmake 1 Oct 2009 21:20:35 -0000 1.21.4.1
***************
*** 19,31 ****
IF(CMAKE_COMPILER_IS_GNUCXX)
SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "-shared -Wl,-G") # -shared
- ELSE(CMAKE_COMPILER_IS_GNUCXX)
- SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "-G -Wl,-brtl,-bnoipath") # -shared
- SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "-Wl,-brtl,-bnoipath,-bexpall") # +s, flag for exe link to use shared lib
- SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS " ")
- SET(CMAKE_SHARED_MODULE_CXX_FLAGS " ")
- SET (CMAKE_CXX_FLAGS_DEBUG_INIT "-g")
- SET (CMAKE_CXX_FLAGS_RELEASE_INIT "-O -DNDEBUG")
- SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-O -DNDEBUG")
- SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-g")
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
--- 19,22 ----
***************
*** 33,60 ****
IF(CMAKE_COMPILER_IS_GNUCC)
SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared -Wl,-G") # -shared
- ELSE(CMAKE_COMPILER_IS_GNUCC)
- SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-G -Wl,-brtl,-bnoipath") # -shared
- SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-Wl,-brtl,-bnoipath,-bexpall") # +s, flag for exe link to use shared lib
- SET(CMAKE_SHARED_LIBRARY_C_FLAGS " ")
- SET(CMAKE_SHARED_MODULE_C_FLAGS " ")
- SET (CMAKE_C_FLAGS_DEBUG_INIT "-g")
- SET (CMAKE_C_FLAGS_RELEASE_INIT "-O -DNDEBUG")
- SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "-O -DNDEBUG")
- SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-g")
ENDIF(CMAKE_COMPILER_IS_GNUCC)
- IF(NOT CMAKE_COMPILER_IS_GNUCC)
- SET (CMAKE_C_CREATE_PREPROCESSED_SOURCE "<CMAKE_C_COMPILER> <DEFINES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
- SET (CMAKE_C_CREATE_ASSEMBLY_SOURCE "<CMAKE_C_COMPILER> <DEFINES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
- ENDIF(NOT CMAKE_COMPILER_IS_GNUCC)
-
- IF(NOT CMAKE_COMPILER_IS_GNUCXX)
- SET(CMAKE_CXX_COMPILE_OBJECT
- "<CMAKE_CXX_COMPILER> -+ <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>")
- SET (CMAKE_CXX_CREATE_PREPROCESSED_SOURCE "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
- SET (CMAKE_CXX_CREATE_ASSEMBLY_SOURCE "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
- ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX)
-
-
# since .a can be a static or shared library on AIX, we can not do this.
# at some point if we wanted it, we would have to figure out if a .a is
--- 24,29 ----
--- NEW FILE: AIX-XL-Fortran.cmake ---
SET(CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS "-G -Wl,-brtl,-bnoipath") # -shared
SET(CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS "-Wl,-brtl,-bnoipath,-bexpall") # +s, flag for exe link to use shared lib
SET(CMAKE_SHARED_LIBRARY_Fortran_FLAGS " ")
SET(CMAKE_SHARED_MODULE_Fortran_FLAGS " ")
--- NEW FILE: AIX-VisualAge-C.cmake ---
include(Platform/AIX-XL-C)
--- NEW FILE: AIX-XL-C.cmake ---
SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-G -Wl,-brtl,-bnoipath") # -shared
SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-Wl,-brtl,-bnoipath,-bexpall") # +s, flag for exe link to use shared lib
SET(CMAKE_SHARED_LIBRARY_C_FLAGS " ")
SET(CMAKE_SHARED_MODULE_C_FLAGS " ")
--- NEW FILE: AIX-XL-CXX.cmake ---
SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "-G -Wl,-brtl,-bnoipath") # -shared
SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "-Wl,-brtl,-bnoipath,-bexpall") # +s, flag for exe link to use shared lib
SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS " ")
SET(CMAKE_SHARED_MODULE_CXX_FLAGS " ")
Index: Linux-XL-CXX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-XL-CXX.cmake,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** Linux-XL-CXX.cmake 16 Sep 2009 16:33:24 -0000 1.1
--- Linux-XL-CXX.cmake 1 Oct 2009 21:20:35 -0000 1.1.2.1
***************
*** 3,5 ****
SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS "")
SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")
! SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-qmkshrobj")
--- 3,5 ----
SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS "")
SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")
! SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "-qmkshrobj")
--- NEW FILE: Darwin-VisualAge-CXX.cmake ---
include(Platform/Darwin-XL-CXX)
More information about the Cmake-commits
mailing list