Revision: 77551
http://sourceforge.net/p/brlcad/code/77551
Author: starseeker
Date: 2020-10-22 18:01:38 +0000 (Thu, 22 Oct 2020)
Log Message:
-----------
Fix the interim state so we can get through configure
Modified Paths:
--------------
brlcad/branches/extbuild/src/external/Creo/CMakeLists.txt
brlcad/branches/extbuild/src/external/Cubit/CMakeLists.txt
brlcad/branches/extbuild/src/external/Unigraphics/CMakeLists.txt
brlcad/branches/extbuild/src/other/CMakeLists.txt
Modified: brlcad/branches/extbuild/src/external/Creo/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/external/Creo/CMakeLists.txt 2020-10-22
17:43:07 UTC (rev 77550)
+++ brlcad/branches/extbuild/src/external/Creo/CMakeLists.txt 2020-10-22
18:01:38 UTC (rev 77551)
@@ -345,8 +345,8 @@
"${CMAKE_CURRENT_BINARY_DIR}/../../../include"
"${CMAKE_CURRENT_SOURCE_DIR}/../../../include"
"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/other/openNURBS"
- "${ZLIB_INCLUDE_DIRS}"
- "${REGEX_INCLUDE_DIRS}"
+ ${ZLIB_INCLUDE_DIRS}
+ ${REGEX_INCLUDE_DIRS}
)
# The build shims aren't so great at mocking the initialization
Modified: brlcad/branches/extbuild/src/external/Cubit/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/external/Cubit/CMakeLists.txt 2020-10-22
17:43:07 UTC (rev 77550)
+++ brlcad/branches/extbuild/src/external/Cubit/CMakeLists.txt 2020-10-22
18:01:38 UTC (rev 77551)
@@ -11,8 +11,8 @@
"${CMAKE_CURRENT_BINARY_DIR}/../../../include"
"${CMAKE_CURRENT_SOURCE_DIR}/../../../include"
"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/other/openNURBS"
- "${ZLIB_INCLUDE_DIRS}"
- "${REGEX_INCLUDE_DIRS}"
+ ${ZLIB_INCLUDE_DIRS}
+ ${REGEX_INCLUDE_DIRS}
)
# The build shims aren't so great at mocking the initialization
Modified: brlcad/branches/extbuild/src/external/Unigraphics/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/external/Unigraphics/CMakeLists.txt
2020-10-22 17:43:07 UTC (rev 77550)
+++ brlcad/branches/extbuild/src/external/Unigraphics/CMakeLists.txt
2020-10-22 18:01:38 UTC (rev 77551)
@@ -15,9 +15,9 @@
"${CMAKE_CURRENT_BINARY_DIR}/../../../include"
"${CMAKE_CURRENT_SOURCE_DIR}/../../../include"
"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/other/openNURBS"
- "${ZLIB_INCLUDE_DIRS}"
- "${REGEX_INCLUDE_DIRS}"
- "${TCL_INCLUDE_PATH}"
+ ${ZLIB_INCLUDE_DIRS}
+ ${REGEX_INCLUDE_DIRS}
+ ${TCL_INCLUDE_PATH}
)
# The build shims aren't so great at mocking the initialization
Modified: brlcad/branches/extbuild/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/CMakeLists.txt 2020-10-22 17:43:07 UTC
(rev 77550)
+++ brlcad/branches/extbuild/src/other/CMakeLists.txt 2020-10-22 18:01:38 UTC
(rev 77551)
@@ -122,8 +122,15 @@
SetTargetFolder(regex "Third Party Libraries")
SetTargetFolder(regex-static "Third Party Libraries")
if (NOT BRLCAD_REGEX_BUILD)
- set(REGEX_LIBRARIES ${REGEX_LIBRARY} CACHE STRING "REGEX_LIBRARIES" FORCE)
- set(REGEX_INCLUDE_DIRS "${REGEX_INCLUDE_DIR}" CACHE STRING "REGEX include
directory" FORCE)
+ if (REGEX_LIBRARY)
+ set(REGEX_LIBRARIES ${REGEX_LIBRARY} CACHE STRING "REGEX_LIBRARIES" FORCE)
+ set(REGEX_INCLUDE_DIRS "${REGEX_INCLUDE_DIR}" CACHE STRING "REGEX include
directory" FORCE)
+ else (REGEX_LIBRARY)
+ set(REGEX_LIBRARIES "" CACHE STRING "REGEX_LIBRARY" FORCE)
+ set(REGEX_LIBRARIES "" CACHE STRING "REGEX_LIBRARIES" FORCE)
+ set(REGEX_INCLUDE_DIR "" CACHE STRING "REGEX include directory" FORCE)
+ set(REGEX_INCLUDE_DIRS "" CACHE STRING "REGEX include directory" FORCE)
+ endif (REGEX_LIBRARY)
else (NOT BRLCAD_REGEX_BUILD)
# Our own code (at least the Creo plugin, maybe others) may require our
# regex.h to build if compiling against an installed BRL-CAD's libs.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
