Revision: 76706
http://sourceforge.net/p/brlcad/code/76706
Author: starseeker
Date: 2020-08-11 17:36:18 +0000 (Tue, 11 Aug 2020)
Log Message:
-----------
Catch files that aren't listed for distcheck by any of the build targets
specifically on Windows.
Modified Paths:
--------------
brlcad/branches/RELEASE/src/CMakeLists.txt
brlcad/branches/RELEASE/src/fb/CMakeLists.txt
brlcad/branches/RELEASE/src/librt/CMakeLists.txt
brlcad/branches/RELEASE/src/libtermio/CMakeLists.txt
brlcad/branches/RELEASE/src/remrt/CMakeLists.txt
brlcad/branches/RELEASE/src/util/CMakeLists.txt
Modified: brlcad/branches/RELEASE/src/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/src/CMakeLists.txt 2020-08-11 15:38:51 UTC (rev
76705)
+++ brlcad/branches/RELEASE/src/CMakeLists.txt 2020-08-11 17:36:18 UTC (rev
76706)
@@ -50,12 +50,6 @@
# Level 3 directories contain BRL-CAD's executables. Setting
# the BRLCAD_ENABLE_TARGETS level to 3 will enable all programs.
-# FIXME: Ideally these should all be in the below list,
-# need to fix them on Windows.
-if(NOT WIN32)
- set(non_win32_dirs remrt)
-endif(NOT WIN32)
-
set(level_3_dirs
brlman
burst
@@ -73,7 +67,7 @@
util
qged
external
- ${non_win32_dirs}
+ remrt
# tclscripts must come before applications like
# mged and archer that need the scripts in place to
# run. The script target lists are defined when the tclscripts
Modified: brlcad/branches/RELEASE/src/fb/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/src/fb/CMakeLists.txt 2020-08-11 15:38:51 UTC
(rev 76705)
+++ brlcad/branches/RELEASE/src/fb/CMakeLists.txt 2020-08-11 17:36:18 UTC
(rev 76706)
@@ -32,6 +32,8 @@
if(TARGET libtermio)
BRLCAD_ADDEXEC(fbcolor fbcolor.c "libdm;libtermio")
ADD_TARGET_DEPS(fbcolor dm-ogl dm-wgl)
+else(TARGET libtermio)
+ CMAKEFILES(fbcolor.c)
endif(TARGET libtermio)
BRLCAD_ADDEXEC(fbfade "fbfade.c;ioutil.c" libdm)
ADD_TARGET_DEPS(fbfade dm-ogl dm-wgl)
@@ -52,6 +54,8 @@
if(TARGET libtermio)
BRLCAD_ADDEXEC(fbpoint fbpoint.c "libdm;libbu;libtermio;libpkg")
ADD_TARGET_DEPS(fbpoint dm-ogl dm-wgl)
+else(TARGET libtermio)
+ CMAKEFILES(fbpoint.c)
endif(TARGET libtermio)
BRLCAD_ADDEXEC(fbstretch "fbstretch.c;ioutil.c" libdm)
ADD_TARGET_DEPS(fbstretch dm-ogl dm-wgl)
@@ -58,6 +62,8 @@
if(TARGET libtermio)
BRLCAD_ADDEXEC(fbzoom fbzoom.c "libdm;libtermio")
ADD_TARGET_DEPS(fbzoom dm-ogl dm-wgl)
+else(TARGET libtermio)
+ CMAKEFILES(fbzoom.c)
endif(TARGET libtermio)
BRLCAD_ADDEXEC(gif-fb "gif-fb.c;ioutil.c" libdm)
ADD_TARGET_DEPS(gif-fb dm-ogl dm-wgl)
Modified: brlcad/branches/RELEASE/src/librt/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/src/librt/CMakeLists.txt 2020-08-11 15:38:51 UTC
(rev 76705)
+++ brlcad/branches/RELEASE/src/librt/CMakeLists.txt 2020-08-11 17:36:18 UTC
(rev 76706)
@@ -300,6 +300,7 @@
test_nurbsfit.cpp
test_root3-subd.cpp
timer-nt.c
+ timer42.c
timerunix.c
uvpoints.cpp
)
Modified: brlcad/branches/RELEASE/src/libtermio/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/src/libtermio/CMakeLists.txt 2020-08-11
15:38:51 UTC (rev 76705)
+++ brlcad/branches/RELEASE/src/libtermio/CMakeLists.txt 2020-08-11
17:36:18 UTC (rev 76706)
@@ -1,3 +1,10 @@
+set(TERMIO_SRCS
+ termio.c
+ termcap.c
+ tgoto.c
+ tputs.c
+ )
+
if (NOT WIN32)
# Include directories needed by libtermio users
set(TERMIO_INCLUDE_DIRS
@@ -10,13 +17,6 @@
-DB_TERMCAP=\"${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/termio/termcap\"
)
- set(TERMIO_SRCS
- termio.c
- termcap.c
- tgoto.c
- tputs.c
- )
-
BRLCAD_ADDDATA(termcap termio)
BRLCAD_ADDLIB(libtermio "${TERMIO_SRCS}" "libbu")
@@ -24,6 +24,7 @@
endif(NOT WIN32)
CMAKEFILES(
+ ${TERMIO_SRCS}
CMakeLists.txt
termcap.h
)
Modified: brlcad/branches/RELEASE/src/remrt/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/src/remrt/CMakeLists.txt 2020-08-11 15:38:51 UTC
(rev 76705)
+++ brlcad/branches/RELEASE/src/remrt/CMakeLists.txt 2020-08-11 17:36:18 UTC
(rev 76706)
@@ -1,25 +1,34 @@
-set(REMRTBIN_INCLUDE_DIRS
- ${REMRT_INCLUDE_DIRS}
- ${OPTICAL_INCLUDE_DIRS}
- ${FB_INCLUDE_DIRS}
- ${PKG_INCLUDE_DIRS}
- )
-LIST(REMOVE_DUPLICATES REMRTBIN_INCLUDE_DIRS)
-include_directories(${REMRTBIN_INCLUDE_DIRS})
-include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${TCL_INCLUDE_PATH}
- )
+if (NOT WIN32)
+ set(REMRTBIN_INCLUDE_DIRS
+ ${REMRT_INCLUDE_DIRS}
+ ${OPTICAL_INCLUDE_DIRS}
+ ${FB_INCLUDE_DIRS}
+ ${PKG_INCLUDE_DIRS}
+ )
+ LIST(REMOVE_DUPLICATES REMRTBIN_INCLUDE_DIRS)
+ include_directories(${REMRTBIN_INCLUDE_DIRS})
-BRLCAD_ADDEXEC(remrt "../rt/opt.c;ihost.c;remrt.c" "liboptical;libdm")
-ADD_TARGET_DEPS(remrt dm-ogl dm-wgl)
+ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TCL_INCLUDE_PATH}
+ )
-BRLCAD_ADDEXEC(rtsrv
"../rt/usage.cpp;../rt/view.c;../rt/do.c;../rt/heatgraph.c;../rt/opt.c;../rt/scanline.c;../rt/worker.c;rtsrv.c"
"libdm;liboptical;libpkg;libicv")
-set_property(TARGET rtsrv APPEND PROPERTY COMPILE_DEFINITIONS "RTSRV")
-ADD_TARGET_DEPS(rtsrv dm-ogl dm-wgl)
+ BRLCAD_ADDEXEC(remrt "../rt/opt.c;ihost.c;remrt.c" "liboptical;libdm")
+ ADD_TARGET_DEPS(remrt dm-ogl dm-wgl)
-CMAKEFILES(ihost.h protocol.h)
+ BRLCAD_ADDEXEC(rtsrv
"../rt/usage.cpp;../rt/view.c;../rt/do.c;../rt/heatgraph.c;../rt/opt.c;../rt/scanline.c;../rt/worker.c;rtsrv.c"
"libdm;liboptical;libpkg;libicv")
+ set_property(TARGET rtsrv APPEND PROPERTY COMPILE_DEFINITIONS "RTSRV")
+ ADD_TARGET_DEPS(rtsrv dm-ogl dm-wgl)
+endif (NOT WIN32)
+
+CMAKEFILES(
+ ihost.c
+ ihost.h
+ protocol.h
+ remrt.c
+ rtsrv.c
+ )
CMAKEFILES(CMakeLists.txt)
# Local Variables:
Modified: brlcad/branches/RELEASE/src/util/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/src/util/CMakeLists.txt 2020-08-11 15:38:51 UTC
(rev 76705)
+++ brlcad/branches/RELEASE/src/util/CMakeLists.txt 2020-08-11 17:36:18 UTC
(rev 76706)
@@ -147,6 +147,8 @@
#maintained and ported
if(NOT WIN32)
BRLCAD_ADDEXEC(ttcp ttcp.c
"${SOCKET_LIBRARY};${NSL_LIBRARY};${NETWORK_LIBRARY}")
+else(NOT WIN32)
+ CMAKEFILES(ttcp.c)
endif(NOT WIN32)
BRLCAD_ADDEXEC(wavelet wavelet.c "libdm;libbn;libbu")
ADD_TARGET_DEPS(wavelet dm-ogl dm-wgl)
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
