Revision: 77610
http://sourceforge.net/p/brlcad/code/77610
Author: starseeker
Date: 2020-10-23 15:21:50 +0000 (Fri, 23 Oct 2020)
Log Message:
-----------
Adjust CMake for new setup. In particular, need to adapt new FindPNG variables
to what we are expecting, even if we're not building PNG.
Modified Paths:
--------------
brlcad/branches/extbuild/src/libbg/CMakeLists.txt
brlcad/branches/extbuild/src/libbrep/CMakeLists.txt
brlcad/branches/extbuild/src/other/CMakeLists.txt
brlcad/branches/extbuild/src/other/ext/png.cmake
brlcad/branches/extbuild/src/util/CMakeLists.txt
Modified: brlcad/branches/extbuild/src/libbg/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/libbg/CMakeLists.txt 2020-10-23 14:49:29 UTC
(rev 77609)
+++ brlcad/branches/extbuild/src/libbg/CMakeLists.txt 2020-10-23 15:21:50 UTC
(rev 77610)
@@ -4,7 +4,8 @@
${BRLCAD_SOURCE_DIR}/include
${BN_INCLUDE_DIRS}
${BU_INCLUDE_DIRS}
- ${P2T_INCLUDE_DIR}
+ ${POLY2TRI_INCLUDE_DIRS}
+ ${SPSR_INCLUDE_DIR}
)
BRLCAD_LIB_INCLUDE_DIRS(bg BG_INCLUDE_DIRS "")
@@ -72,7 +73,7 @@
util.c
)
-BRLCAD_ADDLIB(libbg "${LIBBG_SOURCES}" "libbn;libbu;${P2T_LIBRARY}")
+BRLCAD_ADDLIB(libbg "${LIBBG_SOURCES}" "libbn;libbu;${POLY2TRI_LIBRARIES}")
set_target_properties(libbg PROPERTIES VERSION 20.0.1 SOVERSION 20)
if (HIDE_INTERNAL_SYMBOLS)
if (TARGET poly2tri OR HIDE_INTERNAL_SYMBOLS_EXT)
Modified: brlcad/branches/extbuild/src/libbrep/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/libbrep/CMakeLists.txt 2020-10-23 14:49:29 UTC
(rev 77609)
+++ brlcad/branches/extbuild/src/libbrep/CMakeLists.txt 2020-10-23 15:21:50 UTC
(rev 77610)
@@ -4,7 +4,7 @@
${BRLCAD_SOURCE_DIR}/include
${BU_INCLUDE_DIRS}
${BN_INCLUDE_DIRS}
- ${P2T_INCLUDE_DIR}
+ ${POLY2TRI_INCLUDE_DIRS}
${OPENNURBS_INCLUDE_DIRS}
)
@@ -11,7 +11,7 @@
# locally used but not needed by users of the library
set(BREP_LOCAL_INCLUDE_DIRS
${CMAKE_CURRENT_SOURCE_DIR}
- ${REGEX_INCLUDE_DIR}
+ ${REGEX_INCLUDE_DIRS}
${BRLCAD_SOURCE_DIR}/src/other/Eigen
)
@@ -49,7 +49,7 @@
tools/util.cpp
)
-BRLCAD_ADDLIB(libbrep "${LIBBREP_SOURCES}"
"libbg;libbn;libbu;${OPENNURBS_LIBRARIES};${P2T_LIBRARY};${WINSOCK_LIB};${RPCRT_LIB};${STDCXX_LIBRARIES}")
+BRLCAD_ADDLIB(libbrep "${LIBBREP_SOURCES}"
"libbg;libbn;libbu;${OPENNURBS_LIBRARIES};${POLY2TRI_LIBRARIES};${WINSOCK_LIB};${RPCRT_LIB};${STDCXX_LIBRARIES}")
set_target_properties(libbrep PROPERTIES VERSION 20.0.1 SOVERSION 20)
if(HIDE_INTERNAL_SYMBOLS)
Modified: brlcad/branches/extbuild/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/CMakeLists.txt 2020-10-23 14:49:29 UTC
(rev 77609)
+++ brlcad/branches/extbuild/src/other/CMakeLists.txt 2020-10-23 15:21:50 UTC
(rev 77610)
@@ -100,11 +100,17 @@
# libutahrle Library - The directory to perform ADD_SUBDIRECTORY on
# and the include directory for utahrle are different, so override the
-# macro's setting of UTAHRLE_INCLUDE_DIR here.
+# macro's setting of UTAHRLE_INCLUDE_DIRS here.
if (BRLCAD_LEVEL3)
add_subdirectory(libutahrle)
+ set(UTAHRLE_LIBRARY utahrle CACHE STRING "directory with rle.h header" FORCE)
+ set(UTAHRLE_LIBRARIES utahrle CACHE STRING "directory with rle.h header"
FORCE)
set(UTAHRLE_INCLUDE_DIR "${BRLCAD_SOURCE_DIR}/src/other/libutahrle/include"
CACHE STRING "directory with rle.h header" FORCE)
+ set(UTAHRLE_INCLUDE_DIRS "${BRLCAD_SOURCE_DIR}/src/other/libutahrle/include"
CACHE STRING "directory with rle.h header" FORCE)
+ mark_as_advanced(UTAHRLE_LIBRARY)
+ mark_as_advanced(UTAHRLE_LIBRARIES)
mark_as_advanced(UTAHRLE_INCLUDE_DIR)
+ mark_as_advanced(UTAHRLE_INCLUDE_DIRS)
endif (BRLCAD_LEVEL3)
include("${CMAKE_CURRENT_SOURCE_DIR}/libutahrle.dist")
CMAKEFILES_IN_DIR(libutahrle_ignore_files libutahrle)
@@ -115,10 +121,14 @@
SetTargetFolder(openNURBS "Third Party Libraries")
SetTargetFolder(openNURBS-static "Third Party Libraries")
SetTargetFolder(openNURBS-obj "Third Party Libraries")
+set(OPENNURBS_LIBRARY openNURBS CACHE STRING "Require opennurbs libraries"
FORCE)
+set(OPENNURBS_LIBRARIES openNURBS CACHE STRING "Require opennurbs libraries"
FORCE)
set(OPENNURBS_INCLUDE_DIR "${BRLCAD_SOURCE_DIR}/src/other/openNURBS" CACHE
STRING "Require opennurbs header includes" FORCE)
-set(OPENNURBS_LIBRARY openNURBS CACHE STRING "Require opennurbs libraries"
FORCE)
+set(OPENNURBS_INCLUDE_DIRS "${BRLCAD_SOURCE_DIR}/src/other/openNURBS" CACHE
STRING "Require opennurbs header includes" FORCE)
+mark_as_advanced(OPENNURBS_LIBRARY)
+mark_as_advanced(OPENNURBS_LIBRARIES)
mark_as_advanced(OPENNURBS_INCLUDE_DIR)
-mark_as_advanced(OPENNURBS_LIBRARY)
+mark_as_advanced(OPENNURBS_INCLUDE_DIRS)
get_directory_property(openNURBS_headers_orig DIRECTORY openNURBS DEFINITION
OPENNURBS_HEADERS)
set(openNURBS_headers)
foreach(onhfile ${openNURBS_headers_orig})
@@ -147,11 +157,15 @@
CMAKEFILES_IN_DIR(poly2tri_ignore_files poly2tri)
DISTCLEAN("${CMAKE_CURRENT_SOURCE_DIR}/poly2tri/Makefile")
set(POLY2TRI_LIBRARY "poly2tri" CACHE STRING "Poly2Tri library" FORCE)
+set(POLY2TRI_LIBRARIES "poly2tri" CACHE STRING "Poly2Tri library" FORCE)
set(POLY2TRI_INCLUDE_DIR "${BRLCAD_SOURCE_DIR}/src/other/poly2tri" CACHE
STRING "Directory containing poly2tri header" FORCE)
+set(POLY2TRI_INCLUDE_DIRS "${BRLCAD_SOURCE_DIR}/src/other/poly2tri" CACHE
STRING "Directory containing poly2tri header" FORCE)
SetTargetFolder(poly2tri "Third Party Libraries")
SetTargetFolder(poly2tri-static "Third Party Libraries")
mark_as_advanced(POLY2TRI_LIBRARY)
+mark_as_advanced(POLY2TRI_LIBRARIES)
mark_as_advanced(POLY2TRI_INCLUDE_DIR)
+mark_as_advanced(POLY2TRI_INCLUDE_DIRS)
# GCT is a collection of algorithms for geometry processing and conversion
Modified: brlcad/branches/extbuild/src/other/ext/png.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/png.cmake 2020-10-23 14:49:29 UTC
(rev 77609)
+++ brlcad/branches/extbuild/src/other/ext/png.cmake 2020-10-23 15:21:50 UTC
(rev 77610)
@@ -93,6 +93,16 @@
SetTargetFolder(PNG_BLD "Third Party Libraries")
SetTargetFolder(png "Third Party Libraries")
+else (BRLCAD_PNG_BUILD)
+
+ set(PNG_INCLUDE_DIRS "${PNG_PNG_INCLUDE_DIR}" CACHE STRING "Directory
containing libpng headers." FORCE)
+
+ if (DEFINED PNG_LIBRARY_RELEASE)
+ set(PNG_LIBRARIES ${PNG_LIBRARY_RELEASE} CACHE STRING "libpng" FORCE)
+ else (DEFINED PNG_LIBRARY_RELEASE)
+ set(PNG_LIBRARIES ${PNG_LIBRARY_DEBUG} CACHE STRING "libpng" FORCE)
+ endif (DEFINED PNG_LIBRARY_RELEASE)
+
endif (BRLCAD_PNG_BUILD)
include("${CMAKE_CURRENT_SOURCE_DIR}/png.dist")
Modified: brlcad/branches/extbuild/src/util/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/util/CMakeLists.txt 2020-10-23 14:49:29 UTC
(rev 77609)
+++ brlcad/branches/extbuild/src/util/CMakeLists.txt 2020-10-23 15:21:50 UTC
(rev 77610)
@@ -11,7 +11,7 @@
set(UTIL_LOCAL_INCLUDE_DIRS
${CMAKE_CURRENT_SOURCE_DIR}
- ${UTAHRLE_INCLUDE_DIR}
+ ${UTAHRLE_INCLUDE_DIRS}
${PNG_INCLUDE_DIRS}
)
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
