Revision: 42400
http://brlcad.svn.sourceforge.net/brlcad/?rev=42400&view=rev
Author: starseeker
Date: 2011-01-17 15:03:08 +0000 (Mon, 17 Jan 2011)
Log Message:
-----------
Hopefully this will allow the same common.h to be used in both cmake and
autotools.
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/include/common.h
Property Changed:
----------------
brlcad/branches/cmake/
brlcad/branches/cmake/src/other/tkhtml/
Property changes on: brlcad/branches/cmake
___________________________________________________________________
Modified: svn:mergeinfo
-
/brlcad/trunk:37932-39894,41673-41706,41994-41998,42011-42052,42060-42120,42240-42327,42329-42333,42350-42352,42372-42376,42378-42380,42384-42397
+
/brlcad/trunk:37932-39894,41673-41706,41994-41998,42011-42052,42060-42120,42240-42327,42329-42333,42350-42352,42372-42376,42378-42380,42384-42397,42399
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2011-01-17 15:00:39 UTC (rev
42399)
+++ brlcad/branches/cmake/CMakeLists.txt 2011-01-17 15:03:08 UTC (rev
42400)
@@ -1033,7 +1033,7 @@
ENDFOREACH()
MESSAGE("")
IF(CMAKE_BUILD_TYPE MATCHES "^Basic$")
- SET(CMAKE_ALL_C_FLAGS "${CMAKE_C_FLAGS}")
+ SET(CMAKE_ALL_C_FLAGS "${CMAKE_C_FLAGS} -DCMAKE_HEADERS")
SET(CMAKE_ALL_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
endif()
IF(CMAKE_BUILD_TYPE MATCHES "^Debug$")
Modified: brlcad/branches/cmake/include/common.h
===================================================================
--- brlcad/branches/cmake/include/common.h 2011-01-17 15:00:39 UTC (rev
42399)
+++ brlcad/branches/cmake/include/common.h 2011-01-17 15:03:08 UTC (rev
42400)
@@ -42,8 +42,13 @@
* should not use config defines)
*/
#if defined(BRLCADBUILD) && defined(HAVE_CONFIG_H)
-# include "brlcad_config.h"
+# if defined(_WIN32) && !defined(__CYGWIN__) && !defined(CMAKE_HEADERS)
+# include "config_win.h"
+# else
+# include "brlcad_config.h"
+# endif /* _WIN32 */
+
/* Simulates drand48() functionality using rand() which is assumed to
* exist everywhere. The range is [0, 1).
*/
Property changes on: brlcad/branches/cmake/src/other/tkhtml
___________________________________________________________________
Modified: svn:mergeinfo
-
/brlcad/trunk/src/other/tkhtml:37932-39894,40417,41673-41706,42011-42052,42060-42120,42240-42327,42329-42333,42350-42352,42372-42376,42378-42380,42384-42397
+
/brlcad/trunk/src/other/tkhtml:37932-39894,40417,41673-41706,42011-42052,42060-42120,42240-42327,42329-42333,42350-42352,42372-42376,42378-42380,42384-42397,42399
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
