Revision: 40883
http://brlcad.svn.sourceforge.net/brlcad/?rev=40883&view=rev
Author: starseeker
Date: 2010-09-29 21:07:41 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
OK, now that local apr build is working, turn back on detection of system APR
Modified Paths:
--------------
rt^3/trunk/src/other/subversion/CMake/ThirdParty.cmake
rt^3/trunk/src/other/subversion/CMakeLists.txt
Modified: rt^3/trunk/src/other/subversion/CMake/ThirdParty.cmake
===================================================================
--- rt^3/trunk/src/other/subversion/CMake/ThirdParty.cmake 2010-09-29
21:02:59 UTC (rev 40882)
+++ rt^3/trunk/src/other/subversion/CMake/ThirdParty.cmake 2010-09-29
21:07:41 UTC (rev 40883)
@@ -58,9 +58,7 @@
include(ExternalProject)
MACRO(THIRD_PARTY_CONFIGURE_EXTERNAL_PROJECT upper projname projpath srcpath
extraopts)
- MESSAGE("${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper}:
${${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper}}")
IF(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} AND NOT
${CMAKE_PROJECT_NAME}-ENABLE_SYSTEM_LIBS_ONLY)
- MESSAGE("got this far ${projname}")
ExternalProject_Add(
${projname}
DOWNLOAD_COMMAND ""
Modified: rt^3/trunk/src/other/subversion/CMakeLists.txt
===================================================================
--- rt^3/trunk/src/other/subversion/CMakeLists.txt 2010-09-29 21:02:59 UTC
(rev 40882)
+++ rt^3/trunk/src/other/subversion/CMakeLists.txt 2010-09-29 21:07:41 UTC
(rev 40883)
@@ -116,7 +116,7 @@
find_package(ZLIB)
find_package(EXPAT)
-#find_package(APR)
+find_package(APR)
IF(NOT APR_LIBRARY)
SET(SUBVERSION_BUILD_LOCAL_APR 1)
THIRD_PARTY_CONFIGURE_EXTERNAL_PROJECT(APR apr other/apr "" "")
@@ -126,6 +126,7 @@
IF(NOT APU_LIBRARY)
SET(SUBVERSION_BUILD_LOCAL_APU 1)
THIRD_PARTY_CONFIGURE_EXTERNAL_PROJECT(APU apr-util other/apr-util ""
"--with-apr=${CMAKE_INSTALL_PREFIX}")
+ ADD_DEPENDENCIES(apr-util apr)
SET(APU_LIBRARY
"${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}aprutil-1${CMAKE_SHARED_LIBRARY_SUFFIX}"
CACHE STRING "APU_LIBRARY")
SET(APU_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include/apr-1" CACHE
STRING "APU_INCLUDE")
ENDIF(NOT APU_LIBRARY)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
