cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to cmake 2.8.1 (I also take maintainership).

Browse Source 
"This is good, commit." espie@
This commit is contained in:
dcoppa 2010-05-28 20:21:48 +00:00
parent 25b6d36ba4
commit 8b1b17cff8
76 changed files with 2530 additions and 1853 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
devel/cmake/Makefile
View File

@ -1,42 +1,52 @@
# $OpenBSD: Makefile,v 1.19 2010/04/22 16:10:11 dcoppa Exp $
# $OpenBSD: Makefile,v 1.20 2010/05/28 20:21:48 dcoppa Exp $
HOMEPAGE= http://www.cmake.org/
CATEGORIES= devel
COMMENT= portable build system
DISTNAME= cmake-2.4.8
PKGNAME= ${DISTNAME}p4
MASTER_SITES= ${HOMEPAGE}files/v2.4/
MAINTAINER= Marc Espie <espie@openbsd.org>
HOMEPAGE = http://www.cmake.org/
CATEGORIES = devel
COMMENT = portable build system
DISTNAME = cmake-2.8.1
MASTER_SITES = ${HOMEPAGE}files/v2.8/
MAINTAINER = David Coppa <dcoppa@openbsd.org>
# BSD
PERMIT_DISTFILES_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_DISTFILES_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_PACKAGE_CDROM = Yes
CONFIGURE_STYLE= simple
CONFIGURE_SCRIPT= ${WRKSRC}/bootstrap
SEPARATE_BUILD= simple
CONFIGURE_ENV= LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} MAKE=make
CONFIGURE_ARGS= --prefix=${LOCALBASE} --docdir=/share/doc/CMake \
--datadir=/share/CMake --system-libs
WANTLIB = c curses expat form m stdc++ z
LIB_DEPENDS = curl::net/curl
CONFIGURE_STYLE = simple
CONFIGURE_ARGS = --prefix=${PREFIX} \
--datadir=/share/cmake \
--docdir=/share/doc/cmake \
--system-libs
SEPARATE_BUILD = simple
LIB_DEPENDS= curl::net/curl \
xmlrpc,xmlrpc_client,xmlrpc_util,xmlrpc_xmlparse,xmlrpc_xmltok::net/xmlrpc-c
REGRESS_TARGET = test
WANTLIB= expat m curses c stdc++ z crypto pthread ssl idn
pre-configure:
@cp ${FILESDIR}/*.cmake ${WRKSRC}/Modules/
${SUBST_CMD} ${WRKSRC}/Modules/FindLibIntl.cmake \
${WRKSRC}/Modules/FindMPEG.cmake \
${WRKSRC}/Modules/FindMPEG2.cmake \
${WRKSRC}/Modules/FindQt.cmake \
${WRKSRC}/Modules/FindQt3.cmake \
${WRKSRC}/Modules/FindSDL.cmake \
${WRKSRC}/Modules/FindwxWindows.cmake \
${WRKSRC}/Modules/Platform/UnixPaths.cmake
# Add these if you need to figure out what's going on.
#CONFIGURE_ARGS+= --verbose
#MAKE_FLAGS= VERBOSE=1
# Remove spurious post-build files
post-build:
@rm -f ${WRKDIST}/Modules/*.{beforesubst,orig}
@rm -f ${WRKDIST}/Modules/Platform/*.beforesubst
@rm -f ${WRKDIST}/Modules/Platform/*.orig
REGRESS_TARGET= test
# For the registry test to work
pre-regress:
mkdir -p ${WRKDIR}/registryhome
REGRESS_FLAGS=HOME=${WRKDIR}/registryhome
REGRESS_FLAGS=HOME=${WRKDIR}/registryhome
.include <bsd.port.mk>

16
devel/cmake/cmake.port.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: cmake.port.mk,v 1.4 2009/06/04 21:07:23 ajacoutot Exp $
# $OpenBSD: cmake.port.mk,v 1.5 2010/05/28 20:21:48 dcoppa Exp $
BUILD_DEPENDS+= ::devel/cmake
@ -7,6 +7,20 @@ CONFIGURE_ENV+=LIB${_n}_VERSION=${_v}
MAKE_ENV+=LIB${_n}_VERSION=${_v}
.endfor
CONFIGURE_ENV += MODJAVA_VER=${MODJAVA_VER} \
MODPY_VERSION=${MODPY_VERSION} \
MODPY_BIN=${MODPY_BIN} \
MODPY_INCDIR=${MODPY_INCDIR} \
MODPY_LIBDIR=${MODPY_LIBDIR} \
MODTCL_VERSION=${MODTCL_VERSION} \
MODTK_VERSION=${MODTK_VERSION} \
MODTCL_INCDIR=${MODTCL_INCDIR} \
MODTK_INCDIR=${MODTK_INCDIR} \
MODTCL_LIBDIR=${MODTCL_LIBDIR} \
MODTK_LIBDIR=${MODTK_LIBDIR} \
MODTCL_LIB=${MODTCL_LIB} \
MODTK_LIB=${MODTK_LIB}
.if empty(CONFIGURE_STYLE)
CONFIGURE_STYLE= cmake
.endif

10
devel/cmake/distinfo
View File

@ -1,5 +1,5 @@
MD5 (cmake-2.4.8.tar.gz) = 9d0GHDF2WkncF66L3JhneQ==
RMD160 (cmake-2.4.8.tar.gz) = P3X3eg7KTB4eRQawDFbKRB94yFM=
SHA1 (cmake-2.4.8.tar.gz) = XSU7EoJ0zJUXvOkvwleY1VuqJTs=
SHA256 (cmake-2.4.8.tar.gz) = 8gYH1PMzdupkgwdoFjBXRmLQw/WdiKegKtVHtjIGMfE=
SIZE (cmake-2.4.8.tar.gz) = 2608800
MD5 (cmake-2.8.1.tar.gz) = /q3C5eu/7Q78kBeFg1A3JQ==
RMD160 (cmake-2.8.1.tar.gz) = ceIWcE7kMTZA79vvzGXGV2Bx74I=
SHA1 (cmake-2.8.1.tar.gz) = 6fmc/M+OxPtbvYyn1Jl3Gi8dTr4=
SHA256 (cmake-2.8.1.tar.gz) = fq50q3Zzl0po45XCEYVNMY8K8tMgWQpnAznujulCIkI=
SIZE (cmake-2.8.1.tar.gz) = 3605586

60
devel/cmake/files/FindIconv.cmake Normal file
View File

@ -0,0 +1,60 @@
# - Try to find Iconv
# Once done this will define
#
# ICONV_FOUND - system has Iconv
# ICONV_INCLUDE_DIR - the Iconv include directory
# ICONV_LIBRARIES - Link these to use Iconv
# ICONV_SECOND_ARGUMENT_IS_CONST - the second argument for iconv() is const
#
include(CheckCXXSourceCompiles)
IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
# Already in cache, be silent
SET(ICONV_FIND_QUIETLY TRUE)
ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
FIND_PATH(ICONV_INCLUDE_DIR iconv.h)
FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
SET(ICONV_FOUND TRUE)
ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
IF(ICONV_FOUND)
check_cxx_source_compiles("
#include <iconv.h>
int main(){
iconv_t conv = 0;
const char* in = 0;
size_t ilen = 0;
char* out = 0;
size_t olen = 0;
iconv(conv, &in, &ilen, &out, &olen);
return 0;
}
" ICONV_SECOND_ARGUMENT_IS_CONST )
IF(ICONV_SECOND_ARGUMENT_IS_CONST)
SET(ICONV_CONST "const")
ENDIF(ICONV_SECOND_ARGUMENT_IS_CONST)
ENDIF(ICONV_FOUND)
set(CMAKE_REQUIRED_INCLUDES)
set(CMAKE_REQUIRED_LIBRARIES)
IF(ICONV_FOUND)
IF(NOT ICONV_FIND_QUIETLY)
MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}")
ENDIF(NOT ICONV_FIND_QUIETLY)
ELSE(ICONV_FOUND)
IF(Iconv_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find Iconv")
ENDIF(Iconv_FIND_REQUIRED)
ENDIF(ICONV_FOUND)
MARK_AS_ADVANCED(
ICONV_INCLUDE_DIR
ICONV_LIBRARIES
ICONV_SECOND_ARGUMENT_IS_CONST
)

46
devel/cmake/files/FindLibIntl.cmake Normal file
View File

@ -0,0 +1,46 @@
# Try to find the libintl library. Explicit searching is currently
# only required for Win32, though it might be useful for some UNIX
# variants, too. Therefore code for searching common UNIX include
# directories is included, too.
#
# Once done this will define
#
# LIBINTL_FOUND - system has libintl
# LIBINTL_LIBRARIES - the library needed for linking
IF (LibIntl_LIBRARY)
SET(LibIntl_FIND_QUIETLY TRUE)
ENDIF ()
# for Windows we rely on the environement variables
# %INCLUDE% and %LIB%; FIND_LIBRARY checks %LIB%
# automatically on Windows
IF(WIN32)
FIND_LIBRARY(LibIntl_LIBRARY
NAMES intl
)
ELSE()
FIND_LIBRARY(LibIntl_LIBRARY
NAMES intl
PATHS /usr/lib ${LOCALBASE}/lib
)
ENDIF()
IF (LibIntl_LIBRARY)
SET(LIBINTL_FOUND TRUE)
SET(LIBINTL_LIBRARIES ${LibIntl_LIBRARY})
ELSE ()
SET(LIBINTL_FOUND FALSE)
ENDIF ()
IF (LIBINTL_FOUND)
IF (NOT LibIntl_FIND_QUIETLY)
MESSAGE(STATUS "Found libintl: ${LibIntl_LIBRARY}")
ENDIF ()
ELSE ()
IF (LibIntl_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could NOT find libintl")
ENDIF ()
ENDIF ()
MARK_AS_ADVANCED(LibIntl_LIBRARY)

46
devel/cmake/patches/patch-CMakeLists_txt
View File

@ -1,19 +1,29 @@
$OpenBSD: patch-CMakeLists_txt,v 1.2 2006/12/18 16:04:31 espie Exp $
--- CMakeLists.txt.orig Mon Dec 4 17:03:52 2006
+++ CMakeLists.txt Sun Dec 17 11:11:52 2006
@@ -60,6 +60,15 @@ IF(CMAKE_SYSTEM MATCHES "OSF1-V.*")
ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX)
ENDIF(CMAKE_SYSTEM MATCHES "OSF1-V.*")
$OpenBSD: patch-CMakeLists_txt,v 1.3 2010/05/28 20:21:48 dcoppa Exp $
--- CMakeLists.txt.orig Tue Apr 6 16:45:30 2010
+++ CMakeLists.txt Fri Apr 23 16:07:15 2010
@@ -211,6 +211,15 @@ MACRO (CMAKE_BUILD_UTILITIES)
# (a macro defined in this file)
CMAKE_HANDLE_SYSTEM_LIBRARIES()
+ IF($ENV{LOCALBASE})
+ SET(OPENBSD_LOCALBASE $ENV{LOCALBASE})
+ ELSE($ENV{LOCALBASE})
+ SET(OPENBSD_LOCALBASE /usr/local)
+ ENDIF($ENV{LOCALBASE})
+
+ # to find expat and curl
+ LINK_DIRECTORIES("${OPENBSD_LOCALBASE}/lib")
+
#---------------------------------------------------------------------
# Build zlib library for Curl, CMake, and CTest.
SET(CMAKE_ZLIB_HEADER "cm_zlib.h")
@@ -314,9 +323,6 @@ MACRO (CMAKE_BUILD_UTILITIES)
ELSE (UNIX)
SET(BUILD_CursesDialog 0)
ENDIF (UNIX)
- IF(BUILD_CursesDialog)
- ADD_SUBDIRECTORY(Source/CursesDialog/form)
- ENDIF(BUILD_CursesDialog)
ENDMACRO (CMAKE_BUILD_UTILITIES)
+IF($ENV{LOCALBASE})
+SET(OPENBSD_LOCALBASE $ENV{LOCALBASE})
+ELSE($ENV{LOCALBASE})
+SET(OPENBSD_LOCALBASE /usr/local)
+ENDIF($ENV{LOCALBASE})
+
+# to find expat and curl
+LINK_DIRECTORIES("${OPENBSD_LOCALBASE}/lib")
+
#-----------------------------------------------------------------------------
# Create the kwsys library for CMake.
SET(KWSYS_NAMESPACE cmsys)

12
devel/cmake/patches/patch-CTestCustom_cmake_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-CTestCustom_cmake_in,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- CTestCustom.cmake.in.orig Wed May 26 08:17:24 2010
+++ CTestCustom.cmake.in Wed May 26 08:18:57 2010
@@ -27,6 +27,8 @@ SET(CTEST_CUSTOM_WARNING_EXCEPTION
"(Lexer|Parser).*warning.*conversion.*may (alter its value|change the sign)"
"[Qq]t([Cc]ore|[Gg]ui).*warning.*conversion.*may alter its value"
"Parser.cxx.*warning.*2111-D.*statement is unreachable"
+ "warning:.*is.*very unsafe.*consider using.*"
+ "warning:.*is.*misused, please use.*"
"CMakeSetupManifest.xml.*manifest authoring warning.*Unrecognized Element"
)

73
devel/cmake/patches/patch-Modules_CMakeDetermineJavaCompiler_cmake Normal file
View File

@ -0,0 +1,73 @@
$OpenBSD: patch-Modules_CMakeDetermineJavaCompiler_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/CMakeDetermineJavaCompiler.cmake.orig Tue Apr 6 16:45:30 2010
+++ Modules/CMakeDetermineJavaCompiler.cmake Tue May 11 15:47:14 2010
@@ -16,6 +16,8 @@
# NOTE, a generator may set CMAKE_Java_COMPILER before
# loading this file to force a compiler.
+SET(MODJAVA_VER $ENV{MODJAVA_VER})
+
IF(NOT CMAKE_Java_COMPILER)
# prefer the environment variable CC
IF($ENV{JAVA_COMPILER} MATCHES ".+")
@@ -42,28 +44,38 @@ IF(NOT CMAKE_Java_COMPILER)
ENDIF(NOT EXISTS ${CMAKE_Java_ARCHIVE_INIT})
ENDIF($ENV{JAVA_ARCHIVE} MATCHES ".+")
- SET(Java_BIN_PATH
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\2.0;JavaHome]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.9;JavaHome]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.8;JavaHome]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.7;JavaHome]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.6;JavaHome]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.5;JavaHome]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin"
- $ENV{JAVA_HOME}/bin
- /usr/bin
- /usr/lib/java/bin
- /usr/share/java/bin
- /usr/local/bin
- /usr/local/java/bin
- /usr/local/java/share/bin
- /usr/java/j2sdk1.4.2_04
- /usr/lib/j2sdk1.4-sun/bin
- /usr/java/j2sdk1.4.2_09/bin
- /usr/lib/j2sdk1.5-sun/bin
- /opt/sun-jdk-1.5.0.04/bin
- )
+ IF(MODJAVA_VER)
+ IF(MODJAVA_VER MATCHES "^1\\.5.*")
+ SET(Java_BIN_PATH /usr/local/jdk-1.5.0/bin)
+ ELSEIF(MODJAVA_VER MATCHES "^1\\.6.*")
+ SET(Java_BIN_PATH /usr/local/jdk-1.6.0/bin)
+ ELSE(MODJAVA_VER MATCHES "^1\\.5.*")
+ SET(Java_BIN_PATH /usr/local/jdk-1.7.0/bin)
+ ENDIF(MODJAVA_VER MATCHES "^1\\.5.*")
+ ELSE(MODJAVA_VER)
+ SET(Java_BIN_PATH
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\2.0;JavaHome]/bin"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.9;JavaHome]/bin"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.8;JavaHome]/bin"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.7;JavaHome]/bin"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.6;JavaHome]/bin"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.5;JavaHome]/bin"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/bin"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin"
+ $ENV{JAVA_HOME}/bin
+ /usr/bin
+ /usr/lib/java/bin
+ /usr/share/java/bin
+ /usr/local/bin
+ /usr/local/java/bin
+ /usr/local/java/share/bin
+ /usr/java/j2sdk1.4.2_04
+ /usr/lib/j2sdk1.4-sun/bin
+ /usr/java/j2sdk1.4.2_09/bin
+ /usr/lib/j2sdk1.5-sun/bin
+ /opt/sun-jdk-1.5.0.04/bin
+ )
+ ENDIF(MODJAVA_VER)
# if no compiler has been specified yet, then look for one
IF(CMAKE_Java_COMPILER_INIT)
SET(CMAKE_Java_COMPILER ${CMAKE_Java_COMPILER_INIT} CACHE PATH "Java Compiler")

15
devel/cmake/patches/patch-Modules_CMakeUnixFindMake_cmake
View File

@ -1,7 +1,10 @@
$OpenBSD: patch-Modules_CMakeUnixFindMake_cmake,v 1.1.1.1 2006/07/20 09:23:13 espie Exp $
--- Modules/CMakeUnixFindMake.cmake.orig Sun Jul 2 16:11:48 2006
+++ Modules/CMakeUnixFindMake.cmake Sun Jul 2 16:11:56 2006
@@ -1,2 +1,2 @@
-FIND_PROGRAM(CMAKE_MAKE_PROGRAM NAMES gmake make )
+FIND_PROGRAM(CMAKE_MAKE_PROGRAM NAMES make )
$OpenBSD: patch-Modules_CMakeUnixFindMake_cmake,v 1.2 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/CMakeUnixFindMake.cmake.orig Tue Mar 23 02:17:49 2010
+++ Modules/CMakeUnixFindMake.cmake Tue Mar 23 02:18:02 2010
@@ -12,5 +12,5 @@
# (To distributed this file outside of CMake, substitute the full
# License text for the above reference.)
-FIND_PROGRAM(CMAKE_MAKE_PROGRAM NAMES gmake make smake)
+FIND_PROGRAM(CMAKE_MAKE_PROGRAM NAMES make gmake smake)
MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM)

15
devel/cmake/patches/patch-Modules_FindASPELL_cmake Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-Modules_FindASPELL_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/FindASPELL.cmake.orig Tue Apr 6 16:45:31 2010
+++ Modules/FindASPELL.cmake Mon May 3 11:51:48 2010
@@ -20,11 +20,6 @@
# (To distributed this file outside of CMake, substitute the full
# License text for the above reference.)
-IF (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES)
- # Already in cache, be silent
- SET(ASPELL_FIND_QUIETLY TRUE)
-ENDIF (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES)
-
FIND_PATH(ASPELL_INCLUDE_DIR aspell.h )
FIND_LIBRARY(ASPELL_LIBRARIES NAMES aspell aspell-15 libaspell-15 libaspell)

14
devel/cmake/patches/patch-Modules_FindBoost_cmake Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-Modules_FindBoost_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/FindBoost.cmake.orig Tue Apr 6 16:45:31 2010
+++ Modules/FindBoost.cmake Fri Apr 23 15:55:13 2010
@@ -70,7 +70,9 @@
# omit the 3rd version number from include paths if it is 0 although not all
# binary Boost releases do so.
#
-# SET(Boost_ADDITIONAL_VERSIONS "1.78" "1.78.0" "1.79" "1.79.0")
+SET(Boost_ADDITIONAL_VERSIONS "1.50.0" "1.50" "1.49.0" "1.49" "1.48.0" "1.48"
+ "1.47.0" "1.47" "1.46.0" "1.46" "1.45.0" "1.45" "1.44.0" "1.44" "1.43.0"
+ "1.43" "1.42.0" "1.42")
#
# ===================================== ============= ========================
#

13
devel/cmake/patches/patch-Modules_FindEXPAT_cmake Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-Modules_FindEXPAT_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/FindEXPAT.cmake.orig Mon May 3 10:58:12 2010
+++ Modules/FindEXPAT.cmake Mon May 3 10:58:44 2010
@@ -33,9 +33,6 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(EXPAT DEFAULT_MSG EX
IF(EXPAT_FOUND)
SET(EXPAT_LIBRARIES ${EXPAT_LIBRARY})
SET(EXPAT_INCLUDE_DIRS ${EXPAT_INCLUDE_DIR})
-ELSE(EXPAT_FOUND)
- SET(EXPAT_LIBRARIES)
- SET(EXPAT_INCLUDE_DIRS)
ENDIF(EXPAT_FOUND)
MARK_AS_ADVANCED(EXPAT_INCLUDE_DIR EXPAT_LIBRARY)

14
devel/cmake/patches/patch-Modules_FindGLU_cmake Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-Modules_FindGLU_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/FindGLU.cmake.orig Tue Apr 6 16:45:31 2010
+++ Modules/FindGLU.cmake Mon May 3 11:51:48 2010
@@ -15,7 +15,9 @@
# Use of this file is deprecated, and is here for backwards compatibility with CMake 1.4
# GLU library is now found by FindOpenGL.cmake
#
-#
+
+MESSAGE(STATUS
+ "WARNING: you are using the obsolete 'GLU' package, please use 'OpenGL' instead")
INCLUDE(FindOpenGL)

165
devel/cmake/patches/patch-Modules_FindJNI_cmake Normal file
View File

@ -0,0 +1,165 @@
$OpenBSD: patch-Modules_FindJNI_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/FindJNI.cmake.orig Tue Apr 6 16:45:31 2010
+++ Modules/FindJNI.cmake Tue May 11 15:42:37 2010
@@ -26,6 +26,8 @@
# (To distributed this file outside of CMake, substitute the full
# License text for the above reference.)
+SET(MODJAVA_VER $ENV{MODJAVA_VER})
+
# Expand {libarch} occurences to java_libarch subdirectory(-ies) and set ${_var}
MACRO(java_append_library_directories _var)
# Determine java arch-specific library subdir
@@ -71,29 +73,51 @@ SET(JAVA_AWT_LIBRARY_DIRECTORIES
FILE(TO_CMAKE_PATH "$ENV{JAVA_HOME}" _JAVA_HOME)
-JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
- ${_JAVA_HOME}/jre/lib/{libarch}
- ${_JAVA_HOME}/jre/lib
- ${_JAVA_HOME}/lib
- ${_JAVA_HOME}
- /usr/lib
- /usr/local/lib
- /usr/lib/jvm/java/lib
- /usr/lib/java/jre/lib/{libarch}
- /usr/local/lib/java/jre/lib/{libarch}
- /usr/local/share/java/jre/lib/{libarch}
- /usr/lib/j2sdk1.4-sun/jre/lib/{libarch}
- /usr/lib/j2sdk1.5-sun/jre/lib/{libarch}
- /opt/sun-jdk-1.5.0.04/jre/lib/{libarch}
- /usr/lib/jvm/java-6-sun/jre/lib/{libarch}
- /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
- /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch} # can this one be removed according to #8821 ? Alex
- /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
- # Debian specific paths for default JVM
- /usr/lib/jvm/default-java/jre/lib/{libarch}
- /usr/lib/jvm/default-java/jre/lib
- /usr/lib/jvm/default-java/lib
- )
+IF(MODJAVA_VER)
+ IF(MODJAVA_VER MATCHES "^1\\.5.*")
+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
+ ${JAVA_AWT_LIBRARY_DIRECTORIES}
+ /usr/local/jdk-1.5.0/jre/lib/{libarch}
+ /usr/local/jre-1.5.0/lib/{libarch}
+ )
+ ELSEIF(MODJAVA_VER MATCHES "^1\\.6.*")
+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
+ ${JAVA_AWT_LIBRARY_DIRECTORIES}
+ /usr/local/jdk-1.6.0/jre/lib/{libarch}
+ /usr/local/jre-1.6.0/lib/{libarch}
+ )
+ ELSE(MODJAVA_VER MATCHES "^1\\.5.*")
+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
+ ${JAVA_AWT_LIBRARY_DIRECTORIES}
+ /usr/local/jdk-1.7.0/jre/lib/{libarch}
+ /usr/local/jre-1.7.0/lib/{libarch}
+ )
+ ENDIF(MODJAVA_VER MATCHES "^1\\.5.*")
+ELSE(MODJAVA_VER)
+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
+ ${_JAVA_HOME}/jre/lib/{libarch}
+ ${_JAVA_HOME}/jre/lib
+ ${_JAVA_HOME}/lib
+ ${_JAVA_HOME}
+ /usr/lib
+ /usr/local/lib
+ /usr/lib/jvm/java/lib
+ /usr/lib/java/jre/lib/{libarch}
+ /usr/local/lib/java/jre/lib/{libarch}
+ /usr/local/share/java/jre/lib/{libarch}
+ /usr/lib/j2sdk1.4-sun/jre/lib/{libarch}
+ /usr/lib/j2sdk1.5-sun/jre/lib/{libarch}
+ /opt/sun-jdk-1.5.0.04/jre/lib/{libarch}
+ /usr/lib/jvm/java-6-sun/jre/lib/{libarch}
+ /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
+ /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch} # can this one be removed according to #8821 ? Alex
+ /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
+ # Debian specific paths for default JVM
+ /usr/lib/jvm/default-java/jre/lib/{libarch}
+ /usr/lib/jvm/default-java/jre/lib
+ /usr/lib/jvm/default-java/lib
+ )
+ENDIF(MODJAVA_VER)
SET(JAVA_JVM_LIBRARY_DIRECTORIES)
FOREACH(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
@@ -105,29 +129,47 @@ FOREACH(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
)
ENDFOREACH(dir)
+IF(MODJAVA_VER)
+ IF(MODJAVA_VER MATCHES "^1\\.5.*")
+ SET(JAVA_AWT_INCLUDE_DIRECTORIES
+ ${JAVA_AWT_INCLUDE_DIRECTORIES}
+ /usr/local/jdk-1.5.0/include
+ )
+ ELSEIF(MODJAVA_VER MATCHES "^1\\.6.*")
+ SET(JAVA_AWT_INCLUDE_DIRECTORIES
+ ${JAVA_AWT_INCLUDE_DIRECTORIES}
+ /usr/local/jdk-1.6.0/include
+ )
+ ELSE(MODJAVA_VER MATCHES "^1\\.5.*")
+ SET(JAVA_AWT_INCLUDE_DIRECTORIES
+ ${JAVA_AWT_INCLUDE_DIRECTORIES}
+ /usr/local/jdk-1.7.0/include
+ )
+ ENDIF(MODJAVA_VER MATCHES "^1\\.5.*")
+ELSE(MODJAVA_VER)
+ SET(JAVA_AWT_INCLUDE_DIRECTORIES
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
+ ${_JAVA_HOME}/include
+ /usr/include
+ /usr/local/include
+ /usr/lib/java/include
+ /usr/local/lib/java/include
+ /usr/lib/jvm/java/include
+ /usr/lib/jvm/java-6-sun/include
+ /usr/lib/jvm/java-1.5.0-sun/include
+ /usr/lib/jvm/java-6-sun-1.6.0.00/include # can this one be removed according to #8821 ? Alex
+ /usr/lib/jvm/java-6-openjdk/include
+ /usr/local/share/java/include
+ /usr/lib/j2sdk1.4-sun/include
+ /usr/lib/j2sdk1.5-sun/include
+ /opt/sun-jdk-1.5.0.04/include
+ # Debian specific path for default JVM
+ /usr/lib/jvm/default-java/include
+ )
+ENDIF(MODJAVA_VER)
-SET(JAVA_AWT_INCLUDE_DIRECTORIES
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
- ${_JAVA_HOME}/include
- /usr/include
- /usr/local/include
- /usr/lib/java/include
- /usr/local/lib/java/include
- /usr/lib/jvm/java/include
- /usr/lib/jvm/java-6-sun/include
- /usr/lib/jvm/java-1.5.0-sun/include
- /usr/lib/jvm/java-6-sun-1.6.0.00/include # can this one be removed according to #8821 ? Alex
- /usr/lib/jvm/java-6-openjdk/include
- /usr/local/share/java/include
- /usr/lib/j2sdk1.4-sun/include
- /usr/lib/j2sdk1.5-sun/include
- /opt/sun-jdk-1.5.0.04/include
- # Debian specific path for default JVM
- /usr/lib/jvm/default-java/include
- )
-
FOREACH(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")
GET_FILENAME_COMPONENT(jpath "${JAVA_PROG}" PATH)
FOREACH(JAVA_INC_PATH ../include ../java/include ../share/java/include)
@@ -200,6 +242,7 @@ FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h
${JAVA_INCLUDE_PATH}/win32
${JAVA_INCLUDE_PATH}/linux
${JAVA_INCLUDE_PATH}/freebsd
+ ${JAVA_INCLUDE_PATH}/openbsd
${JAVA_INCLUDE_PATH}/solaris
)

29
devel/cmake/patches/patch-Modules_FindJasper_cmake Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-Modules_FindJasper_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/FindJasper.cmake.orig Tue Apr 6 16:45:31 2010
+++ Modules/FindJasper.cmake Mon May 3 11:51:48 2010
@@ -21,19 +21,10 @@
FIND_PACKAGE(JPEG)
-IF (JASPER_INCLUDE_DIR AND JASPER_LIBRARIES AND JPEG_LIBRARIES)
- # Already in cache, be silent
- SET(Jasper_FIND_QUIETLY TRUE)
-ENDIF (JASPER_INCLUDE_DIR AND JASPER_LIBRARIES AND JPEG_LIBRARIES)
-
FIND_PATH(JASPER_INCLUDE_DIR jasper/jasper.h)
FIND_LIBRARY(JASPER_LIBRARY NAMES jasper libjasper)
-IF (JASPER_INCLUDE_DIR AND JASPER_LIBRARY AND JPEG_LIBRARIES)
- SET(JASPER_LIBRARIES ${JASPER_LIBRARY} ${JPEG_LIBRARIES} )
-ENDIF (JASPER_INCLUDE_DIR AND JASPER_LIBRARY AND JPEG_LIBRARIES)
-
# handle the QUIETLY and REQUIRED arguments and set JASPER_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
@@ -43,4 +34,4 @@ IF (JASPER_FOUND)
SET(JASPER_LIBRARIES ${JASPER_LIBRARY} ${JPEG_LIBRARIES} )
ENDIF (JASPER_FOUND)
-MARK_AS_ADVANCED(JASPER_INCLUDE_DIR JASPER_LIBRARIES JASPER_LIBRARY)
+MARK_AS_ADVANCED(JASPER_INCLUDE_DIR JASPER_LIBRARY)

87
devel/cmake/patches/patch-Modules_FindJava_cmake Normal file
View File

@ -0,0 +1,87 @@
$OpenBSD: patch-Modules_FindJava_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/FindJava.cmake.orig Tue Apr 6 16:45:31 2010
+++ Modules/FindJava.cmake Tue May 11 15:47:54 2010
@@ -42,6 +42,8 @@
# (To distributed this file outside of CMake, substitute the full
# License text for the above reference.)
+SET(MODJAVA_VER $ENV{MODJAVA_VER})
+
# The HINTS option should only be used for values computed from the system.
SET(_JAVA_HINTS
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\2.0;JavaHome]/bin"
@@ -54,19 +56,29 @@ SET(_JAVA_HINTS
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin"
$ENV{JAVA_HOME}/bin
)
-# Hard-coded guesses should still go in PATHS. This ensures that the user
-# environment can always override hard guesses.
-SET(_JAVA_PATHS
- /usr/lib/java/bin
- /usr/share/java/bin
- /usr/local/java/bin
- /usr/local/java/share/bin
- /usr/java/j2sdk1.4.2_04
- /usr/lib/j2sdk1.4-sun/bin
- /usr/java/j2sdk1.4.2_09/bin
- /usr/lib/j2sdk1.5-sun/bin
- /opt/sun-jdk-1.5.0.04/bin
- )
+IF(MODJAVA_VER)
+ IF(MODJAVA_VER MATCHES "^1\\.5.*")
+ SET(_JAVA_PATHS /usr/local/jdk-1.5.0/bin)
+ ELSEIF(MODJAVA_VER MATCHES "^1\\.6.*")
+ SET(_JAVA_PATHS /usr/local/jdk-1.6.0/bin)
+ ELSE(MODJAVA_VER MATCHES "^1\\.5.*")
+ SET(_JAVA_PATHS /usr/local/jdk-1.7.0/bin)
+ ENDIF(MODJAVA_VER MATCHES "^1\\.5.*")
+ELSE(MODJAVA_VER)
+ # Hard-coded guesses should still go in PATHS. This ensures that the user
+ # environment can always override hard guesses.
+ SET(_JAVA_PATHS
+ /usr/lib/java/bin
+ /usr/share/java/bin
+ /usr/local/java/bin
+ /usr/local/java/share/bin
+ /usr/java/j2sdk1.4.2_04
+ /usr/lib/j2sdk1.4-sun/bin
+ /usr/java/j2sdk1.4.2_09/bin
+ /usr/lib/j2sdk1.5-sun/bin
+ /opt/sun-jdk-1.5.0.04/bin
+ )
+ENDIF(MODJAVA_VER)
FIND_PROGRAM(Java_JAVA_EXECUTABLE
NAMES java
HINTS ${_JAVA_HINTS}
@@ -82,7 +94,11 @@ IF(Java_JAVA_EXECUTABLE)
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_STRIP_TRAILING_WHITESPACE)
IF( res )
- MESSAGE( FATAL_ERROR "Error executing java -version" )
+ IF(${Java_FIND_REQUIRED})
+ MESSAGE( FATAL_ERROR "Error executing java -version" )
+ ELSE()
+ MESSAGE( STATUS "Warning, could not run java --version")
+ ENDIF()
ELSE()
# extract major/minor version and patch level from "java -version" output
# Tested on linux using
@@ -90,6 +106,7 @@ IF(Java_JAVA_EXECUTABLE)
# 2. OpenJDK 1.6
# 3. GCJ 1.5
# 4. Kaffe 1.4.2
+ # 5. OpenJDK 1.7 - OpenBSD
IF(var MATCHES "java version \"[0-9]+\\.[0-9]+\\.[0-9_]+[oem-]*\".*")
# This is most likely Sun / OpenJDK, or maybe GCJ-java compat layer
STRING( REGEX REPLACE ".* version \"([0-9]+\\.[0-9]+\\.[0-9_]+)[oem-]*\".*"
@@ -97,6 +114,10 @@ IF(Java_JAVA_EXECUTABLE)
ELSEIF(var MATCHES "java full version \"kaffe-[0-9]+\\.[0-9]+\\.[0-9_]+\".*")
# Kaffe style
STRING( REGEX REPLACE "java full version \"kaffe-([0-9]+\\.[0-9]+\\.[0-9_]+).*"
+ "\\1" Java_VERSION_STRING "${var}" )
+ ELSEIF(var MATCHES "openjdk version \"[0-9]+\\.[0-9]+\\.[0-9_]+-internal\".*")
+ # this is java OpenJDK ver 1.7.x on OpenBSD
+ STRING( REGEX REPLACE "openjdk version \"([0-9]+\\.[0-9]+\\.[0-9_]+)-internal*\".*"
"\\1" Java_VERSION_STRING "${var}" )
ELSE()
IF(NOT Java_FIND_QUIETLY)

40
devel/cmake/patches/patch-Modules_FindMPEG2_cmake Normal file
View File

@ -0,0 +1,40 @@
$OpenBSD: patch-Modules_FindMPEG2_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/FindMPEG2.cmake.orig Mon Apr 26 11:51:05 2010
+++ Modules/FindMPEG2.cmake Mon Apr 26 11:52:13 2010
@@ -21,17 +21,14 @@
# License text for the above reference.)
FIND_PATH(MPEG2_INCLUDE_DIR
- NAMES mpeg2.h mpeg2dec/mpeg2.h
- PATHS /usr/local/livid
+ NAMES mpeg2dec/mpeg2.h
+ PATHS ${LOCALBASE}/include
)
FIND_LIBRARY(MPEG2_mpeg2_LIBRARY mpeg2
- /usr/local/livid/mpeg2dec/libmpeg2/.libs
+ ${LOCALBASE}/lib
)
-FIND_LIBRARY( MPEG2_vo_LIBRARY vo
- /usr/local/livid/mpeg2dec/libvo/.libs
-)
# handle the QUIETLY and REQUIRED arguments and set MPEG2_FOUND to TRUE if
@@ -40,8 +37,7 @@ INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG2 DEFAULT_MSG MPEG2_mpeg2_LIBRARY MPEG2_INCLUDE_DIR)
IF(MPEG2_FOUND)
- SET( MPEG2_LIBRARIES ${MPEG2_mpeg2_LIBRARY}
- ${MPEG2_vo_LIBRARY})
+ SET( MPEG2_LIBRARIES ${MPEG2_mpeg2_LIBRARY})
#some native mpeg2 installations will depend
#on libSDL, if found, add it in.
@@ -51,4 +47,4 @@ IF(MPEG2_FOUND)
ENDIF(SDL_FOUND)
ENDIF(MPEG2_FOUND)
-MARK_AS_ADVANCED(MPEG2_INCLUDE_DIR MPEG2_mpeg2_LIBRARY MPEG2_vo_LIBRARY)
+MARK_AS_ADVANCED(MPEG2_INCLUDE_DIR MPEG2_mpeg2_LIBRARY)

33
devel/cmake/patches/patch-Modules_FindMPEG_cmake Normal file
View File

@ -0,0 +1,33 @@
$OpenBSD: patch-Modules_FindMPEG_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/FindMPEG.cmake.orig Tue Apr 6 16:45:31 2010
+++ Modules/FindMPEG.cmake Mon May 3 11:01:02 2010
@@ -20,23 +20,21 @@
# (To distributed this file outside of CMake, substitute the full
# License text for the above reference.)
-FIND_PATH(MPEG_INCLUDE_DIR mpeg2dec/include/video_out.h
- /usr/local/livid
+FIND_PATH(MPEG_INCLUDE_DIR mpeg2dec/mpeg2.h
+ ${LOCALBASE}/include
)
FIND_LIBRARY(MPEG_mpeg2_LIBRARY mpeg2
- /usr/local/livid/mpeg2dec/libmpeg2/.libs
+ ${LOCALBASE}/lib
)
-FIND_LIBRARY( MPEG_vo_LIBRARY vo
- /usr/local/livid/mpeg2dec/libvo/.libs
-)
-
# handle the QUIETLY and REQUIRED arguments and set MPEG2_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY)
IF(MPEG_FOUND)
- SET( MPEG_LIBRARIES ${MPEG_mpeg2_LIBRARY} ${MPEG_vo_LIBRARY} )
+ SET( MPEG_LIBRARIES ${MPEG_mpeg2_LIBRARY} )
ENDIF(MPEG_FOUND)
+
+MARK_AS_ADVANCED(MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY)

12
devel/cmake/patches/patch-Modules_FindPNG_cmake Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Modules_FindPNG_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/FindPNG.cmake.orig Mon May 3 11:04:16 2010
+++ Modules/FindPNG.cmake Mon May 3 11:04:50 2010
@@ -33,7 +33,7 @@ if(ZLIB_FOUND)
/usr/local/include/libpng # OpenBSD
)
- set(PNG_NAMES ${PNG_NAMES} png libpng png12 libpng12)
+ set(PNG_NAMES ${PNG_NAMES} png libpng png14 libpng14 png14d libpng14d png12 libpng12 png12d libpng12d)
find_library(PNG_LIBRARY NAMES ${PNG_NAMES} )
if (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR)

21
devel/cmake/patches/patch-Modules_FindPythonInterp_cmake Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-Modules_FindPythonInterp_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/FindPythonInterp.cmake.orig Tue Apr 6 16:45:31 2010
+++ Modules/FindPythonInterp.cmake Tue May 11 14:23:03 2010
@@ -19,8 +19,16 @@
# (To distributed this file outside of CMake, substitute the full
# License text for the above reference.)
+SET(MODPY_BIN $ENV{MODPY_BIN})
+
+IF(MODPY_BIN)
+ SET(_EXECUTABLES ${MODPY_BIN})
+ELSE(MODPY_BIN)
+ SET(_EXECUTABLES python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python)
+ENDIF(MODPY_BIN)
+
FIND_PROGRAM(PYTHON_EXECUTABLE
- NAMES python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python
+ NAMES ${_EXECUTABLES}
PATHS
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]

48
devel/cmake/patches/patch-Modules_FindPythonLibs_cmake Normal file
View File

@ -0,0 +1,48 @@
$OpenBSD: patch-Modules_FindPythonLibs_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/FindPythonLibs.cmake.orig Tue Apr 6 16:45:31 2010
+++ Modules/FindPythonLibs.cmake Tue May 11 14:26:12 2010
@@ -27,7 +27,16 @@ INCLUDE(CMakeFindFrameworks)
# Search for the python framework on Apple.
CMAKE_FIND_FRAMEWORKS(Python)
-FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
+SET(MODPY_VERSION $ENV{MODPY_VERSION})
+SET(MODPY_INCDIR $ENV{MODPY_INCDIR})
+
+IF(MODPY_VERSION)
+ SET(_VERSIONS ${MODPY_VERSION})
+ELSE(MODPY_VERSION)
+ SET(_VERSIONS 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
+ENDIF(MODPY_VERSION)
+
+FOREACH(_CURRENT_VERSION ${_VERSIONS})
STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
IF(WIN32)
FIND_LIBRARY(PYTHON_DEBUG_LIBRARY
@@ -68,14 +77,18 @@ FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1
ENDFOREACH(dir)
ENDIF(Python_FRAMEWORKS AND NOT PYTHON_INCLUDE_DIR)
- FIND_PATH(PYTHON_INCLUDE_DIR
- NAMES Python.h
- PATHS
- ${PYTHON_FRAMEWORK_INCLUDES}
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
- PATH_SUFFIXES
- python${_CURRENT_VERSION}
- )
+ IF(MODPY_VERSION AND MODPY_INCDIR)
+ SET(PYTHON_INCLUDE_DIR "${MODPY_INCDIR}")
+ ELSE(MODPY_VERSION AND MODPY_INCDIR)
+ FIND_PATH(PYTHON_INCLUDE_DIR
+ NAMES Python.h
+ PATHS
+ ${PYTHON_FRAMEWORK_INCLUDES}
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
+ PATH_SUFFIXES
+ python${_CURRENT_VERSION}
+ )
+ ENDIF(MODPY_VERSION AND MODPY_INCDIR)
# For backward compatibility, set PYTHON_INCLUDE_PATH, but make it internal.
SET(PYTHON_INCLUDE_PATH "${PYTHON_INCLUDE_DIR}" CACHE INTERNAL

45
devel/cmake/patches/patch-Modules_FindQt3_cmake Normal file
View File

@ -0,0 +1,45 @@
$OpenBSD: patch-Modules_FindQt3_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/FindQt3.cmake.orig Tue Apr 6 16:45:31 2010
+++ Modules/FindQt3.cmake Fri Apr 23 22:50:51 2010
@@ -60,6 +60,7 @@ FIND_PATH(QT_INCLUDE_DIR qt.h
/usr/share/qt3/include
C:/Progra~1/qt/include
/usr/include/qt3
+ ${LOCALBASE}/include/X11/qt3
)
# if qglobal.h is not in the qt_include_dir then set
@@ -138,7 +139,7 @@ FIND_LIBRARY(QT_QASSISTANTCLIENT_LIBRARY
# qt 3 should prefer QTDIR over the PATH
FIND_PROGRAM(QT_MOC_EXECUTABLE
- NAMES moc-qt3 moc
+ NAMES moc-qt3 moc3 moc3-mt moc
HINTS
$ENV{QTDIR}/bin
PATHS
@@ -147,6 +148,7 @@ FIND_PROGRAM(QT_MOC_EXECUTABLE
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
$ENV{QTDIR}/bin
${GLOB_PATHS_BIN}
+ ${LOCALBASE}/bin
/usr/local/qt/bin
/usr/lib/qt/bin
/usr/lib/qt3/bin
@@ -161,7 +163,7 @@ ENDIF(QT_MOC_EXECUTABLE)
# qt 3 should prefer QTDIR over the PATH
FIND_PROGRAM(QT_UIC_EXECUTABLE
- NAMES uic-qt3 uic
+ NAMES uic-qt3 uic3 uic3-mt uic
HINTS
$ENV{QTDIR}/bin
PATHS
@@ -169,6 +171,7 @@ FIND_PROGRAM(QT_UIC_EXECUTABLE
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
${GLOB_PATHS_BIN}
+ ${LOCALBASE}/bin
/usr/local/qt/bin
/usr/lib/qt/bin
/usr/lib/qt3/bin

403
devel/cmake/patches/patch-Modules_FindQt4_cmake
View File

@ -1,371 +1,52 @@
$OpenBSD: patch-Modules_FindQt4_cmake,v 1.6 2008/02/04 22:31:20 espie Exp $
--- Modules/FindQt4.cmake.orig Mon Jan 21 19:59:51 2008
+++ Modules/FindQt4.cmake Mon Feb 4 23:15:04 2008
@@ -29,33 +29,52 @@
# Add this variable to your TARGET_LINK_LIBRARIES.
#
# macro QT4_WRAP_CPP(outfiles inputfile ... OPTIONS ...)
+# create moc code from a list of files containing Qt class with
+# the Q_OBJECT declaration. Options may be given to moc, such as those found
+# when executing "moc -help"
+#
# macro QT4_WRAP_UI(outfiles inputfile ... OPTIONS ...)
+# create code from a list of Qt designer ui files.
+# Options may be given to uic, such as those found
+# when executing "uic -help"
+#
# macro QT4_ADD_RESOURCES(outfiles inputfile ... OPTIONS ...)
+# create code from a list of Qt resource files.
+# Options may be given to rcc, such as those found
+# when executing "rcc -help"
+#
# macro QT4_AUTOMOC(inputfile ... )
# macro QT4_GENERATE_MOC(inputfile outputfile )
#
# macro QT4_ADD_DBUS_INTERFACE(outfiles interface basename)
# create a the interface header and implementation files with the
# given basename from the given interface xml file and add it to
-# the list of sources
+# the list of sources.
+# To disable generating a namespace header, set the source file property
+# NO_NAMESPACE to TRUE on the interface file.
#
# macro QT4_ADD_DBUS_INTERFACES(outfiles inputfile ... )
# create the interface header and implementation files
# for all listed interface xml files
# the name will be automatically determined from the name of the xml file
#
-# macro QT4_ADD_DBUS_ADAPTOR(outfiles xmlfile parentheader parentclassname [basename] )
+# To disable generating namespace headers, set the source file property
+# NO_NAMESPACE to TRUE for these inputfiles.
+# macro QT4_ADD_DBUS_ADAPTOR(outfiles xmlfile parentheader parentclassname [basename] [classname])
# create a dbus adaptor (header and implementation file) from the xml file
# describing the interface, and add it to the list of sources. The adaptor
# forwards the calls to a parent class, defined in parentheader and named
# parentclassname. The name of the generated files will be
-# <basename>adaptor.{cpp,h} where basename is the basename of the xml file.
+# <basename>adaptor.{cpp,h} where basename defaults to the basename of the xml file.
+# If <classname> is provided, then it will be used as the classname of the
+# adaptor itself.
#
-# macro QT4_GENERATE_DBUS_INTERFACE( header [interfacename] )
+# macro QT4_GENERATE_DBUS_INTERFACE( header [interfacename] OPTIONS ...)
# generate the xml interface file from the given header.
# If the optional argument interfacename is omitted, the name of the
# interface file is constructed from the basename of the header with
# the suffix .xml appended.
+# Options may be given to uic, such as those found when executing "qdbuscpp2xml --help"
#
# QT_FOUND If false, don't try to use Qt.
# QT4_FOUND If false, don't try to use Qt 4.
@@ -213,13 +232,34 @@
# (They make no sense in Qt4)
# QT_QT_LIBRARY Qt-Library is now split
+if (QT4_QMAKE_FOUND)
+ # Check already done in this cmake run, nothing more to do
+
+else (QT4_QMAKE_FOUND)
+
+# check that QT_NO_DEBUG is defined for release configurations
+MACRO(QT_CHECK_FLAG_EXISTS FLAG VAR DOC)
+ IF(NOT ${VAR} MATCHES "${FLAG}")
+ SET(${VAR} "${${VAR}} ${FLAG}"
+ CACHE STRING "Flags used by the compiler during ${DOC} builds." FORCE)
+ ENDIF(NOT ${VAR} MATCHES "${FLAG}")
+ENDMACRO(QT_CHECK_FLAG_EXISTS FLAG VAR)
+QT_CHECK_FLAG_EXISTS(-DQT_NO_DEBUG CMAKE_CXX_FLAGS_RELWITHDEBINFO "Release with Debug Info")
+QT_CHECK_FLAG_EXISTS(-DQT_NO_DEBUG CMAKE_CXX_FLAGS_RELEASE "release")
+QT_CHECK_FLAG_EXISTS(-DQT_NO_DEBUG CMAKE_CXX_FLAGS_MINSIZEREL "release minsize")
+
INCLUDE(CheckSymbolExists)
INCLUDE(MacroAddFileDependencies)
+INCLUDE(MacroPushRequiredVars)
SET(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake)
SET( QT_DEFINITIONS "")
+IF (WIN32)
+ SET(QT_DEFINITIONS -DQT_DLL)
+ENDIF(WIN32)
+
SET(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
# macro for asking qmake to process pro files
@@ -250,7 +290,7 @@ ENDMACRO(QT_QUERY_QMAKE)
GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME)
$OpenBSD: patch-Modules_FindQt4_cmake,v 1.7 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/FindQt4.cmake.orig Tue Apr 6 16:45:31 2010
+++ Modules/FindQt4.cmake Fri Apr 23 22:57:32 2010
@@ -392,12 +392,18 @@ GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRE
# check for qmake
-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS
+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake qmake4 qmake-qt4 PATHS
# Debian uses qmake-qt4
# macports' Qt uses qmake-mac
-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
+IF(CMAKE_SYSTEM MATCHES "OpenBSD*")
+ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 PATHS
+ $ENV{QTDIR}/bin
+ )
+ELSE(CMAKE_SYSTEM MATCHES "OpenBSD*")
+ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
@@ -322,6 +362,12 @@ ENDIF (QT_QMAKE_EXECUTABLE)
$ENV{QTDIR}/bin
)
+ENDIF(CMAKE_SYSTEM MATCHES "OpenBSD*")
IF (QT4_QMAKE_FOUND)
IF (QT_QMAKE_EXECUTABLE)
+ if (WIN32)
+ # get qt install dir
+ get_filename_component(_DIR ${QT_QMAKE_EXECUTABLE} PATH )
+ get_filename_component(QT_INSTALL_DIR ${_DIR} PATH )
+ endif (WIN32)
+
# ask qmake for the library dir
# Set QT_LIBRARY_DIR
IF (NOT QT_LIBRARY_DIR)
@@ -424,9 +470,8 @@ IF (QT4_QMAKE_FOUND)
# Find out what window system we're using
#
#############################################
- # Save required variable
- SET(CMAKE_REQUIRED_INCLUDES_SAVE ${CMAKE_REQUIRED_INCLUDES})
- SET(CMAKE_REQUIRED_FLAGS_SAVE ${CMAKE_REQUIRED_FLAGS})
+ # Save required includes and required_flags variables
+ macro_push_required_vars()
# Add QT_INCLUDE_DIR to CMAKE_REQUIRED_INCLUDES
SET(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${QT_INCLUDE_DIR}")
# On Mac OS X when Qt has framework support, also add the framework path
@@ -447,8 +492,8 @@ IF (QT4_QMAKE_FOUND)
ENDIF (QT_QTCOPY_REQUIRED)
# Restore CMAKE_REQUIRED_INCLUDES and CMAKE_REQUIRED_FLAGS variables
- SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE})
- SET(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_SAVE})
+ # Restore CMAKE_REQUIRED_INCLUDES+CMAKE_REQUIRED_FLAGS variables
+ macro_pop_required_vars()
#
#############################################
@@ -836,20 +881,21 @@ IF (QT4_QMAKE_FOUND)
#
######################################
- MACRO (QT4_EXTRACT_OPTIONS qt4_files qt4_options)
- SET(${qt4_files} ${ARGN})
- SET(${qt4_options})
- LIST(FIND ${qt4_files} OPTIONS _index)
- IF(NOT _index EQUAL -1)
- LIST(REMOVE_ITEM ${qt4_files} OPTIONS)
- LIST(LENGTH ${qt4_files} _length)
- WHILE(_length GREATER ${_index})
- LIST(GET ${qt4_files} ${_index} _opt_value)
- LIST(REMOVE_AT ${qt4_files} ${_index})
- LIST(APPEND ${qt4_options} ${_opt_value})
- LIST(LENGTH ${qt4_files} _length)
- ENDWHILE(_length GREATER ${_index})
- ENDIF(NOT _index EQUAL -1)
+ MACRO (QT4_EXTRACT_OPTIONS _qt4_files _qt4_options)
+ SET(${_qt4_files} ${ARGN})
+ SET(${_qt4_options})
+ SET(_QT4_DOING_OPTIONS FALSE)
+ FOREACH(_currentArg ${ARGN})
+ IF ("${_currentArg}" STREQUAL "OPTIONS")
+ SET(_QT4_DOING_OPTIONS TRUE)
+ ELSE ("${_currentArg}" STREQUAL "OPTIONS")
+ IF(_QT4_DOING_OPTIONS)
+ LIST(APPEND ${_qt4_options} "${_currentArg}")
+ ELSE(_QT4_DOING_OPTIONS)
+ LIST(APPEND ${_qt4_files} "${_currentArg}")
+ ENDIF(_QT4_DOING_OPTIONS)
+ ENDIF ("${_currentArg}" STREQUAL "OPTIONS")
+ ENDFOREACH(_currentArg)
ENDMACRO (QT4_EXTRACT_OPTIONS)
MACRO (QT4_GET_MOC_INC_DIRS _moc_INC_DIRS)
@@ -881,6 +927,7 @@ IF (QT4_QMAKE_FOUND)
# QT4_WRAP_CPP(outfiles inputfile ... )
+ # TODO perhaps add support for -D, -U and other minor options
MACRO (QT4_WRAP_CPP outfiles )
# get include dirs
@@ -922,6 +969,7 @@ IF (QT4_QMAKE_FOUND)
# QT4_ADD_RESOURCES(outfiles inputfile ... )
+ # TODO perhaps consider adding support for compression and root options to rcc
MACRO (QT4_ADD_RESOURCES outfiles )
QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN})
@@ -960,8 +1008,20 @@ IF (QT4_QMAKE_FOUND)
SET(_impl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc)
+ GET_SOURCE_FILE_PROPERTY(_nonamespace ${_interface} NO_NAMESPACE)
+ IF ( _nonamespace )
+ SET(_params -N -m)
+ ELSE ( _nonamespace )
+ SET(_params -m)
+ ENDIF ( _nonamespace )
+
+ GET_SOURCE_FILE_PROPERTY(_include ${_interface} INCLUDE)
+ IF ( _include )
+ SET(_params ${_params} -i ${_include})
+ ENDIF ( _include )
+
ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
- COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} -m -p ${_basename} ${_infile}
+ COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} ${_params} -p ${_basename} ${_infile}
DEPENDS ${_infile})
SET_SOURCE_FILES_PROPERTIES(${_impl} PROPERTIES SKIP_AUTOMOC TRUE)
@@ -985,7 +1045,9 @@ IF (QT4_QMAKE_FOUND)
ENDMACRO(QT4_ADD_DBUS_INTERFACES)
- MACRO(QT4_GENERATE_DBUS_INTERFACE _header) # _customName )
+ MACRO(QT4_GENERATE_DBUS_INTERFACE _header) # _customName OPTIONS -some -options )
+ QT4_EXTRACT_OPTIONS(_customName _qt4_dbus_options ${ARGN})
+
SET(_customName "${ARGV1}")
GET_FILENAME_COMPONENT(_in_file ${_header} ABSOLUTE)
GET_FILENAME_COMPONENT(_basename ${_header} NAME_WE)
@@ -997,13 +1059,13 @@ IF (QT4_QMAKE_FOUND)
ENDIF (_customName)
ADD_CUSTOM_COMMAND(OUTPUT ${_target}
- COMMAND ${QT_DBUSCPP2XML_EXECUTABLE} ${_in_file} > ${_target}
+ COMMAND ${QT_DBUSCPP2XML_EXECUTABLE} ${_qt4_dbus_options} ${_in_file} > ${_target}
DEPENDS ${_in_file}
)
ENDMACRO(QT4_GENERATE_DBUS_INTERFACE)
- MACRO(QT4_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass) # _optionalBasename )
+ MACRO(QT4_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass) # _optionalBasename _optionalClassName)
GET_FILENAME_COMPONENT(_infile ${_xml_file} ABSOLUTE)
SET(_optionalBasename "${ARGV4}")
@@ -1094,12 +1156,27 @@ IF (QT4_QMAKE_FOUND)
IF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
SET( QT4_FOUND "YES" )
IF( NOT Qt4_FIND_QUIETLY)
- MESSAGE(STATUS "Found Qt-Version ${QTVERSION}")
+ MESSAGE(STATUS "Found Qt-Version ${QTVERSION} (using ${QT_QMAKE_EXECUTABLE})")
ENDIF( NOT Qt4_FIND_QUIETLY)
ELSE( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
SET( QT4_FOUND "NO")
SET(QT_QMAKE_EXECUTABLE "${QT_QMAKE_EXECUTABLE}-NOTFOUND" CACHE FILEPATH "Invalid qmake found" FORCE)
IF( Qt4_FIND_REQUIRED)
+ IF ( NOT QT_LIBRARY_DIR )
+ MESSAGE(STATUS "Qt libraries NOT found!")
+ ENDIF(NOT QT_LIBRARY_DIR )
+ IF ( NOT QT_INCLUDE_DIR )
+ MESSAGE(STATUS "Qt includes NOT found!")
+ ENDIF( NOT QT_INCLUDE_DIR )
+ IF ( NOT QT_MOC_EXECUTABLE )
+ MESSAGE(STATUS "Qt's moc NOT found!")
+ ENDIF( NOT QT_MOC_EXECUTABLE )
+ IF ( NOT QT_UIC_EXECUTABLE )
+ MESSAGE(STATUS "Qt's uic NOT found!")
+ ENDIF( NOT QT_UIC_EXECUTABLE )
+ IF ( NOT QT_RCC_EXECUTABLE )
+ MESSAGE(STATUS "Qt's rcc NOT found!")
+ ENDIF( NOT QT_RCC_EXECUTABLE )
MESSAGE( FATAL_ERROR "Qt libraries, includes, moc, uic or/and rcc NOT found!")
ENDIF( Qt4_FIND_REQUIRED)
ENDIF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
@@ -1108,9 +1185,19 @@ IF (QT4_QMAKE_FOUND)
#######################################
#
- # Qt configuration
+ # System dependent settings
#
#######################################
+ # for unix add X11 stuff
+ IF(UNIX)
+ # on OS X X11 may not be required
+ IF (Q_WS_X11)
+ FIND_PACKAGE(X11 REQUIRED)
+ ENDIF (Q_WS_X11)
@@ -983,6 +989,12 @@ IF (QT4_QMAKE_FOUND)
_QT4_ADJUST_LIB_VARS(QAxServer)
_QT4_ADJUST_LIB_VARS(QAxContainer)
ENDIF(WIN32)
+ # qt on OpenBSD needs to be linked with -pthread
+ IF(CMAKE_SYSTEM MATCHES "OpenBSD*")
+ FIND_PACKAGE(Threads)
+ SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
+ ENDIF(UNIX)
+
IF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri")
FILE(READ ${QT_MKSPECS_DIR}/qconfig.pri _qconfig_FILE_contents)
STRING(REGEX MATCH "QT_CONFIG[^\n]+" QT_QCONFIG ${_qconfig_FILE_contents})
@@ -1122,14 +1209,9 @@ IF (QT4_QMAKE_FOUND)
ENDIF("${QT_EDITION}" MATCHES "DesktopLight")
+ SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY}
+ ${CMAKE_THREAD_LIBS_INIT})
+ ENDIF(CMAKE_SYSTEM MATCHES "OpenBSD*")
# If Qt is installed as a framework, we need to add QT_QTCORE_LIBRARY here (which
# is the framework directory in that case), since this will make the cmake include_directories()
@@ -1017,13 +1029,13 @@ IF (QT4_QMAKE_FOUND)
ENDIF(QT_QMAKE_CHANGED)
- ###############################################
- #
- # configuration/system dependent settings
- #
- ###############################################
-
SET(QT_GUI_LIB_DEPENDENCIES "")
SET(QT_CORE_LIB_DEPENDENCIES "")
+ SET(QT_DBUS_LIB_DEPENDENCIES "")
# shared build needs -DQT_SHARED
IF(NOT QT_CONFIG MATCHES "static")
@@ -1143,8 +1225,44 @@ IF (QT4_QMAKE_FOUND)
IF(QT_QCONFIG MATCHES "system-png")
FIND_LIBRARY(QT_PNG_LIBRARY NAMES png)
SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_PNG_LIBRARY})
+ MESSAGE(STATUS "add png ${QT_GUI_LIB_DEPENDENCIES}")
MARK_AS_ADVANCED(QT_PNG_LIBRARY)
+ FIND_PATH(QT_PNG_INCLUDE_DIR png.h
+ /usr/local/include
+ /usr/include
+ /usr/local/include/libpng # OpenBSD
+ )
+ MARK_AS_ADVANCED(QT_PNG_INCLUDE_DIR)
+ SET(QT_INCLUDES ${QT_INCLUDES} ${QT_PNG_INCLUDE_DIR})
+
ENDIF(QT_QCONFIG MATCHES "system-png")
+
+ # for X11, get X11 library directory
+ IF(Q_WS_X11)
+ SET(QMAKE_LIBDIR_X11 "/usr/X11R6/lib")
+ ENDIF(Q_WS_X11)
+
+ IF(QT_QCONFIG MATCHES "glib")
+ FIND_LIBRARY(QT_GTHREAD_LIBRARY NAMES gthread-2.0)
+ FIND_LIBRARY(QT_GLIB_LIBRARY NAMES glib-2.0)
+ MARK_AS_ADVANCED(QT_GLIB_LIBRARY)
+ MARK_AS_ADVANCED(QT_GTHREAD_LIBRARY)
+ SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_GTHREAD_LIBRARY} ${QT_GLIB_LIBRARY})
+ ENDIF(QT_QCONFIG MATCHES "glib")
+
+ IF(QT_QCONFIG MATCHES "gnu-libiconv")
+ FIND_LIBRARY(QT_LIBINTL NAMES intl)
+ FIND_LIBRARY(QT_LIBICONV NAMES iconv)
+ MARK_AS_ADVANCED(QT_LIBICONV)
+ MARK_AS_ADVANCED(QT_LIBINTL)
+ SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QT_LIBICONV} ${QT_LIBICONV})
+ ENDIF(QT_QCONFIG MATCHES "gnu-libiconv")
+
+ IF(QT_QCONFIG MATCHES "qdbus")
+ FIND_LIBRARY(QT_DBUS NAMES dbus-1)
+ MARK_AS_ADVANCED(QT_DBUS)
+ SET(QT_DBUS_LIB_DEPENDENCIES ${QT_DBUS_LIB_DEPENDENCIES} ${QT_DBUS})
+ ENDIF(QT_QCONFIG MATCHES "qdbus")
# for X11, get X11 library directory
IF(Q_WS_X11)
@@ -1281,6 +1399,11 @@ IF (QT4_QMAKE_FOUND)
SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} "-framework ApplicationServices")
ENDIF(Q_WS_MAC)
+
+# XXX OpenBSD
+ SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${QT_CORE_LIB_DEPENDENCIES})
+ SET(QT_QTGUI_LIBRARY ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_GUI_LIB_DEPENDENCIES})
+
#######################################
#
# compatibility settings
@@ -1307,5 +1430,6 @@ ELSE(QT4_QMAKE_FOUND)
ENDIF(QT4_INSTALLED_VERSION_TOO_OLD AND NOT Qt4_FIND_QUIETLY)
ENDIF(Qt4_FIND_REQUIRED)
+ENDIF (QT4_QMAKE_FOUND)
ENDIF (QT4_QMAKE_FOUND)
FIND_PROGRAM(QT_MOC_EXECUTABLE
- NAMES moc-qt4 moc
+ NAMES moc-qt4 moc4 moc
PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH
)
FIND_PROGRAM(QT_UIC_EXECUTABLE
- NAMES uic-qt4 uic
+ NAMES uic-qt4 uic4 uic
PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH
)

31
devel/cmake/patches/patch-Modules_FindQt_cmake Normal file
View File

@ -0,0 +1,31 @@
$OpenBSD: patch-Modules_FindQt_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/FindQt.cmake.orig Tue Apr 6 16:45:31 2010
+++ Modules/FindQt.cmake Fri Apr 23 12:55:11 2010
@@ -43,6 +43,13 @@ IF(GLOB_TEMP_VAR)
ENDIF(GLOB_TEMP_VAR)
SET(GLOB_TEMP_VAR)
+FILE(GLOB GLOB_TEMP_VAR ${LOCALBASE}/lib/qt3/bin/qmake)
+IF(GLOB_TEMP_VAR)
+ SET(QT3_INSTALLED TRUE)
+ENDIF(GLOB_TEMP_VAR)
+SET(GLOB_TEMP_VAR)
+
+
# look for qt4 installations
FILE(GLOB GLOB_TEMP_VAR /usr/local/qt-x11-commercial-4*/bin/qmake)
IF(GLOB_TEMP_VAR)
@@ -55,6 +62,13 @@ IF(GLOB_TEMP_VAR)
SET(QT4_INSTALLED TRUE)
ENDIF(GLOB_TEMP_VAR)
SET(GLOB_TEMP_VAR)
+
+FILE(GLOB GLOB_TEMP_VAR ${LOCALBASE}/lib/qt4/bin/qmake)
+IF(GLOB_TEMP_VAR)
+ SET(QT4_INSTALLED TRUE)
+ENDIF(GLOB_TEMP_VAR)
+SET(GLOB_TEMP_VAR)
+
# now find qmake
FIND_PROGRAM(QT_QMAKE_EXECUTABLE_FINDQT NAMES qmake PATHS "${QT_SEARCH_PATH}/bin" "$ENV{QTDIR}/bin")

33
devel/cmake/patches/patch-Modules_FindSDL_cmake Normal file
View File

@ -0,0 +1,33 @@
$OpenBSD: patch-Modules_FindSDL_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/FindSDL.cmake.orig Tue Apr 6 16:45:31 2010
+++ Modules/FindSDL.cmake Mon Apr 26 14:10:36 2010
@@ -81,6 +81,11 @@ FIND_PATH(SDL_INCLUDE_DIR SDL.h
/opt/csw # Blastwave
/opt
)
+# On OpenBSD SDL depends on libiconv and SDL_stdinc.h includes iconv.h,
+# which is located in ${LOCALBASE}/include. Append {LOCALBASE}/include
+# to the SDL_INCLUDE_DIR, thus allow to build SDL apps out of box.
+LIST(APPEND SDL_INCLUDE_DIR ${LOCALBASE}/include)
+
#MESSAGE("SDL_INCLUDE_DIR is ${SDL_INCLUDE_DIR}")
# SDL-1.1 is the name used by FreeBSD ports...
@@ -100,7 +105,7 @@ FIND_LIBRARY(SDL_LIBRARY_TEMP
#MESSAGE("SDL_LIBRARY_TEMP is ${SDL_LIBRARY_TEMP}")
IF(NOT SDL_BUILDING_LIBRARY)
- IF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework")
+ IF(NOT "${SDL_INCLUDE_DIR}" MATCHES ".framework")
# Non-OS X framework versions expect you to also dynamically link to
# SDLmain. This is mainly for Windows and OS X. Other (Unix) platforms
# seem to provide SDLmain for compatibility even though they don't
@@ -116,7 +121,7 @@ IF(NOT SDL_BUILDING_LIBRARY)
/opt/csw
/opt
)
- ENDIF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework")
+ ENDIF(NOT "${SDL_INCLUDE_DIR}" MATCHES ".framework")
ENDIF(NOT SDL_BUILDING_LIBRARY)
# SDL may require threads on your system.

227
devel/cmake/patches/patch-Modules_FindTCL_cmake Normal file
View File

@ -0,0 +1,227 @@
$OpenBSD: patch-Modules_FindTCL_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/FindTCL.cmake.orig Tue Apr 6 16:45:31 2010
+++ Modules/FindTCL.cmake Tue May 11 13:54:34 2010
@@ -48,15 +48,32 @@ INCLUDE(CMakeFindFrameworks)
INCLUDE(FindTclsh)
INCLUDE(FindWish)
+SET(MODTCL_VERSION $ENV{MODTCL_VERSION})
+SET(MODTK_VERSION $ENV{MODTK_VERSION})
+SET(MODTCL_INCDIR $ENV{MODTCL_INCDIR})
+SET(MODTK_INCDIR $ENV{MODTK_INCDIR})
+SET(MODTCL_LIB $ENV{MODTCL_LIB})
+SET(MODTK_LIB $ENV{MODTK_LIB})
+SET(MODTCL_LIBDIR $ENV{MODTCL_LIBDIR})
+SET(MODTK_LIBDIR $ENV{MODTK_LIBDIR})
+
GET_FILENAME_COMPONENT(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH)
GET_FILENAME_COMPONENT(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH)
-STRING(REGEX REPLACE
- "^.*tclsh([0-9]\\.*[0-9]).*$" "\\1" TCL_TCLSH_VERSION "${TCL_TCLSH}")
+IF(MODTCL_VERSION)
+ SET(TCL_TCLSH_VERSION "${MODTCL_VERSION}")
+ELSE(MODTCL_VERSION)
+ STRING(REGEX REPLACE
+ "^.*tclsh([0-9]\\.*[0-9]).*$" "\\1" TCL_TCLSH_VERSION "${TCL_TCLSH}")
+ENDIF(MODTCL_VERSION)
GET_FILENAME_COMPONENT(TK_WISH_PATH "${TK_WISH}" PATH)
GET_FILENAME_COMPONENT(TK_WISH_PATH_PARENT "${TK_WISH_PATH}" PATH)
-STRING(REGEX REPLACE
- "^.*wish([0-9]\\.*[0-9]).*$" "\\1" TK_WISH_VERSION "${TK_WISH}")
+IF(MODTK_VERSION)
+ SET(TK_WISH_VERSION "${MODTK_VERSION}")
+ELSE(MODTK_VERSION)
+ STRING(REGEX REPLACE
+ "^.*wish([0-9]\\.*[0-9]).*$" "\\1" TK_WISH_VERSION "${TK_WISH}")
+ENDIF(MODTK_VERSION)
GET_FILENAME_COMPONENT(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
GET_FILENAME_COMPONENT(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
@@ -71,17 +88,37 @@ GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LI
STRING(REGEX REPLACE
"^.*tk([0-9]\\.*[0-9]).*$" "\\1" TK_LIBRARY_VERSION "${TK_LIBRARY}")
-SET(TCLTK_POSSIBLE_LIB_PATHS
- "${TCL_INCLUDE_PATH_PARENT}/lib"
- "${TK_INCLUDE_PATH_PARENT}/lib"
- "${TCL_LIBRARY_PATH}"
- "${TK_LIBRARY_PATH}"
- "${TCL_TCLSH_PATH_PARENT}/lib"
- "${TK_WISH_PATH_PARENT}/lib"
- /usr/lib
- /usr/local/lib
- )
+IF(MODTCL_LIBDIR)
+ SET(TCLTK_OPENBSD_LIB_PATHS
+ "${TCLTK_OPENBSD_LIB_PATHS}"
+ "${MODTCL_LIBDIR}"
+ )
+ENDIF(MODTCL_LIBDIR)
+IF(MODTK_LIBDIR)
+ SET(TCLTK_OPENBSD_LIB_PATHS
+ "${TCLTK_OPENBSD_LIB_PATHS}"
+ "${MODTK_LIBDIR}"
+ )
+ENDIF(MODTK_LIBDIR)
+
+IF(TCLTK_OPENBSD_LIB_PATHS)
+ SET(TCLTK_POSSIBLE_LIB_PATHS
+ "${TCLTK_OPENBSD_LIB_PATHS}"
+ )
+ELSE(TCLTK_OPENBSD_LIB_PATHS)
+ SET(TCLTK_POSSIBLE_LIB_PATHS
+ "${TCL_INCLUDE_PATH_PARENT}/lib"
+ "${TK_INCLUDE_PATH_PARENT}/lib"
+ "${TCL_LIBRARY_PATH}"
+ "${TK_LIBRARY_PATH}"
+ "${TCL_TCLSH_PATH_PARENT}/lib"
+ "${TK_WISH_PATH_PARENT}/lib"
+ /usr/lib
+ /usr/local/lib
+ )
+ENDIF(TCLTK_OPENBSD_LIB_PATHS)
+
IF(WIN32)
GET_FILENAME_COMPONENT(
ActiveTcl_CurrentVersion
@@ -101,31 +138,47 @@ IF(WIN32)
)
ENDIF(WIN32)
-FIND_LIBRARY(TCL_LIBRARY
- NAMES
- tcl
- tcl${TK_LIBRARY_VERSION} tcl${TCL_TCLSH_VERSION} tcl${TK_WISH_VERSION}
- tcl86 tcl8.6
- tcl85 tcl8.5
- tcl84 tcl8.4
- tcl83 tcl8.3
- tcl82 tcl8.2
- tcl80 tcl8.0
- PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
- )
+IF(MODTCL_LIB)
+ FIND_LIBRARY(TCL_LIBRARY
+ NAMES
+ ${MODTCL_LIB}
+ PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
+ )
+ELSE(MODTCL_LIB)
+ FIND_LIBRARY(TCL_LIBRARY
+ NAMES
+ tcl
+ tcl${TK_LIBRARY_VERSION} tcl${TCL_TCLSH_VERSION} tcl${TK_WISH_VERSION}
+ tcl86 tcl8.6
+ tcl85 tcl8.5
+ tcl84 tcl8.4
+ tcl83 tcl8.3
+ tcl82 tcl8.2
+ tcl80 tcl8.0
+ PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
+ )
+ENDIF(MODTCL_LIB)
-FIND_LIBRARY(TK_LIBRARY
- NAMES
- tk
- tk${TCL_LIBRARY_VERSION} tk${TCL_TCLSH_VERSION} tk${TK_WISH_VERSION}
- tk86 tk8.6
- tk85 tk8.5
- tk84 tk8.4
- tk83 tk8.3
- tk82 tk8.2
- tk80 tk8.0
- PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
- )
+IF(MODTK_LIB)
+ FIND_LIBRARY(TK_LIBRARY
+ NAMES
+ ${MODTK_LIB}
+ PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
+ )
+ELSE(MODTK_LIB)
+ FIND_LIBRARY(TK_LIBRARY
+ NAMES
+ tk
+ tk${TCL_LIBRARY_VERSION} tk${TCL_TCLSH_VERSION} tk${TK_WISH_VERSION}
+ tk86 tk8.6
+ tk85 tk8.5
+ tk84 tk8.4
+ tk83 tk8.3
+ tk82 tk8.2
+ tk80 tk8.0
+ PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
+ )
+ENDIF(MODTK_LIB)
CMAKE_FIND_FRAMEWORKS(Tcl)
CMAKE_FIND_FRAMEWORKS(Tk)
@@ -149,26 +202,46 @@ IF(Tk_FRAMEWORKS)
ENDIF(NOT TK_INCLUDE_PATH)
ENDIF(Tk_FRAMEWORKS)
-SET(TCLTK_POSSIBLE_INCLUDE_PATHS
- "${TCL_LIBRARY_PATH_PARENT}/include"
- "${TK_LIBRARY_PATH_PARENT}/include"
- "${TCL_INCLUDE_PATH}"
- "${TK_INCLUDE_PATH}"
- ${TCL_FRAMEWORK_INCLUDES}
- ${TK_FRAMEWORK_INCLUDES}
- "${TCL_TCLSH_PATH_PARENT}/include"
- "${TK_WISH_PATH_PARENT}/include"
- /usr/include
- /usr/local/include
- /usr/include/tcl${TK_LIBRARY_VERSION}
- /usr/include/tcl${TCL_LIBRARY_VERSION}
- /usr/include/tcl8.6
- /usr/include/tcl8.5
- /usr/include/tcl8.4
- /usr/include/tcl8.3
- /usr/include/tcl8.2
- /usr/include/tcl8.0
- )
+IF(MODTCL_INCDIR)
+ SET(TCLTK_OPENBSD_INCLUDE_PATHS
+ "${TCLTK_OPENBSD_INCLUDE_PATHS}"
+ "${MODTCL_INCDIR}"
+ )
+ENDIF(MODTCL_INCDIR)
+
+IF(MODTK_INCDIR)
+ SET(TCLTK_OPENBSD_INCLUDE_PATHS
+ "${TCLTK_OPENBSD_INCLUDE_PATHS}"
+ "${MODTK_INCDIR}"
+ )
+ENDIF(MODTK_INCDIR)
+
+IF(TCLTK_OPENBSD_INCLUDE_PATHS)
+ SET(TCLTK_POSSIBLE_INCLUDE_PATHS
+ "${TCLTK_OPENBSD_INCLUDE_PATHS}"
+ )
+ELSE(TCLTK_OPENBSD_INCLUDE_PATHS)
+ SET(TCLTK_POSSIBLE_INCLUDE_PATHS
+ "${TCL_LIBRARY_PATH_PARENT}/include"
+ "${TK_LIBRARY_PATH_PARENT}/include"
+ "${TCL_INCLUDE_PATH}"
+ "${TK_INCLUDE_PATH}"
+ ${TCL_FRAMEWORK_INCLUDES}
+ ${TK_FRAMEWORK_INCLUDES}
+ "${TCL_TCLSH_PATH_PARENT}/include"
+ "${TK_WISH_PATH_PARENT}/include"
+ /usr/include
+ /usr/local/include
+ /usr/include/tcl${TK_LIBRARY_VERSION}
+ /usr/include/tcl${TCL_LIBRARY_VERSION}
+ /usr/include/tcl8.6
+ /usr/include/tcl8.5
+ /usr/include/tcl8.4
+ /usr/include/tcl8.3
+ /usr/include/tcl8.2
+ /usr/include/tcl8.0
+ )
+ENDIF(TCLTK_OPENBSD_INCLUDE_PATHS)
IF(WIN32)
SET(TCLTK_POSSIBLE_INCLUDE_PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS}

62
devel/cmake/patches/patch-Modules_FindTclStub_cmake Normal file
View File

@ -0,0 +1,62 @@
$OpenBSD: patch-Modules_FindTclStub_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/FindTclStub.cmake.orig Tue May 11 14:30:20 2010
+++ Modules/FindTclStub.cmake Tue May 11 14:38:47 2010
@@ -38,13 +38,21 @@ INCLUDE(FindTCL)
GET_FILENAME_COMPONENT(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH)
GET_FILENAME_COMPONENT(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH)
-STRING(REGEX REPLACE
- "^.*tclsh([0-9]\\.*[0-9]).*$" "\\1" TCL_TCLSH_VERSION "${TCL_TCLSH}")
+IF(MODTCL_VERSION)
+ SET(TCL_TCLSH_VERSION "${MODTCL_VERSION}")
+ELSE(MODTCL_VERSION)
+ STRING(REGEX REPLACE
+ "^.*tclsh([0-9]\\.*[0-9]).*$" "\\1" TCL_TCLSH_VERSION "${TCL_TCLSH}")
+ENDIF(MODTCL_VERSION)
GET_FILENAME_COMPONENT(TK_WISH_PATH "${TK_WISH}" PATH)
GET_FILENAME_COMPONENT(TK_WISH_PATH_PARENT "${TK_WISH_PATH}" PATH)
-STRING(REGEX REPLACE
- "^.*wish([0-9]\\.*[0-9]).*$" "\\1" TK_WISH_VERSION "${TK_WISH}")
+IF(MODTK_VERSION)
+ SET(TK_WISH_VERSION "${MODTK_VERSION}")
+ELSE(MODTK_VERSION)
+ STRING(REGEX REPLACE
+ "^.*wish([0-9]\\.*[0-9]).*$" "\\1" TK_WISH_VERSION "${TK_WISH}")
+ENDIF(MODTK_VERSION)
GET_FILENAME_COMPONENT(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
GET_FILENAME_COMPONENT(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
@@ -59,16 +67,22 @@ GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LI
STRING(REGEX REPLACE
"^.*tk([0-9]\\.*[0-9]).*$" "\\1" TK_LIBRARY_VERSION "${TK_LIBRARY}")
-SET(TCLTK_POSSIBLE_LIB_PATHS
- "${TCL_INCLUDE_PATH_PARENT}/lib"
- "${TK_INCLUDE_PATH_PARENT}/lib"
- "${TCL_LIBRARY_PATH}"
- "${TK_LIBRARY_PATH}"
- "${TCL_TCLSH_PATH_PARENT}/lib"
- "${TK_WISH_PATH_PARENT}/lib"
- /usr/lib
- /usr/local/lib
-)
+IF(TCLTK_OPENBSD_LIB_PATHS)
+ SET(TCLTK_POSSIBLE_LIB_PATHS
+ "${TCLTK_OPENBSD_LIB_PATHS}"
+ )
+ELSE(TCLTK_OPENBSD_LIB_PATHS)
+ SET(TCLTK_POSSIBLE_LIB_PATHS
+ "${TCL_INCLUDE_PATH_PARENT}/lib"
+ "${TK_INCLUDE_PATH_PARENT}/lib"
+ "${TCL_LIBRARY_PATH}"
+ "${TK_LIBRARY_PATH}"
+ "${TCL_TCLSH_PATH_PARENT}/lib"
+ "${TK_WISH_PATH_PARENT}/lib"
+ /usr/lib
+ /usr/local/lib
+ )
+ENDIF(TCLTK_OPENBSD_LIB_PATHS)
IF(WIN32)
GET_FILENAME_COMPONENT(

60
devel/cmake/patches/patch-Modules_FindTclsh_cmake Normal file
View File

@ -0,0 +1,60 @@
$OpenBSD: patch-Modules_FindTclsh_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/FindTclsh.cmake.orig Tue Apr 6 16:45:31 2010
+++ Modules/FindTclsh.cmake Tue May 11 13:55:06 2010
@@ -20,14 +20,21 @@
# (To distributed this file outside of CMake, substitute the full
# License text for the above reference.)
+SET(MODTCL_VERSION $ENV{MODTCL_VERSION})
+SET(MODTK_VERSION $ENV{MODTK_VERSION})
+
IF(CYGWIN)
FIND_PROGRAM(TCL_TCLSH NAMES cygtclsh83 cygtclsh80)
ENDIF(CYGWIN)
GET_FILENAME_COMPONENT(TK_WISH_PATH "${TK_WISH}" PATH)
GET_FILENAME_COMPONENT(TK_WISH_PATH_PARENT "${TK_WISH_PATH}" PATH)
-STRING(REGEX REPLACE
- "^.*wish([0-9]\\.*[0-9]).*$" "\\1" TK_WISH_VERSION "${TK_WISH}")
+IF(MODTK_VERSION)
+ SET(TK_WISH_VERSION "${MODTK_VERSION}")
+ELSE(MODTK_VERSION)
+ STRING(REGEX REPLACE
+ "^.*wish([0-9]\\.*[0-9]).*$" "\\1" TK_WISH_VERSION "${TK_WISH}")
+ENDIF(MODTK_VERSION)
GET_FILENAME_COMPONENT(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
GET_FILENAME_COMPONENT(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
@@ -66,16 +73,22 @@ IF(WIN32)
)
ENDIF(WIN32)
-SET(TCL_TCLSH_NAMES
- tclsh
- tclsh${TCL_LIBRARY_VERSION} tclsh${TK_LIBRARY_VERSION} tclsh${TK_WISH_VERSION}
- tclsh86 tclsh8.6
- tclsh85 tclsh8.5
- tclsh84 tclsh8.4
- tclsh83 tclsh8.3
- tclsh82 tclsh8.2
- tclsh80 tclsh8.0
- )
+IF(MODTCL_VERSION)
+ SET(TCL_TCLSH_NAMES
+ tclsh${MODTCL_VERSION}
+ )
+ELSE(MODTCL_VERSION)
+ SET(TCL_TCLSH_NAMES
+ tclsh
+ tclsh${TCL_LIBRARY_VERSION} tclsh${TK_LIBRARY_VERSION} tclsh${TK_WISH_VERSION}
+ tclsh86 tclsh8.6
+ tclsh85 tclsh8.5
+ tclsh84 tclsh8.4
+ tclsh83 tclsh8.3
+ tclsh82 tclsh8.2
+ tclsh80 tclsh8.0
+ )
+ENDIF(MODTCL_VERSION)
FIND_PROGRAM(TCL_TCLSH
NAMES ${TCL_TCLSH_NAMES}

45
devel/cmake/patches/patch-Modules_FindThreads_cmake
View File

@ -1,33 +1,39 @@
$OpenBSD: patch-Modules_FindThreads_cmake,v 1.1 2009/09/10 13:54:47 landry Exp $
don't test for -lpthread, so it fallbacks to -pthread
--- Modules/FindThreads.cmake.orig Mon Jan 21 19:59:51 2008
+++ Modules/FindThreads.cmake Fri Sep 4 10:30:59 2009
@@ -24,60 +24,9 @@ ELSE(CMAKE_HAVE_SPROC_H)
IF(CMAKE_HAVE_PTHREAD_H)
$OpenBSD: patch-Modules_FindThreads_cmake,v 1.2 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/FindThreads.cmake.orig Tue Apr 6 16:45:31 2010
+++ Modules/FindThreads.cmake Tue Apr 20 10:29:32 2010
@@ -40,72 +40,9 @@ ELSE()
# We have pthread.h
# Let's check for the library now.
#
- SET(CMAKE_HAVE_THREADS_LIBRARY)
- IF(NOT THREADS_HAVE_PTHREAD_ARG)
-
- # Do we have -lpthreads
- CHECK_LIBRARY_EXISTS(pthreads pthread_create "" CMAKE_HAVE_PTHREADS_CREATE)
- IF(CMAKE_HAVE_PTHREADS_CREATE)
- SET(CMAKE_THREAD_LIBS_INIT "-lpthreads")
- SET(CMAKE_HAVE_THREADS_LIBRARY 1)
- ENDIF(CMAKE_HAVE_PTHREADS_CREATE)
- SET(Threads_FOUND TRUE)
- ENDIF()
-
- # Ok, how about -lpthread
- CHECK_LIBRARY_EXISTS(pthread pthread_create "" CMAKE_HAVE_PTHREAD_CREATE)
- IF(CMAKE_HAVE_PTHREAD_CREATE)
- SET(CMAKE_THREAD_LIBS_INIT "-lpthread")
- SET(Threads_FOUND TRUE)
- SET(CMAKE_HAVE_THREADS_LIBRARY 1)
- ENDIF(CMAKE_HAVE_PTHREAD_CREATE)
- ENDIF()
-
- IF(CMAKE_SYSTEM MATCHES "SunOS.*")
- # On sun also check for -lthread
- CHECK_LIBRARY_EXISTS(thread thr_create "" CMAKE_HAVE_THR_CREATE)
- IF(CMAKE_HAVE_THR_CREATE)
- SET(CMAKE_THREAD_LIBS_INIT "-lthread")
- SET(CMAKE_HAVE_THREADS_LIBRARY 1)
- ENDIF(CMAKE_HAVE_THR_CREATE)
- SET(Threads_FOUND TRUE)
- ENDIF()
- ENDIF(CMAKE_SYSTEM MATCHES "SunOS.*")
-
- ENDIF(NOT THREADS_HAVE_PTHREAD_ARG)
-
- IF(NOT CMAKE_HAVE_THREADS_LIBRARY)
@ -38,31 +44,36 @@ don't test for -lpthread, so it fallbacks to -pthread
- ${CMAKE_BINARY_DIR}
- ${CMAKE_ROOT}/Modules/CheckForPthreads.c
- CMAKE_FLAGS -DLINK_LIBRARIES:STRING=-pthread
- OUTPUT_VARIABLE OUTPUT)
- COMPILE_OUTPUT_VARIABLE OUTPUT)
-
- IF(THREADS_HAVE_PTHREAD_ARG)
- IF(THREADS_PTHREAD_ARG MATCHES "^2$")
- SET(Threads_FOUND TRUE)
- MESSAGE(STATUS "Check if compiler accepts -pthread - yes")
- ELSE(THREADS_PTHREAD_ARG MATCHES "^2$")
- ELSE()
- MESSAGE(STATUS "Check if compiler accepts -pthread - no")
- FILE(APPEND
- ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
- "Determining if compiler accepts -pthread returned ${THREADS_PTHREAD_ARG} instead of 2. The compiler had the following output:\n${OUTPUT}\n\n")
- ENDIF(THREADS_PTHREAD_ARG MATCHES "^2$")
- ELSE(THREADS_HAVE_PTHREAD_ARG)
- ENDIF()
- ELSE()
- MESSAGE(STATUS "Check if compiler accepts -pthread - no")
- FILE(APPEND
- ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
- "Determining if compiler accepts -pthread failed with the following output:\n${OUTPUT}\n\n")
- ENDIF(THREADS_HAVE_PTHREAD_ARG)
- ENDIF()
-
- ENDIF("THREADS_HAVE_PTHREAD_ARG" MATCHES "^THREADS_HAVE_PTHREAD_ARG")
-
- IF(THREADS_HAVE_PTHREAD_ARG)
- SET(Threads_FOUND TRUE)
- SET(CMAKE_THREAD_LIBS_INIT "-pthread")
- ELSE(THREADS_HAVE_PTHREAD_ARG)
- ENDIF(THREADS_HAVE_PTHREAD_ARG)
- ENDIF()
-
- ENDIF(NOT CMAKE_HAVE_THREADS_LIBRARY)
+ SET(CMAKE_HAVE_PTHREAD_CREATE 1)
+ SET(CMAKE_HAVE_THREADS_LIBRARY 1)
+ SET(CMAKE_THREAD_LIBS_INIT "-pthread")
ENDIF(CMAKE_HAVE_PTHREAD_H)
ENDIF(CMAKE_HAVE_SPROC_H)
ENDIF()

60
devel/cmake/patches/patch-Modules_FindWish_cmake Normal file
View File

@ -0,0 +1,60 @@
$OpenBSD: patch-Modules_FindWish_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/FindWish.cmake.orig Tue May 11 13:52:40 2010
+++ Modules/FindWish.cmake Tue May 11 14:06:27 2010
@@ -20,14 +20,21 @@
# (To distributed this file outside of CMake, substitute the full
# License text for the above reference.)
+SET(MODTCL_VERSION $ENV{MODTCL_VERSION})
+SET(MODTK_VERSION $ENV{MODTK_VERSION})
+
IF(UNIX)
FIND_PROGRAM(TK_WISH cygwish80 )
ENDIF(UNIX)
GET_FILENAME_COMPONENT(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH)
GET_FILENAME_COMPONENT(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH)
-STRING(REGEX REPLACE
- "^.*tclsh([0-9]\\.*[0-9]).*$" "\\1" TCL_TCLSH_VERSION "${TCL_TCLSH}")
+IF(MODTCL_VERSION)
+ SET(TCL_TCLSH_VERSION "${MODTCL_VERSION}")
+ELSE(MODTCL_VERSION)
+ STRING(REGEX REPLACE
+ "^.*tclsh([0-9]\\.*[0-9]).*$" "\\1" TCL_TCLSH_VERSION "${TCL_TCLSH}")
+ENDIF(MODTCL_VERSION)
GET_FILENAME_COMPONENT(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
GET_FILENAME_COMPONENT(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
@@ -66,16 +73,22 @@ IF(WIN32)
)
ENDIF(WIN32)
-SET(TK_WISH_NAMES
- wish
- wish${TCL_LIBRARY_VERSION} wish${TK_LIBRARY_VERSION} wish${TCL_TCLSH_VERSION}
- wish86 wish8.6
- wish85 wish8.5
- wish84 wish8.4
- wish83 wish8.3
- wish82 wish8.2
- wish80 wish8.0
- )
+IF(MODTK_VERSION)
+ SET(TK_WISH_NAMES
+ wish${MODTK_VERSION}
+ )
+ELSE(MODTK_VERSION)
+ SET(TK_WISH_NAMES
+ wish
+ wish${TCL_LIBRARY_VERSION} wish${TK_LIBRARY_VERSION} wish${TCL_TCLSH_VERSION}
+ wish86 wish8.6
+ wish85 wish8.5
+ wish84 wish8.4
+ wish83 wish8.3
+ wish82 wish8.2
+ wish80 wish8.0
+ )
+ENDIF(MODTK_VERSION)
FIND_PROGRAM(TK_WISH
NAMES ${TK_WISH_NAMES}

48
devel/cmake/patches/patch-Modules_FindX11_cmake Normal file
View File

@ -0,0 +1,48 @@
$OpenBSD: patch-Modules_FindX11_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/FindX11.cmake.orig Tue Apr 6 16:45:32 2010
+++ Modules/FindX11.cmake Wed May 26 08:20:48 2010
@@ -22,6 +22,7 @@
# X11_xf86vmode_INCLUDE_PATH, X11_xf86vmode_FOUND
# X11_Xfixes_INCLUDE_PATH, X11_Xfixes_LIB, X11_Xfixes_FOUND
# X11_Xft_INCLUDE_PATH, X11_Xft_LIB, X11_Xft_FOUND
+# X11_Xi_INCLUDE_PATH, X11_Xi_LIB, X11_Xi_FOUND
# X11_Xinerama_INCLUDE_PATH, X11_Xinerama_LIB, X11_Xinerama_FOUND
# X11_Xinput_INCLUDE_PATH, X11_Xinput_LIB, X11_Xinput_FOUND
# X11_Xkb_INCLUDE_PATH, X11_Xkb_FOUND
@@ -91,6 +92,7 @@ IF (UNIX)
FIND_PATH(X11_xf86vmode_INCLUDE_PATH X11/extensions/xf86vmode.h ${X11_INC_SEARCH_PATH})
FIND_PATH(X11_Xfixes_INCLUDE_PATH X11/extensions/Xfixes.h ${X11_INC_SEARCH_PATH})
FIND_PATH(X11_Xft_INCLUDE_PATH X11/Xft/Xft.h ${X11_INC_SEARCH_PATH})
+ FIND_PATH(X11_Xi_INCLUDE_PATH X11/extensions/XInput.h ${X11_INC_SEARCH_PATH})
FIND_PATH(X11_Xinerama_INCLUDE_PATH X11/extensions/Xinerama.h ${X11_INC_SEARCH_PATH})
FIND_PATH(X11_Xinput_INCLUDE_PATH X11/extensions/XInput.h ${X11_INC_SEARCH_PATH})
FIND_PATH(X11_Xkb_INCLUDE_PATH X11/extensions/XKB.h ${X11_INC_SEARCH_PATH})
@@ -120,6 +122,7 @@ IF (UNIX)
FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH})
FIND_LIBRARY(X11_Xfixes_LIB Xfixes ${X11_LIB_SEARCH_PATH})
FIND_LIBRARY(X11_Xft_LIB Xft ${X11_LIB_SEARCH_PATH})
+ FIND_LIBRARY(X11_Xi_LIB Xi ${X11_LIB_SEARCH_PATH})
FIND_LIBRARY(X11_Xinerama_LIB Xinerama ${X11_LIB_SEARCH_PATH})
FIND_LIBRARY(X11_Xinput_LIB Xi ${X11_LIB_SEARCH_PATH})
FIND_LIBRARY(X11_Xpm_LIB Xpm ${X11_LIB_SEARCH_PATH})
@@ -219,6 +222,11 @@ IF (UNIX)
SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_XTest_INCLUDE_PATH})
ENDIF (X11_XTest_INCLUDE_PATH AND X11_XTest_LIB)
+ IF (X11_Xi_INCLUDE_PATH AND X11_Xi_LIB)
+ SET(X11_Xi_FOUND TRUE)
+ SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xi_INCLUDE_PATH})
+ ENDIF (X11_Xi_INCLUDE_PATH AND X11_Xi_LIB)
+
IF (X11_Xinerama_INCLUDE_PATH AND X11_Xinerama_LIB)
SET(X11_Xinerama_FOUND TRUE)
SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xinerama_INCLUDE_PATH})
@@ -396,6 +404,8 @@ IF (UNIX)
X11_Xxf86misc_LIB
X11_xf86misc_INCLUDE_PATH
X11_xf86vmode_INCLUDE_PATH
+ X11_Xi_LIB
+ X11_Xi_INCLUDE_PATH
X11_Xinerama_LIB
X11_Xinerama_INCLUDE_PATH
X11_XTest_LIB

10
devel/cmake/patches/patch-Modules_FindXMLRPC_cmake
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-Modules_FindXMLRPC_cmake,v 1.1 2006/12/18 16:04:31 espie Exp $
--- Modules/FindXMLRPC.cmake.orig Sun Dec 17 22:12:54 2006
+++ Modules/FindXMLRPC.cmake Sun Dec 17 22:13:19 2006
@@ -96,6 +96,8 @@ IF(XMLRPC_FOUND)
$OpenBSD: patch-Modules_FindXMLRPC_cmake,v 1.2 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/FindXMLRPC.cmake.orig Tue Apr 20 10:32:19 2010
+++ Modules/FindXMLRPC.cmake Tue Apr 20 10:37:39 2010
@@ -109,6 +109,8 @@ IF(XMLRPC_FOUND)
ENDIF("${flag}" MATCHES "^-L")
ENDFOREACH(flag)
+ # Add system directory, stupid !
+ SET(XMLRPC_LIBRARY_DIRS ${XMLRPC_LIBRARY_DIRS} "/usr/lib")
+
# Search for each library needed using the directories given.
FOREACH(name ${XMLRPC_LIBRARY_NAMES})
# Look for this library.

65
devel/cmake/patches/patch-Modules_FindZLIB_cmake Normal file
View File

@ -0,0 +1,65 @@
$OpenBSD: patch-Modules_FindZLIB_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/FindZLIB.cmake.orig Tue Apr 6 16:45:32 2010
+++ Modules/FindZLIB.cmake Mon May 3 11:51:48 2010
@@ -1,9 +1,14 @@
# - Find zlib
# Find the native ZLIB includes and library
#
-# ZLIB_INCLUDE_DIRS - where to find zlib.h, etc.
-# ZLIB_LIBRARIES - List of libraries when using zlib.
-# ZLIB_FOUND - True if zlib found.
+# ZLIB_INCLUDE_DIRS - where to find zlib.h, etc.
+# ZLIB_LIBRARIES - List of libraries when using zlib.
+# ZLIB_FOUND - True if zlib found.
+#
+# ZLIB_VERSION_STRING - The version of zlib found (x.y.z)
+# ZLIB_MAJOR_VERSION - the major version of zlib
+# ZLIB_MINOR_VERSION - The minor version of zlib
+# ZLIB_PATCH_VERSION - The patch version of zlib
#=============================================================================
# Copyright 2001-2009 Kitware, Inc.
@@ -18,23 +23,31 @@
# (To distributed this file outside of CMake, substitute the full
# License text for the above reference.)
-IF (ZLIB_INCLUDE_DIR)
- # Already in cache, be silent
- SET(ZLIB_FIND_QUIETLY TRUE)
-ENDIF (ZLIB_INCLUDE_DIR)
+FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]/include"
+)
-FIND_PATH(ZLIB_INCLUDE_DIR zlib.h)
-
SET(ZLIB_NAMES z zlib zdll)
-FIND_LIBRARY(ZLIB_LIBRARY NAMES ${ZLIB_NAMES} )
-MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
+FIND_LIBRARY(ZLIB_LIBRARY
+ NAMES
+ ${ZLIB_NAMES}
+ PATHS
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]/lib"
+)
+MARK_AS_ADVANCED(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
-# Per-recommendation
-SET(ZLIB_INCLUDE_DIRS "${ZLIB_INCLUDE_DIR}")
-SET(ZLIB_LIBRARIES "${ZLIB_LIBRARY}")
+IF (ZLIB_INCLUDE_DIR)
+ FILE(READ "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_H)
+ STRING(REGEX REPLACE ".*#define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+)\".*" "\\1.\\2.\\3" ZLIB_VERSION_STRING "${ZLIB_H}")
+ENDIF()
# handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB DEFAULT_MSG ZLIB_LIBRARIES ZLIB_INCLUDE_DIRS)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB DEFAULT_MSG ZLIB_INCLUDE_DIR ZLIB_LIBRARY)
+
+IF (ZLIB_FOUND)
+ SET(ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR})
+ SET(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
+ENDIF()

16
devel/cmake/patches/patch-Modules_FindwxWindows_cmake Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-Modules_FindwxWindows_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/FindwxWindows.cmake.orig Tue Apr 6 16:45:32 2010
+++ Modules/FindwxWindows.cmake Fri Apr 23 12:55:11 2010
@@ -602,9 +602,12 @@ ELSE(WIN32_STYLE_FIND)
FIND_PROGRAM(CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE wx-config
$ENV{WXWIN}
$ENV{WXWIN}/bin
+ ${LOCALBASE}/bin
../wx/bin
../../wx/bin )
+ FIND_PATH(WXWINDOWS_INCLUDE_DIR wx/wx.h
+ "${LOCALBASE}/include" )
# check wether wx-config was found:
IF(CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE)

51
devel/cmake/patches/patch-Modules_MacroPushRequiredVars_cmake
View File

@ -1,51 +0,0 @@
$OpenBSD: patch-Modules_MacroPushRequiredVars_cmake,v 1.1 2008/02/04 22:31:20 espie Exp $
--- Modules/MacroPushRequiredVars.cmake.orig Mon Feb 4 22:18:12 2008
+++ Modules/MacroPushRequiredVars.cmake Mon Feb 4 22:18:07 2008
@@ -0,0 +1,47 @@
+# this module defines two macros:
+# MACRO_PUSH_REQUIRED_VARS()
+# and
+# MACRO_POP_REQUIRED_VARS()
+# use these if you call cmake macros which use
+# any of the CMAKE_REQUIRED_XXX variables
+#
+# Usage:
+# MACRO_PUSH_REQUIRED_VARS()
+# SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -DSOME_MORE_DEF)
+# CHECK_FUNCTION_EXISTS(...)
+# MACRO_POP_REQUIRED_VARS()
+
+# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+MACRO(MACRO_PUSH_REQUIRED_VARS)
+
+ IF(NOT DEFINED _PUSH_REQUIRED_VARS_COUNTER)
+ SET(_PUSH_REQUIRED_VARS_COUNTER 0)
+ ENDIF(NOT DEFINED _PUSH_REQUIRED_VARS_COUNTER)
+
+ MATH(EXPR _PUSH_REQUIRED_VARS_COUNTER "${_PUSH_REQUIRED_VARS_COUNTER}+1")
+
+ SET(_CMAKE_REQUIRED_INCLUDES_SAVE_${_PUSH_REQUIRED_VARS_COUNTER} ${CMAKE_REQUIRED_INCLUDES})
+ SET(_CMAKE_REQUIRED_DEFINITIONS_SAVE_${_PUSH_REQUIRED_VARS_COUNTER} ${CMAKE_REQUIRED_DEFINITIONS})
+ SET(_CMAKE_REQUIRED_LIBRARIES_SAVE_${_PUSH_REQUIRED_VARS_COUNTER} ${CMAKE_REQUIRED_LIBRARIES})
+ SET(_CMAKE_REQUIRED_FLAGS_SAVE_${_PUSH_REQUIRED_VARS_COUNTER} ${CMAKE_REQUIRED_FLAGS})
+ENDMACRO(MACRO_PUSH_REQUIRED_VARS)
+
+MACRO(MACRO_POP_REQUIRED_VARS)
+
+# don't pop more than we pushed
+ IF("${_PUSH_REQUIRED_VARS_COUNTER}" GREATER "0")
+
+ SET(CMAKE_REQUIRED_INCLUDES ${_CMAKE_REQUIRED_INCLUDES_SAVE_${_PUSH_REQUIRED_VARS_COUNTER}})
+ SET(CMAKE_REQUIRED_DEFINITIONS ${_CMAKE_REQUIRED_DEFINITIONS_SAVE_${_PUSH_REQUIRED_VARS_COUNTER}})
+ SET(CMAKE_REQUIRED_LIBRARIES ${_CMAKE_REQUIRED_LIBRARIES_SAVE_${_PUSH_REQUIRED_VARS_COUNTER}})
+ SET(CMAKE_REQUIRED_FLAGS ${_CMAKE_REQUIRED_FLAGS_SAVE_${_PUSH_REQUIRED_VARS_COUNTER}})
+
+ MATH(EXPR _PUSH_REQUIRED_VARS_COUNTER "${_PUSH_REQUIRED_VARS_COUNTER}-1")
+ ENDIF("${_PUSH_REQUIRED_VARS_COUNTER}" GREATER "0")
+
+ENDMACRO(MACRO_POP_REQUIRED_VARS)
+

13
devel/cmake/patches/patch-Modules_Platform_Generic_cmake Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-Modules_Platform_Generic_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/Platform/Generic.cmake.orig Tue Apr 6 16:45:32 2010
+++ Modules/Platform/Generic.cmake Mon May 3 11:51:48 2010
@@ -9,3 +9,9 @@
# (embedded) targets without operating system usually don't support shared libraries
SET_PROPERTY(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE)
+
+# To help the find_xxx() commands, set at least the following so CMAKE_FIND_ROOT_PATH
+# works at least for some simple cases:
+SET(CMAKE_SYSTEM_INCLUDE_PATH /include )
+SET(CMAKE_SYSTEM_LIBRARY_PATH /lib )
+SET(CMAKE_SYSTEM_PROGRAM_PATH /bin )

11
devel/cmake/patches/patch-Modules_Platform_NetBSD_cmake Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-Modules_Platform_NetBSD_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/Platform/NetBSD.cmake.orig Tue May 11 13:30:52 2010
+++ Modules/Platform/NetBSD.cmake Tue May 11 13:31:12 2010
@@ -7,6 +7,7 @@ IF(EXISTS /usr/include/dlfcn.h)
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") # : or empty
SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
+ SET(CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG "-Wl,-soname,")
SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
ENDIF(EXISTS /usr/include/dlfcn.h)

59
devel/cmake/patches/patch-Modules_Platform_OpenBSD_cmake
View File

@ -1,33 +1,20 @@
$OpenBSD: patch-Modules_Platform_OpenBSD_cmake,v 1.2 2010/04/22 16:10:11 dcoppa Exp $
--- Modules/Platform/OpenBSD.cmake.orig Mon Jan 21 19:59:51 2008
+++ Modules/Platform/OpenBSD.cmake Fri Apr 16 10:33:28 2010
@@ -1,2 +1,38 @@
-SET(CMAKE_DL_LIBS "")
-INCLUDE(Platform/UnixPaths)
+IF(EXISTS /usr/include/dlfcn.h)
+ SET(CMAKE_DL_LIBS "")
+ SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") # -pic
+ SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") # -shared
+ SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") # +s, flag for exe link to use shared lib
+ SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") # -rpath
+ SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") # : or empty
+# XXX we set these so that they will be detected
+ SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
+ SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,")
+ SET(CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG "-Wl,-soname,")
+ENDIF(EXISTS /usr/include/dlfcn.h)
+
$OpenBSD: patch-Modules_Platform_OpenBSD_cmake,v 1.3 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/Platform/OpenBSD.cmake.orig Tue Apr 6 16:45:32 2010
+++ Modules/Platform/OpenBSD.cmake Tue May 11 13:33:12 2010
@@ -1,2 +1,37 @@
INCLUDE(Platform/NetBSD)
+
+IF($ENV{LOCALBASE})
+SET(OPENBSD_LOCALBASE $ENV{LOCALBASE})
+ SET(OPENBSD_LOCALBASE $ENV{LOCALBASE})
+ELSE($ENV{LOCALBASE})
+SET(OPENBSD_LOCALBASE /usr/local)
+ SET(OPENBSD_LOCALBASE /usr/local)
+ENDIF($ENV{LOCALBASE})
+
+IF($ENV{X11BASE})
+SET(OPENBSD_X11BASE $ENV{X11BASE})
+ SET(OPENBSD_X11BASE $ENV{X11BASE})
+ELSE($ENV{X11BASE})
+SET(OPENBSD_X11BASE /usr/X11R6)
+ SET(OPENBSD_X11BASE /usr/X11R6)
+ENDIF($ENV{X11BASE})
+SET(CMAKE_OPENBSD_SHARED_LIBS "TRUE")
+
+SET(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SYSTEM_INCLUDE_PATH} /usr/include
+ ${OPENBSD_LOCALBASE}/include ${OPENBSD_X11BASE}/include)
@ -35,10 +22,20 @@ $OpenBSD: patch-Modules_Platform_OpenBSD_cmake,v 1.2 2010/04/22 16:10:11 dcoppa
+ ${OPENBSD_LOCALBASE}/lib ${OPENBSD_X11BASE}/lib)
+SET(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH} /bin /usr/bin
+ ${OPENBSD_LOCALBASE}/bin /sbin /usr/sbin ${OPENBSD_LOCALBASE}/sbin)
+# somewhat klugy, but produces the correct names.
+SET(CMAKE_CXX_CREATE_SHARED_LIBRARY
+ "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+SET(CMAKE_C_CREATE_SHARED_LIBRARY
+ "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+SET(CMAKE_Fortran_CREATE_SHARED_LIBRARY
+ "<CMAKE_Fortran_COMPILER> <CMAKE_SHARED_LIBRARY_Fortran_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+
+# On OpenBSD, the compile time linker does not share it's configuration with
+# the runtime linker. This will extract the library search paths from the
+# system's ld.so.hints file which will allow CMake to set the appropriate
+# -rpath-link flags
+IF(NOT CMAKE_PLATFORM_RUNTIME_PATH)
+ EXECUTE_PROCESS(COMMAND /sbin/ldconfig -r
+ OUTPUT_VARIABLE LDCONFIG_HINTS
+ ERROR_QUIET)
+ STRING(REGEX REPLACE ".*search\\ directories:\\ ([^\n]*).*" "\\1"
+ LDCONFIG_HINTS "${LDCONFIG_HINTS}")
+ STRING(REGEX REPLACE ":" ";"
+ CMAKE_PLATFORM_RUNTIME_PATH
+ "${LDCONFIG_HINTS}")
+ENDIF()
+
SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_OPENBSD_VERSIONING 1)

25
devel/cmake/patches/patch-Modules_Platform_gcc_cmake
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-Modules_Platform_gcc_cmake,v 1.2 2007/08/25 08:35:20 espie Exp $
--- Modules/Platform/gcc.cmake.orig Mon Jul 16 23:12:30 2007
+++ Modules/Platform/gcc.cmake Sun Aug 12 16:02:01 2007
@@ -2,8 +2,8 @@ IF(CMAKE_COMPILER_IS_GNUCC)
SET (CMAKE_C_FLAGS_INIT "")
SET (CMAKE_C_FLAGS_DEBUG_INIT "-g")
SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
- SET (CMAKE_C_FLAGS_RELEASE_INIT "-O3 -DNDEBUG")
- SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")
+ SET (CMAKE_C_FLAGS_RELEASE_INIT "$ENV{CFLAGS} -DNDEBUG")
+ SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "$ENV{CFLAGS} -g")
SET (CMAKE_C_CREATE_PREPROCESSED_SOURCE "<CMAKE_C_COMPILER> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
SET (CMAKE_C_CREATE_ASSEMBLY_SOURCE "<CMAKE_C_COMPILER> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
IF(NOT APPLE)
@@ -15,8 +15,8 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
SET (CMAKE_CXX_FLAGS_INIT "")
SET (CMAKE_CXX_FLAGS_DEBUG_INIT "-g")
SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
- SET (CMAKE_CXX_FLAGS_RELEASE_INIT "-O3 -DNDEBUG")
- SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")
+ SET (CMAKE_CXX_FLAGS_RELEASE_INIT "$ENV{CXXFLAGS} -DNDEBUG")
+ SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "$ENV{CXXFLAGS} -g")
SET (CMAKE_CXX_CREATE_PREPROCESSED_SOURCE "<CMAKE_CXX_COMPILER> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
SET (CMAKE_CXX_CREATE_ASSEMBLY_SOURCE "<CMAKE_CXX_COMPILER> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
IF(NOT APPLE)

169
devel/cmake/patches/patch-Modules_Qt4ConfigDependentSettings_cmake Normal file
View File

@ -0,0 +1,169 @@
$OpenBSD: patch-Modules_Qt4ConfigDependentSettings_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/Qt4ConfigDependentSettings.cmake.orig Tue Apr 6 16:45:32 2010
+++ Modules/Qt4ConfigDependentSettings.cmake Tue May 11 09:19:48 2010
@@ -26,6 +26,9 @@
# if a user needs the dependencies, and they couldn't be found, they can set
# the variables themselves.
+INCLUDE(FindIconv)
+INCLUDE(FindLibIntl)
+
SET(QT_QTGUI_LIB_DEPENDENCIES "")
SET(QT_QTCORE_LIB_DEPENDENCIES "")
SET(QT_QTNETWORK_LIB_DEPENDENCIES "")
@@ -80,7 +83,24 @@ ELSE(Q_WS_MAC)
ENDIF(Q_WS_MAC)
SET (QT_QTOPENGL_LIB_DEPENDENCIES ${QT_QTOPENGL_LIB_DEPENDENCIES} ${QMAKE_LIBS_OPENGL})
+## iconv
+IF(ICONV_FOUND)
+ FIND_LIBRARY(QT_ICONV_LIBRARY NAMES iconv)
+ MARK_AS_ADVANCED(QT_ICONV_LIBRARY)
+ IF(QT_ICONV_LIBRARY)
+ SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_ICONV_LIBRARY})
+ ENDIF(QT_ICONV_LIBRARY)
+ENDIF(ICONV_FOUND)
+## libintl
+IF(LIBINTL_FOUND)
+ FIND_LIBRARY(QT_INTL_LIBRARY NAMES intl)
+ MARK_AS_ADVANCED(QT_INTL_LIBRARY)
+ IF(QT_INTL_LIBRARY)
+ SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_INTL_LIBRARY})
+ ENDIF(QT_INTL_LIBRARY)
+ENDIF(LIBINTL_FOUND)
+
## system png
IF(QT_QCONFIG MATCHES "system-png")
FIND_LIBRARY(QT_PNG_LIBRARY NAMES png)
@@ -93,80 +113,63 @@ ENDIF(QT_QCONFIG MATCHES "system-png")
# for X11, get X11 library directory
IF(Q_WS_X11)
- QT_QUERY_QMAKE(QMAKE_LIBDIR_X11 "QMAKE_LIBDIR_X11")
+ FIND_PACKAGE(X11)
ENDIF(Q_WS_X11)
## X11 SM
IF(QT_QCONFIG MATCHES "x11sm")
- # ask qmake where the x11 libs are
- FIND_LIBRARY(QT_X11_SM_LIBRARY NAMES SM PATHS ${QMAKE_LIBDIR_X11})
- FIND_LIBRARY(QT_X11_ICE_LIBRARY NAMES ICE PATHS ${QMAKE_LIBDIR_X11})
- MARK_AS_ADVANCED(QT_X11_SM_LIBRARY)
- MARK_AS_ADVANCED(QT_X11_ICE_LIBRARY)
- IF(QT_X11_SM_LIBRARY AND QT_X11_ICE_LIBRARY)
- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_X11_SM_LIBRARY} ${QT_X11_ICE_LIBRARY})
- ENDIF(QT_X11_SM_LIBRARY AND QT_X11_ICE_LIBRARY)
+ IF(X11_SM_LIB AND X11_ICE_LIB)
+ SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${X11_SM_LIB} ${X11_ICE_LIB})
+ ENDIF(X11_SM_LIB AND X11_ICE_LIB)
ENDIF(QT_QCONFIG MATCHES "x11sm")
## Xi
IF(QT_QCONFIG MATCHES "tablet")
- FIND_LIBRARY(QT_XI_LIBRARY NAMES Xi PATHS ${QMAKE_LIBDIR_X11})
- MARK_AS_ADVANCED(QT_XI_LIBRARY)
- IF(QT_XI_LIBRARY)
- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XI_LIBRARY})
- ENDIF(QT_XI_LIBRARY)
+ IF(X11_Xi_LIB)
+ SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${X11_Xi_LIB})
+ ENDIF(X11_Xi_LIB)
ENDIF(QT_QCONFIG MATCHES "tablet")
## Xrender
IF(QT_QCONFIG MATCHES "xrender")
- FIND_LIBRARY(QT_XRENDER_LIBRARY NAMES Xrender PATHS ${QMAKE_LIBDIR_X11})
- MARK_AS_ADVANCED(QT_XRENDER_LIBRARY)
- IF(QT_XRENDER_LIBRARY)
- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XRENDER_LIBRARY})
- ENDIF(QT_XRENDER_LIBRARY)
+ IF(X11_Xrender_LIB)
+ SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${X11_Xrender_LIB})
+ ENDIF(X11_Xrender_LIB)
ENDIF(QT_QCONFIG MATCHES "xrender")
## Xrandr
IF(QT_QCONFIG MATCHES "xrandr")
- FIND_LIBRARY(QT_XRANDR_LIBRARY NAMES Xrandr PATHS ${QMAKE_LIBDIR_X11})
- MARK_AS_ADVANCED(QT_XRANDR_LIBRARY)
- IF(QT_XRANDR_LIBRARY)
- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XRANDR_LIBRARY})
- ENDIF(QT_XRANDR_LIBRARY)
+ IF(X11_Xrandr_LIB)
+ SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${X11_Xrandr_LIB})
+ ENDIF(X11_Xrandr_LIB)
ENDIF(QT_QCONFIG MATCHES "xrandr")
## Xcursor
IF(QT_QCONFIG MATCHES "xcursor")
- FIND_LIBRARY(QT_XCURSOR_LIBRARY NAMES Xcursor PATHS ${QMAKE_LIBDIR_X11})
- MARK_AS_ADVANCED(QT_XCURSOR_LIBRARY)
- IF(QT_XCURSOR_LIBRARY)
- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XCURSOR_LIBRARY})
- ENDIF(QT_XCURSOR_LIBRARY)
+ IF(X11_Xcursor_LIB)
+ SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${X11_Xcursor_LIB})
+ ENDIF(X11_Xcursor_LIB)
ENDIF(QT_QCONFIG MATCHES "xcursor")
## Xinerama
IF(QT_QCONFIG MATCHES "xinerama")
- FIND_LIBRARY(QT_XINERAMA_LIBRARY NAMES Xinerama PATHS ${QMAKE_LIBDIR_X11})
- MARK_AS_ADVANCED(QT_XINERAMA_LIBRARY)
- IF(QT_XINERAMA_LIBRARY)
- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XINERAMA_LIBRARY})
- ENDIF(QT_XINERAMA_LIBRARY)
+ IF(X11_Xinerama_LIB)
+ SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${X11_Xinerama_LIB})
+ ENDIF(X11_Xinerama_LIB)
ENDIF(QT_QCONFIG MATCHES "xinerama")
## Xfixes
IF(QT_QCONFIG MATCHES "xfixes")
- FIND_LIBRARY(QT_XFIXES_LIBRARY NAMES Xfixes PATHS ${QMAKE_LIBDIR_X11})
- MARK_AS_ADVANCED(QT_XFIXES_LIBRARY)
- IF(QT_XFIXES_LIBRARY)
- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XFIXES_LIBRARY})
- ENDIF(QT_XFIXES_LIBRARY)
+ IF(X11_Xfixes_LIB)
+ SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${X11_Xfixes_LIB})
+ ENDIF(X11_Xfixes_LIB)
ENDIF(QT_QCONFIG MATCHES "xfixes")
@@ -327,24 +330,13 @@ ENDIF(QT_QCONFIG MATCHES "clock-monotonic")
IF(Q_WS_X11)
- # X11 libraries Qt absolutely depends on
- QT_QUERY_QMAKE(QT_LIBS_X11 "QMAKE_LIBS_X11")
- SEPARATE_ARGUMENTS(QT_LIBS_X11)
- FOREACH(QT_X11_LIB ${QT_LIBS_X11})
- STRING(REGEX REPLACE "-l" "" QT_X11_LIB "${QT_X11_LIB}")
- SET(QT_TMP_STR "QT_X11_${QT_X11_LIB}_LIBRARY")
- FIND_LIBRARY(${QT_TMP_STR} NAMES "${QT_X11_LIB}" PATHS ${QMAKE_LIBDIR_X11})
- MARK_AS_ADVANCED(${QT_TMP_STR})
- IF(${QT_TMP_STR})
- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${${QT_TMP_STR}})
- ENDIF(${QT_TMP_STR})
- ENDFOREACH(QT_X11_LIB)
+ # X11 libraries Qt always depends on
+ SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${X11_Xext_LIB} ${X11_X11_LIB})
QT_QUERY_QMAKE(QT_LIBS_THREAD "QMAKE_LIBS_THREAD")
SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QT_LIBS_THREAD})
- QT_QUERY_QMAKE(QMAKE_LIBS_DYNLOAD "QMAKE_LIBS_DYNLOAD")
- SET (QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QMAKE_LIBS_DYNLOAD})
+ SET (QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${CMAKE_DL_LIBS})
ENDIF(Q_WS_X11)

23
devel/cmake/patches/patch-Source_CMakeLists_txt Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-Source_CMakeLists_txt,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Source/CMakeLists.txt.orig Tue Apr 27 21:54:05 2010
+++ Source/CMakeLists.txt Tue Apr 27 21:58:48 2010
@@ -107,6 +107,19 @@ IF(CMAKE_USE_ELF_PARSER)
SET(ELF_SRCS cmELF.h cmELF.cxx)
ENDIF(CMAKE_USE_ELF_PARSER)
+# Workaround for sparc64
+EXECUTE_PROCESS(
+ COMMAND ${CMAKE_CXX_COMPILER} -dumpmachine
+ OUTPUT_VARIABLE MACHINE
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+STRING(REGEX MATCH "(sparc64-*)" _machine_sparc64 "${MACHINE}")
+
+IF (_machine_sparc64)
+ STRING(REGEX REPLACE "-O2" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ENDIF (_machine_sparc64)
+
#
# Sources for CMakeLib
#

12
devel/cmake/patches/patch-Source_CPack_cmCPackTGZGenerator_cxx
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Source_CPack_cmCPackTGZGenerator_cxx,v 1.4 2008/01/26 21:26:32 espie Exp $
--- Source/CPack/cmCPackTGZGenerator.cxx.orig Mon Jan 21 19:59:53 2008
+++ Source/CPack/cmCPackTGZGenerator.cxx Sat Jan 26 20:47:17 2008
@@ -287,7 +287,7 @@ int cmCPackTGZGenerator::GenerateHeader(std::ostream*
{
const int gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
char header[11];
- sprintf(header, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],
+ snprintf(header, sizeof header, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],
Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/,
3 /* zlib os code for UNIX, not really used anyway */);
os->write(header, 10);

25
devel/cmake/patches/patch-Source_CursesDialog_CMakeLists_txt Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-Source_CursesDialog_CMakeLists_txt,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Source/CursesDialog/CMakeLists.txt.orig Tue Apr 6 16:45:36 2010
+++ Source/CursesDialog/CMakeLists.txt Fri Apr 23 16:01:44 2010
@@ -25,13 +25,18 @@ SET( CURSES_SRCS
CursesDialog/ccmake
)
-INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form
- ${CMake_BINARY_DIR}/Source/CursesDialog/form)
INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH})
ADD_EXECUTABLE(ccmake ${CURSES_SRCS} )
TARGET_LINK_LIBRARIES(ccmake CMakeLib)
-TARGET_LINK_LIBRARIES(ccmake cmForm)
+TARGET_LINK_LIBRARIES(ccmake form)
+TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY})
+IF(CURSES_EXTRA_LIBRARY)
+ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY})
+ENDIF(CURSES_EXTRA_LIBRARY)
+
INSTALL_TARGETS(/bin ccmake)
+
+

12
devel/cmake/patches/patch-Source_CursesDialog_cmCursesStandardIncludes_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Source_CursesDialog_cmCursesStandardIncludes_h,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Source/CursesDialog/cmCursesStandardIncludes.h.orig Tue Apr 6 16:45:36 2010
+++ Source/CursesDialog/cmCursesStandardIncludes.h Fri Apr 23 16:01:44 2010
@@ -15,8 +15,6 @@
#define _MSE_INT_H
#endif
-#include <cmFormConfigure.h>
-
#if defined(__hpux)
# define _BOOL_DEFINED
# include <sys/time.h>

51
devel/cmake/patches/patch-Source_cmCPluginAPI_cxx
View File

@ -1,51 +0,0 @@
$OpenBSD: patch-Source_cmCPluginAPI_cxx,v 1.3 2007/03/20 11:23:10 espie Exp $
--- Source/cmCPluginAPI.cxx.orig Wed Jan 10 18:59:12 2007
+++ Source/cmCPluginAPI.cxx Sun Mar 18 13:52:02 2007
@@ -405,10 +405,11 @@ char CCONV *cmExpandVariablesInString(void *arg, const
mf->ExpandVariablesInString(barf,
(escapeQuotes ? true : false),
(atOnly ? true : false));
- char *res = static_cast<char *>(malloc(result.size() + 1));
+ size_t sz = result.size() + 1;
+ char *res = static_cast<char *>(malloc(sz));
if (result.size())
{
- strcpy(res,result.c_str());
+ strlcpy(res,result.c_str(), sz);
}
res[result.size()] = '\0';
return res;
@@ -581,24 +582,27 @@ void CCONV cmSourceFileSetName2(void *arg, const char*
char * CCONV cmGetFilenameWithoutExtension(const char *name)
{
std::string sres = cmSystemTools::GetFilenameWithoutExtension(name);
- char *result = (char *)malloc(sres.size()+1);
- strcpy(result,sres.c_str());
+ size_t sz = sres.size() + 1;
+ char *result = (char *)malloc(sz);
+ strlcpy(result,sres.c_str(), sz);
return result;
}
char * CCONV cmGetFilenamePath(const char *name)
{
std::string sres = cmSystemTools::GetFilenamePath(name);
- char *result = (char *)malloc(sres.size()+1);
- strcpy(result,sres.c_str());
+ size_t sz = sres.size() + 1;
+ char *result = (char *)malloc(sz);
+ strlcpy(result,sres.c_str(), sz);
return result;
}
char * CCONV cmCapitalized(const char *name)
{
std::string sres = cmSystemTools::Capitalized(name);
- char *result = (char *)malloc(sres.size()+1);
- strcpy(result,sres.c_str());
+ size_t sz = sres.size() + 1;
+ char *result = (char *)malloc(sz);
+ strlcpy(result,sres.c_str(), sz);
return result;
}

43
devel/cmake/patches/patch-Source_cmCommandArgumentParserHelper_cxx
View File

@ -1,43 +0,0 @@
$OpenBSD: patch-Source_cmCommandArgumentParserHelper_cxx,v 1.4 2007/08/25 08:35:20 espie Exp $
--- Source/cmCommandArgumentParserHelper.cxx.orig Mon Jul 16 23:12:30 2007
+++ Source/cmCommandArgumentParserHelper.cxx Sun Aug 12 16:02:01 2007
@@ -29,12 +29,12 @@ cmCommandArgumentParserHelper::cmCommandArgumentParser
this->FileName = 0;
this->RemoveEmpty = true;
this->EmptyVariable[0] = 0;
- strcpy(this->DCURLYVariable, "${");
- strcpy(this->RCURLYVariable, "}");
- strcpy(this->ATVariable, "@");
- strcpy(this->DOLLARVariable, "$");
- strcpy(this->LCURLYVariable, "{");
- strcpy(this->BSLASHVariable, "\\");
+ strlcpy(this->DCURLYVariable, "${", sizeof(this->DCURLYVariable));
+ strlcpy(this->RCURLYVariable, "}", sizeof(this->RCURLYVariable));
+ strlcpy(this->ATVariable, "@", sizeof(this->ATVariable));
+ strlcpy(this->DOLLARVariable, "$", sizeof(this->DOLLARVariable));
+ strlcpy(this->LCURLYVariable, "{", sizeof(this->LCURLYVariable));
+ strlcpy(this->BSLASHVariable, "\\", sizeof(this->BSLASHVariable));
this->NoEscapeMode = false;
this->ReplaceAtSyntax = false;
@@ -58,8 +58,7 @@ char* cmCommandArgumentParserHelper::AddString(const c
{
return this->EmptyVariable;
}
- char* stVal = new char[strlen(str)+1];
- strcpy(stVal, str);
+ char *stVal = cmSystemTools::dupstring(str);
this->Variables.push_back(stVal);
return stVal;
}
@@ -160,8 +159,8 @@ char* cmCommandArgumentParserHelper::CombineUnions(cha
}
size_t len = strlen(in1) + strlen(in2) + 1;
char* out = new char [ len ];
- strcpy(out, in1);
- strcat(out, in2);
+ strlcpy(out, in1, len);
+ strlcat(out, in2, len);
this->Variables.push_back(out);
return out;
}

27
devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-Source_cmComputeLinkInformation_cxx,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Source/cmComputeLinkInformation.cxx.orig Tue Apr 6 16:45:33 2010
+++ Source/cmComputeLinkInformation.cxx Fri Apr 23 22:39:44 2010
@@ -376,6 +376,8 @@ cmComputeLinkInformation
{
this->OrderDependentRPath
->SetImplicitDirectories(this->ImplicitLinkDirs);
+ this->OrderDependentRPath
+ ->AddLanguageDirectories(this->RuntimeLinkDirs);
}
// Decide whether to enable compatible library search path mode.
@@ -1641,6 +1643,14 @@ void cmComputeLinkInformation::LoadImplicitLinkInfo()
{
this->ImplicitLinkLibs.insert(item);
}
+ }
+
+ // Get platform specific rpath link directories
+ if(const char *rpathDirs =
+ (this->Makefile->GetDefinition
+ ("CMAKE_PLATFORM_RUNTIME_PATH")))
+ {
+ cmSystemTools::ExpandListArgument(rpathDirs, this->RuntimeLinkDirs);
}
}

13
devel/cmake/patches/patch-Source_cmComputeLinkInformation_h Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-Source_cmComputeLinkInformation_h,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Source/cmComputeLinkInformation.h.orig Tue Apr 6 16:45:33 2010
+++ Source/cmComputeLinkInformation.h Mon Apr 19 11:06:50 2010
@@ -163,6 +163,9 @@ class cmComputeLinkInformation (private)
std::set<cmStdString> ImplicitLinkDirs;
std::set<cmStdString> ImplicitLinkLibs;
+ // Additional paths configured by the runtime linker
+ std::vector<std::string> RuntimeLinkDirs;
+
// Linker search path compatibility mode.
std::set<cmStdString> OldLinkDirMask;
std::vector<std::string> OldLinkDirItems;

45
devel/cmake/patches/patch-Source_cmDocumentation_cxx
View File

@ -1,18 +1,27 @@
$OpenBSD: patch-Source_cmDocumentation_cxx,v 1.3 2007/03/20 11:23:10 espie Exp $
--- Source/cmDocumentation.cxx.orig Wed Jan 10 18:59:12 2007
+++ Source/cmDocumentation.cxx Sun Mar 18 13:52:02 2007
@@ -336,11 +336,11 @@ bool cmDocumentation::CreateSingleModule(const char* f
{
return false;
}
- char* pname = strcpy(new char[strlen(moduleName)+1], moduleName);
- char* ptext = strcpy(new char[text.length()+1], text.c_str());
+ char* pname = cmSystemTools::dupstring(moduleName);
+ char* ptext = cmSystemTools::dupstring(text.c_str());
this->ModuleStrings.push_back(pname);
this->ModuleStrings.push_back(ptext);
- char* pbrief = strcpy(new char[brief.length()+1], brief.c_str());
+ char* pbrief = cmSystemTools::dupstring(brief.c_str());
this->ModuleStrings.push_back(pbrief);
cmDocumentationEntry e = { pname, pbrief, ptext };
this->ModulesSection.push_back(e);
$OpenBSD: patch-Source_cmDocumentation_cxx,v 1.4 2010/05/28 20:21:48 dcoppa Exp $
--- Source/cmDocumentation.cxx.orig Tue Apr 6 16:45:33 2010
+++ Source/cmDocumentation.cxx Mon May 3 10:55:11 2010
@@ -1177,11 +1177,18 @@ bool cmDocumentation::PrintDocumentationSingleModule(s
this->CurrentArgument.c_str(),
*this->AllSections["Modules"]))
{
- this->PrintDocumentationCommand
- (os, this->AllSections["Modules"]->GetEntries()[0]);
- os << "\n Defined in: ";
- os << moduleName << "\n";
- return true;
+ if(this->AllSections["Modules"]->GetEntries().size())
+ {
+ this->PrintDocumentationCommand
+ (os, this->AllSections["Modules"]->GetEntries()[0]);
+ os << "\n Defined in: ";
+ os << moduleName << "\n";
+ return true;
+ }
+ else
+ {
+ return false;
+ }
}
}

61
devel/cmake/patches/patch-Source_cmFileCommand_cxx
View File

@ -1,61 +0,0 @@
$OpenBSD: patch-Source_cmFileCommand_cxx,v 1.3 2010/04/15 20:30:47 dcoppa Exp $
--- Source/cmFileCommand.cxx.orig Mon Jan 21 19:59:52 2008
+++ Source/cmFileCommand.cxx Sun Apr 4 18:54:42 2010
@@ -1279,14 +1279,49 @@ bool cmFileCommand::HandleInstallCommand(
std::string libname = toFile;
std::string soname = toFile;
std::string soname_nopath = fromName;
+#if defined(__OpenBSD__)
+ // need to tweak version for our shared libraries
+ std::string myversion = lib_version;
+ if (itype == cmTarget::SHARED_LIBRARY) {
+ // namely, transform version from 5.0.0 -> 5.0
+
+ int j = 0;
+
+ for (int i = 0; i < myversion.size(); i++) {
+ if (myversion[i] == '.') {
+ j++;
+ if (j == 2) {
+ myversion.erase(i);
+ break;
+ }
+ }
+ }
+ int n = fromName.length();
+ if (fromName.compare(0, 3, "lib") == 0 &&
+ fromName.compare(n-3, n, ".so") == 0) {
+ std::string base = fromName.substr(3, n-6);
+ // if the env says so, produce a tweaked version number instead
+ std::string v = "LIB" +base + "_VERSION";
+ char *tweaked = ::getenv(v.c_str());
+ if (tweaked)
+ myversion = tweaked;
+ }
+ }
+ this->ComputeVersionedLibName(soname, myversion.c_str());
+ this->ComputeVersionedLibName(soname_nopath, myversion.c_str());
+ this->ComputeVersionedLibName(fromName, myversion.c_str());
+ this->ComputeVersionedLibName(toFile, myversion.c_str());
+#else
this->ComputeVersionedLibName(soname, lib_soversion);
this->ComputeVersionedLibName(soname_nopath, lib_soversion);
this->ComputeVersionedLibName(fromName, lib_version);
this->ComputeVersionedLibName(toFile, lib_version);
+#endif
cmSystemTools::RemoveFile(soname.c_str());
cmSystemTools::RemoveFile(libname.c_str());
+#if !defined(__OpenBSD__)
if (!cmSystemTools::CreateSymlink(soname_nopath.c_str(),
libname.c_str()) )
{
@@ -1296,6 +1331,7 @@ bool cmFileCommand::HandleInstallCommand(
return false;
}
installer.ManifestAppend(libname);
+#endif
if ( toFile != soname )
{
if ( !cmSystemTools::CreateSymlink(fromName.c_str(),

73
devel/cmake/patches/patch-Source_cmFindLibraryCommand_cxx
View File

@ -1,73 +0,0 @@
$OpenBSD: patch-Source_cmFindLibraryCommand_cxx,v 1.4 2007/03/23 16:30:35 espie Exp $
--- Source/cmFindLibraryCommand.cxx.orig Wed Jan 10 18:59:12 2007
+++ Source/cmFindLibraryCommand.cxx Fri Mar 23 17:07:55 2007
@@ -139,11 +139,52 @@ void cmFindLibraryCommand::AddLib64Paths()
}
}
+std::string OpenBSD_find_library(const std::string& path, const std::string& prefix, const char *name)
+{
+ std::vector<std::string> result;
+
+ std::string stem = prefix + name + ".so.";
+ std::size_t len = stem.length();
+ std::string best;
+ int bestmajor = -1;
+ int bestminor = -1;
+ std::string globstring = "^" + prefix+".*\\.so\\.[0-9]+\\.[0-9]+$";
+
+ cmSystemTools::Glob(path.c_str(), globstring.c_str(), result);
+ for (std::vector<std::string>::iterator it = result.begin();
+ it != result.end(); ++it) {
+ if (it->substr(0, len) != stem) {
+ continue;
+ }
+ std::istringstream sc(it->substr(len, it->size()));
+ int major, minor;
+ sc >> major;
+ if (sc.get() != '.')
+ continue;
+ sc >> minor;
+
+ if (major < bestmajor)
+ continue;
+ if (major == bestmajor && minor < bestminor)
+ continue;
+ bestmajor = major;
+ bestminor = minor;
+ best = path + "/" + *it;
+ }
+ return best;
+}
+
std::string cmFindLibraryCommand::FindLibrary(const char* name)
{
bool supportFrameworks = false;
bool onlyFrameworks = false;
+ bool openbsdSharedLibs = false;
std::string ff = this->Makefile->GetSafeDefinition("CMAKE_FIND_FRAMEWORK");
+ std::string openbsd = this->Makefile->GetSafeDefinition("CMAKE_OPENBSD_SHARED_LIBS");
+ if (openbsd == "TRUE")
+ {
+ openbsdSharedLibs = true;
+ }
if(ff == "FIRST" || ff == "LAST")
{
supportFrameworks = true;
@@ -194,6 +235,16 @@ std::string cmFindLibraryCommand::FindLibrary(const ch
tryPath += *prefix;
tryPath += name;
tryPath += *suffix;
+ if (openbsdSharedLibs && *suffix == ".so")
+ {
+ std::string foundPath = OpenBSD_find_library(*p, *prefix, name);
+ if (foundPath != "")
+ {
+ tryPath = cmSystemTools::CollapseFullPath(foundPath.c_str());
+ cmSystemTools::ConvertToUnixSlashes(tryPath);
+ return tryPath;
+ }
+ }
if(cmSystemTools::FileExists(tryPath.c_str())
&& !cmSystemTools::FileIsDirectory(tryPath.c_str()))
{

12
devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Source_cmGlobalGenerator_cxx,v 1.3 2006/12/18 16:04:31 espie Exp $
--- Source/cmGlobalGenerator.cxx.orig Mon Dec 4 17:03:56 2006
+++ Source/cmGlobalGenerator.cxx Sun Dec 17 11:07:03 2006
@@ -644,7 +644,7 @@ void cmGlobalGenerator::Configure()
// update the cache entry for the number of local generators, this is used
// for progress
char num[100];
- sprintf(num,"%d",static_cast<int>(this->LocalGenerators.size()));
+ snprintf(num, sizeof num, "%d",static_cast<int>(this->LocalGenerators.size()));
this->GetCMakeInstance()->AddCacheEntry
("CMAKE_NUMBER_OF_LOCAL_GENERATORS", num,
"number of local generators", cmCacheManager::INTERNAL);

23
devel/cmake/patches/patch-Source_cmIfCommand_cxx
View File

@ -1,23 +0,0 @@
$OpenBSD: patch-Source_cmIfCommand_cxx,v 1.6 2008/01/26 21:26:32 espie Exp $
--- Source/cmIfCommand.cxx.orig Mon Jan 21 19:59:52 2008
+++ Source/cmIfCommand.cxx Sat Jan 26 20:47:17 2008
@@ -220,8 +220,7 @@ bool cmIfCommand::IsTrue(const std::vector<std::string
const char *def;
const char *def2;
const char* msg = "Unknown arguments specified";
- *errorString = new char[strlen(msg) + 1];
- strcpy(*errorString, msg);
+ *errorString = cmSystemTools::dupstring(msg);
// handle empty invocation
if (args.size() < 1)
@@ -390,8 +389,7 @@ bool cmIfCommand::IsTrue(const std::vector<std::string
cmOStringStream error;
error << "Regular expression \"" << rex << "\" cannot compile";
delete [] *errorString;
- *errorString = new char[error.str().size() + 1];
- strcpy(*errorString, error.str().c_str());
+ *errorString = cmSystemTools::dupstring(error.str().c_str());
return false;
}
if (regEntry.find(def))

23
devel/cmake/patches/patch-Source_cmInstallCommand_cxx Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-Source_cmInstallCommand_cxx,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Source/cmInstallCommand.cxx.orig Tue Apr 6 16:45:34 2010
+++ Source/cmInstallCommand.cxx Mon Apr 19 16:04:04 2010
@@ -324,6 +324,8 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
// Select the mode for installing symlinks to versioned shared libraries.
cmInstallTargetGenerator::NamelinkModeType
+ // OpenBSD ports system needs NamelinkModeSkip by default.
+#if !defined(__OpenBSD__)
namelinkMode = cmInstallTargetGenerator::NamelinkModeNone;
if(libraryArgs.GetNamelinkOnly())
{
@@ -333,7 +335,9 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
{
namelinkMode = cmInstallTargetGenerator::NamelinkModeSkip;
}
-
+#else
+ namelinkMode = cmInstallTargetGenerator::NamelinkModeSkip;
+#endif
// Check if there is something to do.
if(targetList.GetVector().empty())
{

35
devel/cmake/patches/patch-Source_cmListFileLexer_c
View File

@ -1,35 +0,0 @@
$OpenBSD: patch-Source_cmListFileLexer_c,v 1.3 2007/03/20 11:23:10 espie Exp $
--- Source/cmListFileLexer.c.orig Wed Jan 10 18:59:13 2007
+++ Source/cmListFileLexer.c Sun Mar 18 13:52:03 2007
@@ -2088,7 +2088,7 @@ static void cmListFileLexerSetToken(cmListFileLexer* l
{
if(text && length < lexer->size)
{
- strcpy(lexer->token.text, text);
+ strlcpy(lexer->token.text, text, lexer->size);
lexer->token.length = length;
return;
}
@@ -2121,7 +2121,7 @@ static void cmListFileLexerAppend(cmListFileLexer* lex
newSize = lexer->token.length + length + 1;
if(lexer->token.text && newSize <= lexer->size)
{
- strcpy(lexer->token.text+lexer->token.length, text);
+ strlcpy(lexer->token.text+lexer->token.length, text, lexer->size - lexer->token.length);
lexer->token.length += length;
return;
}
@@ -2239,11 +2239,11 @@ int cmListFileLexer_SetString(cmListFileLexer* lexer,
cmListFileLexerDestroy(lexer);
if(text)
{
- int length = (int)strlen(text);
+ size_t length = strlen(text);
lexer->string_buffer = (char*)malloc(length+1);
if(lexer->string_buffer)
{
- strcpy(lexer->string_buffer, text);
+ strlcpy(lexer->string_buffer, text, length+1);
lexer->string_position = lexer->string_buffer;
lexer->string_left = length;
}

27
devel/cmake/patches/patch-Source_cmLocalUnixMakefileGenerator3_cxx
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-Source_cmLocalUnixMakefileGenerator3_cxx,v 1.4 2007/08/25 08:35:20 espie Exp $
--- Source/cmLocalUnixMakefileGenerator3.cxx.orig Mon Jul 16 23:12:31 2007
+++ Source/cmLocalUnixMakefileGenerator3.cxx Sun Aug 12 16:02:01 2007
@@ -1150,7 +1150,7 @@ cmLocalUnixMakefileGenerator3
while(this->ShortMakeVariableMap.count(ret) && ni < 1000)
{
++ni;
- sprintf(buffer, "%04d", ni);
+ snprintf(buffer, sizeof buffer, "%04d", ni);
ret = unmodified + buffer;
}
this->ShortMakeVariableMap[ret] = "1";
@@ -1178,12 +1178,12 @@ cmLocalUnixMakefileGenerator3
}
char buffer[5];
int ni = 0;
- sprintf(buffer, "%04d", ni);
+ snprintf(buffer, sizeof buffer, "%04d", ni);
ret = str1 + str2 + buffer;
while(this->ShortMakeVariableMap.count(ret) && ni < 1000)
{
++ni;
- sprintf(buffer, "%04d", ni);
+ snprintf(buffer, sizeof buffer, "%04d", ni);
ret = str1 + str2 + buffer;
}
if(ni == 1000)

15
devel/cmake/patches/patch-Source_cmMakefile_cxx
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-Source_cmMakefile_cxx,v 1.5 2008/01/26 21:26:32 espie Exp $
--- Source/cmMakefile.cxx.orig Mon Jan 21 19:59:53 2008
+++ Source/cmMakefile.cxx Sat Jan 26 20:47:17 2008
@@ -1884,9 +1884,9 @@ void cmMakefile::AddDefaultDefinitions()
#endif
char temp[1024];
- sprintf(temp, "%d", cmMakefile::GetMinorVersion());
+ snprintf(temp, sizeof temp, "%d", cmMakefile::GetMinorVersion());
this->AddDefinition("CMAKE_MINOR_VERSION", temp);
- sprintf(temp, "%d", cmMakefile::GetMajorVersion());
+ snprintf(temp, sizeof temp, "%d", cmMakefile::GetMajorVersion());
this->AddDefinition("CMAKE_MAJOR_VERSION", temp);
sprintf(temp, "%d", cmMakefile::GetPatchVersion());
this->AddDefinition("CMAKE_PATCH_VERSION", temp);

66
devel/cmake/patches/patch-Source_cmSystemTools_cxx
View File

@ -1,66 +0,0 @@
$OpenBSD: patch-Source_cmSystemTools_cxx,v 1.6 2008/01/26 21:26:32 espie Exp $
--- Source/cmSystemTools.cxx.orig Sat Jan 26 20:49:32 2008
+++ Source/cmSystemTools.cxx Sat Jan 26 20:52:09 2008
@@ -1365,11 +1365,18 @@ class cmDeletingCharVector : public std::vector<char*>
};
+char* cmSystemTools::dupstring(const char* src)
+{
+ size_t sz = strlen(src)+1;
+ char* dest = new char[sz];
+ strlcpy(dest, src, sz);
+ return dest;
+}
+
bool cmSystemTools::PutEnv(const char* value)
{
static cmDeletingCharVector localEnvironment;
- char* envVar = new char[strlen(value)+1];
- strcpy(envVar, value);
+ char* envVar = dupstring(value);
int ret = putenv(envVar);
// save the pointer in the static vector so that it can
// be deleted on exit
@@ -1428,7 +1435,7 @@ std::string cmSystemTools::MakeXMLSafe(const char* str
&& ch != '\r' )
{
char buffer[33];
- sprintf(buffer, "&lt;%d&gt;", static_cast<int>(ch));
+ snprintf(buffer, sizeof buffer, "&lt;%d&gt;", static_cast<int>(ch));
//sprintf(buffer, "&#x%0x;", (unsigned int)ch);
result.insert(result.end(), buffer, buffer+strlen(buffer));
}
@@ -1579,9 +1586,8 @@ bool cmSystemTools::CreateTar(const char* outFileName,
};
// Ok, this libtar is not const safe. for now use auto_ptr hack
- char* realName = new char[ strlen(outFileName) + 1 ];
+ char* realName = dupstring(outFileName);
std::auto_ptr<char> realNamePtr(realName);
- strcpy(realName, outFileName);
int options = 0;
if(verbose)
{
@@ -1658,9 +1664,8 @@ bool cmSystemTools::ExtractTar(const char* outFileName
};
// Ok, this libtar is not const safe. for now use auto_ptr hack
- char* realName = new char[ strlen(outFileName) + 1 ];
+ char* realName = dupstring(outFileName);
std::auto_ptr<char> realNamePtr(realName);
- strcpy(realName, outFileName);
if (tar_open(&t, realName,
(gzip? &gztype : NULL),
O_RDONLY
@@ -1712,9 +1717,8 @@ bool cmSystemTools::ListTar(const char* outFileName,
};
// Ok, this libtar is not const safe. for now use auto_ptr hack
- char* realName = new char[ strlen(outFileName) + 1 ];
+ char* realName = dupstring(outFileName);
std::auto_ptr<char> realNamePtr(realName);
- strcpy(realName, outFileName);
if (tar_open(&t, realName,
(gzip? &gztype : NULL),
O_RDONLY

14
devel/cmake/patches/patch-Source_cmSystemTools_h
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-Source_cmSystemTools_h,v 1.2 2007/03/20 11:23:10 espie Exp $
--- Source/cmSystemTools.h.orig Wed Jan 10 18:59:13 2007
+++ Source/cmSystemTools.h Sun Mar 18 13:52:03 2007
@@ -65,6 +65,10 @@ class cmSystemTools: public cmsys::SystemTools (public
*/
static std::string RemoveEscapes(const char*);
+ /**
+ * Make a string copy using new.
+ */
+ static char*dupstring(const char*);
typedef void (*ErrorCallback)(const char*, const char*, bool&, void*);
/**
* Set the function used by GUI's to display error messages

107
devel/cmake/patches/patch-Source_cmTarget_cxx
View File

@ -1,50 +1,65 @@
$OpenBSD: patch-Source_cmTarget_cxx,v 1.3 2008/01/26 21:26:32 espie Exp $
--- Source/cmTarget.cxx.orig Mon Jan 21 19:59:53 2008
+++ Source/cmTarget.cxx Sat Jan 26 20:47:17 2008
@@ -1480,6 +1480,46 @@ void cmTarget::GetLibraryNamesInternal(std::string& na
realName += suffix;
#endif
+#if defined(__OpenBSD__)
+ // need to tweak version for our shared libraries
+ if (type == cmTarget::SHARED_LIBRARY) {
+ if (version) {
+ // namely, transform version from 5.0.0 -> 5.0
+ std::string myversion = version;
$OpenBSD: patch-Source_cmTarget_cxx,v 1.4 2010/05/28 20:21:48 dcoppa Exp $
--- Source/cmTarget.cxx.orig Tue Apr 6 16:45:35 2010
+++ Source/cmTarget.cxx Tue May 11 16:37:04 2010
@@ -3136,6 +3136,34 @@ void cmTarget::GetLibraryNames(std::string& name,
// Check for library version properties.
const char* version = this->GetProperty("VERSION");
const char* soversion = this->GetProperty("SOVERSION");
+
+ int j = 0;
+ /* OpenBSD - LIBxxx_VERSION environment override.
+ * Needed for OpenBSD ports system.
+ */
+ std::string env_name = "LIB" + Name + "_VERSION";
+ char *env_vers_cstr = getenv(env_name.c_str());
+
+ for (int i = 0; i < myversion.size(); i++) {
+ if (myversion[i] == '.') {
+ j++;
+ if (j == 2) {
+ myversion.erase(i);
+ break;
+ }
+ }
+ }
+ // if the env says so, produce a tweaked version number instead
+ std::string v = "LIB" +base + "_VERSION";
+ char *tweaked = ::getenv(v.c_str());
+#if 0
+ char *logname = ::getenv("SHARED_LIBS_LOG");
+ if (logname) {
+ std::ofstream logfile(logname, std::ios_base::out | std::ios_base::app);
+ if (logfile)
+ logfile << "SHARED_LIBS += " << base << " "
+ << tweaked << " # " << myversion << "\n";
+ }
+#endif
+ if (tweaked)
+ myversion = tweaked;
+ else
+ tweaked = "";
+ // all our shared libs have major.number, no links
+ realName = prefix+base+".so."+myversion;
+ soName = realName;
+ }
+ if (env_vers_cstr != NULL) {
+ // this means an override is present
+ std::string env_vers = std::string(env_vers_cstr);
+
+ size_t first = env_vers.find_first_of(".");
+ size_t last = env_vers.find_first_of(".");
+
+ if ((first != last) || (first == std::string::npos)) {
+ std::string msg = "Bad ";
+ msg += env_name;
+ msg += " specification: ";
+ msg += env_vers;
+ this->Makefile->IssueMessage(cmake::FATAL_ERROR,
+ msg.c_str());
+ } else {
+ /* all OK, use OpenBSD override */
+ soversion = env_vers_cstr;
+ version = env_vers_cstr;
+ }
+ }
+#endif
// The import library name.
if(type == cmTarget::SHARED_LIBRARY)
+
if((this->GetType() != cmTarget::SHARED_LIBRARY &&
this->GetType() != cmTarget::MODULE_LIBRARY) ||
!this->Makefile->GetDefinition(sonameFlag.c_str()) ||
@@ -3186,8 +3214,26 @@ void cmTarget::GetLibraryNames(std::string& name,
if(version)
{
realName += ".";
+#if defined(__OpenBSD__)
+ // libname.so.X.X.X -> libname.so.X.X conversion
+ int j = 0;
+ for (int i = 0; i < (int)strlen(version); i++)
+ {
+ if (version[i] == '.')
+ {
+ j++;
+ if (j == 2)
+ {
+ break;
+ }
+ }
+ realName += version[i];
+ }
+ }
+#else
realName += version;
}
+#endif
else if(soversion)
{
realName += ".";

17
devel/cmake/patches/patch-Source_cmTryRunCommand_cxx
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-Source_cmTryRunCommand_cxx,v 1.3 2007/03/20 11:23:10 espie Exp $
--- Source/cmTryRunCommand.cxx.orig Wed Jan 10 18:59:13 2007
+++ Source/cmTryRunCommand.cxx Sun Mar 18 13:52:03 2007
@@ -140,11 +140,11 @@ bool cmTryRunCommand::InitialPass(std::vector<std::str
char retChar[1000];
if(worked)
{
- sprintf(retChar,"%i",retVal);
+ snprintf(retChar, sizeof retChar, "%i",retVal);
}
else
{
- strcpy(retChar, "FAILED_TO_RUN");
+ strlcpy(retChar, "FAILED_TO_RUN", sizeof retChar);
}
this->Makefile->AddCacheDefinition(argv[0].c_str(), retChar,
"Result of TRY_RUN",

30
devel/cmake/patches/patch-Source_cmake_cxx
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-Source_cmake_cxx,v 1.6 2008/01/26 21:26:32 espie Exp $
--- Source/cmake.cxx.orig Mon Jan 21 19:59:52 2008
+++ Source/cmake.cxx Sat Jan 26 20:47:18 2008
@@ -1532,7 +1532,7 @@ int cmake::Configure()
if(!this->CacheManager->GetCacheValue("CMAKE_BACKWARDS_COMPATIBILITY"))
{
char ver[256];
- sprintf(ver,"%i.%i",cmMakefile::GetMajorVersion(),
+ snprintf(ver, sizeof ver, "%i.%i",cmMakefile::GetMajorVersion(),
cmMakefile::GetMinorVersion());
this->CacheManager->AddCacheEntry
("CMAKE_BACKWARDS_COMPATIBILITY",ver,
@@ -1897,7 +1897,7 @@ int cmake::DumpDocumentationToFile(std::ostream& f)
const char *terse;
const char *full;
char tmp[1024];
- sprintf(tmp,"Version %d.%d (%s)", cmake::GetMajorVersion(),
+ snprintf(tmp, sizeof tmp, "Version %d.%d (%s)", cmake::GetMajorVersion(),
cmake::GetMinorVersion(), cmVersion::GetReleaseVersion().c_str());
f << "<html>\n";
f << "<h1>Documentation for commands of CMake " << tmp << "</h1>\n";
@@ -2008,7 +2008,7 @@ int cmake::LoadCache()
if(!this->CacheManager->GetCacheValue("CMAKE_BACKWARDS_COMPATIBILITY"))
{
char ver[256];
- sprintf(ver,"%i.%i",cmMakefile::GetMajorVersion(),
+ snprintf(ver, sizeof ver, "%i.%i",cmMakefile::GetMajorVersion(),
cmMakefile::GetMinorVersion());
this->CacheManager->AddCacheEntry
("CMAKE_BACKWARDS_COMPATIBILITY",ver,

35
devel/cmake/patches/patch-Source_kwsys_CommandLineArguments_cxx
View File

@ -1,35 +0,0 @@
$OpenBSD: patch-Source_kwsys_CommandLineArguments_cxx,v 1.3 2007/03/20 11:23:10 espie Exp $
--- Source/kwsys/CommandLineArguments.cxx.orig Wed Jan 10 18:59:15 2007
+++ Source/kwsys/CommandLineArguments.cxx Sun Mar 18 13:52:03 2007
@@ -333,16 +333,18 @@ void CommandLineArguments::GetRemainingArguments(int*
// Copy Argv0 as the first argument
char** args = new char*[ size ];
- args[0] = new char[ this->Internals->Argv0.size() + 1 ];
- strcpy(args[0], this->Internals->Argv0.c_str());
+ size_t sz = this->Internals->Argv0.size() + 1;
+ args[0] = new char[ sz ];
+ strlcpy(args[0], this->Internals->Argv0.c_str(), sz);
int cnt = 1;
// Copy everything after the LastArgument, since that was not parsed.
for ( cc = this->Internals->LastArgument+1;
cc < this->Internals->Argv.size(); cc ++ )
{
- args[cnt] = new char[ this->Internals->Argv[cc].size() + 1];
- strcpy(args[cnt], this->Internals->Argv[cc].c_str());
+ size_t sz2 = this->Internals->Argv[cc].size() + 1;
+ args[cnt] = new char[ sz2 ];
+ strlcpy(args[cnt], this->Internals->Argv[cc].c_str(), sz2);
cnt ++;
}
*argc = cnt;
@@ -594,7 +596,7 @@ void CommandLineArguments::GenerateHelp()
// Create format for that string
char format[80];
- sprintf(format, " %%-%ds ", static_cast<unsigned int>(maxlen));
+ snprintf(format, sizeof format, " %%-%ds ", static_cast<unsigned int>(maxlen));
maxlen += 4; // For the space before and after the option

132
devel/cmake/patches/patch-Source_kwsys_ProcessUNIX_c
View File

@ -1,119 +1,13 @@
$OpenBSD: patch-Source_kwsys_ProcessUNIX_c,v 1.4 2007/03/20 11:23:10 espie Exp $
--- Source/kwsys/ProcessUNIX.c.orig Wed Jan 10 18:59:15 2007
+++ Source/kwsys/ProcessUNIX.c Sun Mar 18 13:52:03 2007
@@ -457,12 +457,13 @@ int kwsysProcess_SetWorkingDirectory(kwsysProcess* cp,
}
if(dir)
{
- cp->WorkingDirectory = (char*)malloc(strlen(dir) + 1);
+ size_t sz = strlen(dir) + 1;
+ cp->WorkingDirectory = (char*)malloc(sz);
if(!cp->WorkingDirectory)
{
return 0;
}
- strcpy(cp->WorkingDirectory, dir);
+ strlcpy(cp->WorkingDirectory, dir, sz);
}
return 1;
}
@@ -489,12 +490,13 @@ int kwsysProcess_SetPipeFile(kwsysProcess* cp, int prP
}
if(file)
{
- *pfile = malloc(strlen(file)+1);
+ size_t sz = strlen(file)+1;
+ *pfile = malloc(sz);
if(!*pfile)
{
return 0;
}
- strcpy(*pfile, file);
+ strlcpy(*pfile, file, sz);
}
/* If we are redirecting the pipe, do not share it or use a native
@@ -670,7 +672,7 @@ void kwsysProcess_Execute(kwsysProcess* cp)
/* Initialize the control structure for a new process. */
if(!kwsysProcessInitialize(cp))
{
- strcpy(cp->ErrorMessage, "Out of memory");
+ strlcpy(cp->ErrorMessage, "Out of memory", sizeof(cp->ErrorMessage));
cp->State = kwsysProcess_State_Error;
return;
}
@@ -1021,7 +1023,7 @@ int kwsysProcess_WaitForData(kwsysProcess* cp, char**
{
/* Select returned an error. Leave the error description in the
pipe buffer. */
- strncpy(cp->ErrorMessage, strerror(errno), KWSYSPE_PIPE_BUFFER_SIZE);
+ strlcpy(cp->ErrorMessage, strerror(errno), sizeof(cp->ErrorMessage));
/* Kill the children now. */
kwsysProcess_Kill(cp);
@@ -1146,7 +1148,7 @@ int kwsysProcess_WaitForExit(kwsysProcess* cp, double*
else
{
/* Error getting the child return code. */
- strcpy(cp->ErrorMessage, "Error getting child return code.");
+ strlcpy(cp->ErrorMessage, "Error getting child return code.", sizeof(cp->ErrorMessage));
cp->State = kwsysProcess_State_Error;
}
@@ -1222,7 +1224,7 @@ static int kwsysProcessInitialize(kwsysProcess* cp)
cp->ExitCode = 1;
cp->ExitValue = 1;
cp->ErrorMessage[0] = 0;
- strcpy(cp->ExitExceptionString, "No exception");
+ strlcpy(cp->ExitExceptionString, "No exception", sizeof(cp->ExitExceptionString));
if(cp->ForkPIDs)
{
@@ -1589,7 +1591,7 @@ static void kwsysProcessDestroy(kwsysProcess* cp)
else if(result < 0 && cp->State != kwsysProcess_State_Error)
{
/* Unexpected error. Report the first time this happens. */
- strncpy(cp->ErrorMessage, strerror(errno), KWSYSPE_PIPE_BUFFER_SIZE);
+ strlcpy(cp->ErrorMessage, strerror(errno), sizeof(cp->ErrorMessage));
cp->State = kwsysProcess_State_Error;
}
}
@@ -1784,7 +1786,7 @@ static kwsysProcessTime kwsysProcessTimeSubtract(kwsys
/*--------------------------------------------------------------------------*/
#define KWSYSPE_CASE(type, str) \
cp->ExitException = kwsysProcess_Exception_##type; \
- strcpy(cp->ExitExceptionString, str)
+ strlcpy(cp->ExitExceptionString, str, sizeof(cp->ExitExceptionString))
static void kwsysProcessSetExitException(kwsysProcess* cp, int sig)
{
switch (sig)
@@ -1903,7 +1905,8 @@ static void kwsysProcessSetExitException(kwsysProcess*
#endif
default:
cp->ExitException = kwsysProcess_Exception_Other;
- sprintf(cp->ExitExceptionString, "Signal %d", sig);
+ snprintf(cp->ExitExceptionString, sizeof(cp->ExitExceptionString),
+ "Signal %d", sig);
break;
}
}
@@ -1916,8 +1919,8 @@ static void kwsysProcessSetExitException(kwsysProcess*
static void kwsysProcessChildErrorExit(int errorPipe)
{
/* Construct the error message. */
- char buffer[KWSYSPE_PIPE_BUFFER_SIZE];
- strncpy(buffer, strerror(errno), KWSYSPE_PIPE_BUFFER_SIZE);
+ char buffer[KWSYSPE_PIPE_BUFFER_SIZE+1];
+ strlcpy(buffer, strerror(errno), KWSYSPE_PIPE_BUFFER_SIZE+1);
/* Report the error to the parent through the special pipe. */
write(errorPipe, buffer, strlen(buffer));
@@ -2145,7 +2148,7 @@ static void kwsysProcessKill(pid_t process_id)
if(sscanf(d->d_name, "%d", &pid) == 1 && pid != 0)
{
struct stat finfo;
- sprintf(fname, "/proc/%d/stat", pid);
+ snprintf(fname, sizeof fname, "/proc/%d/stat", pid);
if(stat(fname, &finfo) == 0)
{
FILE* f = fopen(fname, "r");
$OpenBSD: patch-Source_kwsys_ProcessUNIX_c,v 1.5 2010/05/28 20:21:48 dcoppa Exp $
--- Source/kwsys/ProcessUNIX.c.orig Fri Apr 23 15:45:44 2010
+++ Source/kwsys/ProcessUNIX.c Fri Apr 23 15:49:42 2010
@@ -2373,7 +2373,8 @@ static pid_t kwsysProcessFork(kwsysProcess* cp,
Here we define the command to call on each platform and the
corresponding parsing format string. The parsing format should
have two integers to store: the pid and then the ppid. */
-#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
+#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) \
+ || defined(__OpenBSD__)
# define KWSYSPE_PS_COMMAND "ps axo pid,ppid"
# define KWSYSPE_PS_FORMAT "%d %d\n"
#elif defined(__hpux) || defined(__sun__) || defined(__sgi) || defined(_AIX) \

21
devel/cmake/patches/patch-Source_kwsys_Registry_cxx
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-Source_kwsys_Registry_cxx,v 1.3 2007/03/20 11:23:10 espie Exp $
--- Source/kwsys/Registry.cxx.orig Wed Jan 10 18:59:15 2007
+++ Source/kwsys/Registry.cxx Sun Mar 18 13:52:03 2007
@@ -756,7 +756,7 @@ kwsys_stl::string RegistryHelper::EncodeKey(const char
{
case '%': case '=': case '\n': case '\r': case '\t':
char buffer[4];
- sprintf(buffer, "%%%02X", *str);
+ snprintf(buffer, sizeof buffer, "%%%02X", *str);
ostr << buffer;
break;
default:
@@ -777,7 +777,7 @@ kwsys_stl::string RegistryHelper::EncodeValue(const ch
{
case '%': case '=': case '\n': case '\r': case '\t':
char buffer[4];
- sprintf(buffer, "%%%02X", *str);
+ snprintf(buffer, sizeof buffer, "%%%02X", *str);
ostr << buffer;
break;
default:

16
devel/cmake/patches/patch-Source_kwsys_SharedForward_h_in Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-Source_kwsys_SharedForward_h_in,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Source/kwsys/SharedForward.h.in.orig Tue Apr 6 16:45:37 2010
+++ Source/kwsys/SharedForward.h.in Fri Apr 23 15:50:35 2010
@@ -201,6 +201,12 @@ static const char kwsys_shared_forward_path_slash[2] =
# define KWSYS_SHARED_FORWARD_LDD_N 1
# define KWSYS_SHARED_FORWARD_LDPATH "LD_LIBRARY_PATH"
+/* OpenBSD */
+#elif defined(__OpenBSD__)
+# define KWSYS_SHARED_FORWARD_LDD "ldd"
+# define KWSYS_SHARED_FORWARD_LDD_N 1
+# define KWSYS_SHARED_FORWARD_LDPATH "LD_LIBRARY_PATH"
+
/* OSX */
#elif defined(__APPLE__)
# define KWSYS_SHARED_FORWARD_LDD "otool", "-L"

98
devel/cmake/patches/patch-Source_kwsys_SystemTools_cxx
View File

@ -1,98 +0,0 @@
$OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.7 2008/01/26 21:26:32 espie Exp $
--- Source/kwsys/SystemTools.cxx.orig Mon Jan 21 19:59:55 2008
+++ Source/kwsys/SystemTools.cxx Sat Jan 26 20:47:18 2008
@@ -371,7 +371,9 @@ bool SystemTools::MakeDirectory(const char* path)
while((pos = dir.find('/', pos)) != kwsys_stl::string::npos)
{
topdir = dir.substr(0, pos);
- Mkdir(topdir.c_str());
+ if (pos > 0 && !SystemTools::FileIsDirectory(topdir.c_str())) {
+ Mkdir(topdir.c_str());
+ }
pos++;
}
if(dir[dir.size()-1] == '/')
@@ -963,13 +965,14 @@ char* SystemTools::AppendStrings(const char* str1, con
return SystemTools::DuplicateString(str1);
}
size_t len1 = strlen(str1);
- char *newstr = new char[len1 + strlen(str2) + 1];
+ size_t tot = len1 + strlen(str2) + 1;
+ char *newstr = new char[tot];
if (!newstr)
{
return 0;
}
- strcpy(newstr, str1);
- strcat(newstr + len1, str2);
+ strlcpy(newstr, str1, tot);
+ strlcat(newstr + len1, str2, tot - len1);
return newstr;
}
@@ -990,14 +993,15 @@ char* SystemTools::AppendStrings(
}
size_t len1 = strlen(str1), len2 = strlen(str2);
- char *newstr = new char[len1 + len2 + strlen(str3) + 1];
+ size_t tot = len1 + len2 + strlen(str3) + 1;
+ char *newstr = new char[tot];
if (!newstr)
{
return 0;
}
- strcpy(newstr, str1);
- strcat(newstr + len1, str2);
- strcat(newstr + len1 + len2, str3);
+ strlcpy(newstr, str1, tot);
+ strlcat(newstr + len1, str2, tot - len1);
+ strlcat(newstr + len1 + len2, str3, tot - len1 - len2);
return newstr;
}
@@ -1165,8 +1169,10 @@ char* SystemTools::DuplicateString(const char* str)
{
if (str)
{
- char *newstr = new char [strlen(str) + 1];
- return strcpy(newstr, str);
+ size_t sz = strlen(str)+1;
+ char *newstr = new char [sz];
+ strlcpy(newstr, str, sz);
+ return newstr;
}
return NULL;
}
@@ -1863,7 +1869,7 @@ bool SystemTools::ConvertDateMacroString(const char *s
static char month_names[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
char buffer[12];
- strcpy(buffer, str);
+ strlcpy(buffer, str, sizeof buffer);
buffer[3] = 0;
char *ptr = strstr(month_names, buffer);
@@ -1914,7 +1920,7 @@ bool SystemTools::ConvertTimeStampMacroString(const ch
static char month_names[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
char buffer[27];
- strcpy(buffer, str);
+ strlcpy(buffer, str, sizeof buffer);
buffer[7] = 0;
char *ptr = strstr(month_names, buffer + 4);
@@ -3412,12 +3418,12 @@ bool SystemTools::GetShortPath(const char* path, kwsys
// if the path passed in has quotes around it, first remove the quotes
if (path[0] == '"' && path[strlen(path)-1] == '"')
{
- strcpy(tempPath,path+1);
+ strlcpy(tempPath,path+1, size);
tempPath[strlen(tempPath)-1] = '\0';
}
else
{
- strcpy(tempPath,path);
+ strlcpy(tempPath,path, size);
}
buffer[0] = 0;

21
devel/cmake/patches/patch-Utilities_cmtar_encode_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-Utilities_cmtar_encode_c,v 1.2 2008/01/26 21:26:32 espie Exp $
--- Utilities/cmtar/encode.c.orig Mon Jan 21 19:59:58 2008
+++ Utilities/cmtar/encode.c Sat Jan 26 20:47:18 2008
@@ -91,7 +91,7 @@ th_set_path(TAR *t, char *pathname)
t->th_buf.gnu_longname = NULL;
if (pathname[strlen(pathname) - 1] != '/' && TH_ISDIR(t))
- strcpy(suffix, "/");
+ strlcpy(suffix, "/", sizeof suffix);
if (strlen(pathname)+strlen(suffix) >= T_NAMELEN && (t->options & TAR_GNU))
{
@@ -135,7 +135,7 @@ th_set_link(TAR *t, char *linkname)
{
/* GNU longlink format */
t->th_buf.gnu_longlink = strdup(linkname);
- strcpy(t->th_buf.linkname, "././@LongLink");
+ strlcpy(t->th_buf.linkname, "././@LongLink", sizeof t->th_buf.linkname);
}
else
{

32
devel/cmake/patches/patch-Utilities_cmtar_util_c
View File

@ -1,32 +0,0 @@
$OpenBSD: patch-Utilities_cmtar_util_c,v 1.1.1.1 2006/07/20 09:23:13 espie Exp $
--- Utilities/cmtar/util.c.orig Wed May 17 15:48:56 2006
+++ Utilities/cmtar/util.c Tue Jul 18 10:51:27 2006
@@ -33,7 +33,7 @@ path_hashfunc(char *key, int numbuckets)
char buf[TAR_MAXPATHLEN];
char *p;
- strcpy(buf, key);
+ strlcpy(buf, key, sizeof buf);
p = basename(buf);
return (((unsigned int)p[0]) % numbuckets);
@@ -93,7 +93,7 @@ mkdirhier(char *path)
}
if (path[0] == '/')
- strcpy(dst, "/");
+ strlcpy(dst, "/", sizeof src);
while ((dirp = strsep(&nextp, "/")) != NULL)
{
@@ -101,8 +101,8 @@ mkdirhier(char *path)
continue;
if (dst[0] != '\0')
- strcat(dst, "/");
- strcat(dst, dirp);
+ strlcat(dst, "/", sizeof dst);
+ strlcat(dst, dirp, sizeof dst);
if (
#if defined(_WIN32) && !defined(__CYGWIN__)
mkdir(dst) == -1

70
devel/cmake/patches/patch-Utilities_cmxmlrpc_xmlrpc_client_c
View File

@ -1,70 +0,0 @@
$OpenBSD: patch-Utilities_cmxmlrpc_xmlrpc_client_c,v 1.2 2007/03/20 11:23:10 espie Exp $
--- Utilities/cmxmlrpc/xmlrpc_client.c.orig Wed Jan 10 18:59:18 2007
+++ Utilities/cmxmlrpc/xmlrpc_client.c Sun Mar 18 13:52:03 2007
@@ -547,6 +547,7 @@ xmlrpc_server_info_new (xmlrpc_env * const env,
xmlrpc_server_info *server;
char *url_copy;
+ size_t sz;
/* Error-handling preconditions. */
url_copy = NULL;
@@ -559,12 +560,13 @@ xmlrpc_server_info_new (xmlrpc_env * const env,
XMLRPC_FAIL_IF_NULL(server, env, XMLRPC_INTERNAL_ERROR,
"Couldn't allocate memory for xmlrpc_server_info");
memset(server, 0, sizeof(xmlrpc_server_info));
- url_copy = (char*) malloc(strlen(server_url) + 1);
+ sz = strlen(server_url) + 1;
+ url_copy = (char*) malloc(sz);
XMLRPC_FAIL_IF_NULL(url_copy, env, XMLRPC_INTERNAL_ERROR,
"Couldn't allocate memory for server URL");
/* Build our object. */
- strcpy(url_copy, server_url);
+ strlcpy(url_copy, server_url, sz);
server->_server_url = url_copy;
server->_http_basic_auth = NULL;
@@ -584,6 +586,7 @@ xmlrpc_server_info * xmlrpc_server_info_copy(xmlrpc_en
{
xmlrpc_server_info *server;
char *url_copy, *auth_copy;
+ size_t url_sz, auth_sz;
XMLRPC_ASSERT_ENV_OK(env);
XMLRPC_ASSERT_PTR_OK(aserver);
@@ -596,17 +599,19 @@ xmlrpc_server_info * xmlrpc_server_info_copy(xmlrpc_en
server = (xmlrpc_server_info*) malloc(sizeof(xmlrpc_server_info));
XMLRPC_FAIL_IF_NULL(server, env, XMLRPC_INTERNAL_ERROR,
"Couldn't allocate memory for xmlrpc_server_info");
- url_copy = (char*) malloc(strlen(aserver->_server_url) + 1);
+ url_sz = strlen(aserver->_server_url) + 1;
+ url_copy = (char*) malloc(url_sz);
XMLRPC_FAIL_IF_NULL(url_copy, env, XMLRPC_INTERNAL_ERROR,
"Couldn't allocate memory for server URL");
- auth_copy = (char*) malloc(strlen(aserver->_http_basic_auth) + 1);
+ auth_sz = strlen(aserver->_http_basic_auth) + 1;
+ auth_copy = (char*) malloc(auth_sz);
XMLRPC_FAIL_IF_NULL(auth_copy, env, XMLRPC_INTERNAL_ERROR,
"Couldn't allocate memory for authentication info");
/* Build our object. */
- strcpy(url_copy, aserver->_server_url);
+ strlcpy(url_copy, aserver->_server_url, url_sz);
server->_server_url = url_copy;
- strcpy(auth_copy, aserver->_http_basic_auth);
+ strlcpy(auth_copy, aserver->_http_basic_auth, auth_sz);
server->_http_basic_auth = auth_copy;
cleanup:
@@ -935,9 +940,7 @@ xmlrpc_server_info_set_basic_auth(xmlrpc_env *
raw_token = (char*) malloc(raw_token_len + 1);
XMLRPC_FAIL_IF_NULL(raw_token, envP, XMLRPC_INTERNAL_ERROR,
"Couldn't allocate memory for auth token");
- strcpy(raw_token, username);
- raw_token[username_len] = ':';
- strcpy(&raw_token[username_len + 1], password);
+ snprintf(raw_token, raw_token_len+1, "%s:%s", username, password);
/* Encode our raw token using Base64. */
token = xmlrpc_base64_encode_without_newlines(envP,

46
devel/cmake/patches/patch-Utilities_cmxmlrpc_xmlrpc_curl_transport_c
View File

@ -1,46 +0,0 @@
$OpenBSD: patch-Utilities_cmxmlrpc_xmlrpc_curl_transport_c,v 1.2 2007/03/20 11:23:10 espie Exp $
--- Utilities/cmxmlrpc/xmlrpc_curl_transport.c.orig Wed Jan 10 18:59:18 2007
+++ Utilities/cmxmlrpc/xmlrpc_curl_transport.c Sun Mar 18 13:52:03 2007
@@ -27,9 +27,9 @@
# include "xmlrpc_pthreads.h"
#endif
-#include <cmcurl/curl/curl.h>
-#include <cmcurl/curl/types.h>
-#include <cmcurl/curl/easy.h>
+#include <curl/curl.h>
+#include <curl/types.h>
+#include <curl/easy.h>
#ifndef WIN32
# include <unistd.h>
@@ -290,11 +290,11 @@ setupCurlSession(xmlrpc_env * const envP,
proxy_type = 1;
if (getenv("HTTP_PROXY_PORT") )
{
- sprintf(proxy, "%s:%s", getenv("HTTP_PROXY"), getenv("HTTP_PROXY_PORT"));
+ snprintf(proxy, sizeof proxy, "%s:%s", getenv("HTTP_PROXY"), getenv("HTTP_PROXY_PORT"));
}
else
{
- sprintf(proxy, "%s", getenv("HTTP_PROXY"));
+ snprintf(proxy, sizeof proxy, "%s", getenv("HTTP_PROXY"));
}
if ( getenv("HTTP_PROXY_TYPE") )
{
@@ -314,12 +314,12 @@ setupCurlSession(xmlrpc_env * const envP,
}
if ( getenv("HTTP_PROXY_USER") )
{
- strcpy(proxyUser, getenv("HTTP_PROXY_USER"));
+ strlcpy(proxyUser, getenv("HTTP_PROXY_USER"), sizeof proxyUser);
}
if ( getenv("HTTP_PROXY_PASSWD") )
{
- strcat(proxyUser, ":");
- strcat(proxyUser, getenv("HTTP_PROXY_PASSWD"));
+ strlcat(proxyUser, ":", sizeof proxyUser);
+ strlcat(proxyUser, getenv("HTTP_PROXY_PASSWD"), sizeof proxyUser);
}
}
/* Using proxy */

23
devel/cmake/patches/patch-Utilities_cmxmlrpc_xmlrpc_data_c
View File

@ -1,23 +0,0 @@
$OpenBSD: patch-Utilities_cmxmlrpc_xmlrpc_data_c,v 1.1.1.1 2006/07/20 09:23:13 espie Exp $
--- Utilities/cmxmlrpc/xmlrpc_data.c.orig Tue Jul 18 10:51:45 2006
+++ Utilities/cmxmlrpc/xmlrpc_data.c Tue Jul 18 10:53:10 2006
@@ -566,14 +566,17 @@ mkDatetime(xmlrpc_env * const envP,
createXmlrpcValue(envP, &valP);
if (!envP->fault_occurred) {
+ size_t sz = strlen(value) + 1;
+
valP->_type = XMLRPC_TYPE_DATETIME;
+
XMLRPC_TYPED_MEM_BLOCK_INIT(
- char, envP, &valP->_block, strlen(value) + 1);
+ char, envP, &valP->_block, sz);
if (!envP->fault_occurred) {
char * const contents =
XMLRPC_TYPED_MEM_BLOCK_CONTENTS(char, &valP->_block);
- strcpy(contents, value);
+ strlcpy(contents, value, sz);
}
if (envP->fault_occurred)
free(valP);

25
devel/cmake/patches/patch-Utilities_cmxmlrpc_xmlrpc_parse_c
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-Utilities_cmxmlrpc_xmlrpc_parse_c,v 1.2 2007/03/20 11:23:10 espie Exp $
--- Utilities/cmxmlrpc/xmlrpc_parse.c.orig Wed Jan 10 18:59:18 2007
+++ Utilities/cmxmlrpc/xmlrpc_parse.c Sun Mar 18 13:52:03 2007
@@ -579,6 +579,7 @@ xmlrpc_parse_call(xmlrpc_env * const envP,
size_t call_child_count;
char * outMethodName;
xmlrpc_value * outParamArrayP;
+ size_t sz;
XMLRPC_ASSERT_ENV_OK(envP);
XMLRPC_ASSERT(xml_data != NULL);
@@ -618,10 +619,11 @@ xmlrpc_parse_call(xmlrpc_env * const envP,
xmlrpc_validate_utf8(envP, cdata, strlen(cdata));
XMLRPC_FAIL_IF_FAULT(envP);
#endif /* HAVE_UNICODE_WCHAR */
- outMethodName = malloc(strlen(cdata) + 1);
+ sz = strlen(cdata) + 1;
+ outMethodName = malloc(sz);
XMLRPC_FAIL_IF_NULL(outMethodName, envP, XMLRPC_INTERNAL_ERROR,
"Could not allocate memory for method name");
- strcpy(outMethodName, cdata);
+ strlcpy(outMethodName, cdata, sz);
/* Convert our parameters. */
if (call_child_count == 1) {

16
devel/cmake/patches/patch-bootstrap Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-bootstrap,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- bootstrap.orig Tue Apr 27 17:51:26 2010
+++ bootstrap Tue Apr 27 18:01:34 2010
@@ -624,6 +624,12 @@ cmake_c_flags=${CFLAGS}
cmake_cxx_flags=${CXXFLAGS}
cmake_ld_flags=${LDFLAGS}
+# Workaround for sparc64
+ARCH=$(sysctl -n hw.machine)
+if [ "${ARCH}" == "sparc64" ]; then
+ cmake_cxx_flags=$(echo ${CXXFLAGS} | sed -e s/'-O2'//)
+fi
+
# Add Cygwin-specific flags
if ${cmake_system_cygwin}; then
cmake_ld_flags="${LDFLAGS} -Wl,--enable-auto-import"

9
devel/cmake/pkg/DESCR
View File

@ -1,2 +1,7 @@
Portable build system, replaces autoconf, automake and libtool.
Will be used by KDE in KDE 4.
CMake is used to control the software compilation process using
simple platform and compiler independent configuration files. CMake
generates native makefiles and workspaces that can be used in the
compiler environment of your choice. CMake is quite sophisticated:
it is possible to support complex environments requiring system
configuration, pre-processor generation, code generation, and
template instantiation.

821
devel/cmake/pkg/PLIST
View File

@ -1,279 +1,556 @@
@comment $OpenBSD: PLIST,v 1.7 2009/03/14 18:59:36 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.8 2010/05/28 20:21:48 dcoppa Exp $
@bin bin/ccmake
@bin bin/cmake
@bin bin/cpack
@bin bin/ctest
@man man/man1/ccmake.1
@man man/man1/cmake.1
@man man/man1/cmakecommands.1
@man man/man1/cmakecompat.1
@man man/man1/cmakemodules.1
@man man/man1/cmakepolicies.1
@man man/man1/cmakeprops.1
@man man/man1/cmakevars.1
@man man/man1/cpack.1
@man man/man1/ctest.1
share/CMake/
share/CMake/Modules/
share/CMake/Modules/AddFileDependencies.cmake
share/CMake/Modules/CMake.cmake
share/CMake/Modules/CMakeBackwardCompatibilityC.cmake
share/CMake/Modules/CMakeBackwardCompatibilityCXX.cmake
share/CMake/Modules/CMakeBorlandFindMake.cmake
share/CMake/Modules/CMakeBuildSettings.cmake.in
share/CMake/Modules/CMakeCCompiler.cmake.in
share/CMake/Modules/CMakeCInformation.cmake
share/CMake/Modules/CMakeCXXCompiler.cmake.in
share/CMake/Modules/CMakeCXXInformation.cmake
share/CMake/Modules/CMakeCommonLanguageInclude.cmake
share/CMake/Modules/CMakeConfigurableFile.in
share/CMake/Modules/CMakeDependentOption.cmake
share/CMake/Modules/CMakeDetermineCCompiler.cmake
share/CMake/Modules/CMakeDetermineCXXCompiler.cmake
share/CMake/Modules/CMakeDetermineFortranCompiler.cmake
share/CMake/Modules/CMakeDetermineJavaCompiler.cmake
share/CMake/Modules/CMakeDetermineRCCompiler.cmake
share/CMake/Modules/CMakeDetermineSystem.cmake
share/CMake/Modules/CMakeExportBuildSettings.cmake
share/CMake/Modules/CMakeFindFrameworks.cmake
share/CMake/Modules/CMakeFindWMake.cmake
share/CMake/Modules/CMakeFindXCode.cmake
share/CMake/Modules/CMakeFortranCompiler.cmake.in
share/CMake/Modules/CMakeFortranInformation.cmake
share/CMake/Modules/CMakeGenericSystem.cmake
share/CMake/Modules/CMakeImportBuildSettings.cmake
share/CMake/Modules/CMakeJavaCompiler.cmake.in
share/CMake/Modules/CMakeJavaInformation.cmake
share/CMake/Modules/CMakeMSYSFindMake.cmake
share/CMake/Modules/CMakeMinGWFindMake.cmake
share/CMake/Modules/CMakeNMakeFindMake.cmake
share/CMake/Modules/CMakePrintSystemInformation.cmake
share/CMake/Modules/CMakeRCCompiler.cmake.in
share/CMake/Modules/CMakeRCInformation.cmake
share/CMake/Modules/CMakeSystem.cmake.in
share/CMake/Modules/CMakeSystemSpecificInformation.cmake
share/CMake/Modules/CMakeTestCCompiler.cmake
share/CMake/Modules/CMakeTestCXXCompiler.cmake
share/CMake/Modules/CMakeTestForFreeVC.cxx
share/CMake/Modules/CMakeTestFortranCompiler.cmake
share/CMake/Modules/CMakeTestGNU.c
share/CMake/Modules/CMakeTestJavaCompiler.cmake
share/CMake/Modules/CMakeTestNMakeCLVersion.c
share/CMake/Modules/CMakeTestRCCompiler.cmake
share/CMake/Modules/CMakeUnixFindMake.cmake
share/CMake/Modules/CMakeVCManifest.cmake
share/CMake/Modules/CMakeVCManifestExe.cmake
share/CMake/Modules/CMakeVS6BackwardCompatibility.cmake
share/CMake/Modules/CMakeVS6FindMake.cmake
share/CMake/Modules/CMakeVS71FindMake.cmake
share/CMake/Modules/CMakeVS7BackwardCompatibility.cmake
share/CMake/Modules/CMakeVS7FindMake.cmake
share/CMake/Modules/CMakeVS8FindMake.cmake
share/CMake/Modules/CMakeVS9FindMake.cmake
share/CMake/Modules/CPack.Description.plist.in
share/CMake/Modules/CPack.Info.plist.in
share/CMake/Modules/CPack.STGZ_Header.sh.in
share/CMake/Modules/CPack.cmake
share/CMake/Modules/CTest.cmake
share/CMake/Modules/CTestTargets.cmake
share/CMake/Modules/CheckCCompilerFlag.cmake
share/CMake/Modules/CheckCSourceCompiles.cmake
share/CMake/Modules/CheckCSourceRuns.cmake
share/CMake/Modules/CheckCXXCompilerFlag.cmake
share/CMake/Modules/CheckCXXSourceCompiles.cmake
share/CMake/Modules/CheckCXXSourceRuns.cmake
share/CMake/Modules/CheckForPthreads.c
share/CMake/Modules/CheckFunctionExists.c
share/CMake/Modules/CheckFunctionExists.cmake
share/CMake/Modules/CheckIncludeFile.c.in
share/CMake/Modules/CheckIncludeFile.cmake
share/CMake/Modules/CheckIncludeFile.cxx.in
share/CMake/Modules/CheckIncludeFileCXX.cmake
share/CMake/Modules/CheckIncludeFiles.cmake
share/CMake/Modules/CheckLibraryExists.cmake
share/CMake/Modules/CheckLibraryExists.lists.in
share/CMake/Modules/CheckSizeOf.cmake
share/CMake/Modules/CheckSymbolExists.cmake
share/CMake/Modules/CheckTypeSize.c.in
share/CMake/Modules/CheckTypeSize.cmake
share/CMake/Modules/CheckVariableExists.c
share/CMake/Modules/CheckVariableExists.cmake
share/CMake/Modules/Dart.cmake
share/CMake/Modules/DartConfiguration.tcl.in
share/CMake/Modules/Documentation.cmake
share/CMake/Modules/DummyCXXFile.cxx
share/CMake/Modules/FindASPELL.cmake
share/CMake/Modules/FindAVIFile.cmake
share/CMake/Modules/FindBZip2.cmake
share/CMake/Modules/FindBoost.cmake
share/CMake/Modules/FindCABLE.cmake
share/CMake/Modules/FindCURL.cmake
share/CMake/Modules/FindCurses.cmake
share/CMake/Modules/FindCygwin.cmake
share/CMake/Modules/FindDCMTK.cmake
share/CMake/Modules/FindDart.cmake
share/CMake/Modules/FindDoxygen.cmake
share/CMake/Modules/FindEXPAT.cmake
share/CMake/Modules/FindFLTK.cmake
share/CMake/Modules/FindGCCXML.cmake
share/CMake/Modules/FindGLU.cmake
share/CMake/Modules/FindGLUT.cmake
share/CMake/Modules/FindGTK.cmake
share/CMake/Modules/FindGnuplot.cmake
share/CMake/Modules/FindHSPELL.cmake
share/CMake/Modules/FindHTMLHelp.cmake
share/CMake/Modules/FindITK.cmake
share/CMake/Modules/FindImageMagick.cmake
share/CMake/Modules/FindJNI.cmake
share/CMake/Modules/FindJPEG.cmake
share/CMake/Modules/FindJasper.cmake
share/CMake/Modules/FindJava.cmake
share/CMake/Modules/FindKDE.cmake
share/CMake/Modules/FindKDE3.cmake
share/CMake/Modules/FindKDE4.cmake
share/CMake/Modules/FindLATEX.cmake
share/CMake/Modules/FindLibXml2.cmake
share/CMake/Modules/FindLibXslt.cmake
share/CMake/Modules/FindMFC.cmake
share/CMake/Modules/FindMPEG.cmake
share/CMake/Modules/FindMPEG2.cmake
share/CMake/Modules/FindMPI.cmake
share/CMake/Modules/FindMatlab.cmake
share/CMake/Modules/FindMotif.cmake
share/CMake/Modules/FindOpenAL.cmake
share/CMake/Modules/FindOpenGL.cmake
share/CMake/Modules/FindOpenSSL.cmake
share/CMake/Modules/FindPHP4.cmake
share/CMake/Modules/FindPNG.cmake
share/CMake/Modules/FindPerl.cmake
share/CMake/Modules/FindPerlLibs.cmake
share/CMake/Modules/FindPhysFS.cmake
share/CMake/Modules/FindPike.cmake
share/CMake/Modules/FindPkgConfig.cmake
share/CMake/Modules/FindPythonInterp.cmake
share/CMake/Modules/FindPythonLibs.cmake
share/CMake/Modules/FindQt.cmake
share/CMake/Modules/FindQt3.cmake
share/CMake/Modules/FindQt4.cmake
share/CMake/Modules/FindRuby.cmake
share/CMake/Modules/FindSDL.cmake
share/CMake/Modules/FindSDL_image.cmake
share/CMake/Modules/FindSDL_mixer.cmake
share/CMake/Modules/FindSDL_net.cmake
share/CMake/Modules/FindSDL_sound.cmake
share/CMake/Modules/FindSDL_ttf.cmake
share/CMake/Modules/FindSWIG.cmake
share/CMake/Modules/FindSelfPackers.cmake
share/CMake/Modules/FindSubversion.cmake
share/CMake/Modules/FindTCL.cmake
share/CMake/Modules/FindTIFF.cmake
share/CMake/Modules/FindTclsh.cmake
share/CMake/Modules/FindThreads.cmake
share/CMake/Modules/FindUnixCommands.cmake
share/CMake/Modules/FindVTK.cmake
share/CMake/Modules/FindWget.cmake
share/CMake/Modules/FindWish.cmake
share/CMake/Modules/FindX11.cmake
share/CMake/Modules/FindXMLRPC.cmake
share/CMake/Modules/FindZLIB.cmake
share/CMake/Modules/FindwxWidgets.cmake
share/CMake/Modules/FindwxWindows.cmake
share/CMake/Modules/InstallRequiredSystemLibraries.cmake
share/CMake/Modules/KDE3Macros.cmake
share/CMake/Modules/MacOSXBundleInfo.plist.in
share/CMake/Modules/MacroAddFileDependencies.cmake
share/CMake/Modules/MacroPushRequiredVars.cmake
share/CMake/Modules/NSIS.InstallOptions.ini.in
share/CMake/Modules/NSIS.template.in
share/CMake/Modules/Platform/
share/CMake/Modules/Platform/AIX.cmake
share/CMake/Modules/Platform/BSDOS.cmake
share/CMake/Modules/Platform/CYGWIN-g77.cmake
share/CMake/Modules/Platform/CYGWIN.cmake
share/CMake/Modules/Platform/Darwin-xlc.cmake
share/CMake/Modules/Platform/Darwin.cmake
share/CMake/Modules/Platform/DragonFly.cmake
share/CMake/Modules/Platform/FreeBSD.cmake
share/CMake/Modules/Platform/GNU.cmake
share/CMake/Modules/Platform/HP-UX.cmake
share/CMake/Modules/Platform/IRIX.cmake
share/CMake/Modules/Platform/IRIX64.cmake
share/CMake/Modules/Platform/Linux-como.cmake
share/CMake/Modules/Platform/Linux-icpc.cmake
share/CMake/Modules/Platform/Linux-ifort.cmake
share/CMake/Modules/Platform/Linux.cmake
share/CMake/Modules/Platform/MP-RAS.cmake
share/CMake/Modules/Platform/NetBSD.cmake
share/CMake/Modules/Platform/OSF1.cmake
share/CMake/Modules/Platform/OpenBSD.cmake
share/CMake/Modules/Platform/QNX.cmake
share/CMake/Modules/Platform/RISCos.cmake
share/CMake/Modules/Platform/SCO_SV.cmake
share/CMake/Modules/Platform/SINIX.cmake
share/CMake/Modules/Platform/SunOS.cmake
share/CMake/Modules/Platform/Tru64.cmake
share/CMake/Modules/Platform/ULTRIX.cmake
share/CMake/Modules/Platform/UNIX_SV.cmake
share/CMake/Modules/Platform/UnixPaths.cmake
share/CMake/Modules/Platform/UnixWare.cmake
share/CMake/Modules/Platform/Windows-bcc32.cmake
share/CMake/Modules/Platform/Windows-cl.cmake
share/CMake/Modules/Platform/Windows-cl.cmake.in
share/CMake/Modules/Platform/Windows-g++.cmake
share/CMake/Modules/Platform/Windows-g77.cmake
share/CMake/Modules/Platform/Windows-gcc.cmake
share/CMake/Modules/Platform/Windows-icl.cmake
share/CMake/Modules/Platform/Windows-ifort.cmake
share/CMake/Modules/Platform/Windows-wcl386.cmake
share/CMake/Modules/Platform/Windows.cmake
share/CMake/Modules/Platform/WindowsPaths.cmake
share/CMake/Modules/Platform/Xenix.cmake
share/CMake/Modules/Platform/g77.cmake
share/CMake/Modules/Platform/gcc.cmake
share/CMake/Modules/Platform/kFreeBSD.cmake
share/CMake/Modules/TestBigEndian.c
share/CMake/Modules/TestBigEndian.cmake
share/CMake/Modules/TestCXXAcceptsFlag.cmake
share/CMake/Modules/TestForANSIForScope.cmake
share/CMake/Modules/TestForANSIStreamHeaders.cmake
share/CMake/Modules/TestForANSIStreamHeaders.cxx
share/CMake/Modules/TestForAnsiForScope.cxx
share/CMake/Modules/TestForSSTREAM.cmake
share/CMake/Modules/TestForSSTREAM.cxx
share/CMake/Modules/TestForSTDNamespace.cmake
share/CMake/Modules/TestForSTDNamespace.cxx
share/CMake/Modules/UseEcos.cmake
share/CMake/Modules/UsePkgConfig.cmake
share/CMake/Modules/UseQt4.cmake
share/CMake/Modules/UseSWIG.cmake
share/CMake/Modules/UseVTK40.cmake
share/CMake/Modules/UseVTKBuildSettings40.cmake
share/CMake/Modules/UseVTKConfig40.cmake
share/CMake/Modules/Use_wxWindows.cmake
share/CMake/Modules/UsewxWidgets.cmake
share/CMake/Modules/VTKCompatibility.cmake
share/CMake/Modules/kde3init_dummy.cpp.in
share/CMake/Modules/kde3uic.cmake
share/CMake/Modules/readme.txt
share/CMake/Templates/
share/CMake/Templates/CMakeLists.txt
share/CMake/Templates/CMakeVisualStudio6Configurations.cmake
share/CMake/Templates/CMakeWindowsSystemConfig.cmake
share/CMake/Templates/CPack.GenericDescription.txt
share/CMake/Templates/CPack.GenericLicense.txt
share/CMake/Templates/CPack.GenericWelcome.txt
share/CMake/Templates/CPackConfig.cmake.in
share/CMake/Templates/CTestScript.cmake.in
share/CMake/Templates/DLLFooter.dsptemplate
share/CMake/Templates/DLLHeader.dsptemplate
share/CMake/Templates/EXEFooter.dsptemplate
share/CMake/Templates/EXEHeader.dsptemplate
share/CMake/Templates/EXEWinHeader.dsptemplate
share/CMake/Templates/TestDriver.cxx.in
share/CMake/Templates/UtilityFooter.dsptemplate
share/CMake/Templates/UtilityHeader.dsptemplate
share/CMake/Templates/staticLibFooter.dsptemplate
share/CMake/Templates/staticLibHeader.dsptemplate
share/CMake/include/
share/CMake/include/cmCPluginAPI.h
share/doc/CMake/
share/doc/CMake/Copyright.txt
share/doc/CMake/ccmake.html
share/doc/CMake/ccmake.txt
share/doc/CMake/cmake.html
share/doc/CMake/cmake.txt
share/doc/CMake/ctest.html
share/doc/CMake/ctest.txt
share/cmake/
share/cmake/Modules/
share/cmake/Modules/AddFileDependencies.cmake
share/cmake/Modules/BundleUtilities.cmake
share/cmake/Modules/CMake.cmake
share/cmake/Modules/CMakeASM-ATTInformation.cmake
share/cmake/Modules/CMakeASMCompiler.cmake.in
share/cmake/Modules/CMakeASMInformation.cmake
share/cmake/Modules/CMakeASM_MASMInformation.cmake
share/cmake/Modules/CMakeAddNewLanguage.txt
share/cmake/Modules/CMakeBackwardCompatibilityC.cmake
share/cmake/Modules/CMakeBackwardCompatibilityCXX.cmake
share/cmake/Modules/CMakeBorlandFindMake.cmake
share/cmake/Modules/CMakeBuildSettings.cmake.in
share/cmake/Modules/CMakeCCompiler.cmake.in
share/cmake/Modules/CMakeCCompilerABI.c
share/cmake/Modules/CMakeCCompilerId.c.in
share/cmake/Modules/CMakeCInformation.cmake
share/cmake/Modules/CMakeCXXCompiler.cmake.in
share/cmake/Modules/CMakeCXXCompilerABI.cpp
share/cmake/Modules/CMakeCXXCompilerId.cpp.in
share/cmake/Modules/CMakeCXXInformation.cmake
share/cmake/Modules/CMakeCommonLanguageInclude.cmake
share/cmake/Modules/CMakeCompilerABI.h
share/cmake/Modules/CMakeConfigurableFile.in
share/cmake/Modules/CMakeDependentOption.cmake
share/cmake/Modules/CMakeDetermineASM-ATTCompiler.cmake
share/cmake/Modules/CMakeDetermineASMCompiler.cmake
share/cmake/Modules/CMakeDetermineASM_MASMCompiler.cmake
share/cmake/Modules/CMakeDetermineCCompiler.cmake
share/cmake/Modules/CMakeDetermineCXXCompiler.cmake
share/cmake/Modules/CMakeDetermineCompilerABI.cmake
share/cmake/Modules/CMakeDetermineCompilerId.cmake
share/cmake/Modules/CMakeDetermineFortranCompiler.cmake
share/cmake/Modules/CMakeDetermineJavaCompiler.cmake
share/cmake/Modules/CMakeDetermineRCCompiler.cmake
share/cmake/Modules/CMakeDetermineSystem.cmake
share/cmake/Modules/CMakeDetermineVSServicePack.cmake
share/cmake/Modules/CMakeExportBuildSettings.cmake
share/cmake/Modules/CMakeFindBinUtils.cmake
share/cmake/Modules/CMakeFindCodeBlocks.cmake
share/cmake/Modules/CMakeFindEclipseCDT4.cmake
share/cmake/Modules/CMakeFindFrameworks.cmake
share/cmake/Modules/CMakeFindKDevelop3.cmake
share/cmake/Modules/CMakeFindWMake.cmake
share/cmake/Modules/CMakeFindXCode.cmake
share/cmake/Modules/CMakeForceCompiler.cmake
share/cmake/Modules/CMakeFortranCompiler.cmake.in
share/cmake/Modules/CMakeFortranCompilerABI.F
share/cmake/Modules/CMakeFortranCompilerId.F.in
share/cmake/Modules/CMakeFortranInformation.cmake
share/cmake/Modules/CMakeGenericSystem.cmake
share/cmake/Modules/CMakeImportBuildSettings.cmake
share/cmake/Modules/CMakeJOMFindMake.cmake
share/cmake/Modules/CMakeJavaCompiler.cmake.in
share/cmake/Modules/CMakeJavaInformation.cmake
share/cmake/Modules/CMakeMSYSFindMake.cmake
share/cmake/Modules/CMakeMinGWFindMake.cmake
share/cmake/Modules/CMakeNMakeFindMake.cmake
share/cmake/Modules/CMakeParseImplicitLinkInfo.cmake
share/cmake/Modules/CMakePlatformId.h.in
share/cmake/Modules/CMakePrintSystemInformation.cmake
share/cmake/Modules/CMakeRCCompiler.cmake.in
share/cmake/Modules/CMakeRCInformation.cmake
share/cmake/Modules/CMakeSystem.cmake.in
share/cmake/Modules/CMakeSystemSpecificInformation.cmake
share/cmake/Modules/CMakeTestASM-ATTCompiler.cmake
share/cmake/Modules/CMakeTestASMCompiler.cmake
share/cmake/Modules/CMakeTestASM_MASMCompiler.cmake
share/cmake/Modules/CMakeTestCCompiler.cmake
share/cmake/Modules/CMakeTestCXXCompiler.cmake
share/cmake/Modules/CMakeTestCompilerCommon.cmake
share/cmake/Modules/CMakeTestForFreeVC.cxx
share/cmake/Modules/CMakeTestFortranCompiler.cmake
share/cmake/Modules/CMakeTestGNU.c
share/cmake/Modules/CMakeTestJavaCompiler.cmake
share/cmake/Modules/CMakeTestNMakeCLVersion.c
share/cmake/Modules/CMakeTestRCCompiler.cmake
share/cmake/Modules/CMakeUnixFindMake.cmake
share/cmake/Modules/CMakeVS10FindMake.cmake
share/cmake/Modules/CMakeVS6BackwardCompatibility.cmake
share/cmake/Modules/CMakeVS6FindMake.cmake
share/cmake/Modules/CMakeVS71FindMake.cmake
share/cmake/Modules/CMakeVS7BackwardCompatibility.cmake
share/cmake/Modules/CMakeVS7FindMake.cmake
share/cmake/Modules/CMakeVS8FindMake.cmake
share/cmake/Modules/CMakeVS9FindMake.cmake
share/cmake/Modules/CMakeVerifyManifest.cmake
share/cmake/Modules/CPack.DS_Store.in
share/cmake/Modules/CPack.Description.plist.in
share/cmake/Modules/CPack.Info.plist.in
share/cmake/Modules/CPack.OSXScriptLauncher.in
share/cmake/Modules/CPack.OSXScriptLauncher.rsrc.in
share/cmake/Modules/CPack.OSXX11.Info.plist.in
share/cmake/Modules/CPack.OSXX11.main.scpt.in
share/cmake/Modules/CPack.RuntimeScript.in
share/cmake/Modules/CPack.STGZ_Header.sh.in
share/cmake/Modules/CPack.VolumeIcon.icns.in
share/cmake/Modules/CPack.background.png.in
share/cmake/Modules/CPack.cmake
share/cmake/Modules/CPack.distribution.dist.in
share/cmake/Modules/CPackDeb.cmake
share/cmake/Modules/CPackRPM.cmake
share/cmake/Modules/CPackZIP.cmake
share/cmake/Modules/CTest.cmake
share/cmake/Modules/CTestScriptMode.cmake
share/cmake/Modules/CTestTargets.cmake
share/cmake/Modules/CheckCCompilerFlag.cmake
share/cmake/Modules/CheckCSourceCompiles.cmake
share/cmake/Modules/CheckCSourceRuns.cmake
share/cmake/Modules/CheckCXXCompilerFlag.cmake
share/cmake/Modules/CheckCXXSourceCompiles.cmake
share/cmake/Modules/CheckCXXSourceRuns.cmake
share/cmake/Modules/CheckForPthreads.c
share/cmake/Modules/CheckFortranFunctionExists.cmake
share/cmake/Modules/CheckFunctionExists.c
share/cmake/Modules/CheckFunctionExists.cmake
share/cmake/Modules/CheckIncludeFile.c.in
share/cmake/Modules/CheckIncludeFile.cmake
share/cmake/Modules/CheckIncludeFile.cxx.in
share/cmake/Modules/CheckIncludeFileCXX.cmake
share/cmake/Modules/CheckIncludeFiles.cmake
share/cmake/Modules/CheckLibraryExists.cmake
share/cmake/Modules/CheckLibraryExists.lists.in
share/cmake/Modules/CheckSizeOf.cmake
share/cmake/Modules/CheckStructHasMember.cmake
share/cmake/Modules/CheckSymbolExists.cmake
share/cmake/Modules/CheckTypeSize.c.in
share/cmake/Modules/CheckTypeSize.cmake
share/cmake/Modules/CheckTypeSizeMap.cmake.in
share/cmake/Modules/CheckVariableExists.c
share/cmake/Modules/CheckVariableExists.cmake
share/cmake/Modules/Compiler/
share/cmake/Modules/Compiler/G95-Fortran.cmake
share/cmake/Modules/Compiler/GNU-C.cmake
share/cmake/Modules/Compiler/GNU-CXX.cmake
share/cmake/Modules/Compiler/GNU-Fortran.cmake
share/cmake/Modules/Compiler/GNU.cmake
share/cmake/Modules/Compiler/HP-C.cmake
share/cmake/Modules/Compiler/HP-CXX.cmake
share/cmake/Modules/Compiler/HP-Fortran.cmake
share/cmake/Modules/Compiler/Intel-C.cmake
share/cmake/Modules/Compiler/Intel-CXX.cmake
share/cmake/Modules/Compiler/Intel-Fortran.cmake
share/cmake/Modules/Compiler/MIPSpro-C.cmake
share/cmake/Modules/Compiler/MIPSpro-CXX.cmake
share/cmake/Modules/Compiler/MIPSpro-Fortran.cmake
share/cmake/Modules/Compiler/PGI-C.cmake
share/cmake/Modules/Compiler/PGI-CXX.cmake
share/cmake/Modules/Compiler/PGI-Fortran.cmake
share/cmake/Modules/Compiler/PGI.cmake
share/cmake/Modules/Compiler/PathScale-C.cmake
share/cmake/Modules/Compiler/PathScale-CXX.cmake
share/cmake/Modules/Compiler/PathScale-Fortran.cmake
share/cmake/Modules/Compiler/PathScale.cmake
share/cmake/Modules/Compiler/SunPro-C.cmake
share/cmake/Modules/Compiler/SunPro-CXX.cmake
share/cmake/Modules/Compiler/SunPro-Fortran.cmake
share/cmake/Modules/Compiler/VisualAge-C.cmake
share/cmake/Modules/Compiler/VisualAge-CXX.cmake
share/cmake/Modules/Compiler/VisualAge-Fortran.cmake
share/cmake/Modules/Compiler/XL-C.cmake
share/cmake/Modules/Compiler/XL-CXX.cmake
share/cmake/Modules/Compiler/XL-Fortran.cmake
share/cmake/Modules/Dart.cmake
share/cmake/Modules/DartConfiguration.tcl.in
share/cmake/Modules/Documentation.cmake
share/cmake/Modules/DummyCXXFile.cxx
share/cmake/Modules/ExternalProject.cmake
share/cmake/Modules/FLTKCompatibility.cmake
share/cmake/Modules/FeatureSummary.cmake
share/cmake/Modules/FindALSA.cmake
share/cmake/Modules/FindASPELL.cmake
share/cmake/Modules/FindAVIFile.cmake
share/cmake/Modules/FindBISON.cmake
share/cmake/Modules/FindBLAS.cmake
share/cmake/Modules/FindBZip2.cmake
share/cmake/Modules/FindBoost.cmake
share/cmake/Modules/FindBullet.cmake
share/cmake/Modules/FindCABLE.cmake
share/cmake/Modules/FindCUDA/
share/cmake/Modules/FindCUDA.cmake
share/cmake/Modules/FindCUDA/make2cmake.cmake
share/cmake/Modules/FindCUDA/parse_cubin.cmake
share/cmake/Modules/FindCUDA/run_nvcc.cmake
share/cmake/Modules/FindCURL.cmake
share/cmake/Modules/FindCVS.cmake
share/cmake/Modules/FindCoin3D.cmake
share/cmake/Modules/FindCups.cmake
share/cmake/Modules/FindCurses.cmake
share/cmake/Modules/FindCxxTest.cmake
share/cmake/Modules/FindCygwin.cmake
share/cmake/Modules/FindDCMTK.cmake
share/cmake/Modules/FindDart.cmake
share/cmake/Modules/FindDevIL.cmake
share/cmake/Modules/FindDoxygen.cmake
share/cmake/Modules/FindEXPAT.cmake
share/cmake/Modules/FindFLEX.cmake
share/cmake/Modules/FindFLTK.cmake
share/cmake/Modules/FindFLTK2.cmake
share/cmake/Modules/FindFreetype.cmake
share/cmake/Modules/FindGCCXML.cmake
share/cmake/Modules/FindGDAL.cmake
share/cmake/Modules/FindGIF.cmake
share/cmake/Modules/FindGLU.cmake
share/cmake/Modules/FindGLUT.cmake
share/cmake/Modules/FindGTK.cmake
share/cmake/Modules/FindGTK2.cmake
share/cmake/Modules/FindGTest.cmake
share/cmake/Modules/FindGettext.cmake
share/cmake/Modules/FindGnuTLS.cmake
share/cmake/Modules/FindGnuplot.cmake
share/cmake/Modules/FindHDF5.cmake
share/cmake/Modules/FindHSPELL.cmake
share/cmake/Modules/FindHTMLHelp.cmake
share/cmake/Modules/FindITK.cmake
share/cmake/Modules/FindIconv.cmake
share/cmake/Modules/FindImageMagick.cmake
share/cmake/Modules/FindJNI.cmake
share/cmake/Modules/FindJPEG.cmake
share/cmake/Modules/FindJasper.cmake
share/cmake/Modules/FindJava.cmake
share/cmake/Modules/FindKDE3.cmake
share/cmake/Modules/FindKDE4.cmake
share/cmake/Modules/FindLAPACK.cmake
share/cmake/Modules/FindLATEX.cmake
share/cmake/Modules/FindLibIntl.cmake
share/cmake/Modules/FindLibXml2.cmake
share/cmake/Modules/FindLibXslt.cmake
share/cmake/Modules/FindLua50.cmake
share/cmake/Modules/FindLua51.cmake
share/cmake/Modules/FindMFC.cmake
share/cmake/Modules/FindMPEG.cmake
share/cmake/Modules/FindMPEG2.cmake
share/cmake/Modules/FindMPI.cmake
share/cmake/Modules/FindMatlab.cmake
share/cmake/Modules/FindMotif.cmake
share/cmake/Modules/FindOpenAL.cmake
share/cmake/Modules/FindOpenGL.cmake
share/cmake/Modules/FindOpenMP.cmake
share/cmake/Modules/FindOpenSSL.cmake
share/cmake/Modules/FindOpenSceneGraph.cmake
share/cmake/Modules/FindOpenThreads.cmake
share/cmake/Modules/FindPHP4.cmake
share/cmake/Modules/FindPNG.cmake
share/cmake/Modules/FindPackageHandleStandardArgs.cmake
share/cmake/Modules/FindPackageMessage.cmake
share/cmake/Modules/FindPerl.cmake
share/cmake/Modules/FindPerlLibs.cmake
share/cmake/Modules/FindPhysFS.cmake
share/cmake/Modules/FindPike.cmake
share/cmake/Modules/FindPkgConfig.cmake
share/cmake/Modules/FindProducer.cmake
share/cmake/Modules/FindProtobuf.cmake
share/cmake/Modules/FindPythonInterp.cmake
share/cmake/Modules/FindPythonLibs.cmake
share/cmake/Modules/FindQt.cmake
share/cmake/Modules/FindQt3.cmake
share/cmake/Modules/FindQt4.cmake
share/cmake/Modules/FindQuickTime.cmake
share/cmake/Modules/FindRTI.cmake
share/cmake/Modules/FindRuby.cmake
share/cmake/Modules/FindSDL.cmake
share/cmake/Modules/FindSDL_image.cmake
share/cmake/Modules/FindSDL_mixer.cmake
share/cmake/Modules/FindSDL_net.cmake
share/cmake/Modules/FindSDL_sound.cmake
share/cmake/Modules/FindSDL_ttf.cmake
share/cmake/Modules/FindSWIG.cmake
share/cmake/Modules/FindSelfPackers.cmake
share/cmake/Modules/FindSquish.cmake
share/cmake/Modules/FindSubversion.cmake
share/cmake/Modules/FindTCL.cmake
share/cmake/Modules/FindTIFF.cmake
share/cmake/Modules/FindTclStub.cmake
share/cmake/Modules/FindTclsh.cmake
share/cmake/Modules/FindThreads.cmake
share/cmake/Modules/FindUnixCommands.cmake
share/cmake/Modules/FindVTK.cmake
share/cmake/Modules/FindWget.cmake
share/cmake/Modules/FindWish.cmake
share/cmake/Modules/FindX11.cmake
share/cmake/Modules/FindXMLRPC.cmake
share/cmake/Modules/FindZLIB.cmake
share/cmake/Modules/Findosg.cmake
share/cmake/Modules/FindosgAnimation.cmake
share/cmake/Modules/FindosgDB.cmake
share/cmake/Modules/FindosgFX.cmake
share/cmake/Modules/FindosgGA.cmake
share/cmake/Modules/FindosgIntrospection.cmake
share/cmake/Modules/FindosgManipulator.cmake
share/cmake/Modules/FindosgParticle.cmake
share/cmake/Modules/FindosgProducer.cmake
share/cmake/Modules/FindosgShadow.cmake
share/cmake/Modules/FindosgSim.cmake
share/cmake/Modules/FindosgTerrain.cmake
share/cmake/Modules/FindosgText.cmake
share/cmake/Modules/FindosgUtil.cmake
share/cmake/Modules/FindosgViewer.cmake
share/cmake/Modules/FindosgVolume.cmake
share/cmake/Modules/FindosgWidget.cmake
share/cmake/Modules/Findosg_functions.cmake
share/cmake/Modules/FindwxWidgets.cmake
share/cmake/Modules/FindwxWindows.cmake
share/cmake/Modules/FortranCInterface/
share/cmake/Modules/FortranCInterface.cmake
share/cmake/Modules/FortranCInterface/CMakeLists.txt
share/cmake/Modules/FortranCInterface/Detect.cmake
share/cmake/Modules/FortranCInterface/Input.cmake.in
share/cmake/Modules/FortranCInterface/Macro.h.in
share/cmake/Modules/FortranCInterface/Output.cmake.in
share/cmake/Modules/FortranCInterface/Verify/
share/cmake/Modules/FortranCInterface/Verify/CMakeLists.txt
share/cmake/Modules/FortranCInterface/Verify/VerifyC.c
share/cmake/Modules/FortranCInterface/Verify/VerifyCXX.cxx
share/cmake/Modules/FortranCInterface/Verify/VerifyFortran.f
share/cmake/Modules/FortranCInterface/Verify/main.c
share/cmake/Modules/FortranCInterface/call_mod.f90
share/cmake/Modules/FortranCInterface/call_sub.f
share/cmake/Modules/FortranCInterface/main.F
share/cmake/Modules/FortranCInterface/my_module.f90
share/cmake/Modules/FortranCInterface/my_module_.c
share/cmake/Modules/FortranCInterface/my_sub.f
share/cmake/Modules/FortranCInterface/mymodule.f90
share/cmake/Modules/FortranCInterface/mymodule_.c
share/cmake/Modules/FortranCInterface/mysub.f
share/cmake/Modules/FortranCInterface/symbol.c.in
share/cmake/Modules/GetPrerequisites.cmake
share/cmake/Modules/ITKCompatibility.cmake
share/cmake/Modules/InstallRequiredSystemLibraries.cmake
share/cmake/Modules/KDE3Macros.cmake
share/cmake/Modules/MacOSXBundleInfo.plist.in
share/cmake/Modules/MacOSXFrameworkInfo.plist.in
share/cmake/Modules/MacroAddFileDependencies.cmake
share/cmake/Modules/NSIS.InstallOptions.ini.in
share/cmake/Modules/NSIS.template.in
share/cmake/Modules/Platform/
share/cmake/Modules/Platform/AIX-GNU-C.cmake
share/cmake/Modules/Platform/AIX-GNU-CXX.cmake
share/cmake/Modules/Platform/AIX-GNU-Fortran.cmake
share/cmake/Modules/Platform/AIX-GNU.cmake
share/cmake/Modules/Platform/AIX-VisualAge-C.cmake
share/cmake/Modules/Platform/AIX-VisualAge-CXX.cmake
share/cmake/Modules/Platform/AIX-XL-C.cmake
share/cmake/Modules/Platform/AIX-XL-CXX.cmake
share/cmake/Modules/Platform/AIX-XL-Fortran.cmake
share/cmake/Modules/Platform/AIX.cmake
share/cmake/Modules/Platform/BSDOS.cmake
share/cmake/Modules/Platform/BeOS.cmake
share/cmake/Modules/Platform/BlueGeneL.cmake
share/cmake/Modules/Platform/CYGWIN-GNU-C.cmake
share/cmake/Modules/Platform/CYGWIN-GNU-CXX.cmake
share/cmake/Modules/Platform/CYGWIN-GNU-Fortran.cmake
share/cmake/Modules/Platform/CYGWIN-GNU.cmake
share/cmake/Modules/Platform/CYGWIN.cmake
share/cmake/Modules/Platform/Catamount.cmake
share/cmake/Modules/Platform/Darwin-GNU-C.cmake
share/cmake/Modules/Platform/Darwin-GNU-CXX.cmake
share/cmake/Modules/Platform/Darwin-GNU-Fortran.cmake
share/cmake/Modules/Platform/Darwin-GNU.cmake
share/cmake/Modules/Platform/Darwin-VisualAge-C.cmake
share/cmake/Modules/Platform/Darwin-VisualAge-CXX.cmake
share/cmake/Modules/Platform/Darwin-XL-C.cmake
share/cmake/Modules/Platform/Darwin-XL-CXX.cmake
share/cmake/Modules/Platform/Darwin-icc.cmake
share/cmake/Modules/Platform/Darwin-icpc.cmake
share/cmake/Modules/Platform/Darwin.cmake
share/cmake/Modules/Platform/DragonFly.cmake
share/cmake/Modules/Platform/FreeBSD.cmake
share/cmake/Modules/Platform/GNU.cmake
share/cmake/Modules/Platform/Generic-ADSP-ASM.cmake
share/cmake/Modules/Platform/Generic-ADSP-C.cmake
share/cmake/Modules/Platform/Generic-ADSP-CXX.cmake
share/cmake/Modules/Platform/Generic-ADSP-Common.cmake
share/cmake/Modules/Platform/Generic-SDCC-C.cmake
share/cmake/Modules/Platform/Generic.cmake
share/cmake/Modules/Platform/HP-UX-GNU-C.cmake
share/cmake/Modules/Platform/HP-UX-GNU-CXX.cmake
share/cmake/Modules/Platform/HP-UX-GNU-Fortran.cmake
share/cmake/Modules/Platform/HP-UX-GNU.cmake
share/cmake/Modules/Platform/HP-UX.cmake
share/cmake/Modules/Platform/Haiku.cmake
share/cmake/Modules/Platform/IRIX.cmake
share/cmake/Modules/Platform/IRIX64.cmake
share/cmake/Modules/Platform/Linux-GNU-C.cmake
share/cmake/Modules/Platform/Linux-GNU-CXX.cmake
share/cmake/Modules/Platform/Linux-GNU-Fortran.cmake
share/cmake/Modules/Platform/Linux-GNU.cmake
share/cmake/Modules/Platform/Linux-Intel-C.cmake
share/cmake/Modules/Platform/Linux-Intel-CXX.cmake
share/cmake/Modules/Platform/Linux-Intel-Fortran.cmake
share/cmake/Modules/Platform/Linux-Intel.cmake
share/cmake/Modules/Platform/Linux-PGI-C.cmake
share/cmake/Modules/Platform/Linux-PGI-CXX.cmake
share/cmake/Modules/Platform/Linux-PGI-Fortran.cmake
share/cmake/Modules/Platform/Linux-PGI.cmake
share/cmake/Modules/Platform/Linux-PathScale-C.cmake
share/cmake/Modules/Platform/Linux-PathScale-CXX.cmake
share/cmake/Modules/Platform/Linux-PathScale-Fortran.cmake
share/cmake/Modules/Platform/Linux-PathScale.cmake
share/cmake/Modules/Platform/Linux-SunPro-CXX.cmake
share/cmake/Modules/Platform/Linux-VisualAge-C.cmake
share/cmake/Modules/Platform/Linux-VisualAge-CXX.cmake
share/cmake/Modules/Platform/Linux-VisualAge-Fortran.cmake
share/cmake/Modules/Platform/Linux-XL-C.cmake
share/cmake/Modules/Platform/Linux-XL-CXX.cmake
share/cmake/Modules/Platform/Linux-XL-Fortran.cmake
share/cmake/Modules/Platform/Linux-como.cmake
share/cmake/Modules/Platform/Linux.cmake
share/cmake/Modules/Platform/MP-RAS.cmake
share/cmake/Modules/Platform/NetBSD.cmake
share/cmake/Modules/Platform/OSF1.cmake
share/cmake/Modules/Platform/OpenBSD.cmake
share/cmake/Modules/Platform/OpenVMS.cmake
share/cmake/Modules/Platform/QNX.cmake
share/cmake/Modules/Platform/RISCos.cmake
share/cmake/Modules/Platform/SCO_SV.cmake
share/cmake/Modules/Platform/SINIX.cmake
share/cmake/Modules/Platform/SunOS-GNU-C.cmake
share/cmake/Modules/Platform/SunOS-GNU-CXX.cmake
share/cmake/Modules/Platform/SunOS-GNU-Fortran.cmake
share/cmake/Modules/Platform/SunOS-GNU.cmake
share/cmake/Modules/Platform/SunOS.cmake
share/cmake/Modules/Platform/Tru64.cmake
share/cmake/Modules/Platform/ULTRIX.cmake
share/cmake/Modules/Platform/UNIX_SV.cmake
share/cmake/Modules/Platform/UnixPaths.cmake
share/cmake/Modules/Platform/UnixWare.cmake
share/cmake/Modules/Platform/Windows-Borland-C.cmake
share/cmake/Modules/Platform/Windows-Borland-CXX.cmake
share/cmake/Modules/Platform/Windows-Borland.cmake
share/cmake/Modules/Platform/Windows-GNU-C.cmake
share/cmake/Modules/Platform/Windows-GNU-CXX.cmake
share/cmake/Modules/Platform/Windows-GNU-Fortran.cmake
share/cmake/Modules/Platform/Windows-GNU.cmake
share/cmake/Modules/Platform/Windows-Intel.cmake
share/cmake/Modules/Platform/Windows-NMcl.cmake
share/cmake/Modules/Platform/Windows-cl.cmake
share/cmake/Modules/Platform/Windows-cl.cmake.in
share/cmake/Modules/Platform/Windows-df.cmake
share/cmake/Modules/Platform/Windows-g++.cmake
share/cmake/Modules/Platform/Windows-icl.cmake
share/cmake/Modules/Platform/Windows-ifort.cmake
share/cmake/Modules/Platform/Windows-wcl386.cmake
share/cmake/Modules/Platform/Windows.cmake
share/cmake/Modules/Platform/WindowsPaths.cmake
share/cmake/Modules/Platform/Xenix.cmake
share/cmake/Modules/Platform/cl.cmake
share/cmake/Modules/Platform/eCos.cmake
share/cmake/Modules/Platform/gas.cmake
share/cmake/Modules/Platform/kFreeBSD.cmake
share/cmake/Modules/Platform/syllable.cmake
share/cmake/Modules/Qt4ConfigDependentSettings.cmake
share/cmake/Modules/Qt4Macros.cmake
share/cmake/Modules/RepositoryInfo.txt.in
share/cmake/Modules/SelectLibraryConfigurations.cmake
share/cmake/Modules/SquishRunTestCase.bat
share/cmake/Modules/SquishRunTestCase.sh
share/cmake/Modules/SquishTestScript.cmake
share/cmake/Modules/SystemInformation.cmake
share/cmake/Modules/SystemInformation.in
share/cmake/Modules/TestBigEndian.cmake
share/cmake/Modules/TestCXXAcceptsFlag.cmake
share/cmake/Modules/TestEndianess.c.in
share/cmake/Modules/TestForANSIForScope.cmake
share/cmake/Modules/TestForANSIStreamHeaders.cmake
share/cmake/Modules/TestForANSIStreamHeaders.cxx
share/cmake/Modules/TestForAnsiForScope.cxx
share/cmake/Modules/TestForSSTREAM.cmake
share/cmake/Modules/TestForSSTREAM.cxx
share/cmake/Modules/TestForSTDNamespace.cmake
share/cmake/Modules/TestForSTDNamespace.cxx
share/cmake/Modules/UseEcos.cmake
share/cmake/Modules/UsePkgConfig.cmake
share/cmake/Modules/UseQt4.cmake
share/cmake/Modules/UseSWIG.cmake
share/cmake/Modules/UseVTK40.cmake
share/cmake/Modules/UseVTKBuildSettings40.cmake
share/cmake/Modules/UseVTKConfig40.cmake
share/cmake/Modules/Use_wxWindows.cmake
share/cmake/Modules/UsewxWidgets.cmake
share/cmake/Modules/VTKCompatibility.cmake
share/cmake/Modules/ecos_clean.cmake
share/cmake/Modules/kde3init_dummy.cpp.in
share/cmake/Modules/kde3uic.cmake
share/cmake/Modules/readme.txt
share/cmake/Templates/
share/cmake/Templates/AppleInfo.plist
share/cmake/Templates/CMakeVSMacros1.vsmacros
share/cmake/Templates/CMakeVSMacros2.vsmacros
share/cmake/Templates/CMakeVisualStudio6Configurations.cmake
share/cmake/Templates/CPack.GenericDescription.txt
share/cmake/Templates/CPack.GenericLicense.txt
share/cmake/Templates/CPack.GenericWelcome.txt
share/cmake/Templates/CPackConfig.cmake.in
share/cmake/Templates/CTestScript.cmake.in
share/cmake/Templates/DLLFooter.dsptemplate
share/cmake/Templates/DLLHeader.dsptemplate
share/cmake/Templates/EXEFooter.dsptemplate
share/cmake/Templates/EXEHeader.dsptemplate
share/cmake/Templates/EXEWinHeader.dsptemplate
share/cmake/Templates/TestDriver.cxx.in
share/cmake/Templates/UtilityFooter.dsptemplate
share/cmake/Templates/UtilityHeader.dsptemplate
share/cmake/Templates/cygwin-package.sh.in
share/cmake/Templates/staticLibFooter.dsptemplate
share/cmake/Templates/staticLibHeader.dsptemplate
share/cmake/include/
share/cmake/include/cmCPluginAPI.h
share/doc/cmake/
share/doc/cmake/Copyright.txt
share/doc/cmake/ccmake.docbook
share/doc/cmake/ccmake.html
share/doc/cmake/ccmake.txt
share/doc/cmake/cmake-commands.html
share/doc/cmake/cmake-commands.txt
share/doc/cmake/cmake-compatcommands.html
share/doc/cmake/cmake-compatcommands.txt
share/doc/cmake/cmake-modules.html
share/doc/cmake/cmake-modules.txt
share/doc/cmake/cmake-policies.html
share/doc/cmake/cmake-policies.txt
share/doc/cmake/cmake-properties.html
share/doc/cmake/cmake-properties.txt
share/doc/cmake/cmake-variables.html
share/doc/cmake/cmake-variables.txt
share/doc/cmake/cmake.docbook
share/doc/cmake/cmake.html
share/doc/cmake/cmake.txt
share/doc/cmake/cmcompress/
share/doc/cmake/cmcompress/Copyright.txt
share/doc/cmake/cmsys/
share/doc/cmake/cmsys/Copyright.txt
share/doc/cmake/cmtar/
share/doc/cmake/cmtar/COPYRIGHT
share/doc/cmake/cpack.docbook
share/doc/cmake/cpack.html
share/doc/cmake/cpack.txt
share/doc/cmake/ctest.docbook
share/doc/cmake/ctest.html
share/doc/cmake/ctest.txt