Revision: 69103
          http://sourceforge.net/p/brlcad/code/69103
Author:   starseeker
Date:     2016-10-17 21:35:32 +0000 (Mon, 17 Oct 2016)
Log Message:
-----------
Convince CMake we really do want the STACK option set...

Modified Paths:
--------------
    brlcad/trunk/CMakeLists.txt
    brlcad/trunk/misc/CMake/CompilerFlags.cmake

Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2016-10-17 18:55:27 UTC (rev 69102)
+++ brlcad/trunk/CMakeLists.txt 2016-10-17 21:35:32 UTC (rev 69103)
@@ -2494,9 +2494,9 @@
 
 # Before we finalize, set some specific global linker flags
 if(MSVC)
-  set(CMAKE_EXE_LINKER_FLAGS_INIT ${CMAKE_EXE_LINKER_FLAGS_INIT} 
/STACK:10000000 /NOLOGO)
-  set(CMAKE_SHARED_LINKER_FLAGS_INIT ${CMAKE_EXE_LINKER_FLAGS_INIT} /NOLOGO)
-  set(CMAKE_MODULE_LINKER_FLAGS_INIT ${CMAKE_EXE_LINKER_FLAGS_INIT} /NOLOGO)
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:10000000 
/NOLOGO")
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /STACK:10000000 
/NOLOGO")
+  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /STACK:10000000 
/NOLOGO")
 endif(MSVC)
 
 #-----------------------------------------------------------------------------
@@ -2632,6 +2632,8 @@
   set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Allowed BRL-CAD 
configuration types" FORCE)
 endif(CMAKE_CONFIGURATION_TYPES AND NOT "${CMAKE_CONFIGURATION_TYPES}" 
STREQUAL "Debug;Release")
 
+PRINT_BUILD_FLAGS("POST_RESTORE_2")
+
 # *******************************************************************
 # ***        Output and Summarize Results - Stage 9 of 9          ***
 # *******************************************************************
@@ -2785,7 +2787,6 @@
   include("${BRLCAD_CMAKE_DIR}/BRLCAD_Summary.cmake")
 endif(NOT BRLCAD_DISABLE_SUMMARY)
 
-
 # *******************************************************************
 # ***                      Timestamp Rules                        ***
 # *******************************************************************

Modified: brlcad/trunk/misc/CMake/CompilerFlags.cmake
===================================================================
--- brlcad/trunk/misc/CMake/CompilerFlags.cmake 2016-10-17 18:55:27 UTC (rev 
69102)
+++ brlcad/trunk/misc/CMake/CompilerFlags.cmake 2016-10-17 21:35:32 UTC (rev 
69103)
@@ -83,15 +83,15 @@
 
 # Restore cached values of CMake build variables
 macro(RESTORE_CACHED_BUILD_FLAGS suffix)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_CACHED${suffix}}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_CACHED${suffix}}")
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_CACHED${suffix}}")
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS_CACHED${suffix}}")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_CACHED${suffix}}" CACHE STRING "Restored 
build flag value" FORCE)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_CACHED${suffix}}" CACHE STRING 
"Restored build flag value" FORCE)
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_CACHED${suffix}}" 
CACHE STRING "Restored build flag value" FORCE)
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS_CACHED${suffix}}" CACHE 
STRING "Restored build flag value" FORCE)
   foreach(BTYPE ${CMAKE_BUILD_TYPES})
-    set(CMAKE_C_FLAGS_${BTYPE} "${CMAKE_C_FLAGS_${BTYPE}_CACHED${suffix}}")
-    set(CMAKE_CXX_FLAGS_${BTYPE} "${CMAKE_CXX_FLAGS_${BTYPE}_CACHED${suffix}}")
-    set(CMAKE_SHARED_LINKER_FLAGS_${BTYPE} 
"${CMAKE_SHARED_LINKER_FLAGS_${BTYPE}_CACHED${suffix}}")
-    set(CMAKE_EXE_LINKER_FLAGS_${BTYPE} 
"${CMAKE_EXE_LINKER_FLAGS_${BTYPE}_CACHED${suffix}}")
+    set(CMAKE_C_FLAGS_${BTYPE} "${CMAKE_C_FLAGS_${BTYPE}_CACHED${suffix}}" 
CACHE STRING "Restored build flag value" FORCE)
+    set(CMAKE_CXX_FLAGS_${BTYPE} "${CMAKE_CXX_FLAGS_${BTYPE}_CACHED${suffix}}" 
CACHE STRING "Restored build flag value" FORCE)
+    set(CMAKE_SHARED_LINKER_FLAGS_${BTYPE} 
"${CMAKE_SHARED_LINKER_FLAGS_${BTYPE}_CACHED${suffix}}" CACHE STRING "Restored 
build flag value" FORCE)
+    set(CMAKE_EXE_LINKER_FLAGS_${BTYPE} 
"${CMAKE_EXE_LINKER_FLAGS_${BTYPE}_CACHED${suffix}}" CACHE STRING "Restored 
build flag value" FORCE)
   endforeach(BTYPE ${CMAKE_BUILD_TYPES})
 endmacro(RESTORE_CACHED_BUILD_FLAGS)
 

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most 
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits

Reply via email to