Revision: 76804
http://sourceforge.net/p/brlcad/code/76804
Author: starseeker
Date: 2020-08-16 18:07:20 +0000 (Sun, 16 Aug 2020)
Log Message:
-----------
Do the custom assignments after the generic assignments
Modified Paths:
--------------
brlcad/trunk/src/other/tcl/CMakeLists.txt
Modified: brlcad/trunk/src/other/tcl/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/tcl/CMakeLists.txt 2020-08-16 17:51:23 UTC (rev
76803)
+++ brlcad/trunk/src/other/tcl/CMakeLists.txt 2020-08-16 18:07:20 UTC (rev
76804)
@@ -1218,11 +1218,6 @@
win/tclMainUNICODE.c
)
-set_property(SOURCE win/tclWinInit.c APPEND PROPERTY COMPILE_DEFINITIONS
TCL_LIBRARY="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}tcl${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-set_property(SOURCE win/tclWinInit.c APPEND PROPERTY COMPILE_DEFINITIONS
TCL_PACKAGE_PATH="${CMAKE_INSTALL_PREFIX}/lib")
-set_property(SOURCE win/tclMainUNICODE.c APPEND PROPERTY COMPILE_DEFINITIONS
TCL_UNICODE)
-set_property(SOURCE win/tclAppInit.c APPEND PROPERTY COMPILE_DEFINITIONS
TCL_UNICODE)
-
set(TCL_UNIX_SRCS
unix/tclAppInit.c
unix/tclUnixChan.c
@@ -1238,9 +1233,6 @@
unix/tclUnixTime.c
)
-set_property(SOURCE unix/tclUnixInit.c APPEND PROPERTY COMPILE_DEFINITIONS
TCL_LIBRARY="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}tcl${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-set_property(SOURCE unix/tclUnixInit.c APPEND PROPERTY COMPILE_DEFINITIONS
TCL_PACKAGE_PATH="${CMAKE_INSTALL_PREFIX}/lib")
-
set(TCL_NOTIFY_SRCS
unix/tclUnixNotfy.c
)
@@ -1262,6 +1254,14 @@
TCL_WIN_FLAGS(TCL_SRCS)
TCL_WIN_FLAGS(TCL_STUB_SRCS)
+set_property(SOURCE win/tclWinInit.c APPEND PROPERTY COMPILE_DEFINITIONS
TCL_LIBRARY="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}tcl${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+set_property(SOURCE win/tclWinInit.c APPEND PROPERTY COMPILE_DEFINITIONS
TCL_PACKAGE_PATH="${CMAKE_INSTALL_PREFIX}/lib")
+set_property(SOURCE win/tclMainUNICODE.c APPEND PROPERTY COMPILE_DEFINITIONS
TCL_UNICODE)
+set_property(SOURCE win/tclAppInit.c APPEND PROPERTY COMPILE_DEFINITIONS
TCL_UNICODE)
+
+set_property(SOURCE unix/tclUnixInit.c APPEND PROPERTY COMPILE_DEFINITIONS
TCL_LIBRARY="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}tcl${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+set_property(SOURCE unix/tclUnixInit.c APPEND PROPERTY COMPILE_DEFINITIONS
TCL_PACKAGE_PATH="${CMAKE_INSTALL_PREFIX}/lib")
+
set(TCL_INCLUDE_PATH ${TCL_SOURCE_DIR}/generic ${TCL_SOURCE_DIR}/libtommath
${TCL_BINARY_DIR}/include)
if (WIN32)
set(TCL_INCLUDE_PATH ${TCL_SOURCE_DIR}/win ${TCL_INCLUDE_PATH})
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
