Revision: 75590
http://sourceforge.net/p/brlcad/code/75590
Author: starseeker
Date: 2020-04-23 21:42:25 +0000 (Thu, 23 Apr 2020)
Log Message:
-----------
More cleanup work - vanilla FindTCL logic (even when concated together) doesn't
set some of the information our original FindTCL did.
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
brlcad/trunk/src/other/tkhtml/CMakeLists.txt
brlcad/trunk/src/other/tkhtml.dist
brlcad/trunk/src/other/tktable/CMakeLists.txt
brlcad/trunk/src/other/tktable.dist
Removed Paths:
-------------
brlcad/trunk/src/other/tkhtml/CMake/
brlcad/trunk/src/other/tktable/CMake/
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2020-04-23 21:22:26 UTC (rev
75589)
+++ brlcad/trunk/src/other/CMakeLists.txt 2020-04-23 21:42:25 UTC (rev
75590)
@@ -432,7 +432,7 @@
set(TK_INCLUDE_PATH "${TK_INCLUDE_PATH}" CACHE STRING "Tk include path"
FORCE)
get_directory_property(TK_SYSTEM_GRAPHICS DIRECTORY tk DEFINITION
TK_SYSTEM_GRAPHICS)
- set(TK_SYSTEM_GRAPHICS "${TK_SYSTEM_GRAPHICS}" CACHE STRING "Tk system
graphis type" FORCE)
+ set(TK_SYSTEM_GRAPHICS "${TK_SYSTEM_GRAPHICS}" CACHE STRING "Tk system
graphics type" FORCE)
# Let Distclean know it will have work to do both here and in
# the lib directory
@@ -455,6 +455,18 @@
# Still need the header, even if we're using system Tcl/Tk
BRLCAD_INCLUDE_FILE(tk.h HAVE_TK_H)
+ # Packages probably still need to know the system graphics package
+ if (NOT WIN32)
+ if (APPLE AND TK_ENABLE_AQUA)
+ set(TK_SYSTEM_GRAPHICS aqua)
+ else ()
+ set(TK_SYSTEM_GRAPHICS x11)
+ endif (APPLE AND TK_ENABLE_AQUA)
+ else (NOT WIN32)
+ set(TK_SYSTEM_GRAPHICS win32)
+ endif (NOT WIN32)
+ set(TK_SYSTEM_GRAPHICS "${TK_SYSTEM_GRAPHICS}" CACHE STRING "Tk system
graphics type" FORCE)
+
endif(BRLCAD_TK_BUILD)
mark_as_advanced(TK_INCLUDE_PATH)
mark_as_advanced(TK_LIBRARY)
Modified: brlcad/trunk/src/other/tkhtml/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/tkhtml/CMakeLists.txt 2020-04-23 21:22:26 UTC
(rev 75589)
+++ brlcad/trunk/src/other/tkhtml/CMakeLists.txt 2020-04-23 21:42:25 UTC
(rev 75590)
@@ -4,15 +4,11 @@
# set CMake project name
project(TKHTML)
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
+find_package(TCL)
-IF(NOT TCL_TCLSH OR NOT TCL_STUB_LIBRARY OR NOT TK_STUB_LIBRARY)
- find_package(TCL)
-ENDIF()
-
-IF(TK_SYSTEM_GRAPHICS MATCHES "x11")
+if (TK_SYSTEM_GRAPHICS MATCHES "x11")
find_package(X11)
-ENDIF(TK_SYSTEM_GRAPHICS MATCHES "x11")
+endif (TK_SYSTEM_GRAPHICS MATCHES "x11")
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/src
@@ -22,36 +18,36 @@
${X11_INCLUDE_DIR}
)
-SET(TKHTML_PKGNAME Tkhtml)
-SET(TKHTML_PKGVERSION "3.0")
+set(TKHTML_PKGNAME Tkhtml)
+set(TKHTML_PKGVERSION "3.0")
# Windows specific flags
-IF(WIN32)
- SET(TKHTML_CFLAGS "${TKHTML_CFLAGS} -D_CRT_SECURE_NO_DEPRECATE
-D_CRT_NONSTDC_NO_DEP -Ot -Oi -fp:strict -Gs -GS -GL -DUSE_TCL_STUBS
-DUSE_TK_STUBS -D__WIN32__")
- SET(TKHTML_CFLAGS "${TKHTML_CFLAGS} -Dinline=__inline -DBUILD_tkhtml")
-ENDIF(WIN32)
+if (WIN32)
+ set(TKHTML_CFLAGS "${TKHTML_CFLAGS} -D_CRT_SECURE_NO_DEPRECATE
-D_CRT_NONSTDC_NO_DEP -Ot -Oi -fp:strict -Gs -GS -GL -DUSE_TCL_STUBS
-DUSE_TK_STUBS -D__WIN32__")
+ set(TKHTML_CFLAGS "${TKHTML_CFLAGS} -Dinline=__inline -DBUILD_tkhtml")
+endif (WIN32)
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TKHTML_CFLAGS}")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TKHTML_CFLAGS}")
-ADD_CUSTOM_COMMAND(
+add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/htmldefaultstyle.c
COMMAND ${TCL_TCLSH} ${CMAKE_CURRENT_SOURCE_DIR}/src/mkdefaultstyle.tcl >
${CMAKE_CURRENT_BINARY_DIR}/htmldefaultstyle.c
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/mkdefaultstyle.tcl ${TCL_TCLSH}
)
-ADD_CUSTOM_COMMAND(
+add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/htmltokens.c
${CMAKE_CURRENT_BINARY_DIR}/htmltokens.h
COMMAND ${TCL_TCLSH} ${CMAKE_CURRENT_SOURCE_DIR}/src/tokenlist.txt
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/tokenlist.txt ${TCL_TCLSH}
)
-ADD_CUSTOM_COMMAND(
+add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/cssprop.c
${CMAKE_CURRENT_BINARY_DIR}/cssprop.h
COMMAND ${TCL_TCLSH} ${CMAKE_CURRENT_SOURCE_DIR}/src/cssprop.tcl
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/htmltokens.c
${CMAKE_CURRENT_SOURCE_DIR}/src/cssprop.tcl ${TCL_TCLSH}
)
-SET(TKHTML_SRCS
+set(TKHTML_SRCS
${CMAKE_CURRENT_BINARY_DIR}/htmldefaultstyle.c
${CMAKE_CURRENT_BINARY_DIR}/cssprop.c
src/css.c
@@ -78,25 +74,26 @@
src/swproc.c
)
-IF(NOT LIB_DIR)
- IF(NOT WIN32)
- SET(LIB_DIR lib)
- ELSE(NOT WIN32)
- SET(LIB_DIR bin)
- ENDIF(NOT WIN32)
-ENDIF(NOT LIB_DIR)
+if (NOT LIB_DIR)
+ if (NOT WIN32)
+ set(LIB_DIR lib)
+ else (NOT WIN32)
+ set(LIB_DIR bin)
+ endif (NOT WIN32)
+endif (NOT LIB_DIR)
add_library(Tkhtml SHARED ${TKHTML_SRCS})
-IF(TK_SYSTEM_GRAPHICS MATCHES "aqua")
+if (TK_SYSTEM_GRAPHICS MATCHES "aqua")
# Need the X emulation functions from Tk when using aqua - the stubs
# library doesn't seem to supply them
target_link_libraries(Tkhtml ${TCL_STUB_LIBRARY} ${TK_STUB_LIBRARY}
${TK_LIBRARY} ${X11_LIBRARIES})
-ELSE(TK_SYSTEM_GRAPHICS MATCHES "aqua")
+else (TK_SYSTEM_GRAPHICS MATCHES "aqua")
target_link_libraries(Tkhtml ${TCL_STUB_LIBRARY} ${TK_STUB_LIBRARY}
${X11_LIBRARIES})
-ENDIF(TK_SYSTEM_GRAPHICS MATCHES "aqua")
-SET_TARGET_PROPERTIES(Tkhtml PROPERTIES VERSION ${TKHTML_PKGVERSION})
-SET_PROPERTY(TARGET Tkhtml APPEND PROPERTY COMPILE_DEFINITIONS USE_TCL_STUBS)
-SET_PROPERTY(TARGET Tkhtml APPEND PROPERTY COMPILE_DEFINITIONS USE_TK_STUBS)
+endif (TK_SYSTEM_GRAPHICS MATCHES "aqua")
+
+set_target_properties(Tkhtml PROPERTIES VERSION ${TKHTML_PKGVERSION})
+set_property(TARGET Tkhtml APPEND PROPERTY COMPILE_DEFINITIONS USE_TCL_STUBS)
+set_property(TARGET Tkhtml APPEND PROPERTY COMPILE_DEFINITIONS USE_TK_STUBS)
install(TARGETS Tkhtml
RUNTIME DESTINATION ${BIN_DIR}
LIBRARY DESTINATION ${LIB_DIR}
@@ -105,12 +102,14 @@
include(TCL_PKGINDEX.cmake)
TCL_PKGINDEX(Tkhtml ${TKHTML_PKGNAME} ${TKHTML_PKGVERSION})
-ADD_CUSTOM_COMMAND(
+add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tkhtml.n
COMMAND ${TCL_TCLSH} ${CMAKE_CURRENT_SOURCE_DIR}/doc/macros.tcl -nroff
${CMAKE_CURRENT_SOURCE_DIR}/doc/html.man > ${CMAKE_CURRENT_BINARY_DIR}/tkhtml.n
)
-ADD_CUSTOM_TARGET(tkhtml_n_gen ALL DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/tkhtml.n)
+add_custom_target(tkhtml_n_gen ALL DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/tkhtml.n)
+
if(NOT MAN_DIR)
- SET(MAN_DIR man)
+ set(MAN_DIR man)
endif(NOT MAN_DIR)
+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tkhtml.n DESTINATION ${MAN_DIR}/mann)
Modified: brlcad/trunk/src/other/tkhtml.dist
===================================================================
--- brlcad/trunk/src/other/tkhtml.dist 2020-04-23 21:22:26 UTC (rev 75589)
+++ brlcad/trunk/src/other/tkhtml.dist 2020-04-23 21:42:25 UTC (rev 75590)
@@ -1,5 +1,4 @@
set(tkhtml_ignore_files
-CMake/FindX11.cmake
CMakeLists.txt
COPYING
README
Modified: brlcad/trunk/src/other/tktable/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/tktable/CMakeLists.txt 2020-04-23 21:22:26 UTC
(rev 75589)
+++ brlcad/trunk/src/other/tktable/CMakeLists.txt 2020-04-23 21:42:25 UTC
(rev 75590)
@@ -4,12 +4,14 @@
# set CMake project name
project(TKTABLE)
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
-IF(NOT TCL_TCLSH OR NOT TCL_STUB_LIBRARY OR NOT TK_STUB_LIBRARY)
- find_package(TCL)
-endif()
-find_package(X11)
+find_package(TCL)
+if (WIN32 OR "${TK_SYSTEM_GRAPHICS}" MATCHES "aqua")
+ include_directories("${TK_SOURCE_DIR}/xlib/X11")
+else ()
+ find_package(X11)
+endif ()
+
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR}
@@ -18,17 +20,17 @@
${X11_INCLUDE_DIR}
)
-SET(TKTABLE_PKGNAME Tktable)
-SET(TKTABLE_PKGVERSION "2.10")
+set(TKTABLE_PKGNAME Tktable)
+set(TKTABLE_PKGVERSION "2.10")
# Windows specific flags
IF(WIN32)
- SET(TKTABLE_CFLAGS "${TKTABLE_CFLAGS} -D_CRT_SECURE_NO_DEPRECATE
-D_CRT_NONSTDC_NO_DEP -Ot -Oi -fp:strict -Gs -GS -GL")
- SET(TKTABLE_CFLAGS "${TKTABLE_CFLAGS} -Dinline=__inline -DBUILD_Tktable")
- SET(TKTABLE_CFLAGS "${TKTABLE_CFLAGS} -DTBL_COMMAND=\"table\"
-DTBL_RUNTIME=\"tkTable.tcl\" -DTBL_RUNTIME_DIR=\"\"")
+ set(TKTABLE_CFLAGS "${TKTABLE_CFLAGS} -D_CRT_SECURE_NO_DEPRECATE
-D_CRT_NONSTDC_NO_DEP -Ot -Oi -fp:strict -Gs -GS -GL")
+ set(TKTABLE_CFLAGS "${TKTABLE_CFLAGS} -Dinline=__inline -DBUILD_Tktable")
+ set(TKTABLE_CFLAGS "${TKTABLE_CFLAGS} -DTBL_COMMAND=\"table\"
-DTBL_RUNTIME=\"tkTable.tcl\" -DTBL_RUNTIME_DIR=\"\"")
ENDIF(WIN32)
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TKTABLE_CFLAGS}")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TKTABLE_CFLAGS}")
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tkTable.tcl.h
@@ -39,7 +41,7 @@
)
ADD_CUSTOM_TARGET(tktable_header_gen ALL DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/tkTable.tcl.h)
-SET(TKTABLE_SRCS
+set(TKTABLE_SRCS
generic/tkTable.c
generic/tkTableCell.c
generic/tkTableCellSort.c
@@ -51,13 +53,13 @@
generic/tkTableWin.c
)
-SET(TKTABLE_CFG_H_FILE ${CMAKE_CURRENT_BINARY_DIR}/tktable_cfg.h.tmp)
-FILE(WRITE ${TKTABLE_CFG_H_FILE} "/**** Variables for Tktable build - replaces
-D options ****/\n")
-FILE(APPEND ${TKTABLE_CFG_H_FILE} "#define PACKAGE_NAME
\"${TKTABLE_PKGNAME}\"\n")
-FILE(APPEND ${TKTABLE_CFG_H_FILE} "#define PACKAGE_VERSION
\"${TKTABLE_PKGVERSION}\"\n")
-FILE(APPEND ${TKTABLE_CFG_H_FILE} "#define TBL_COMMAND \"table\"\n")
-FILE(APPEND ${TKTABLE_CFG_H_FILE} "#define TBL_RUNTIME \"tkTable.tcl\"\n")
-FILE(APPEND ${TKTABLE_CFG_H_FILE} "#define TBL_RUNTIME_DIR
\"${CMAKE_INSTALL_PREFIX}/lib/${TKTABLE_PKGNAME}${TKTABLE_PKGVERSION}\"\n")
+set(TKTABLE_CFG_H_FILE ${CMAKE_CURRENT_BINARY_DIR}/tktable_cfg.h.tmp)
+file(WRITE ${TKTABLE_CFG_H_FILE} "/**** Variables for Tktable build - replaces
-D options ****/\n")
+file(APPEND ${TKTABLE_CFG_H_FILE} "#define PACKAGE_NAME
\"${TKTABLE_PKGNAME}\"\n")
+file(APPEND ${TKTABLE_CFG_H_FILE} "#define PACKAGE_VERSION
\"${TKTABLE_PKGVERSION}\"\n")
+file(APPEND ${TKTABLE_CFG_H_FILE} "#define TBL_COMMAND \"table\"\n")
+file(APPEND ${TKTABLE_CFG_H_FILE} "#define TBL_RUNTIME \"tkTable.tcl\"\n")
+file(APPEND ${TKTABLE_CFG_H_FILE} "#define TBL_RUNTIME_DIR
\"${CMAKE_INSTALL_PREFIX}/lib/${TKTABLE_PKGNAME}${TKTABLE_PKGVERSION}\"\n")
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_BINARY_DIR}/tktable_cfg.h.tmp
${CMAKE_CURRENT_BINARY_DIR}/tktable_cfg.h)
execute_process(COMMAND ${CMAKE_COMMAND} -E remove
${CMAKE_CURRENT_BINARY_DIR}/tktable_cfg.h.tmp)
@@ -71,9 +73,9 @@
target_link_libraries(Tktable ${TCL_LIBRARY} ${TK_LIBRARY} ${X11_LIBRARIES})
set_target_properties(Tktable PROPERTIES VERSION ${TKTABLE_PKGVERSION})
install(TARGETS Tktable
- RUNTIME DESTINATION ${BIN_DIR}
- LIBRARY DESTINATION ${LIB_DIR}
- ARCHIVE DESTINATION ${LIB_DIR})
+ RUNTIME DESTINATION ${BIN_DIR}
+ LIBRARY DESTINATION ${LIB_DIR}
+ ARCHIVE DESTINATION ${LIB_DIR})
# Create the pkgIndex.tcl file.
TCL_PKGINDEX(Tktable ${TKTABLE_PKGNAME} ${TKTABLE_PKGVERSION})
@@ -81,17 +83,24 @@
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.txt DESTINATION
lib/${TKTABLE_PKGNAME}${TKTABLE_PKGVERSION})
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/license.txt DESTINATION
lib/${TKTABLE_PKGNAME}${TKTABLE_PKGVERSION})
-SET(TKTABLE_MISC
+set(TKTABLE_MISC
library/tkTable.tcl
library/tktable.py
)
if(CMAKE_CONFIGURATION_TYPES)
- foreach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
- string(TOUPPER "${CFG_TYPE}" CFG_TYPE_UPPER)
- FILE(COPY ${TKTABLE_MISC} DESTINATION
${CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}}/lib/${TKTABLE_PKGNAME}${TKTABLE_PKGVERSION})
- endforeach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
+ foreach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
+ string(TOUPPER "${CFG_TYPE}" CFG_TYPE_UPPER)
+ file(COPY ${TKTABLE_MISC} DESTINATION
${CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}}/lib/${TKTABLE_PKGNAME}${TKTABLE_PKGVERSION})
+ endforeach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
else(CMAKE_CONFIGURATION_TYPES)
- FILE(COPY ${TKTABLE_MISC} DESTINATION
${CMAKE_BINARY_DIR}/lib/${TKTABLE_PKGNAME}${TKTABLE_PKGVERSION})
+ 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})
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
Modified: brlcad/trunk/src/other/tktable.dist
===================================================================
--- brlcad/trunk/src/other/tktable.dist 2020-04-23 21:22:26 UTC (rev 75589)
+++ brlcad/trunk/src/other/tktable.dist 2020-04-23 21:42:25 UTC (rev 75590)
@@ -1,5 +1,4 @@
set(tktable_ignore_files
-CMake/FindX11.cmake
CMakeLists.txt
README.txt
generic/tkAppInit.c
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
