try_compile: Cleanup temporary directories
Since commit 4fbdce2b (try_compile: Use random executable file name, 2012-02-13) a different <target>.dir is used for each try-compile. Cleanup the directories as well as their content to avoid accumulating leftover temporary directories. (upstream git commit 953257ca611526c9a161a22e5148802be1c67649) Remove troublesome "Qt4Deploy" and "CTest.UpdateCVS" tests (from gentoo's package/dev-util/cmake/files/) Sync FindPkgConfig.cmake patch with upstream
This commit is contained in:
dcoppa
parent
1f89378825
commit
7defea07ff
@ -1,4 +1,4 @@
|
|||||||
# $OpenBSD: Makefile,v 1.52 2012/05/07 07:06:20 dcoppa Exp $
|
# $OpenBSD: Makefile,v 1.53 2012/05/07 13:58:18 dcoppa Exp $
|
||||||
|
|
||||||
VMEM_WARNING = Yes
|
VMEM_WARNING = Yes
|
||||||
BROKEN-arm = build fails since move to gcc4
|
BROKEN-arm = build fails since move to gcc4
|
||||||
@ -7,6 +7,7 @@ HOMEPAGE = http://www.cmake.org/
|
|||||||
CATEGORIES = devel
|
CATEGORIES = devel
|
||||||
COMMENT = portable build system
|
COMMENT = portable build system
|
||||||
DISTNAME = cmake-2.8.8
|
DISTNAME = cmake-2.8.8
|
||||||
|
REVISION = 0
|
||||||
MASTER_SITES = ${HOMEPAGE}files/v2.8/
|
MASTER_SITES = ${HOMEPAGE}files/v2.8/
|
||||||
|
|
||||||
MAINTAINER = David Coppa <dcoppa@openbsd.org>
|
MAINTAINER = David Coppa <dcoppa@openbsd.org>
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
$OpenBSD: patch-Modules_FindPkgConfig_cmake,v 1.1 2012/05/07 07:06:20 dcoppa Exp $
|
$OpenBSD: patch-Modules_FindPkgConfig_cmake,v 1.2 2012/05/07 13:58:18 dcoppa Exp $
|
||||||
|
|
||||||
Unbreak FindPkgConfig.cmake
|
FindPkgConfig.cmake: fix documented output variable not set
|
||||||
(upstream git commit 3ea850a5023060b84dcc0e6f0098c32c28b15807)
|
(upstream git commit 3ea850a5023060b84dcc0e6f0098c32c28b15807)
|
||||||
|
|
||||||
--- Modules/FindPkgConfig.cmake.orig Thu May 3 09:28:55 2012
|
--- Modules/FindPkgConfig.cmake.orig Thu May 3 09:28:55 2012
|
||||||
|
|||||||
20
devel/cmake/patches/patch-Source_cmCoreTryCompile_cxx
Normal file
20
devel/cmake/patches/patch-Source_cmCoreTryCompile_cxx
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
$OpenBSD: patch-Source_cmCoreTryCompile_cxx,v 1.1 2012/05/07 13:58:18 dcoppa Exp $
|
||||||
|
|
||||||
|
try_compile: Cleanup temporary directories
|
||||||
|
|
||||||
|
Since commit 4fbdce2b (try_compile: Use random executable file name,
|
||||||
|
2012-02-13) a different <target>.dir is used for each try-compile.
|
||||||
|
Cleanup the directories as well as their content to avoid accumulating
|
||||||
|
leftover temporary directories.
|
||||||
|
(upstream git commit 953257ca611526c9a161a22e5148802be1c67649)
|
||||||
|
|
||||||
|
--- Source/cmCoreTryCompile.cxx.orig Mon May 7 13:34:33 2012
|
||||||
|
+++ Source/cmCoreTryCompile.cxx Mon May 7 13:35:05 2012
|
||||||
|
@@ -404,6 +404,7 @@ void cmCoreTryCompile::CleanupFiles(const char* binDir
|
||||||
|
if(cmSystemTools::FileIsDirectory(fullPath.c_str()))
|
||||||
|
{
|
||||||
|
this->CleanupFiles(fullPath.c_str());
|
||||||
|
+ cmSystemTools::RemoveADirectory(fullPath.c_str());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
62
devel/cmake/patches/patch-Tests_CMakeLists_txt
Normal file
62
devel/cmake/patches/patch-Tests_CMakeLists_txt
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
$OpenBSD: patch-Tests_CMakeLists_txt,v 1.1 2012/05/07 13:58:18 dcoppa Exp $
|
||||||
|
|
||||||
|
Remove troublesome "Qt4Deploy" and "CTest.UpdateCVS" tests
|
||||||
|
(from gentoo's package/dev-util/cmake/files/)
|
||||||
|
|
||||||
|
--- Tests/CMakeLists.txt.orig Wed Apr 18 20:10:54 2012
|
||||||
|
+++ Tests/CMakeLists.txt Mon May 7 13:45:40 2012
|
||||||
|
@@ -273,23 +273,6 @@ IF(BUILD_TESTING)
|
||||||
|
)
|
||||||
|
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities")
|
||||||
|
|
||||||
|
- # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities)
|
||||||
|
- # this test also depends on the existence of the standard qtiff plugin
|
||||||
|
- if(QT4_WORKS AND QT_QTSQL_FOUND)
|
||||||
|
- ADD_TEST(Qt4Deploy ${CMAKE_CTEST_COMMAND}
|
||||||
|
- --build-and-test
|
||||||
|
- "${CMake_SOURCE_DIR}/Tests/Qt4Deploy"
|
||||||
|
- "${CMake_BINARY_DIR}/Tests/Qt4Deploy"
|
||||||
|
- --build-generator ${CMAKE_TEST_GENERATOR}
|
||||||
|
- --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
|
||||||
|
- --build-project Qt4Deploy
|
||||||
|
- --build-options
|
||||||
|
- -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
|
||||||
|
- -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
|
||||||
|
- )
|
||||||
|
- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Deploy")
|
||||||
|
- endif()
|
||||||
|
-
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
@@ -1547,30 +1530,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CM
|
||||||
|
)
|
||||||
|
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}")
|
||||||
|
ENDIF(Subversion_FOUND)
|
||||||
|
-
|
||||||
|
- # Test CTest Update with CVS
|
||||||
|
- IF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
|
||||||
|
- FIND_PACKAGE(CVS QUIET)
|
||||||
|
- ELSE(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
|
||||||
|
- FIND_PROGRAM(CVS_EXECUTABLE NAMES cvs)
|
||||||
|
- SET(CVS_FOUND ${CVS_EXECUTABLE})
|
||||||
|
- ENDIF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
|
||||||
|
- SET(CTEST_TEST_UPDATE_CVS ${CVS_FOUND})
|
||||||
|
- IF(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
|
||||||
|
- IF("${CVS_EXECUTABLE}" MATCHES "cygwin")
|
||||||
|
- MESSAGE(STATUS "No CTest.UpdateCVS test with cygwin cvs.exe outside cygwin!")
|
||||||
|
- SET(CTEST_TEST_UPDATE_CVS 0)
|
||||||
|
- ENDIF("${CVS_EXECUTABLE}" MATCHES "cygwin")
|
||||||
|
- ENDIF(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
|
||||||
|
- IF(CTEST_TEST_UPDATE_CVS)
|
||||||
|
- SET(CTestUpdateCVS_DIR "CTest UpdateCVS")
|
||||||
|
- CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestUpdateCVS.cmake.in"
|
||||||
|
- "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" @ONLY)
|
||||||
|
- ADD_TEST(CTest.UpdateCVS ${CMAKE_CMAKE_COMMAND}
|
||||||
|
- -P "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake"
|
||||||
|
- )
|
||||||
|
- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateCVS_DIR}")
|
||||||
|
- ENDIF(CTEST_TEST_UPDATE_CVS)
|
||||||
|
|
||||||
|
# Test CTest Update with BZR
|
||||||
|
FIND_PROGRAM(BZR_EXECUTABLE NAMES bzr)
|
||||||
@ -0,0 +1,21 @@
|
|||||||
|
$OpenBSD: patch-Tests_CMakeOnly_AllFindModules_CMakeLists_txt,v 1.1 2012/05/07 13:58:18 dcoppa Exp $
|
||||||
|
|
||||||
|
FindPkgConfig.cmake: fix documented output variable not set
|
||||||
|
(upstream git commit 3ea850a5023060b84dcc0e6f0098c32c28b15807)
|
||||||
|
|
||||||
|
--- Tests/CMakeOnly/AllFindModules/CMakeLists.txt.orig Wed Apr 18 20:10:54 2012
|
||||||
|
+++ Tests/CMakeOnly/AllFindModules/CMakeLists.txt Mon May 7 13:45:28 2012
|
||||||
|
@@ -71,7 +71,7 @@ endmacro(check_version_string)
|
||||||
|
# reported.
|
||||||
|
|
||||||
|
foreach(VTEST ALSA ARMADILLO BZIP2 CUPS CURL EXPAT FREETYPE GETTEXT GIT HSPELL
|
||||||
|
- JASPER LIBXML2 LIBXSLT PERL PostgreSQL TIFF ZLIB)
|
||||||
|
+ JASPER LIBXML2 LIBXSLT PERL PKG_CONFIG PostgreSQL TIFF ZLIB)
|
||||||
|
check_version_string(${VTEST} ${VTEST}_VERSION_STRING)
|
||||||
|
endforeach(VTEST)
|
||||||
|
|
||||||
|
@@ -82,4 +82,3 @@ endforeach(VTEST)
|
||||||
|
|
||||||
|
check_version_string(PYTHONINTERP PYTHON_VERSION_STRING)
|
||||||
|
check_version_string(SUBVERSION Subversion_VERSION_SVN)
|
||||||
|
-check_version_string(PKGCONFIG PKG_CONFIG_VERSION_STRING)
|
||||||
Loading…
x
Reference in New Issue
Block a user