Revision: 58304
http://sourceforge.net/p/brlcad/code/58304
Author: brlcad
Date: 2013-10-25 18:04:04 +0000 (Fri, 25 Oct 2013)
Log Message:
-----------
looks like there are some assumptions about the ordering, so preserve the
previous ordering by moving the BRLCAD_CompilerFlags.cmake include after the
logic that was moved.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2013-10-25 18:01:34 UTC (rev 58303)
+++ brlcad/trunk/CMakeLists.txt 2013-10-25 18:04:04 UTC (rev 58304)
@@ -1454,10 +1454,6 @@
# load our compiler testing macro definitions
include(${BRLCAD_CMAKE_DIR}/CompilerFlags.cmake)
-if(NOT MSVC)
- # alas, we heavily assume and test for gcc-style flags in both
- include(${BRLCAD_CMAKE_DIR}/BRLCAD_CompilerFlags.cmake)
-endif(NOT MSVC)
# Clear out most CMake-assigned defaults - We're managing
# our own compile flags, and don't (for example) want NDEBUG
@@ -1690,6 +1686,14 @@
# TODO: Fixing these is a work in progress.
# CHECK_C_COMPILER_FLAG("Wl,--no-undefined" NO_UNDEFINED_LINKER_FLAG)
+if(NOT MSVC)
+ # We could include this, but these tests are almost entirely for
+ # gcc-style flags. This file is intentionally included after we
+ # wipe out the various FLAGS variables.
+ include(${BRLCAD_CMAKE_DIR}/BRLCAD_CompilerFlags.cmake)
+endif(NOT MSVC)
+
+
# *******************************************************************
if(NOT EXISTS ${CMAKE_BINARY_DIR}/CMakeCache.txt.prev)
message("***********************************************************")
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60135991&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
