Revision: 77341
http://sourceforge.net/p/brlcad/code/77341
Author: starseeker
Date: 2020-10-06 13:31:07 +0000 (Tue, 06 Oct 2020)
Log Message:
-----------
simplify
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/other/tkhtml/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/other/tktable/CMakeLists.txt
Removed Paths:
-------------
brlcad/branches/thirdparty_rework/src/other/tkhtml/CMake/
brlcad/branches/thirdparty_rework/src/other/tktable/CMake/
Modified: brlcad/branches/thirdparty_rework/src/other/tkhtml/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/other/tkhtml/CMakeLists.txt
2020-10-06 13:14:09 UTC (rev 77340)
+++ brlcad/branches/thirdparty_rework/src/other/tkhtml/CMakeLists.txt
2020-10-06 13:31:07 UTC (rev 77341)
@@ -4,8 +4,6 @@
# set CMake project name
project(TKHTML)
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
-
find_package(TCL)
if (TK_SYSTEM_GRAPHICS MATCHES "x11")
Modified: brlcad/branches/thirdparty_rework/src/other/tktable/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/other/tktable/CMakeLists.txt
2020-10-06 13:14:09 UTC (rev 77340)
+++ brlcad/branches/thirdparty_rework/src/other/tktable/CMakeLists.txt
2020-10-06 13:31:07 UTC (rev 77341)
@@ -4,8 +4,6 @@
# set CMake project name
project(TKTABLE)
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
-
find_package(TCL)
if (WIN32 OR "${TK_SYSTEM_GRAPHICS}" MATCHES "aqua")
@@ -34,7 +32,7 @@
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TKTABLE_CFLAGS}")
-ADD_CUSTOM_COMMAND(
+add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tkTable.tcl.h
COMMAND ${TCL_TCLSH} ${CMAKE_CURRENT_SOURCE_DIR}/misc/tkTable_header.tcl
${CMAKE_CURRENT_SOURCE_DIR}/library/tkTable.tcl
${CMAKE_CURRENT_BINARY_DIR}/tkTable.tcl.h.new
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_BINARY_DIR}/tkTable.tcl.h.new
${CMAKE_CURRENT_BINARY_DIR}/tkTable.tcl.h
@@ -41,7 +39,7 @@
COMMAND ${CMAKE_COMMAND} -E remove
${CMAKE_CURRENT_BINARY_DIR}/tkTable.tcl.h.new
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/library/tkTable.tcl
${CMAKE_CURRENT_SOURCE_DIR}/misc/tkTable_header.tcl ${TCL_TCLSH}
)
-ADD_CUSTOM_TARGET(tktable_header_gen ALL DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/tkTable.tcl.h)
+add_custom_target(tktable_header_gen ALL DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/tkTable.tcl.h)
set(TKTABLE_SRCS
generic/tkTable.c
@@ -99,7 +97,7 @@
file(COPY ${TKTABLE_MISC} DESTINATION
${CMAKE_BINARY_DIR}/lib/${TKTABLE_PKGNAME}${TKTABLE_PKGVERSION})
endif(CMAKE_CONFIGURATION_TYPES)
-INSTALL(FILES ${TKTABLE_MISC} DESTINATION
lib/${TKTABLE_PKGNAME}${TKTABLE_PKGVERSION})
+install(FILES ${TKTABLE_MISC} DESTINATION
lib/${TKTABLE_PKGNAME}${TKTABLE_PKGVERSION})
# Local Variables:
# tab-width: 8
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
