Revision: 76798
http://sourceforge.net/p/brlcad/code/76798
Author: starseeker
Date: 2020-08-16 16:55:29 +0000 (Sun, 16 Aug 2020)
Log Message:
-----------
See if the same approach will work for Tk
Modified Paths:
--------------
brlcad/trunk/src/other/tk/CMakeLists.txt
Modified: brlcad/trunk/src/other/tk/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/tk/CMakeLists.txt 2020-08-16 16:49:14 UTC (rev
76797)
+++ brlcad/trunk/src/other/tk/CMakeLists.txt 2020-08-16 16:55:29 UTC (rev
76798)
@@ -98,10 +98,19 @@
#----------------------------------------------------------------------------
# Define some platform specific flags
-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)
+# Windows specific flags
+function(TCL_WIN_FLAGS srcfiles)
+ if (MSVC)
+ foreach(srcfile ${${srcfiles}})
+ message("Applying to ${srcfile}")
+ set_property(SOURCE ${srcfile} APPEND_STRING PROPERTY
COMPILE_DEFINITIONS "-D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
-D_CRT_NONSTDC_NO_DEP")
+ set_property(SOURCE ${srcfile} APPEND_STRING PROPERTY
COMPILE_DEFINITIONS "-Ot -Oi -fp:strict -Gs -GS -GL -MD")
+ set_property(SOURCE ${srcfile} APPEND_STRING PROPERTY
COMPILE_DEFINITIONS "-DSUPPORT_CONFIG_EMBEDDED -DHAVE_UXTHEME_H=1")
+ endforeach(srcfile ${${srcfiles}})
+ endif (MSVC)
+endfunction(TCL_WIN_FLAGS)
+
if (MINGW)
add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
-DSUPPORT_CONFIG_EMBEDDED -DHAVE_UXTHEME_H=1)
remove_definitions(-w)
@@ -585,7 +594,6 @@
xlib/ximage.c
xlib/xutil.c
win/stubs.c
- win/rc/tk.rc
generic/tkFileFilter.c
generic/tkMacWinMenu.c
generic/tkPointer.c
@@ -637,6 +645,8 @@
endif (TK_ENABLE_AQUA)
endif (WIN32)
+TCL_WIN_FLAGS(TK_SRCS)
+
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)
@@ -658,6 +668,10 @@
set(WISH_SRCS win/winMain.c)# win/rc/wish.rc)
endif (NOT WIN32)
+if (MSVC)
+ set(TK_SRCS ${TK_SRCS} win/rc/tk.rc)
+endif (MSVC)
+
if (X11_INCLUDE_DIR)
set(TK_X11_INCLUDE_DIRS ${TK_X11_INCLUDE_DIRS} ${X11_INCLUDE_DIR})
endif (X11_INCLUDE_DIR)
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
