Revision: 75316
http://sourceforge.net/p/brlcad/code/75316
Author: starseeker
Date: 2020-04-09 15:19:06 +0000 (Thu, 09 Apr 2020)
Log Message:
-----------
Wrap header installs
Modified Paths:
--------------
brlcad/trunk/src/other/libgdiam/CMakeLists.txt
brlcad/trunk/src/other/libnetpbm/CMakeLists.txt
brlcad/trunk/src/other/libspsr/CMakeLists.txt
brlcad/trunk/src/other/libutahrle/CMakeLists.txt
brlcad/trunk/src/other/libvds/CMakeLists.txt
brlcad/trunk/src/other/poly2tri/CMakeLists.txt
brlcad/trunk/src/other/proj-4/src/CMakeLists.txt
brlcad/trunk/src/other/rply/CMakeLists.txt
brlcad/trunk/src/other/stepcode/include/CMakeLists.txt
brlcad/trunk/src/other/stepcode/src/base/CMakeLists.txt
brlcad/trunk/src/other/stepcode/src/cldai/CMakeLists.txt
brlcad/trunk/src/other/stepcode/src/cleditor/CMakeLists.txt
brlcad/trunk/src/other/stepcode/src/cllazyfile/CMakeLists.txt
brlcad/trunk/src/other/stepcode/src/clstepcore/CMakeLists.txt
brlcad/trunk/src/other/stepcode/src/clutils/CMakeLists.txt
Modified: brlcad/trunk/src/other/libgdiam/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/libgdiam/CMakeLists.txt 2020-04-09 02:20:47 UTC
(rev 75315)
+++ brlcad/trunk/src/other/libgdiam/CMakeLists.txt 2020-04-09 15:19:06 UTC
(rev 75316)
@@ -47,7 +47,9 @@
ARCHIVE DESTINATION ${LIB_DIR})
endif (BUILD_STATIC_LIBS)
+if (NOT SKIP_INSTALL_HEADERS)
install(FILES gdiam.hpp DESTINATION ${INCLUDE_DIR})
+endif (NOT SKIP_INSTALL_HEADERS)
if (ENABLE_GDIAM_TESTING)
# Enable ctest
Modified: brlcad/trunk/src/other/libnetpbm/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/libnetpbm/CMakeLists.txt 2020-04-09 02:20:47 UTC
(rev 75315)
+++ brlcad/trunk/src/other/libnetpbm/CMakeLists.txt 2020-04-09 15:19:06 UTC
(rev 75316)
@@ -137,9 +137,9 @@
ppmfloyd.h
)
-if (NOT SKIP_INSTALL_HDRS)
+if (NOT SKIP_INSTALL_HEADERS)
install (FILES ${NETPBM_HEADERS} DESTINATION ${INCLUDE_DIR}/netpbm)
-endif (NOT SKIP_INSTALL_HDRS)
+endif (NOT SKIP_INSTALL_HEADERS)
if (NOT DEFINED BUILD_SHARED_LIBS)
Modified: brlcad/trunk/src/other/libspsr/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/libspsr/CMakeLists.txt 2020-04-09 02:20:47 UTC
(rev 75315)
+++ brlcad/trunk/src/other/libspsr/CMakeLists.txt 2020-04-09 15:19:06 UTC
(rev 75316)
@@ -69,9 +69,9 @@
Src/SPSR.h
Src/cvertex.h
)
-if (NOT SKIP_INSTALL_HDRS)
+if (NOT SKIP_INSTALL_HEADERS)
install (FILES ${SPSR_HDRS} DESTINATION ${INCLUDE_DIR}/SPSR)
-endif (NOT SKIP_INSTALL_HDRS)
+endif (NOT SKIP_INSTALL_HEADERS)
if(MSVC)
add_definitions("-DSPSR_DLL_EXPORTS")
Modified: brlcad/trunk/src/other/libutahrle/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/libutahrle/CMakeLists.txt 2020-04-09 02:20:47 UTC
(rev 75315)
+++ brlcad/trunk/src/other/libutahrle/CMakeLists.txt 2020-04-09 15:19:06 UTC
(rev 75316)
@@ -158,9 +158,9 @@
ARCHIVE DESTINATION ${LIB_DIR})
endif(BUILD_STATIC_LIBS)
-if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
+if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
install(FILES ${LIBUTAHRLE_PUBLIC_HDRS} DESTINATION include)
-endif(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
+endif(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
# Local Variables:
# tab-width: 8
Modified: brlcad/trunk/src/other/libvds/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/libvds/CMakeLists.txt 2020-04-09 02:20:47 UTC
(rev 75315)
+++ brlcad/trunk/src/other/libvds/CMakeLists.txt 2020-04-09 15:19:06 UTC
(rev 75316)
@@ -88,7 +88,9 @@
ARCHIVE DESTINATION ${LIB_DIR})
endif (BUILD_STATIC_LIBS)
-install(FILES vds.h DESTINATION ${INCLUDE_DIR})
+if (NOT SKIP_INSTALL_HEADERS)
+ install(FILES vds.h DESTINATION ${INCLUDE_DIR})
+endif (NOT SKIP_INSTALL_HEADERS)
# Local Variables:
# tab-width: 8
Modified: brlcad/trunk/src/other/poly2tri/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/poly2tri/CMakeLists.txt 2020-04-09 02:20:47 UTC
(rev 75315)
+++ brlcad/trunk/src/other/poly2tri/CMakeLists.txt 2020-04-09 15:19:06 UTC
(rev 75316)
@@ -86,9 +86,11 @@
poly2tri/sweep/sweep.h
poly2tri/sweep/sweep_context.h
)
-install(FILES ${SWEEP_HDRS} DESTINATION ${INCLUDE_DIR}/poly2tri/sweep)
-install(FILES poly2tri/poly2tri.h DESTINATION ${INCLUDE_DIR}/poly2tri)
-install(FILES poly2tri/common/shapes.h DESTINATION
${INCLUDE_DIR}/poly2tri/common)
+if (NOT SKIP_INSTALL_HEADERS)
+ install(FILES ${SWEEP_HDRS} DESTINATION ${INCLUDE_DIR}/poly2tri/sweep)
+ install(FILES poly2tri/poly2tri.h DESTINATION ${INCLUDE_DIR}/poly2tri)
+ install(FILES poly2tri/common/shapes.h DESTINATION
${INCLUDE_DIR}/poly2tri/common)
+endif (NOT SKIP_INSTALL_HEADERS)
set(SOURCES
poly2tri/common/shapes.cc
Modified: brlcad/trunk/src/other/proj-4/src/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/proj-4/src/CMakeLists.txt 2020-04-09 02:20:47 UTC
(rev 75315)
+++ brlcad/trunk/src/other/proj-4/src/CMakeLists.txt 2020-04-09 15:19:06 UTC
(rev 75316)
@@ -230,7 +230,9 @@
)
endif (BUILD_STATIC_LIBS)
-install(FILES ${hdr_files} DESTINATION ${INCLUDE_DIR}/proj)
+if (NOT SKIP_INSTALL_HEADERS)
+ install(FILES ${hdr_files} DESTINATION ${INCLUDE_DIR}/proj)
+endif (NOT SKIP_INSTALL_HEADERS)
# Local Variables:
Modified: brlcad/trunk/src/other/rply/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/rply/CMakeLists.txt 2020-04-09 02:20:47 UTC (rev
75315)
+++ brlcad/trunk/src/other/rply/CMakeLists.txt 2020-04-09 15:19:06 UTC (rev
75316)
@@ -48,7 +48,9 @@
ARCHIVE DESTINATION ${LIB_DIR})
endif (BUILD_STATIC_LIBS)
-install(FILES rply.h DESTINATION ${INCLUDE_DIR})
+if (NOT SKIP_INSTALL_HEADERS)
+ install(FILES rply.h DESTINATION ${INCLUDE_DIR})
+endif (NOT SKIP_INSTALL_HEADERS)
# Local Variables:
# tab-width: 8
Modified: brlcad/trunk/src/other/stepcode/include/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/stepcode/include/CMakeLists.txt 2020-04-09
02:20:47 UTC (rev 75315)
+++ brlcad/trunk/src/other/stepcode/include/CMakeLists.txt 2020-04-09
15:19:06 UTC (rev 75316)
@@ -1,4 +1,4 @@
-SET(express_HDRS
+set(express_HDRS
express/alg.h
express/basic.h
express/caseitem.h
@@ -21,20 +21,24 @@
express/type.h
express/variable.h
)
-install(FILES ${express_HDRS}
- DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/express)
-
-SET(exppp_HDRS
+set(exppp_HDRS
exppp/exppp.h
)
-install(FILES ${exppp_HDRS}
- DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/exppp)
-install(FILES ordered_attrs.h
- sc_export.h
- sc_stdbool.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode)
+if (NOT SKIP_INSTALL_HEADERS)
+ install(FILES ${express_HDRS}
+ DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/express)
-install(FILES ${SC_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_cf.h
- ${SC_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_version_string.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode)
+ install(FILES ${exppp_HDRS}
+ DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/exppp)
+
+ install(FILES ordered_attrs.h
+ sc_export.h
+ sc_stdbool.h
+ DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode)
+
+ install(FILES ${SC_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_cf.h
+ ${SC_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_version_string.h
+ DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode)
+endif (NOT SKIP_INSTALL_HEADERS)
+
Modified: brlcad/trunk/src/other/stepcode/src/base/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/stepcode/src/base/CMakeLists.txt 2020-04-09
02:20:47 UTC (rev 75315)
+++ brlcad/trunk/src/other/stepcode/src/base/CMakeLists.txt 2020-04-09
15:19:06 UTC (rev 75316)
@@ -40,5 +40,7 @@
message( "Judy array source code extracted." )
endif(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/judy/src" )
-install(FILES ${SC_BASE_HDRS}
- DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/base)
+if (NOT SKIP_INSTALL_HEADERS)
+ install(FILES ${SC_BASE_HDRS}
+ DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/base)
+endif (NOT SKIP_INSTALL_HEADERS)
Modified: brlcad/trunk/src/other/stepcode/src/cldai/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/stepcode/src/cldai/CMakeLists.txt 2020-04-09
02:20:47 UTC (rev 75315)
+++ brlcad/trunk/src/other/stepcode/src/cldai/CMakeLists.txt 2020-04-09
15:19:06 UTC (rev 75316)
@@ -36,5 +36,7 @@
SC_ADDLIB(stepdai "${LIBSTEPDAI_SRCS}" "steputils;base")
-install(FILES ${SC_CLDAI_HDRS}
- DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/cldai)
+if (NOT SKIP_INSTALL_HEADERS)
+ install(FILES ${SC_CLDAI_HDRS}
+ DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/cldai)
+endif (NOT SKIP_INSTALL_HEADERS)
Modified: brlcad/trunk/src/other/stepcode/src/cleditor/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/stepcode/src/cleditor/CMakeLists.txt 2020-04-09
02:20:47 UTC (rev 75315)
+++ brlcad/trunk/src/other/stepcode/src/cleditor/CMakeLists.txt 2020-04-09
15:19:06 UTC (rev 75316)
@@ -29,5 +29,7 @@
SC_ADDLIB(stepeditor "${LIBSTEPEDITOR_SRCS}" "stepcore;stepdai;steputils;base")
-install(FILES ${SC_CLEDITOR_HDRS}
- DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/cleditor)
+if (NOT SKIP_INSTALL_HEADERS)
+ install(FILES ${SC_CLEDITOR_HDRS}
+ DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/cleditor)
+endif (NOT SKIP_INSTALL_HEADERS)
Modified: brlcad/trunk/src/other/stepcode/src/cllazyfile/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/stepcode/src/cllazyfile/CMakeLists.txt
2020-04-09 02:20:47 UTC (rev 75315)
+++ brlcad/trunk/src/other/stepcode/src/cllazyfile/CMakeLists.txt
2020-04-09 15:19:06 UTC (rev 75316)
@@ -37,5 +37,7 @@
SC_ADDEXEC(lazy_test "lazy_test.cc" "steplazyfile;stepeditor" NO_INSTALL)
set_target_properties(lazy_test PROPERTIES COMPILE_FLAGS "-DNO_REGISTRY" )
-install(FILES ${SC_CLLAZYFILE_HDRS}
- DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/cllazyfile)
+if (NOT SKIP_INSTALL_HEADERS)
+ install(FILES ${SC_CLLAZYFILE_HDRS}
+ DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/cllazyfile)
+endif (NOT SKIP_INSTALL_HEADERS)
Modified: brlcad/trunk/src/other/stepcode/src/clstepcore/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/stepcode/src/clstepcore/CMakeLists.txt
2020-04-09 02:20:47 UTC (rev 75315)
+++ brlcad/trunk/src/other/stepcode/src/clstepcore/CMakeLists.txt
2020-04-09 15:19:06 UTC (rev 75316)
@@ -70,5 +70,7 @@
SC_ADDLIB(stepcore "${LIBSTEPCORE_SRCS}" "steputils;stepdai;base")
-install(FILES ${SC_CLSTEPCORE_HDRS}
- DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/clstepcore)
+if (NOT SKIP_INSTALL_HEADERS)
+ install(FILES ${SC_CLSTEPCORE_HDRS}
+ DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/clstepcore)
+endif (NOT SKIP_INSTALL_HEADERS)
Modified: brlcad/trunk/src/other/stepcode/src/clutils/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/stepcode/src/clutils/CMakeLists.txt 2020-04-09
02:20:47 UTC (rev 75315)
+++ brlcad/trunk/src/other/stepcode/src/clutils/CMakeLists.txt 2020-04-09
15:19:06 UTC (rev 75316)
@@ -31,5 +31,7 @@
TARGET_LINK_LIBRARIES(steputils shlwapi.lib)
ENDIF()
+if (NOT SKIP_INSTALL_HEADERS)
install(FILES ${SC_CLUTILS_HDRS}
DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/clutils)
+endif (NOT SKIP_INSTALL_HEADERS)
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
