Revision: 40584
http://brlcad.svn.sourceforge.net/brlcad/?rev=40584&view=rev
Author: starseeker
Date: 2010-09-16 00:52:41 +0000 (Thu, 16 Sep 2010)
Log Message:
-----------
Sigh - tweak some more stuff. Gonna have to set build flags after the tests
are run, from the looks of things, and need to exclude opennurbs from the
strict build flags.
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-09-16 00:30:46 UTC (rev
40583)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-09-16 00:52:41 UTC (rev
40584)
@@ -409,6 +409,7 @@
if (BRLCAD-ENABLE_X11)
INCLUDE(${BRLCAD_CMAKE_DIR}/FindX11.cmake)
SET(BRLCAD-BUILD_AQUA OFF CACHE STRING "Don't use Aqua if we're doing
X11" FORCE)
+ SET(OPENGL_USE_AQUA OFF CACHE STRING "Don't use Aqua if we're doing
X11" FORCE)
endif (BRLCAD-ENABLE_X11)
# Enable features requring OPENGL
@@ -467,13 +468,8 @@
ENDIF(NOT BRLCAD-ENABLE_RUNTIME_DEBUG)
# Enable/disable strict compiler settings
-OPTION(BRLCAD-ENABLE_STRICT "Use strict compiler settings" ON)
+OPTION(BRLCAD-ENABLE_STRICT "Use strict compiler settings" OFF)
MARK_AS_ADVANCED(BRLCAD-ENABLE_STRICT)
-if (BRLCAD-ENABLE_STRICT)
- FILE(APPEND ${CONFIG_H_FILE} "#define STRICT_FLAGS 1\n")
- SET(CMAKE_C_FLAGS "-pedantic -W -Wall -Werror -Wno-long-long")
- SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")
-endif (BRLCAD-ENABLE_STRICT)
# Build with O3 compiler optimization
OPTION(BRLCAD-ENABLE_OPTIMIZED_BUILD "Use optimized compiler settings" OFF)
@@ -776,6 +772,14 @@
# a Bourne shell or something compatible.
INCLUDE(${BRLCAD_CMAKE_DIR}/FindSH.cmake)
+# Now that we're done running tests, we can enable strict flags if turned on
+if (BRLCAD-ENABLE_STRICT)
+ FILE(APPEND ${CONFIG_H_FILE} "#define STRICT_FLAGS 1\n")
+ SET(CMAKE_C_FLAGS "-pedantic -W -Wall -Werror -Wno-long-long")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")
+endif (BRLCAD-ENABLE_STRICT)
+
+
# Virtually all of the BRL-CAD code needs the BRL-CAD include directories
# and a couple of standard defines - set those up in variables now - the
# idea being that if any other system-wide defines or include are needed
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
