Revision: 75576
http://sourceforge.net/p/brlcad/code/75576
Author: starseeker
Date: 2020-04-23 17:46:55 +0000 (Thu, 23 Apr 2020)
Log Message:
-----------
Use the include path from Tk as well. In a quick test, a dmtype set X works
now with bundled Tcl/Tk.
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
brlcad/trunk/src/other/tk/CMakeLists.txt
brlcad/trunk/src/other/tk.dist
Removed Paths:
-------------
brlcad/trunk/src/other/tk/CMake/
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2020-04-23 16:26:44 UTC (rev
75575)
+++ brlcad/trunk/src/other/CMakeLists.txt 2020-04-23 17:46:55 UTC (rev
75576)
@@ -418,11 +418,11 @@
# For the include path, use the TCL_INCLUDE_PATH set in the tcl build itself;
# we are not installing headers, so we have to look in the source tree
get_directory_property(TCL_INCLUDE_PATH DIRECTORY tcl DEFINITION
TCL_INCLUDE_PATH)
- set(TCL_INCLUDE_PATH "${CMAKE_BINARY_DIR}/${INCLUDE_DIR}" CACHE STRING "Tcl
include path" FORCE)
+ set(TCL_INCLUDE_PATH "${TCL_INCLUDE_PATH}" CACHE STRING "Tcl include path"
FORCE)
# Let Distclean know it will have work to do
- DISTCLEAN("${CMAKE_BINARY_DIR}/lib/tcl8")
- DISTCLEAN("${CMAKE_BINARY_DIR}/lib/tcl8.6")
+ DISTCLEAN("${CMAKE_BINARY_DIR}/${LIB_DIR}/tcl8")
+ DISTCLEAN("${CMAKE_BINARY_DIR}/${LIB_DIR}/tcl8.6")
# Group the targets in Visual Studio project files
SetTargetFolder(tclsh "Third Party Executables")
@@ -493,33 +493,28 @@
set(TK_DISABLE_XFT 1 CACHE STRING "Disable due to building local libpng"
FORCE)
mark_as_advanced(TK_DISABLE_XFT)
endif (NOT TEST_FONTCONFIG AND BRLCAD_PNG_BUILD)
+
THIRD_PARTY_TCL_PACKAGE(Tk tk "${TCL_TCLSH}" "tcl"
"BRLCAD_ENABLE_TK;BRLCAD_LEVEL2" "tk" tk_ALIASES tk_DESCRIPTION)
+
if(BRLCAD_TK_BUILD)
- SetTargetFolder(wish "Third Party Executables")
- SetTargetFolder(tk "Third Party Libraries")
- SetTargetFolder(tkstub "Third Party Libraries")
+
+ # Let the BRL-CAD compilation know we have Tcl
+ CONFIG_H_APPEND(BRLCAD "#define HAVE_TK_H 1\n")
+
+ # Set the necessary variables ourselves since FindTCL.cmake doesn't know
about our build
set(TK_LIBRARY tk CACHE STRING "TK_LIBRARY" FORCE)
set(TK_STUB_LIBRARY tkstub CACHE STRING "TK_LIBRARY" FORCE)
- if (MSVC)
- # When building packages without X11 on Windows, we need more headers.
- set(TK_INCLUDE_PATH
"${CMAKE_BINARY_DIR}/${INCLUDE_DIR};${CMAKE_CURRENT_SOURCE_DIR}/tk/xlib;${CMAKE_CURRENT_SOURCE_DIR}/tk/win;${CMAKE_CURRENT_SOURCE_DIR}/tk/generic"
CACHE STRING "Tk include path" FORCE)
- else (MSVC)
- set(TK_INCLUDE_PATH "${CMAKE_BINARY_DIR}/${INCLUDE_DIR}" CACHE STRING "Tk
include path" FORCE)
- endif (MSVC)
- set(TK_WISH wish CACHE STRING "Tk shell" FORCE)
- if(WIN32)
- set(TK_SYSTEM_GRAPHICS "win32" CACHE STRING "Tk system graphics" FORCE)
- elseif(APPLE)
- if(OPENGL_USE_AQUA)
- set(TK_SYSTEM_GRAPHICS "aqua" CACHE STRING "Tk system graphics" FORCE)
- ELSE(OPENGL_USE_AQUA)
- set(TK_SYSTEM_GRAPHICS "x11" CACHE STRING "Tk system graphics" FORCE)
- endif(OPENGL_USE_AQUA)
- elseif(UNIX)
- set(TK_SYSTEM_GRAPHICS "x11" CACHE STRING "Tk system graphics" FORCE)
- endif(WIN32)
- CONFIG_H_APPEND(BRLCAD "#define HAVE_TK_H 1\n")
- mark_as_advanced(TK-ENABLE_FREETYPE)
+
+ # For the include path, use the TK_INCLUDE_PATH set in the tk build itself;
+ # we are not installing headers, so we have to look in the source tree
+ get_directory_property(TK_INCLUDE_PATH DIRECTORY tk DEFINITION
TK_INCLUDE_PATH)
+ 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)
+
+ # Let Distclean know it will have work to do both here and in
+ # the lib directory
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/tk/doc/Makefile")
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/tk/doc/man1")
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/tk/doc/man3")
@@ -526,10 +521,19 @@
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/tk/doc/mann")
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/tk/library/Makefile")
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/tk/pkgIndex.tcl")
- DISTCLEAN("${CMAKE_BINARY_DIR}/lib/tk8.6")
- DISTCLEAN("${CMAKE_BINARY_DIR}/lib/tk8.6.10")
+ DISTCLEAN("${CMAKE_BINARY_DIR}/${LIB_DIR}/tk8.6")
+ DISTCLEAN("${CMAKE_BINARY_DIR}/${LIB_DIR}/tk8.6.10")
+
+ # Group the targets in Visual Studio project files
+ SetTargetFolder(wish "Third Party Executables")
+ SetTargetFolder(tk "Third Party Libraries")
+ SetTargetFolder(tkstub "Third Party Libraries")
+
elseif(BRLCAD_TK_BUILD AND BRLCAD_ENABLE_TK)
- BRLCAD_INCLUDE_FILE(tk.h HAVE_TK_H)
+
+ # Still need the header, even if we're using system Tcl/Tk
+ BRLCAD_INCLUDE_FILE(tk.h HAVE_TK_H)
+
endif(BRLCAD_TK_BUILD)
mark_as_advanced(TK_INCLUDE_PATH)
mark_as_advanced(TK_LIBRARY)
Modified: brlcad/trunk/src/other/tk/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/tk/CMakeLists.txt 2020-04-23 16:26:44 UTC (rev
75575)
+++ brlcad/trunk/src/other/tk/CMakeLists.txt 2020-04-23 17:46:55 UTC (rev
75576)
@@ -42,14 +42,14 @@
project(TK)
# build shared libs by default
-if(NOT DEFINED BUILD_SHARED_LIBS)
+if (NOT DEFINED BUILD_SHARED_LIBS)
option(BUILD_SHARED_LIBS "Build shared libraries" ON)
-endif(NOT DEFINED BUILD_SHARED_LIBS)
+endif (NOT DEFINED BUILD_SHARED_LIBS)
# build static libs by default
-if(NOT DEFINED BUILD_STATIC_LIBS)
+if (NOT DEFINED BUILD_STATIC_LIBS)
option(BUILD_STATIC_LIBS "Build shared libraries" ON)
-endif(NOT DEFINED BUILD_STATIC_LIBS)
+endif (NOT DEFINED BUILD_STATIC_LIBS)
# version numbers
set(TK_VERSION_MAJOR 8)
@@ -59,9 +59,9 @@
set(TK_VERSION "${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}.${TK_PATCH_LEVEL}")
# For Windows, we need the Resource Compiler language
-if(WIN32)
+if (WIN32)
enable_language(RC)
-endif(WIN32)
+endif (WIN32)
#-----------------------------------------------------------------------------
# Set CMake module path
@@ -98,54 +98,53 @@
#----------------------------------------------------------------------------
# Define some platform specific flags
-if(MSVC)
+if (MSVC)
add_definitions(-DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
-D_CRT_NONSTDC_NO_DEPRECATE -Ot -Oi -fp:strict -Gs -GS -GL -MD
-DSUPPORT_CONFIG_EMBEDDED -DHAVE_UXTHEME_H=1)
-endif(MSVC)
+endif (MSVC)
-if(MINGW)
+if (MINGW)
add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
-DSUPPORT_CONFIG_EMBEDDED -DHAVE_UXTHEME_H=1)
remove_definitions(-w)
add_definitions(-DHAVE_NO_SEH -DEXCEPTION_DISPOSITION=int)
-endif(MINGW)
+endif (MINGW)
-if(APPLE)
+if (APPLE)
add_definitions(-DMAC_OSX_TCL=1)
include(CMakeFindFrameworks)
cmake_find_frameworks(CoreFoundation)
- if(CoreFoundation_FRAMEWORKS)
+ if (CoreFoundation_FRAMEWORKS)
set(CoreFoundation_LIBRARIES "-framework CoreFoundation")
- add_definitions(-DHAVE_COREFOUNDATION=1)
- endif(CoreFoundation_FRAMEWORKS)
+ add_definitions(-DHAVE_COREFOUNDATION=1)
+ endif (CoreFoundation_FRAMEWORKS)
cmake_find_frameworks(IOKit)
- if(IOKit_FRAMEWORKS)
+ if (IOKit_FRAMEWORKS)
set(IOKit_LIBRARIES "-framework IOKit")
- add_definitions(-DHAVE_COREFOUNDATION=1)
- endif(IOKit_FRAMEWORKS)
-endif(APPLE)
+ add_definitions(-DHAVE_COREFOUNDATION=1)
+ endif (IOKit_FRAMEWORKS)
+endif (APPLE)
#-----------------------------------------------------------------------------
# Check if the compiler supports pipe - if so, use it
include(CheckCCompilerFlag)
check_c_compiler_flag(-pipe PIPE_COMPILER_FLAG)
-if(PIPE_COMPILER_FLAG)
+if (PIPE_COMPILER_FLAG)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe")
-endif(PIPE_COMPILER_FLAG)
+endif (PIPE_COMPILER_FLAG)
#------------------------------------------------------------------------
# Threads support
#------------------------------------------------------------------------
find_package(Threads)
-if(NOT ${CMAKE_THREAD_LIBS_INIT} STREQUAL "")
+if (NOT ${CMAKE_THREAD_LIBS_INIT} STREQUAL "")
add_definitions(-DTCL_THREADS=1)
-endif(NOT ${CMAKE_THREAD_LIBS_INIT} STREQUAL "")
+endif (NOT ${CMAKE_THREAD_LIBS_INIT} STREQUAL "")
#-----------------------------------------------------------------------------
# Tcl/Tk's normal build system uses autotools macros, referred to as the
# TEA system. An attempt to duplicate the required functionality from
# TEA is found in tcl.cmake
-INCLUDE(${TK_SOURCE_DIR}/CMake/tcl.cmake)
+include(${TCL_SOURCE_DIR}/CMake/tcl.cmake)
-
#------------------------------------------------------------------------
# Call the LINK_LIBS macro to get M_LIBRARY properly defined (TEA
# doesn't do this, needs looking into...)
@@ -161,13 +160,13 @@
#--------------------------------------------------------------------
# Check endianness because we can optimize some operations
#--------------------------------------------------------------------
-IF(NOT WIN32)
- INCLUDE(TestBigEndian)
+if (NOT WIN32)
+ include(TestBigEndian)
TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
- IF(WORDS_BIGENDIAN)
+ if (WORDS_BIGENDIAN)
add_definitions(-DWORDS_BIGENDIAN=1)
- ENDIF(WORDS_BIGENDIAN)
-ENDIF(NOT WIN32)
+ endif (WORDS_BIGENDIAN)
+endif (NOT WIN32)
#------------------------------------------------------------------------------
# Find out all about time handling differences.
@@ -174,8 +173,6 @@
#------------------------------------------------------------------------------
SC_TIME_HANDLER()
-#TODO SC_BUGGY_STRTOD - Solaris 2.4 only? Do we still care?
-
#--------------------------------------------------------------------
# Check for various typedefs and provide substitutes if
# they don't exist.
@@ -189,9 +186,9 @@
TCL_CHECK_TYPE_SIZE(intptr_t INTPTR)
TCL_CHECK_TYPE_SIZE(uintptr_t UINTPTR)
-IF(NOT HAVE_OPENDIR)
- ADD_TCL_CFLAG(USE_DIRENT2_H)
-ENDIF(NOT HAVE_OPENDIR)
+if (NOT HAVE_OPENDIR)
+ add_definitions(-DUSE_DIRENT2_H)
+endif (NOT HAVE_OPENDIR)
# The union wait test was for HP-UX - do we still need this?
SET(UNION_WAIT_SRC "
@@ -207,45 +204,45 @@
return 0;
}
")
-if(NOT DEFINED HAVE_UNION_WAIT)
+if (NOT DEFINED HAVE_UNION_WAIT)
CHECK_C_SOURCE_RUNS("${UNION_WAIT_SRC}" HAVE_UNION_WAIT)
-endif(NOT DEFINED HAVE_UNION_WAIT)
-IF(NOT HAVE_UNION_WAIT)
- ADD_TCL_CFLAG(NO_UNION_WAIT)
-ENDIF(NOT HAVE_UNION_WAIT)
+endif (NOT DEFINED HAVE_UNION_WAIT)
+if (NOT HAVE_UNION_WAIT)
+ add_definitions(-DNO_UNION_WAIT)
+endif (NOT HAVE_UNION_WAIT)
#--------------------------------------------------------------------
# On Mac OS X, we can build either with X11 or with Aqua
# For the moment, we don't allow enabling X11 on Windows,
# eventually we may want to change that.
-# We support enabling only the new Cocoa backend, not the
+# We support enabling only the new Cocoa backend, not the
# older Carbon code
#--------------------------------------------------------------------
-IF(NOT WIN32)
- IF(APPLE)
+if (NOT WIN32)
+ if (APPLE)
OPTION(TK_ENABLE_AQUA "Build Tk using the Aqua windowing system" OFF)
- IF(TK_ENABLE_AQUA)
+ if (TK_ENABLE_AQUA)
SET(TK_SYSTEM_GRAPHICS aqua)
add_definitions(-DMAC_OSX_TK=1)
add_definitions(-D_DARWIN_C_SOURCE=1)
SET(X11_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/xlib")
- find_library(COCOA_FRAMEWORK Cocoa)
+ find_library(COCOA_FRAMEWORK Cocoa)
MARK_AS_ADVANCED(COCOA_FRAMEWORK)
find_library(CARBON_FRAMEWORK Carbon)
MARK_AS_ADVANCED(CARBON_FRAMEWORK)
SET(OPENGL_USE_AQUA ON CACHE BOOL "Building Aqua Tk" FORCE)
- ELSE(TK_ENABLE_AQUA)
+ else (TK_ENABLE_AQUA)
find_package(X11)
SET(TK_SYSTEM_GRAPHICS x11)
SET(OPENGL_USE_AQUA OFF CACHE BOOL "Building X11 Tk" FORCE)
- ENDIF(TK_ENABLE_AQUA)
- ELSE(APPLE)
+ endif (TK_ENABLE_AQUA)
+ else (APPLE)
find_package(X11)
- SET(TK_SYSTEM_GRAPHICS x11)
- ENDIF(APPLE)
-ELSE(NOT WIN32)
+ set(TK_SYSTEM_GRAPHICS x11)
+ endif (APPLE)
+else (NOT WIN32)
SET(TK_SYSTEM_GRAPHICS win32)
-ENDIF(NOT WIN32)
+endif (NOT WIN32)
#--------------------------------------------------------------------
# Check whether the header and library for the XScreenSaver
@@ -252,35 +249,35 @@
# extension are available, and set HAVE_XSS if so.
# XScreenSaver is needed for Tk_GetUserInactiveTime().
#--------------------------------------------------------------------
-INCLUDE(CMakeDependentOption)
+include(CMakeDependentOption)
CMAKE_DEPENDENT_OPTION(TK_ENABLE_XSS "Use XScreenSaver" ON "TK_SYSTEM_GRAPHICS
STREQUAL x11;${X11_Xscreensaver_LIB}" OFF)
#--------------------------------------------------------------------
# Check for freetype / fontconfig / Xft support.
#--------------------------------------------------------------------
-if(NOT TK_DISABLE_XFT)
- IF(NOT WIN32)
+if (NOT TK_DISABLE_XFT)
+ if (NOT WIN32)
find_package(Freetype)
find_package(Fontconfig)
- IF(NOT FREETYPE_FOUND)
+ if (NOT FREETYPE_FOUND)
SET(FREETYPE_LIBRARIES "")
- ENDIF(NOT FREETYPE_FOUND)
- IF(NOT Fontconfig_FOUND)
+ endif (NOT FREETYPE_FOUND)
+ if (NOT Fontconfig_FOUND)
SET(Fontconfig_LIBRARIES "")
- ENDIF(NOT Fontconfig_FOUND)
- ENDIF(NOT WIN32)
+ endif (NOT Fontconfig_FOUND)
+ endif (NOT WIN32)
CMAKE_DEPENDENT_OPTION(TK_ENABLE_XFT "Use freetype/fontconfig/xft" ON
"TK_SYSTEM_GRAPHICS STREQUAL x11;FREETYPE_FOUND;Fontconfig_FOUND;X11_Xft_FOUND"
OFF)
else(NOT TK_DISABLE_XFT)
set(TK_ENABLE_XFT OFF)
set(FREETYPE_LIBRARIES "")
set(Fontconfig_LIBRARIES "")
-endif(NOT TK_DISABLE_XFT)
+endif (NOT TK_DISABLE_XFT)
#----------------------------------------------------------------------------
# signed/unsigned char - does the Tcl code still need this? See
# http://lists.gnu.org/archive/html/autoconf/2008-06/msg00054.html
#----------------------------------------------------------------------------
-SET(unsigned_char_srcs "
+set(unsigned_char_srcs "
int
main ()
{
@@ -289,12 +286,12 @@
return 0;
}
")
-if(NOT DEFINED HAVE_UNION_WAIT)
+if (NOT DEFINED HAVE_UNION_WAIT)
CHECK_C_SOURCE_RUNS("${unsigned_char_srcs}" CHAR_IS_UNSIGNED)
-endif(NOT DEFINED HAVE_UNION_WAIT)
-IF(CHAR_IS_UNSIGNED)
- ADD_TCL_CFLAG(__CHAR_UNSIGNED__)
-ENDIF(CHAR_IS_UNSIGNED)
+endif (NOT DEFINED HAVE_UNION_WAIT)
+if (CHAR_IS_UNSIGNED)
+ add_definitions(-D__CHAR_UNSIGNED__)
+endif (CHAR_IS_UNSIGNED)
SET(signed_char_srcs "
int
main ()
@@ -305,9 +302,9 @@
}
")
CHECK_C_SOURCE_COMPILES("${signed_char_srcs}" HAVE_SIGNED_CHAR)
-IF(HAVE_SIGNED_CHAR)
- ADD_TCL_CFLAG(HAVE_SIGNED_CHAR)
-ENDIF(HAVE_SIGNED_CHAR)
+if (HAVE_SIGNED_CHAR)
+ add_definitions(-DHAVE_SIGNED_CHAR)
+endif (HAVE_SIGNED_CHAR)
@@ -314,9 +311,9 @@
TCL_CHECK_INCLUDE_FILE(sys/types.h HAVE_SYS_TYPES_H)
TCL_CHECK_INCLUDE_FILE(sys/stat.h HAVE_SYS_STAT_H)
TCL_CHECK_INCLUDE_FILE(sys/fstatfs.h HAVE_SYS_FSTATFS_H)
-IF(NOT HAVE_SYS_FSTATFS_H)
+if (NOT HAVE_SYS_FSTATFS_H)
add_definitions(-DNO_FSTATFS=1)
-ENDIF(NOT HAVE_SYS_FSTATFS_H)
+endif (NOT HAVE_SYS_FSTATFS_H)
TCL_CHECK_INCLUDE_FILE(memory.h HAVE_MEMORY_H)
TCL_CHECK_INCLUDE_FILE(strings.h HAVE_STRINGS_H)
TCL_CHECK_INCLUDE_FILE(inttypes.h HAVE_INTTYPES_H)
@@ -323,21 +320,21 @@
TCL_CHECK_INCLUDE_FILE(stdint.h HAVE_STDINT_H)
TCL_CHECK_INCLUDE_FILE(unistd.h HAVE_UNISTD_H)
-IF(${CMAKE_SYSTEM_NAME} MATCHES "^Darwin$")
+if (${CMAKE_SYSTEM_NAME} MATCHES "^Darwin$")
TCL_CHECK_FUNCTION_EXISTS(getattrlist HAVE_GETATTRLIST)
TCL_CHECK_INCLUDE_FILE(copyfile.h HAVE_COPYFILE_H)
TCL_CHECK_FUNCTION_EXISTS(copyfile HAVE_COPYFILE)
- IF(${CoreFoundation_LIBRARIES})
+ if (${CoreFoundation_LIBRARIES})
TCL_CHECK_INCLUDE_FILE(libkern/OSAtomic.h HAVE_LIBKERN_OSATOMIC_H)
TCL_CHECK_FUNCTION_EXISTS(OSSpinLockLock HAVE_OSSPINLOCKLOCK)
TCL_CHECK_FUNCTION_EXISTS(pthread_atfork HAVE_PTHREAD_ATFORK)
- ENDIF(${CoreFoundation_LIBRARIES})
- ADD_TCL_CFLAG(USE_VFORK)
+ endif (${CoreFoundation_LIBRARIES})
+ add_definitions(-DUSE_VFORK)
add_definitions(-DTCL_DEFAULT_ENCODING="utf-8")
- ADD_TCL_CFLAG(TCL_LOAD_FROM_MEMORY)
- ADD_TCL_CFLAG(TCL_WIDE_CLICKS)
+ add_definitions(-DTCL_LOAD_FROM_MEMORY)
+ add_definitions(-DTCL_WIDE_CLICKS)
TCL_CHECK_INCLUDE_FILE_USABILITY(AvailabilityMacros.h
HAVE_AVAILABILITYMACROS_H)
- IF(HAVE_AVAILABILITYMACROS_H)
+ if (HAVE_AVAILABILITYMACROS_H)
SET(WEAK_IMPORT_SRCS "
#ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1020
@@ -353,9 +350,9 @@
}
")
CHECK_C_SOURCE_COMPILES("${WEAK_IMPORT_SRCS}" WEAK_IMPORT_WORKING)
- IF(WEAK_IMPORT_WORKING)
- ADD_TCL_CFLAG(HAVE_WEAK_IMPORT)
- ENDIF(WEAK_IMPORT_WORKING)
+ if (WEAK_IMPORT_WORKING)
+ add_definitions(-DHAVE_WEAK_IMPORT)
+ endif (WEAK_IMPORT_WORKING)
SET(SUSV3_SRCS "
#ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1050
@@ -370,12 +367,12 @@
int main () {return 0;}
")
CHECK_C_SOURCE_COMPILES("${SUSV3_SRCS}" SUSV3_WORKING)
- IF(SUSV3_WORKING)
- ADD_TCL_CFLAG(_DARWIN_C_SOURCE)
- ENDIF(SUSV3_WORKING)
+ if (SUSV3_WORKING)
+ add_definitions(-D_DARWIN_C_SOURCE)
+ endif (SUSV3_WORKING)
- ENDIF(HAVE_AVAILABILITYMACROS_H)
-ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "^Darwin$")
+ endif (HAVE_AVAILABILITYMACROS_H)
+endif (${CMAKE_SYSTEM_NAME} MATCHES "^Darwin$")
add_definitions(-DTK_LAYOUT_WITH_BASE_CHUNKS=0)
add_definitions(-DTK_DRAW_IN_CONTEXT=0)
@@ -382,9 +379,9 @@
add_definitions(-DTILE_07_COMPAT=0)
add_definitions(-DDEBUG_FONTSEL=0)
-ADD_SUBDIRECTORY(library)
+add_subdirectory(library)
-SET(TK_GENERIC_SRCS
+set(TK_GENERIC_SRCS
generic/tk3d.c
generic/tkArgv.c
generic/tkAtom.c
@@ -459,13 +456,13 @@
generic/tkOldConfig.c
)
-SET(TK_HDRS
+set(TK_HDRS
generic/tk.h
generic/tkDecls.h
generic/tkPlatDecls.h
)
-SET(TTK_SRCS
+set(TTK_SRCS
generic/ttk/ttkBlink.c
generic/ttk/ttkButton.c
generic/ttk/ttkCache.c
@@ -499,17 +496,17 @@
generic/ttk/ttkWidget.c
)
-SET(TK_STUB_SRCS
+set(TK_STUB_SRCS
generic/tkStubInit.c
generic/tkStubLib.c
)
-SET(TTK_STUB_SRCS
+set(TTK_STUB_SRCS
generic/ttk/ttkStubInit.c
generic/ttk/ttkStubLib.c
)
-SET(TK_X11_SRCS
+set(TK_X11_SRCS
unix/tkUnix.c
unix/tkUnix3d.c
unix/tkUnixButton.c
@@ -532,13 +529,13 @@
unix/tkUnixXId.c
)
-IF(TK_ENABLE_XFT)
- SET(TK_X11_SRCS ${TK_X11_SRCS} unix/tkUnixRFont.c)
-ELSE(TK_ENABLE_XFT)
- SET(TK_X11_SRCS ${TK_X11_SRCS} unix/tkUnixFont.c)
-ENDIF(TK_ENABLE_XFT)
+if (TK_ENABLE_XFT)
+ set(TK_X11_SRCS ${TK_X11_SRCS} unix/tkUnixRFont.c)
+else (TK_ENABLE_XFT)
+ set(TK_X11_SRCS ${TK_X11_SRCS} unix/tkUnixFont.c)
+endif (TK_ENABLE_XFT)
-SET(TK_AQUA_SRCS
+set(TK_AQUA_SRCS
macosx/tkMacOSXBitmap.c
macosx/tkMacOSXButton.c
macosx/tkMacOSXClipboard.c
@@ -583,7 +580,7 @@
)
configure_file(win/wish.exe.manifest.in
${CMAKE_CURRENT_BINARY_DIR}/wish.exe.manifest @ONLY)
-SET(TK_WIN_SRCS
+set(TK_WIN_SRCS
xlib/xcolors.c
xlib/xdraw.c
xlib/xgc.c
@@ -630,51 +627,51 @@
set_property(SOURCE win/tkMainASCII.c APPEND PROPERTY COMPILE_DEFINITIONS
TK_ASCII_MAIN)
-SET(TK_SRCS ${TK_GENERIC_SRCS} ${TTK_SRCS})
+set(TK_SRCS ${TK_GENERIC_SRCS} ${TTK_SRCS})
-IF(WIN32)
- SET(TK_SRCS ${TK_SRCS} ${TK_WIN_SRCS})
-ELSE(WIN32)
- IF(TK_ENABLE_AQUA)
- SET(TK_SRCS ${TK_SRCS} ${TK_AQUA_SRCS})
- ELSE(TK_ENABLE_AQUA)
- SET(TK_SRCS ${TK_SRCS} ${TK_X11_SRCS})
- ENDIF(TK_ENABLE_AQUA)
-ENDIF(WIN32)
+if (WIN32)
+ set(TK_SRCS ${TK_SRCS} ${TK_WIN_SRCS})
+else (WIN32)
+ if (TK_ENABLE_AQUA)
+ set(TK_SRCS ${TK_SRCS} ${TK_AQUA_SRCS})
+ else (TK_ENABLE_AQUA)
+ set(TK_SRCS ${TK_SRCS} ${TK_X11_SRCS})
+ endif (TK_ENABLE_AQUA)
+endif (WIN32)
-SET(TK_INCLUDE_PATH ${TK_SOURCE_DIR}/generic ${TK_SOURCE_DIR}/bitmaps
${TK_BINARY_DIR}/include)
-IF(WIN32)
- SET(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${TK_SOURCE_DIR}/win
${TK_SOURCE_DIR}/xlib ${TK_SOURCE_DIR}/xlib/X11)
-ELSE(WIN32)
- SET(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${TK_SOURCE_DIR}/unix)
- IF(APPLE)
- SET(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${TK_SOURCE_DIR}/macosx)
- IF(TK_ENABLE_AQUA)
- SET(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${X11_INCLUDE_DIR})
- ELSE(TK_ENABLE_AQUA)
- SET(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${TK_SOURCE_DIR}/xlib)
- ENDIF(TK_ENABLE_AQUA)
- ENDIF(APPLE)
-ENDIF(WIN32)
+set(TK_INCLUDE_PATH ${TK_SOURCE_DIR}/generic ${TK_SOURCE_DIR}/bitmaps
${TK_BINARY_DIR}/include)
+if (WIN32)
+ set(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${TK_SOURCE_DIR}/win
${TK_SOURCE_DIR}/xlib ${TK_SOURCE_DIR}/xlib/X11)
+else (WIN32)
+ set(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${TK_SOURCE_DIR}/unix)
+ if (APPLE)
+ set(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${TK_SOURCE_DIR}/macosx)
+ if (NOT TK_ENABLE_AQUA)
+ set(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${X11_INCLUDE_DIR})
+ else (NOT TK_ENABLE_AQUA)
+ set(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${TK_SOURCE_DIR}/xlib)
+ endif (NOT TK_ENABLE_AQUA)
+ endif (APPLE)
+endif (WIN32)
-IF(NOT WIN32)
- SET(WISH_SRCS unix/tkAppInit.c)
-ELSE(NOT WIN32)
- SET(WISH_SRCS win/winMain.c)# win/rc/wish.rc)
-ENDIF(NOT WIN32)
+if (NOT WIN32)
+ set(WISH_SRCS unix/tkAppInit.c)
+else (NOT WIN32)
+ set(WISH_SRCS win/winMain.c)# win/rc/wish.rc)
+endif (NOT WIN32)
-IF(X11_INCLUDE_DIR)
- SET(TK_X11_INCLUDE_DIRS ${TK_X11_INCLUDE_DIRS} ${X11_INCLUDE_DIR})
-ENDIF(X11_INCLUDE_DIR)
-IF(X11_Xft_INCLUDE_PATH)
- SET(TK_X11_INCLUDE_DIRS ${TK_X11_INCLUDE_DIRS} ${X11_Xft_INCLUDE_PATH})
-ENDIF(X11_Xft_INCLUDE_PATH)
-IF(X11_Xrender_INCLUDE_PATH)
- SET(TK_X11_INCLUDE_DIRS ${TK_X11_INCLUDE_DIRS} ${X11_Xrender_INCLUDE_PATH})
-ENDIF(X11_Xrender_INCLUDE_PATH)
-IF(X11_Xscreensaver_INCLUDE_PATH)
- SET(TK_X11_INCLUDE_DIRS ${TK_X11_INCLUDE_DIRS}
${X11_Xscreensaver_INCLUDE_PATH})
-ENDIF(X11_Xscreensaver_INCLUDE_PATH)
+if (X11_INCLUDE_DIR)
+ set(TK_X11_INCLUDE_DIRS ${TK_X11_INCLUDE_DIRS} ${X11_INCLUDE_DIR})
+endif (X11_INCLUDE_DIR)
+if (X11_Xft_INCLUDE_PATH)
+ set(TK_X11_INCLUDE_DIRS ${TK_X11_INCLUDE_DIRS} ${X11_Xft_INCLUDE_PATH})
+endif (X11_Xft_INCLUDE_PATH)
+if (X11_Xrender_INCLUDE_PATH)
+ set(TK_X11_INCLUDE_DIRS ${TK_X11_INCLUDE_DIRS} ${X11_Xrender_INCLUDE_PATH})
+endif (X11_Xrender_INCLUDE_PATH)
+if (X11_Xscreensaver_INCLUDE_PATH)
+ set(TK_X11_INCLUDE_DIRS ${TK_X11_INCLUDE_DIRS}
${X11_Xscreensaver_INCLUDE_PATH})
+endif (X11_Xscreensaver_INCLUDE_PATH)
#TODO - figure out how to properly test this
add_definitions(-DHAVE_XKBKEYCODETOKEYSYM=1)
@@ -685,36 +682,36 @@
${TK_INCLUDE_PATH}
${TK_X11_INCLUDE_DIRS}
)
-if(TK_ENABLE_XFT)
+if (TK_ENABLE_XFT)
include_directories(${FREETYPE_INCLUDE_DIRS})
-endif(TK_ENABLE_XFT)
+endif (TK_ENABLE_XFT)
-SET(X11_TK_LIBS ${X11_X11_LIB} ${X11_Xext_LIB})
-IF(TK_ENABLE_XSS AND X11_Xscreensaver_LIB)
- SET(X11_TK_LIBS ${X11_TK_LIBS} ${X11_Xscreensaver_LIB})
-ENDIF(TK_ENABLE_XSS AND X11_Xscreensaver_LIB)
-IF(X11_Xft_LIB AND TK_ENABLE_XFT)
- SET(X11_TK_LIBS ${X11_TK_LIBS} ${X11_Xft_LIB})
+set(X11_TK_LIBS ${X11_X11_LIB} ${X11_Xext_LIB})
+if (TK_ENABLE_XSS AND X11_Xscreensaver_LIB)
+ set(X11_TK_LIBS ${X11_TK_LIBS} ${X11_Xscreensaver_LIB})
+endif (TK_ENABLE_XSS AND X11_Xscreensaver_LIB)
+if (X11_Xft_LIB AND TK_ENABLE_XFT)
+ set(X11_TK_LIBS ${X11_TK_LIBS} ${X11_Xft_LIB})
add_definitions(-DHAVE_LIBXFT=1)
add_definitions(-DHAVE_XFT=1)
-ENDIF(X11_Xft_LIB AND TK_ENABLE_XFT)
-IF(X11_Xrender_LIB)
- SET(X11_TK_LIBS ${X11_TK_LIBS} ${X11_Xrender_LIB})
-ENDIF(X11_Xrender_LIB)
+endif (X11_Xft_LIB AND TK_ENABLE_XFT)
+if (X11_Xrender_LIB)
+ set(X11_TK_LIBS ${X11_TK_LIBS} ${X11_Xrender_LIB})
+endif (X11_Xrender_LIB)
-IF(NOT LIB_DIR)
- SET(LIB_DIR lib)
-ENDIF(NOT LIB_DIR)
+if (NOT LIB_DIR)
+ set(LIB_DIR lib)
+endif (NOT LIB_DIR)
-IF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
- SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LIB_DIR})
-ENDIF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+if (NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LIB_DIR})
+endif (NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
add_library(tkstub STATIC ${TK_STUB_SRCS} ${TTK_STUB_SRCS})
CHECK_C_COMPILER_FLAG(-fPIC PIC_COMPILER_FLAG)
-IF(PIC_COMPILER_FLAG)
- SET_TARGET_PROPERTIES(tkstub PROPERTIES COMPILE_FLAGS "-fPIC")
-ENDIF(PIC_COMPILER_FLAG)
+if (PIC_COMPILER_FLAG)
+ set_target_properties(tkstub PROPERTIES COMPILE_FLAGS "-fPIC")
+endif (PIC_COMPILER_FLAG)
install(TARGETS tkstub
RUNTIME DESTINATION ${BIN_DIR}
LIBRARY DESTINATION ${LIB_DIR}
@@ -721,19 +718,19 @@
ARCHIVE DESTINATION ${LIB_DIR})
SET_PROPERTY(TARGET tkstub APPEND PROPERTY COMPILE_DEFINITIONS USE_TCL_STUBS)
-IF(MINGW)
+if (MINGW)
set(TK_MINGW_LIBS comctl32 m dinput8 dxguid dxerr8 user32 gdi32 winmm imm32
ole32 oleaut32 shell32 version uuid)
-ENDIF(MINGW)
+endif (MINGW)
add_library(tk ${TK_SRCS})
-IF(WIN32)
+if (WIN32)
target_link_libraries(tk tkstub ${TCL_STUB_LIBRARY} ${TCL_THREADS_LIB}
${X11_TK_LIBS} ${TK_MINGW_LIBS})
-ELSE(WIN32)
+else (WIN32)
target_link_libraries(tk tkstub ${TCL_STUB_LIBRARY} ${TCL_THREADS_LIB}
${CoreFoundation_LIBRARIES} ${CARBON_FRAMEWORK}
${COCOA_FRAMEWORK} ${IOKit_LIBRARIES} ${FREETYPE_LIBRARIES}
${PNG_LIBRARIES} ${Fontconfig_LIBRARIES} ${X11_TK_LIBS} ${M_LIBRARY})
-ENDIF(WIN32)
+endif (WIN32)
install(TARGETS tk
RUNTIME DESTINATION ${BIN_DIR}
LIBRARY DESTINATION ${LIB_DIR}
@@ -740,9 +737,9 @@
ARCHIVE DESTINATION ${LIB_DIR})
SET_TARGET_PROPERTIES(tk PROPERTIES VERSION ${TK_VERSION} SOVERSION
${TK_VERSION_MAJOR}.${TK_VERSION_MINOR})
SET_PROPERTY(TARGET tk APPEND PROPERTY COMPILE_DEFINITIONS USE_TCL_STUBS)
-IF(TK_ENABLE_AQUA)
+if (TK_ENABLE_AQUA)
SET_PROPERTY(TARGET tk APPEND PROPERTY COMPILE_FLAGS "-std=gnu99 -x
objective-c -fobjc-gc")
-ENDIF(TK_ENABLE_AQUA)
+endif (TK_ENABLE_AQUA)
if (TARGET tcl)
add_dependencies(tk tcl)
endif (TARGET tcl)
@@ -755,7 +752,7 @@
# Set up build directory copies of the public headers
foreach(hdrfile ${TK_HDRS})
get_filename_component(hf ${hdrfile} NAME)
- if(NOT CMAKE_CONFIGURATION_TYPES)
+ if (NOT CMAKE_CONFIGURATION_TYPES)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${hdrfile}
${CMAKE_BINARY_DIR}/${INCLUDE_DIR}/${hf} COPYONLY)
else(NOT CMAKE_CONFIGURATION_TYPES)
foreach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
@@ -762,26 +759,25 @@
string(TOUPPER "${CFG_TYPE}" CFG_TYPE_UPPER)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${hdrfile}
${CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}}/${INCLUDE_DIR}/${hf} COPYONLY)
endforeach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
- endif(NOT CMAKE_CONFIGURATION_TYPES)
+ endif (NOT CMAKE_CONFIGURATION_TYPES)
endforeach(hdrfile ${LIBRARY_FILES})
-
-IF(WIN32)
+if (WIN32)
add_executable(wish WIN32 ${WISH_SRCS})
target_link_libraries(wish tcl tk imm32.lib comctl32.lib)
-ELSE(WIN32)
+else (WIN32)
add_executable(wish ${WISH_SRCS})
target_link_libraries(wish ${TCL_LIBRARY} ${TCL_STUB_LIBRARY} tk
${CoreFoundation_LIBRARIES}
${CARBON_FRAMEWORK} ${COCOA_FRAMEWORK} ${IOKit_LIBRARIES}
${TCL_THREADS_LIB} ${M_LIBRARY} ${FREETYPE_LIBRARIES} ${PNG_LIBRARIES}
${Fontconfig_LIBRARIES})
- IF(TK_ENABLE_AQUA)
+ if (TK_ENABLE_AQUA)
SET_PROPERTY(TARGET wish APPEND PROPERTY COMPILE_FLAGS "-std=gnu99 -x
objective-c -fobjc-gc")
- ENDIF(TK_ENABLE_AQUA)
-ENDIF(WIN32)
+ endif (TK_ENABLE_AQUA)
+endif (WIN32)
SET_TARGET_PROPERTIES(wish PROPERTIES VERSION
${TK_VERSION_MAJOR}.${TK_VERSION_MINOR})
install(TARGETS wish DESTINATION bin)
-IF(NOT WIN32)
+if (NOT WIN32)
FILE(COPY unix/tkAppInit.c DESTINATION
${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/tk${TK_VERSION})
foreach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
string(TOUPPER "${CFG_TYPE}" CFG_TYPE_UPPER)
@@ -788,7 +784,7 @@
FILE(COPY unix/tkAppInit.c DESTINATION
${CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER}}/tk${TK_VERSION})
endforeach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
INSTALL(FILES unix/tkAppInit.c DESTINATION lib/tk${TK_VERSION})
-ENDIF(NOT WIN32)
+endif (NOT WIN32)
# Local Variables:
# tab-width: 8
Modified: brlcad/trunk/src/other/tk.dist
===================================================================
--- brlcad/trunk/src/other/tk.dist 2020-04-23 16:26:44 UTC (rev 75575)
+++ brlcad/trunk/src/other/tk.dist 2020-04-23 17:46:55 UTC (rev 75576)
@@ -1,19 +1,4 @@
set(tk_ignore_files
-CMake/CheckCSourceRuns.cmake
-CMake/CheckPrototypeExists.cmake
-CMake/CheckSystemFunctionality.cmake
-CMake/FindFontconfig.cmake
-CMake/FindTIMEZONE.cmake
-CMake/FindX11.cmake
-CMake/Path_Setup.cmake
-CMake/RPath_Setup.cmake
-CMake/TCL_PKGINDEX.cmake
-CMake/ac_std_funcs.cmake
-CMake/tcl.cmake
-CMake/test_sources/alloca_header_test.c
-CMake/test_sources/alloca_test.c
-CMake/test_sources/ctypes_test.c
-CMake/test_sources/sys_wait_test.c
CMakeLists.txt
README.md
bitmaps/error.xbm
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
