Revision: 46365
http://brlcad.svn.sourceforge.net/brlcad/?rev=46365&view=rev
Author: starseeker
Date: 2011-08-24 01:39:42 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
Be nice to source file flags set prior to the target being defined and bring
them along for the ride.
Modified Paths:
--------------
brlcad/trunk/misc/CMake/BRLCAD_Util.cmake
Modified: brlcad/trunk/misc/CMake/BRLCAD_Util.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_Util.cmake 2011-08-24 00:29:02 UTC (rev
46364)
+++ brlcad/trunk/misc/CMake/BRLCAD_Util.cmake 2011-08-24 01:39:42 UTC (rev
46365)
@@ -109,10 +109,12 @@
IF(${srcfile} MATCHES "cpp$" OR ${srcfile} MATCHES
"cc$")
IF(BRLCAD-ENABLE_COMPILER_WARNINGS)
IF(NOERROR_FLAG)
-
set_source_files_properties(${srcfile} COMPILE_FLAGS "-Wno-error")
+ GET_PROPERTY(previous_flags
SOURCE ${srcfile} PROPERTY COMPILE_FLAGS)
+
set_source_files_properties(${srcfile} COMPILE_FLAGS "-Wno-error
${previous_flags}")
ENDIF(NOERROR_FLAG)
ELSE(BRLCAD-ENABLE_COMPILER_WARNINGS)
- set_source_files_properties(${srcfile}
COMPILE_FLAGS "-w")
+ GET_PROPERTY(previous_flags SOURCE
${srcfile} PROPERTY COMPILE_FLAGS)
+ set_source_files_properties(${srcfile}
COMPILE_FLAGS "-w ${previous_flags}")
ENDIF(BRLCAD-ENABLE_COMPILER_WARNINGS)
ENDIF(${srcfile} MATCHES "cpp$" OR ${srcfile} MATCHES
"cc$")
ENDFOREACH(srcfile ${${srcslist}})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
EMC VNX: the world's simplest storage, starting under $10K
The only unified storage solution that offers unified management
Up to 160% more powerful than alternatives and 25% more efficient.
Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
