Commit graph

152 commits

Author SHA1 Message Date
Cliff Yapp
80e57f274f Apply brlcad patches through r54980 2013-03-31 00:16:18 -04:00
Cliff Yapp
b196aac059 Remove some unnecessary and/or duplicate files 2013-03-05 21:39:08 -05:00
Cliff Yapp
784363bf5f Make a stab at merging master and brlcad. Not properly working yet, need to remove some files, etc. 2013-03-04 21:57:08 -05:00
Christopher Sean Morrison
d55fffb079 typos carl noticed, but looks like they're all benign 2012-09-25 16:57:04 +00:00
Cliff Yapp
7b8867f43b Update documentation on handling of INSTALL.new, configure.new, and perplex/re2c/lemon cached files. 2012-08-14 15:55:52 +00:00
Mark Pictor
2236a5be23 fix SCL_ENABLE_COVERAGE 2012-08-01 18:57:24 -04:00
Mark Pictor
35d54e1179 fix problem when linking with static libs 2012-08-01 18:57:24 -04:00
Cliff Yapp
86b9d78c52 harden managed sources file against weird pathnames 2012-07-31 20:38:55 +00:00
Cliff Yapp
df2bb7ed4f Use semicolons in lists for SCL_ADD macros as well. 2012-07-30 12:46:46 +00:00
Cliff Yapp
7eb24440a2 Thanks Keith for reminding me of the potential problem - strip newlines out of md5 calculations so Windows can't toss in a monkey wrench. 2012-07-18 15:24:25 +00:00
Cliff Yapp
c49527e19e fix SCL cmake logic 2012-07-17 21:03:37 +00:00
Cliff Yapp
540c67a3b9 Tweak handling of perplex template 2012-07-17 20:51:57 +00:00
Nicholas Reed
c55e374981 update dll export macros and remove local definitions; SCL git 7be54f3 2012-07-17 19:25:03 +00:00
Cliff Yapp
2ff824da69 Upgrade template searching logic a bit, in light of new perplex build logic. In the 'standard' case, builds using perplex now stand a chance of 'just working' without requiring manual template specification. 2012-07-16 13:41:45 +00:00
Mark Pictor
95738d8e4e fix intermittent (?!) gcc 4.7 error about c++-11 user-defined literals
scl_version_string.h:13:63: error: inconsistent user-defined literal suffixes ‘__TIME__’ and
  ‘__DATE__’ in string literal
scl_version_string.h:13:63: error: unable to find string literal operator ‘operator"" __TIME__’
2012-07-14 18:54:44 -04:00
Cliff Yapp
411c972e18 Use DEBUGGING_GENERATED_SOURCES to allow re2c debugging information to appear in re2c intermediate output. Disable normal behavior while doing so, so the debug-enabled output won't poison the MD5 management mechanism. 2012-07-14 22:45:56 +00:00
Cliff Yapp
b8fcdc8dbb Add management routines for syncing info back into the generated source tree. 2012-07-14 20:55:56 +00:00
Cliff Yapp
3e8449c10e Add necessary re2c flag 2012-07-14 20:11:51 +00:00
Cliff Yapp
70afc8a933 Be noisy for now so it's clear what's actually going on, fix copy-paste error. 2012-07-13 21:00:55 +00:00
Cliff Yapp
92dcc912f9 More tweaks and added logic to generated source verification 2012-07-13 20:41:42 +00:00
Cliff Yapp
29c16b7d28 Checkpoint some more work on generated src management. 2012-07-13 18:43:10 +00:00
Cliff Yapp
9b6c4f49a7 Start working on the easier verification case - verifying generated sources haven't been monkeyed with. 2012-07-13 16:01:09 +00:00
Cliff Yapp
201188e704 Try to be a little more helpful with the template error message. 2012-07-12 20:32:42 +00:00
Cliff Yapp
f8918053c3 Don't want a BRL-CAD path hardcoded into the perplex CMake macros, now that the prospect of them being used elsewhere is real. 2012-07-12 20:22:53 +00:00
Cliff Yapp
0fea20a436 Start building towards an SCL build that can work with or without perplex/re2c/lemon. Fair bit more work to do - these are just the fundamental essentials. 2012-07-12 19:41:56 +00:00
Mark Pictor
758a45089e fix quotes 2012-05-05 11:17:45 -04:00
Mark Pictor
3df1d1ccce EXCLUDE_FROM_ALL cannot be set on targets that are installed
so either test a target or install it, but not both
2012-05-05 11:06:54 -04:00
Mark Pictor
f125079519 sdai should be lowercase 2012-05-05 11:06:54 -04:00
Mark Pictor
7be54f3fec update scl_utils macros for apple flags and for windows dllimport/dllexport 2012-05-05 11:06:54 -04:00
Christopher Sean Morrison
f2fe965efe rename STDCXX_LINKLIB to STDCXX_LIBRARIES to comply with cmake's documented convention (and it can require multiple libraries like -lm and -lc, too) 2012-05-03 22:15:52 +00:00
Cliff Yapp
51acac30c2 Try to make the stdc++ usage a matter of detection instead of hardcoding. Untested on systems which would show the issue. 2012-05-03 17:41:23 +00:00
Christopher Sean Morrison
f6838a13ec more stl linkages for external deps compiling through cache or different compilers 2012-05-03 15:27:42 +00:00
Mark Pictor
6c76d7b184 fix potential scl_cf.h problem 2012-04-06 16:35:33 -04:00
Cliff Yapp
3c344b80e4 Need quotes for this comparison... 2012-04-05 17:42:40 +00:00
Cliff Yapp
b96f54d1f8 libs->libslist, per 49867 2012-04-05 17:38:15 +00:00
Nicholas Reed
afad910fd2 sync comment changes from 7b54e23 2012-04-03 18:01:54 +00:00
Cliff Yapp
0df1493ee5 Finally bite the bullet and start reworking the build logic to be robust to weirder source and build directory names. This is not everything needed, but it's a step in the right direction. 2012-04-02 00:25:21 +00:00
Mark Pictor
7b54e23e1a update comment in scl_version_string.h 2012-03-26 20:40:17 -04:00
starseeker
b507ee8179 Two more of Cliff's patches 2012-03-26 20:31:36 -04:00
Cliff Yapp
f701e8b558 don't use a generic IS_SUBBUILD variable - bad idea. 2012-03-22 18:04:32 +00:00
Cliff Yapp
5f63f3d021 Don't need the messages when SCL is a subbuild. 2012-03-22 17:05:54 +00:00
starseeker
75706a942a starseeker's patch from http://bzflag.bz/~starseeker/scl_cmake_files.patch 2012-03-21 21:18:38 -04:00
Cliff Yapp
7474ff5c5d More syncing with github tree 2012-03-22 00:46:23 +00:00
Cliff Yapp
4fa0761fb0 Edge our CMakeLists.txt file and tree a little closer to the github tree. base and fedex_python are turned off and ignored for the moment. 2012-03-22 00:24:59 +00:00
Cliff Yapp
c4337773bc go with the mpictor github capitalization 2012-03-21 23:03:37 +00:00
tpaviot
f3eab5d91a Added ABI versioning 2012-03-02 07:49:03 +01:00
tpaviot
38d2a49967 Improvements in the cmake builder 2012-03-02 07:49:02 +01:00
Mark Pictor
13204e4027 change scl_version_string.cmake to fix parallel ctest issue
This replaces use of the system time command with __DATE__ and __TIME__

I think the following two errors are caused by fedex_plus being rebuilt for each test:

Linking CXX executable ../../bin/fedex_plus
CMakeFiles/fedex_plus.dir/__/express/fedex.c.o: file not recognized: File truncated

and

[ 87%] Running fedex_plus for AP214E3_2010...
/bin/sh: /opt/step/test-scl/build_ctest/bin/fedex_plus: Text file busy

fedex_plus is being rebuilt because the version string changes, since it contains the date and time.
2011-12-07 18:44:43 -05:00
Mark Pictor
d190a1e042 for version info, read SCL_VERSION.txt if git fails 2011-11-27 11:41:27 -05:00
Mark Pictor
dc30ee21fd Generate version info and timestamp at build time
* Print this info from `p21read -v` and in a comment in generated source, not just from `fedex_plus -v`

* Use a function `const char* scl_version()`, instead of using the macro `SCL_COMMIT_ID`

* Fail gracefully if the `.git` directory does not exist (thanks CY!)

* Fixes issue #89
2011-11-27 11:12:54 -05:00
Mark Pictor
62d80a5c5b missed one path when renaming CMake/ to cmake/ 2011-07-31 13:37:55 -04:00
Mark Pictor
00092d081f cmake: rename BRL-CAD variables, remove unused variable, rename CMake/ to cmake/ 2011-07-31 12:49:32 -04:00