Revision: 76807
http://sourceforge.net/p/brlcad/code/76807
Author: starseeker
Date: 2020-08-16 18:38:22 +0000 (Sun, 16 Aug 2020)
Log Message:
-----------
See if making the targeted assignments more focused helps
Modified Paths:
--------------
brlcad/trunk/src/other/tcl/CMakeLists.txt
brlcad/trunk/src/other/tk/CMakeLists.txt
Modified: brlcad/trunk/src/other/tcl/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/tcl/CMakeLists.txt 2020-08-16 18:16:49 UTC (rev
76806)
+++ brlcad/trunk/src/other/tcl/CMakeLists.txt 2020-08-16 18:38:22 UTC (rev
76807)
@@ -104,13 +104,15 @@
# of these, but until then just do what's needed.
# Windows specific flags
+if (MSVC)
+ add_definitions(-D_UNICODE -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEP)
+
add_definitions(-DTCL_PIPE_DLL="tclpip${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}.dll")
+ add_definitions(-Dinline=__inline)
+endif (MSVC)
function(TCL_WIN_FLAGS srcfiles)
if (MSVC)
foreach(srcfile ${${srcfiles}})
- 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
-DTCL_PIPE_DLL="tclpip${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}.dll")
- set_property(SOURCE ${srcfile} APPEND_STRING PROPERTY
COMPILE_DEFINITIONS "-Dinline=__inline")
endforeach(srcfile ${${srcfiles}})
endif (MSVC)
endfunction(TCL_WIN_FLAGS)
Modified: brlcad/trunk/src/other/tk/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/tk/CMakeLists.txt 2020-08-16 18:16:49 UTC (rev
76806)
+++ brlcad/trunk/src/other/tk/CMakeLists.txt 2020-08-16 18:38:22 UTC (rev
76807)
@@ -100,12 +100,13 @@
# Windows 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)
function(TCL_WIN_FLAGS srcfiles)
if (MSVC)
foreach(srcfile ${${srcfiles}})
- 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)
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
