Commit graph

139 commits

Author SHA1 Message Date
Stephen Birarda
76f3378223 don't pass no-libraries option to windeployqt 2015-03-10 18:05:10 -07:00
Sam Gateau
d8ebb0c5b9 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-26 14:19:23 -08:00
Stephen Birarda
f8627c8233 fix handling for vc12 externals 2015-02-25 17:48:26 -08:00
Stephen Birarda
1c2606c6db fail out if windeployqt is not found 2015-02-25 13:12:37 -08:00
Stephen Birarda
33b0fd24a6 don't call copy dll step for scribe 2015-02-25 11:02:05 -08:00
Stephen Birarda
66ab2ba9f9 fix for flipped conditional for dll fixup 2015-02-25 10:44:02 -08:00
Stephen Birarda
fd8240669b fix for windeployqt for executables 2015-02-25 10:39:44 -08:00
Stephen Birarda
d52ba5e958 call windeployqt after fixup_bundle for qt plugins 2015-02-24 13:20:17 -08:00
Stephen Birarda
71dd443ae2 also call fixup_bundle for release builds on win 2015-02-23 15:29:43 -08:00
Stephen Birarda
87ce55cc42 add new macro file for fixup libs 2015-02-23 13:24:53 -08:00
Stephen Birarda
8be707f63f rename add paths macro for fixup_bundle 2015-02-23 13:24:21 -08:00
Stephen Birarda
2ad8ac866d make correct version of bullet for windows 2015-02-23 12:50:53 -08:00
Stephen Birarda
dc9c4ea43c add options with default for get of external projects 2015-02-20 15:34:41 -08:00
Stephen Birarda
32fa2e8d31 add missing docstring to AddPathsToLibPaths 2015-02-20 12:24:17 -08:00
Stephen Birarda
b7cc163ca4 lib paths is actually a string 2015-02-20 12:21:10 -08:00
Stephen Birarda
0bad8db1a0 fix missing dependencies to external projects 2015-02-20 12:17:58 -08:00
Stephen Birarda
b7c03c34a8 use path and filepath where appropriate for cache 2015-02-19 16:39:05 -08:00
Stephen Birarda
c3b9198ec3 cleanup handling of external projects if OS not handled 2015-02-19 15:19:52 -08:00
Stephen Birarda
a3d370f01f more path shortening for build of external projects 2015-02-19 14:33:31 -08:00
Stephen Birarda
a0a4882ed6 shorten externals binary dir path 2015-02-19 14:18:05 -08:00
Stephen Birarda
6f055ca0d7 add an external project to handle bullet 2015-02-19 12:01:40 -08:00
Sam Gateau
6070bf8a37 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-18 16:02:18 -08:00
Stephen Birarda
b2e587dbbd remove use of include_dependency_includes and use cmake 2015-02-18 14:12:05 -08:00
Stephen Birarda
9d7212cdae remove some debug in AddPathsToLibPaths 2015-02-17 17:18:24 -08:00
Stephen Birarda
68c19866c4 call dll copy after project deps are setup 2015-02-17 17:17:30 -08:00
Stephen Birarda
5b563e3bc5 add LIB_PATHS debugging to catch destruction 2015-02-17 17:12:14 -08:00
Stephen Birarda
315ab73900 fix a typo on temporary list 2015-02-17 16:32:52 -08:00
Stephen Birarda
bc9481051b use configure_file to pass lib_paths to fixup_bundle 2015-02-17 16:30:39 -08:00
Stephen Birarda
73891b61b0 use separate arugments to get colon separated list of paths 2015-02-17 16:18:35 -08:00
Stephen Birarda
7920f7afa3 spell things correctly so cmake knows what you want 2015-02-17 16:13:53 -08:00
Stephen Birarda
1a0a4d0e20 use seperate_arguments to allow cmake path escape 2015-02-17 16:05:32 -08:00
Stephen Birarda
b14110f596 ensure fixup bundle post build step called with list 2015-02-17 16:01:41 -08:00
Stephen Birarda
c3b71196c7 add debug to catch LIB_PATHS override 2015-02-17 15:58:08 -08:00
Stephen Birarda
d0d4eaec86 fix AddPathsToLibPaths foreach, soxr requirements 2015-02-17 15:44:03 -08:00
Stephen Birarda
bc0ddd8c1c rename AddPathToLibPaths file so it is findable 2015-02-17 15:19:57 -08:00
Stephen Birarda
b727c910d1 handle multiple dll paths, add sixense 2015-02-17 15:19:17 -08:00
Stephen Birarda
18f293b59b disable bundle fixup on Release build 2015-02-17 14:53:22 -08:00
Stephen Birarda
97fa1412e2 copy dlls beside windows executable for all executables 2015-02-17 14:45:26 -08:00
Stephen Birarda
767601de4f use a cache variable to pass around lib paths 2015-02-17 14:09:26 -08:00
Stephen Birarda
bc899eaa58 add fixup_bundle step for WIN32 interface 2015-02-17 13:17:23 -08:00
Stephen Birarda
a5bd9be510 put externals in build-externals to avoid clean build removal 2015-02-17 11:00:23 -08:00
Stephen Birarda
2d1ad4977f handle soxr build for android 2015-02-17 10:46:19 -08:00
Stephen Birarda
e99012efbb updates to build guides to remove soxr 2015-02-17 10:33:12 -08:00
Stephen Birarda
d299f015d1 use binary dir for externals as well 2015-02-17 09:46:39 -08:00
Stephen Birarda
feaad37751 add a GET_PROJ_NAME var to skip external projects 2015-02-16 09:38:53 -08:00
Stephen Birarda
a1bf06f004 can't use find module for external proj 2015-02-16 09:10:18 -08:00
Stephen Birarda
6e63c1c1ad set the GLM_INCLUDE_DIRS var in cache so find hits it 2015-02-13 14:50:12 -08:00
Stephen Birarda
8c998a65ee use the glm find_package and check externals 2015-02-13 12:50:32 -08:00
Stephen Birarda
50c9bb2ae5 remove glm as manual dep in BUILD guides 2015-02-13 12:33:29 -08:00
Stephen Birarda
9136154cd5 fix double subdir include, clear up build guide 2015-02-13 10:48:27 -08:00