Revision: 40846
http://brlcad.svn.sourceforge.net/brlcad/?rev=40846&view=rev
Author: starseeker
Date: 2010-09-29 17:54:40 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
Hmm - maybe I don't need to stub in the empty version of the external project
to turn it on/off... give it a try.
Modified Paths:
--------------
brlcad/branches/cmake/misc/CMake/ThirdParty.cmake
Modified: brlcad/branches/cmake/misc/CMake/ThirdParty.cmake
===================================================================
--- brlcad/branches/cmake/misc/CMake/ThirdParty.cmake 2010-09-29 17:30:15 UTC
(rev 40845)
+++ brlcad/branches/cmake/misc/CMake/ThirdParty.cmake 2010-09-29 17:54:40 UTC
(rev 40846)
@@ -73,16 +73,6 @@
INSTALL_COMMAND cd
${${CMAKE_PROJECT_NAME}_BINARY_DIR}/${projpath}/ && $(MAKE) install
)
SET(CMAKE_EXTERNAL_TARGET_LIST
"${CMAKE_EXTERNAL_TARGET_LIST};${projname}" CACHE STRING "external target list"
FORCE)
- ELSE(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} AND NOT
${CMAKE_PROJECT_NAME}-ENABLE_SYSTEM_LIBS_ONLY)
- ExternalProject_Add(
- ${projname}
- DOWNLOAD_COMMAND ""
- PREFIX ${${CMAKE_PROJECT_NAME}_BINARY_DIR}
- SOURCE_DIR
${${CMAKE_PROJECT_NAME}_SOURCE_DIR}/${projpath}/${srcpath}
- CONFIGURE_COMMAND ""
- BUILD_COMMAND ""
- INSTALL_COMMAND ""
- )
ENDIF(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} AND NOT
${CMAKE_PROJECT_NAME}-ENABLE_SYSTEM_LIBS_ONLY)
ENDMACRO(THIRD_PARTY_AUTOCONF_EXTERNAL_PROJECT)
@@ -102,16 +92,6 @@
INSTALL_COMMAND cd
${${CMAKE_PROJECT_NAME}_BINARY_DIR}/${projpath}/ && $(MAKE) install
)
SET(CMAKE_EXTERNAL_TARGET_LIST
"${CMAKE_EXTERNAL_TARGET_LIST};${projname}" CACHE STRING "external target list"
FORCE)
- ELSE(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} AND NOT
${CMAKE_PROJECT_NAME}-ENABLE_SYSTEM_LIBS_ONLY)
- ExternalProject_Add(
- ${projname}
- DOWNLOAD_COMMAND ""
- PREFIX ${${CMAKE_PROJECT_NAME}_BINARY_DIR}
- SOURCE_DIR
${${CMAKE_PROJECT_NAME}_SOURCE_DIR}/${projpath}/${srcpath}
- CONFIGURE_COMMAND ""
- BUILD_COMMAND ""
- INSTALL_COMMAND ""
- )
ENDIF(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} AND NOT
${CMAKE_PROJECT_NAME}-ENABLE_SYSTEM_LIBS_ONLY)
ENDMACRO(THIRD_PARTY_AUTORECONF_EXTERNAL_PROJECT)
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
