Revision: 68988
http://sourceforge.net/p/brlcad/code/68988
Author: starseeker
Date: 2016-10-05 13:41:03 +0000 (Wed, 05 Oct 2016)
Log Message:
-----------
Check if directory exists before adding, and skip if not found.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2016-10-05 13:33:52 UTC (rev 68987)
+++ brlcad/trunk/CMakeLists.txt 2016-10-05 13:41:03 UTC (rev 68988)
@@ -2585,21 +2585,27 @@
# We've done the toplevel configure steps, now add the subdirectories
macro(verbose_add_subdirectory root dir)
- if(NOT EXISTS "${BRLCAD_BINARY_DIR}/CMakeCache.txt.prev")
- if(NOT "${root}" STREQUAL "")
- message("-- Adding ${root}/${dir}...")
- else(NOT "${root}" STREQUAL "")
- message("-- Adding ${dir}...")
- endif(NOT "${root}" STREQUAL "")
- endif(NOT EXISTS "${BRLCAD_BINARY_DIR}/CMakeCache.txt.prev")
- add_subdirectory(${dir})
- if(NOT EXISTS "${BRLCAD_BINARY_DIR}/CMakeCache.txt.prev")
- if(NOT "${root}" STREQUAL "")
- message("-- Adding ${root}/${dir} - done")
- else(NOT "${root}" STREQUAL "")
- message("-- Adding ${dir} - done")
- endif(NOT "${root}" STREQUAL "")
- endif(NOT EXISTS "${BRLCAD_BINARY_DIR}/CMakeCache.txt.prev")
+ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${dir})
+ if(NOT EXISTS "${BRLCAD_BINARY_DIR}/CMakeCache.txt.prev")
+ if(NOT "${root}" STREQUAL "")
+ message("-- Adding ${root}/${dir}...")
+ else(NOT "${root}" STREQUAL "")
+ message("-- Adding ${dir}...")
+ endif(NOT "${root}" STREQUAL "")
+ endif(NOT EXISTS "${BRLCAD_BINARY_DIR}/CMakeCache.txt.prev")
+ add_subdirectory(${dir})
+ if(NOT EXISTS "${BRLCAD_BINARY_DIR}/CMakeCache.txt.prev")
+ if(NOT "${root}" STREQUAL "")
+ message("-- Adding ${root}/${dir} - done")
+ else(NOT "${root}" STREQUAL "")
+ message("-- Adding ${dir} - done")
+ endif(NOT "${root}" STREQUAL "")
+ endif(NOT EXISTS "${BRLCAD_BINARY_DIR}/CMakeCache.txt.prev")
+ else(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${dir})
+ if(NOT EXISTS "${BRLCAD_BINARY_DIR}/CMakeCache.txt.prev")
+ message("-- Addition of directory ${dir} requested, but not found on
filesystem - skipping")
+ endif(NOT EXISTS "${BRLCAD_BINARY_DIR}/CMakeCache.txt.prev")
+ endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${dir})
endmacro()
verbose_add_subdirectory("" src)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
