Compare commits
1148 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
5243bcee98 | ||
|
ae58f70718 | ||
|
faff37677c | ||
|
691711cd3e | ||
|
8189cc72d0 | ||
|
c6f14a5213 | ||
|
4db6748cc5 | ||
|
158f2931a7 | ||
|
4b59685af1 | ||
|
9e9b826aa1 | ||
|
64e8b010af | ||
|
1b6e8b9f09 | ||
|
b04decfaae | ||
|
79aa9b5cf6 | ||
|
72e6020d50 | ||
|
a87b1b3738 | ||
|
fa8a462827 | ||
|
0ebe5b0a7f | ||
|
39c8dc708f | ||
|
dcc4e908c2 | ||
|
b40cdc2b55 | ||
|
2615c2d705 | ||
|
23fe70ec52 | ||
|
331bcfc0d0 | ||
|
7ff18fb9cc | ||
|
ab9e277f15 | ||
|
0439d1cf44 | ||
|
e1c9a10311 | ||
|
9ad4ff93a0 | ||
|
89fcfe1551 | ||
|
a24a782174 | ||
|
5a2f31c887 | ||
|
67a843c0d4 | ||
|
b9f43ad13b | ||
|
b8a00b410a | ||
|
e00b8ed948 | ||
|
590b3f0416 | ||
|
62fbfa9856 | ||
|
1f9cb9f999 | ||
|
13dd311c9b | ||
|
1e1b83c07b | ||
|
8f08e231fa | ||
|
f0ada3e8d4 | ||
|
9171cefaad | ||
|
247ecf1b16 | ||
|
3f7e5e99d5 | ||
|
6d43db4f74 | ||
|
128654b60b | ||
|
21095f2dc2 | ||
|
420f5c8682 | ||
|
85b147584e | ||
|
7f24b768c3 | ||
|
787ff2408c | ||
|
64943a5187 | ||
|
486ad71287 | ||
|
c9125b6232 | ||
|
87c7d55469 | ||
|
14b741b0ef | ||
|
89180f9822 | ||
|
517ba7aa70 | ||
|
68064d7bc3 | ||
|
62afcbbb4a | ||
|
7ef1f9b7c1 | ||
|
877fd611ac | ||
|
dc9f1dbf69 | ||
|
895a80d38a | ||
|
6a9f983a16 | ||
|
22fa1da36e | ||
|
fb99177766 | ||
|
67441d0ca3 | ||
|
b5163d2f8d | ||
|
29263c947e | ||
|
08669adf1b | ||
|
68ad329c9d | ||
|
d6e18114eb | ||
|
e5c11edd7b | ||
|
fffc249f21 | ||
|
739c7e5968 | ||
|
f732ea1ab5 | ||
|
ae87bb87d0 | ||
|
3d60d73f76 | ||
|
0950253ca6 | ||
|
f6d8ca74d5 | ||
|
00cdefc7a2 | ||
|
d850414af1 | ||
|
b380b06c5d | ||
|
c64efd9e30 | ||
|
cd43c08f2b | ||
|
28b13b31aa | ||
|
10ac040338 | ||
|
7e1c1e4869 | ||
|
a2803f37e7 | ||
|
18348b382e | ||
|
64e68ea690 | ||
|
bee13ef1cf | ||
|
e73ef9d219 | ||
|
8b3fbdef34 | ||
|
e2550e48f1 | ||
|
62beabff7c | ||
|
5e06dfcb32 | ||
|
35befde2ad | ||
|
bc73b00672 | ||
|
00ea7f2676 | ||
|
fe758dbe2c | ||
|
8811d6f2aa | ||
|
1939cfd9cb | ||
|
7860770232 | ||
|
6216ed573e | ||
|
973f7d55bd | ||
|
0c74168c42 | ||
|
3eba1c72ef | ||
|
e83d440f92 | ||
|
6558400123 | ||
|
389f5b59dd | ||
|
08353e37cf | ||
|
c8bead4752 | ||
|
9df71488b3 | ||
|
ef59b5e064 | ||
|
0c061f3d9d | ||
|
88b312d3a4 | ||
|
0858125fd4 | ||
|
89d855ba58 | ||
|
d415125a68 | ||
|
0da2ecac41 | ||
|
bdd09cfaf4 | ||
|
9504a30d15 | ||
|
9a1701fbcb | ||
|
c68c346d2b | ||
|
e2447a80ea | ||
|
936ce1f273 | ||
|
6ef7a1f9e5 | ||
|
23c2ae55c7 | ||
|
8bfae263c1 | ||
|
1c2ddf5612 | ||
|
5a8d30b87b | ||
|
b7b22996bb | ||
|
552a74d829 | ||
|
c37bd936c3 | ||
|
4e8c1d8666 | ||
|
72f6dc612c | ||
|
f051908edc | ||
|
420b38fde9 | ||
|
34e7ac6817 | ||
|
2b5a58a33c | ||
|
e513a6c538 | ||
|
8c2d331426 | ||
|
caee80f39f | ||
|
01b2f506d6 | ||
|
df8c7e3e18 | ||
|
3f1675c941 | ||
|
6a56fe9240 | ||
|
51ee6a7dbb | ||
|
14a356b178 | ||
|
4eff0c0480 | ||
|
8f00325d73 | ||
|
9a90a4524e | ||
|
31a5a359bb | ||
|
bf97419a18 | ||
|
4c26106f76 | ||
|
15e4e6a23e | ||
|
6b467e52bb | ||
|
08b438b076 | ||
|
a14f2b4722 | ||
|
a1a9b24952 | ||
|
f979709590 | ||
|
e9d05765c2 | ||
|
7756fc599d | ||
|
b31fbc832d | ||
|
1bd04b5a02 | ||
|
6466cc9eb1 | ||
|
f7fc0c03be | ||
|
67312b7991 | ||
|
f4a7308f61 | ||
|
53d770b3a2 | ||
|
7ed6e985e2 | ||
|
da6b95a075 | ||
|
565baee64b | ||
|
36e28f96f6 | ||
|
215dd33149 | ||
|
5646c90e87 | ||
|
97e0059b05 | ||
|
8445efca81 | ||
|
a6a66c3a21 | ||
|
cc99be369e | ||
|
1a5007a920 | ||
|
3818aacaa5 | ||
|
e1d039d56d | ||
|
a4815d5509 | ||
|
ba00aab7a0 | ||
|
aaf8d6a98d | ||
|
b008226203 | ||
|
eff3eff916 | ||
|
bf327822d6 | ||
|
63da0df9c2 | ||
|
13a44c4b7f | ||
|
f04de1335c | ||
|
c08fd12706 | ||
|
d7992a77f6 | ||
|
8c787b5fa9 | ||
|
44fafc477f | ||
|
780fbc2897 | ||
|
620a6baa59 | ||
|
89073268fd | ||
|
6ed44b1ca9 | ||
|
746cb7c328 | ||
|
8ba3d978db | ||
|
c275673dbf | ||
|
9e3045dae1 | ||
|
c2bcd98369 | ||
|
683b72c3c1 | ||
|
3358ed643b | ||
|
2724a0b3cc | ||
|
0deeff45a0 | ||
|
fd47711d68 | ||
|
c61c864f73 | ||
|
d9619512e1 | ||
|
7863dabb54 | ||
|
cf97685735 | ||
|
92686513a2 | ||
|
8c186dad9b | ||
|
3de0f78449 | ||
|
8aafd5f9e3 | ||
|
cc50812d6f | ||
|
467e864adf | ||
|
0a5ec5f380 | ||
|
27bd52b540 | ||
|
9196ea9d5a | ||
|
d537c5e67d | ||
|
e774a5534c | ||
|
258a844b63 | ||
|
cbaac5de6d | ||
|
1f99e08822 | ||
|
eb62cbc494 | ||
|
1e0a1fc9cb | ||
|
25093c3f54 | ||
|
0904aa6395 | ||
|
c42ef16585 | ||
|
1f44d29a0f | ||
|
05ed7ed8e0 | ||
|
f4b0c77247 | ||
|
487942b562 | ||
|
8b037fe4ea | ||
|
cd58de63de | ||
|
5859be3886 | ||
|
d45b7860a5 | ||
|
0cdaa8a4a5 | ||
|
3b80dc166a | ||
|
fdae2107d9 | ||
|
44b80414d3 | ||
|
b1492cb30f | ||
|
5c225e8e07 | ||
|
3068c3bb65 | ||
|
ac293bde7f | ||
|
a53d3975c9 | ||
|
94beb42a68 | ||
|
5a7808160e | ||
|
9063f1e089 | ||
|
fa68c1e116 | ||
|
ba165db3d3 | ||
|
f2c862db07 | ||
|
a90dd15e6b | ||
|
f9c58d7c4e | ||
|
ce64c9ad5e | ||
|
dec7af167b | ||
|
14c7f553a9 | ||
|
7a74087601 | ||
|
9eefb360a7 | ||
|
3f50e94e33 | ||
|
bbd8ce1008 | ||
|
30870f51f4 | ||
|
741c4f3ecc | ||
|
611684187d | ||
|
c8428cb3e4 | ||
|
1202160b57 | ||
|
59ee34efc0 | ||
|
7185019ae6 | ||
|
090ef04012 | ||
|
a22151d83c | ||
|
990d032c90 | ||
|
b383a61fbd | ||
|
07f2064617 | ||
|
fb64d0f4a2 | ||
|
115d350e09 | ||
|
3dd193aa6d | ||
|
87018b452a | ||
|
61f73653ba | ||
|
8ed0708507 | ||
|
077a220c51 | ||
|
c5cee3222f | ||
|
e837b3a26c | ||
|
846245d4b2 | ||
|
d7fa57a7a3 | ||
|
0be11733a7 | ||
|
c64135f723 | ||
|
5e2477a7bd | ||
|
8e7dc6f465 | ||
|
2546fd477f | ||
|
7fab82af5f | ||
|
0423218095 | ||
|
3977d18aca | ||
|
9975d32acf | ||
|
a6b55fba08 | ||
|
208dc370ac | ||
|
caa309aaf4 | ||
|
6f5db50804 | ||
|
8996b4490a | ||
|
87bda9d805 | ||
|
ba83248011 | ||
|
b1bb21e714 | ||
|
da7e894868 | ||
|
389b9d5ca3 | ||
|
c2100640f6 | ||
|
607e5e62e7 | ||
|
e36ee9677a | ||
|
f6b4e578cd | ||
|
59515ca600 | ||
|
fa1710b567 | ||
|
9460f8c0b9 | ||
|
a3a3ff3d33 | ||
|
2108d9a25b | ||
|
e8dec5e171 | ||
|
0dab581700 | ||
|
1c728f2d6d | ||
|
6b9b7e3c92 | ||
|
7c08e3ac6e | ||
|
718d07fe5e | ||
|
bc28da5c3a | ||
|
2fb08f0132 | ||
|
b8d92a7f8f | ||
|
f6abd02cdc | ||
|
943b4e5b95 | ||
|
c55c8fe929 | ||
|
4c04741d4c | ||
|
0d56f7433b | ||
|
acc6542a1b | ||
|
803bdcdf2b | ||
|
b6c113d0eb | ||
|
82c59511b4 | ||
|
d9dd07545d | ||
|
88c3accd1a | ||
|
3c1b70842d | ||
|
62810a3c51 | ||
|
bbf3fcdecd | ||
|
e05d8d90c0 | ||
|
841aa8c47b | ||
|
95bde2af7f | ||
|
64a4475285 | ||
|
0c33a0bf4d | ||
|
4151c94d20 | ||
|
0a419c51ed | ||
|
eec6e810f1 | ||
|
c2a25d522b | ||
|
fe525c6f7c | ||
|
3b739e69c9 | ||
|
c9983ee863 | ||
|
912761ea17 | ||
|
1bb67d3844 | ||
|
6b41f0f335 | ||
|
d6b200e03a | ||
|
7f662bf4ef | ||
|
13c556d9de | ||
|
49582f9dbf | ||
|
61aef3ce05 | ||
|
d31fb73a09 | ||
|
8d2c79f4e3 | ||
|
fc552d842e | ||
|
5771d380b1 | ||
|
78005ffefe | ||
|
9324aa2d0d | ||
|
0616aa9ecf | ||
|
0ae9ac2179 | ||
|
b30b2c1381 | ||
|
edc4ba21c4 | ||
|
9aceb23df6 | ||
|
8e6ce38cf4 | ||
|
7c1a821000 | ||
|
1b827f0484 | ||
|
e3249d8e5a | ||
|
48ba181118 | ||
|
f6973d9054 | ||
|
9369e98a62 | ||
|
7783ba1120 | ||
|
47cd8af2d2 | ||
|
a4d594cbda | ||
|
0ef04197f7 | ||
|
547fcc76b2 | ||
|
98eb4489d7 | ||
|
a9080ef924 | ||
|
8cf3bf84ce | ||
|
8fd45ae74f | ||
|
4811214cc0 | ||
|
52c38ce17d | ||
|
b271edb092 | ||
|
cca36b6b21 | ||
|
853af31fb1 | ||
|
ab1f458034 | ||
|
49dfdb7a97 | ||
|
43070f2fd8 | ||
|
77bc2ad1e0 | ||
|
858435884d | ||
|
1ac1059961 | ||
|
b44bf0f8fe | ||
|
6f2411378b | ||
|
7dd7c146e8 | ||
|
faa0a91133 | ||
|
42451ec057 | ||
|
66278500db | ||
|
245cbf9441 | ||
|
2b88626548 | ||
|
2506cf29b3 | ||
|
6fd9bdf2cc | ||
|
d1775ee992 | ||
|
293211aee0 | ||
|
1bbd7c793c | ||
|
ba7f665dce | ||
|
130bc3c097 | ||
|
1ec17fb48a | ||
|
2b2be3fb82 | ||
|
833034f301 | ||
|
f9b30c0db3 | ||
|
a5278fc126 | ||
|
74413ca7d3 | ||
|
98e6c6d17b | ||
|
9491df8c1b | ||
|
d325cb7f57 | ||
|
24ee60ffd7 | ||
|
cea8d5c1ab | ||
|
fc867b96a5 | ||
|
aafe169f89 | ||
|
84b904bc36 | ||
|
33defc7121 | ||
|
2a0522b1c6 | ||
|
8693dfd0e8 | ||
|
a738b534ca | ||
|
f996b507d8 | ||
|
d9166000fe | ||
|
3697d4fa2f | ||
|
4bcd07385e | ||
|
d84b49c743 | ||
|
aff73fd598 | ||
|
afb3647b34 | ||
|
2328cae25d | ||
|
85831628d6 | ||
|
667b5eb81b | ||
|
de07af824b | ||
|
cb6cad7df1 | ||
|
ad67e36766 | ||
|
18434846a3 | ||
|
43c8661e5e | ||
|
404504b234 | ||
|
d65f9183fd | ||
|
6b121e2b48 | ||
|
437ef7713e | ||
|
737e9a8da4 | ||
|
ad4b04291f | ||
|
e9fb0cba58 | ||
|
f2b42160f4 | ||
|
6072d5975a | ||
|
85c103d277 | ||
|
31fe1f8ec4 | ||
|
5716d13b43 | ||
|
a7fd4b1bb0 | ||
|
226fce20f0 | ||
|
ac8f17746b | ||
|
a98b97f5da | ||
|
c3c2b331cd | ||
|
af2fa459f1 | ||
|
060fc60338 | ||
|
bf5f0ca20a | ||
|
e08a9b0302 | ||
|
55c8f0f7a4 | ||
|
799318357c | ||
|
f522ce50b2 | ||
|
5d0038626b | ||
|
88b12b7c05 | ||
|
7b93ae3c5e | ||
|
6ef0d6f156 | ||
|
967d2f4f30 | ||
|
4ec8ee66a0 | ||
|
0493ffd083 | ||
|
0be7dbe183 | ||
|
1c8fc6bee2 | ||
|
d95f5ce102 | ||
|
1e756cb979 | ||
|
3bb61eb0fe | ||
|
2a33274558 | ||
|
4efe27fc4e | ||
|
ea298f59e4 | ||
|
78d5ea7a71 | ||
|
e084dbbc20 | ||
|
66d1cdc65d | ||
|
e607bd3e6b | ||
|
1ccc1371b9 | ||
|
5ac0f98974 | ||
|
2bda8346dc | ||
|
92435cd0ff | ||
|
597fde688e | ||
|
458ff6a680 | ||
|
a7ced2a456 | ||
|
ab9f6cabdc | ||
|
95c882e9d4 | ||
|
976627e601 | ||
|
d918208af6 | ||
|
98ae54f728 | ||
|
c1197a1575 | ||
|
82d23ad590 | ||
|
c29c0ad0a2 | ||
|
cf152970e2 | ||
|
a0d0f96afe | ||
|
9c0787df75 | ||
|
5b377041e3 | ||
|
169c944c4b | ||
|
79b544e652 | ||
|
0e3025bc14 | ||
|
30a1b24e19 | ||
|
25333d45ea | ||
|
8de8dacd02 | ||
|
9b4243f9bf | ||
|
0939d4cf1f | ||
|
a345becea2 | ||
|
80eeb3cef1 | ||
|
39235bedc6 | ||
|
4473e33655 | ||
|
6c27a5d993 | ||
|
4fe725a46a | ||
|
4b97f9b15b | ||
|
3d999c6090 | ||
|
7803c28d96 | ||
|
eeabb8f86a | ||
|
1d441d1ac7 | ||
|
2719e4f828 | ||
|
d4db985b5e | ||
|
f4d20b0086 | ||
|
405b6fc5f9 | ||
|
3c7a61eae2 | ||
|
da555fc2ab | ||
|
2ebb10988d | ||
|
0c09fd3c6f | ||
|
53a73fc1d1 | ||
|
e9c073b866 | ||
|
061cd2d841 | ||
|
e2fc86bbd9 | ||
|
1bb8ce7b7d | ||
|
87036bbb70 | ||
|
99524c4d24 | ||
|
44d5a096a3 | ||
|
7e19e96ae9 | ||
|
e05c25c123 | ||
|
0df4bbd689 | ||
|
a2fb712bea | ||
|
1d54b80764 | ||
|
364c88864b | ||
|
ce1c28b8b4 | ||
|
5290fb106f | ||
|
5fe14d0fac | ||
|
dc57476a0e | ||
|
9d083161b6 | ||
|
1f17d5fbf7 | ||
|
0f16fd3cec | ||
|
ac2ee719c0 | ||
|
9d09a1263e | ||
|
57d0f56b58 | ||
|
a385e6d1cd | ||
|
70bc8e4a71 | ||
|
080fcebfca | ||
|
51cf5bb604 | ||
|
e2f8fe449c | ||
|
42a213c67f | ||
|
22887d12c4 | ||
|
fb99e177e1 | ||
|
24f355f097 | ||
|
1741292616 | ||
|
3f9b6e9ea4 | ||
|
cab49d68fc | ||
|
c3ca03eb17 | ||
|
8946be3422 | ||
|
23babb36ec | ||
|
6e7791948b | ||
|
cf4bee7c0c | ||
|
6ff61620a3 | ||
|
c84c2ef70c | ||
|
3c8287eb0a | ||
|
9bc5f5850a | ||
|
32c408d76a | ||
|
4006ca98a2 | ||
|
6933df8fe0 | ||
|
46478ffe32 | ||
|
7bd071edb1 | ||
|
80da8585f4 | ||
|
9619ef4c94 | ||
|
e28b8c6218 | ||
|
a6ebe9fc7c | ||
|
100be67aa4 | ||
|
df1d6870c0 | ||
|
f15c5f90c3 | ||
|
cdcf6fc27a | ||
|
04f0f1b046 | ||
|
253cfde728 | ||
|
a8b8f90dd3 | ||
|
5ada54fb79 | ||
|
e5826d916c | ||
|
d8406b2f3a | ||
|
3b4c69452b | ||
|
87a64d53ab | ||
|
b49b181901 | ||
|
cb6a45e318 | ||
|
b34d86cb28 | ||
|
90fd614536 | ||
|
5f41ce6626 | ||
|
20f720f11b | ||
|
78a8dfb9f8 | ||
|
da87ddc3eb | ||
|
34253146da | ||
|
751d055356 | ||
|
0fdcb9c998 | ||
|
dc2749cfbd | ||
|
c3749171b7 | ||
|
5e30547b63 | ||
|
9b9f2fe972 | ||
|
1b63268eb2 | ||
|
84e847557a | ||
|
dce5b3eb0c | ||
|
f67d7efd4e | ||
|
dcd768a49a | ||
|
dcf0889fc2 | ||
|
6997ff1c88 | ||
|
521648ce02 | ||
|
87efa821fa | ||
|
13c0e40223 | ||
|
60b1a085c7 | ||
|
a3506de770 | ||
|
eaac086605 | ||
|
f2eaecb217 | ||
|
72a2da560f | ||
|
a922aab52c | ||
|
4ba5491a50 | ||
|
c39bb31bac | ||
|
39effd08e5 | ||
|
7e425ba7b0 | ||
|
b8f7f6081f | ||
|
0de16e296a | ||
|
6b1800cb76 | ||
|
d0bcf7aa9b | ||
|
7604a15365 | ||
|
c60ec7f521 | ||
|
241a61330a | ||
|
798a95ed9b | ||
|
5fecc4953b | ||
|
112139f00a | ||
|
82d3cd0b0a | ||
|
83f7dbeb62 | ||
|
98974dccef | ||
|
06a505ba53 | ||
|
1ad3bc4c00 | ||
|
93808a4a9c | ||
|
0e48692e82 | ||
|
56062e13f2 | ||
|
7eb3580b79 | ||
|
4a056d205b | ||
|
477000eb31 | ||
|
e2a47b0cd2 | ||
|
65bb82f241 | ||
|
2382618330 | ||
|
343f7e4d34 | ||
|
cdcb6655e7 | ||
|
47ba172e98 | ||
|
e121dd4d58 | ||
|
7c5f7e3e04 | ||
|
c16c60a402 | ||
|
170175554f | ||
|
c348746059 | ||
|
b11aef43d4 | ||
|
4a3610588f | ||
|
31e8d3c185 | ||
|
6487fb1c9c | ||
|
94783b5111 | ||
|
39b7b2a465 | ||
|
73a7509fde | ||
|
7686e915e2 | ||
|
9dc6c9b8d4 | ||
|
1f26f80bb7 | ||
|
3dc5809557 | ||
|
d3578357e3 | ||
|
fb60181a3a | ||
|
6f26baa0fc | ||
|
321659b075 | ||
|
27a4b067ff | ||
|
8f521168b4 | ||
|
a6df1715ed | ||
|
9427bc1d1e | ||
|
288fff89cc | ||
|
edc9567475 | ||
|
4ccdb6f675 | ||
|
6e3a8b035d | ||
|
67740c81cf | ||
|
ae276302f6 | ||
|
63cdf48ec1 | ||
|
0a96e0bbc4 | ||
|
3388cf17dc | ||
|
59694b5da3 | ||
|
b5ea631975 | ||
|
feaedd5756 | ||
|
45117bfc1d | ||
|
ca0962a1e9 | ||
|
ffe1b14331 | ||
|
07f2b74116 | ||
|
3b7f55e9d1 | ||
|
6f498847fa | ||
|
be3d8cbc02 | ||
|
df6f165a2b | ||
|
1f886fae1b | ||
|
e2aba8ebf3 | ||
|
73e403b8c6 | ||
|
92a55b01af | ||
|
8ff2e494f5 | ||
|
e119b6c3c7 | ||
|
c520fb2aa2 | ||
|
39ab2e0c4d | ||
|
029594a052 | ||
|
98b15dbfce | ||
|
1b661a81d5 | ||
|
14823c6f5e | ||
|
73b07eddd0 | ||
|
b053e5d673 | ||
|
5efab28a44 | ||
|
4c4420dfe9 | ||
|
b2cd90e2b6 | ||
|
3306fdd954 | ||
|
d9d3107d8d | ||
|
70aac17140 | ||
|
1dbdf099cd | ||
|
35cbf341d1 | ||
|
fcdb829c25 | ||
|
8cbf1f8d41 | ||
|
4680b22c2c | ||
|
12280e4bfc | ||
|
68dcee028d | ||
|
d9f79dae49 | ||
|
4b114473ef | ||
|
a820bd4f13 | ||
|
56cc44e0f5 | ||
|
cf12784f94 | ||
|
0c44027cb9 | ||
|
bc37935836 | ||
|
4e73d75b03 | ||
|
bd6f0d2ff9 | ||
|
b2d1851c43 | ||
|
e67e482d99 | ||
|
d60e8ddedc | ||
|
f277ba3771 | ||
|
948fe6ca88 | ||
|
894dba72a3 | ||
|
638ad7f3c5 | ||
|
395a5977d5 | ||
|
ef33df518a | ||
|
7e4ff64898 | ||
|
9f785738a1 | ||
|
25c35042b6 | ||
|
012264339e | ||
|
e52ba46e3b | ||
|
7775636a15 | ||
|
ec86d65faf | ||
|
42da0d5115 | ||
|
d25f052208 | ||
|
60fddce474 | ||
|
61ace3dc72 | ||
|
2e32a64577 | ||
|
6acbb1c641 | ||
|
fad3eca77f | ||
|
3e782664b8 | ||
|
64e93ce135 | ||
|
8c7fab9b4d | ||
|
c9ebb2dd0e | ||
|
ab5b3c22e0 | ||
|
340549b052 | ||
|
8f1384072c | ||
|
57f84042ff | ||
|
ea7ffc2802 | ||
|
f841d372e9 | ||
|
14deaf427f | ||
|
3d77e9620e | ||
|
32ca771129 | ||
|
9ce99357a4 | ||
|
8bca7d76a5 | ||
|
8a5905801c | ||
|
be480fe752 | ||
|
0e4e721c6b | ||
|
26b004e9e8 | ||
|
b2300241d1 | ||
|
042e09aa36 | ||
|
d0fbc7e5dd | ||
|
ed667b9069 | ||
|
2e93433ee5 | ||
|
0c80bdbf5e | ||
|
72e4db54e7 | ||
|
b4dfd43648 | ||
|
fbcef69b1a | ||
|
e50ebf1f0f | ||
|
94443b4811 | ||
|
4563cf3e6c | ||
|
80d55adf7c | ||
|
ea1114eb85 | ||
|
fc87027267 | ||
|
698faabef3 | ||
|
4f7d41eac3 | ||
|
a3d3777de9 | ||
|
510d969084 | ||
|
ae5225dfcd | ||
|
1ccef79a2a | ||
|
6822a3bef1 | ||
|
6dfdbb7ab8 | ||
|
7373e19fa1 | ||
|
e13b9464ef | ||
|
cbc4faa980 | ||
|
9b74e2071c | ||
|
11af6cddf5 | ||
|
c37f570215 | ||
|
759e2a15ca | ||
|
557916474b | ||
|
55a40de890 | ||
|
41bf7e0b3c | ||
|
6664a9c233 | ||
|
f84edf5816 | ||
|
d051064495 | ||
|
a38b44f172 | ||
|
f0bef12142 | ||
|
bc728d2621 | ||
|
eacdb38f2e | ||
|
10a55e0d05 | ||
|
f816395691 | ||
|
4563472c1e | ||
|
bad76cfc7a | ||
|
f84d6446a7 | ||
|
060811b1b5 | ||
|
fe76088cc7 | ||
|
0e443e130c | ||
|
229add784f | ||
|
8e45500e21 | ||
|
0575de6d7e | ||
|
41ea50ac6f | ||
|
384db46a5a | ||
|
7d13fd8ea3 | ||
|
f29de68237 | ||
|
6ca66a7dea | ||
|
834f289709 | ||
|
0f57ab750d | ||
|
0553a8ea99 | ||
|
1fa1615244 | ||
|
7f3408c8c8 | ||
|
3c9f082bb9 | ||
|
68df847802 | ||
|
8662560e2c | ||
|
39a349fdcb | ||
|
f46c2b39e6 | ||
|
130eb11405 | ||
|
50c4757387 | ||
|
9fb8f3f174 | ||
|
b1f350a2e1 | ||
|
fcd9a94e76 | ||
|
56c5a5979e | ||
|
97e9660965 | ||
|
0a0eec807d | ||
|
1167d6cc50 | ||
|
967905a364 | ||
|
8c088c52fc | ||
|
d9ca2e0cb1 | ||
|
9e04ccdcf8 | ||
|
81ce8c4de3 | ||
|
49225e2f5c | ||
|
d4efee2bfa | ||
|
06084bb8ec | ||
|
410dd2c903 | ||
|
a468bca87c | ||
|
726b5d9e92 | ||
|
c40eb6b950 | ||
|
ff6d145402 | ||
|
db5d29de1c | ||
|
dc89236fee | ||
|
8bf738e673 | ||
|
94807a7d97 | ||
|
0b35e9d037 | ||
|
3f912eb289 | ||
|
5c655dd566 | ||
|
8dc56d0f88 | ||
|
7797eb389a | ||
|
e3744452bb | ||
|
c5a65111c4 | ||
|
12d6e15582 | ||
|
0793c4f942 | ||
|
b17e5bae1a | ||
|
12d71ad6a5 | ||
|
db60634ed1 | ||
|
5f6e3a0711 | ||
|
f8e0c6c48a | ||
|
8a7476a622 | ||
|
a8fea2a924 | ||
|
a981082925 | ||
|
03a3ba9ebe | ||
|
161e0e95b7 | ||
|
f9ffd4f9f3 | ||
|
05fb2b05af | ||
|
03cca6f742 | ||
|
95f688263d | ||
|
1d53219a28 | ||
|
9b1d4e7fbe | ||
|
32712d67c1 | ||
|
ca4e36ae5b | ||
|
07bbde451a | ||
|
0edbf10564 | ||
|
ca9faa284d | ||
|
779d6bc6a5 | ||
|
93445088d8 | ||
|
00dfcc765a | ||
|
b6cf8ffa35 | ||
|
f24150b851 | ||
|
4bc805bfc6 | ||
|
14abe5dc81 | ||
|
fcca9d7cd0 | ||
|
2651bb324e | ||
|
67b3d2a8ad | ||
|
1f59dfa9c2 | ||
|
2c3f1a579b | ||
|
5d010b1d05 | ||
|
409095ba18 | ||
|
44f2982356 | ||
|
62a672fb35 | ||
|
bfb6523573 | ||
|
4a5eefb909 | ||
|
153fee015d | ||
|
d9f2bc6b08 | ||
|
e25185fff0 | ||
|
8197951d7e | ||
|
2e473bb049 | ||
|
83ae35919c | ||
|
31e026ba63 | ||
|
0ab4e62183 | ||
|
81a2800c0d | ||
|
c805f9a8f8 | ||
|
5b7f8e0a69 | ||
|
77cd443b99 | ||
|
683d15cbd4 | ||
|
803a8cafe5 | ||
|
6f1ea0f4b1 | ||
|
624c599cd3 | ||
|
0a807dd9a3 | ||
|
4e882c7153 | ||
|
472433e2c7 | ||
|
67160f4e79 | ||
|
5dc0517d2d | ||
|
944768d277 | ||
|
1a0339b464 | ||
|
8d1a539c4a | ||
|
faaa95cbe7 | ||
|
48a2dd2012 | ||
|
15669413da | ||
|
ab3ff92cc0 | ||
|
992ed6b3c0 | ||
|
3cbd0a8e87 | ||
|
64c6d8df50 | ||
|
f47849f49e | ||
|
81a55a6996 | ||
|
1155d05a06 | ||
|
2da5126371 | ||
|
18d8e3e794 | ||
|
b8bf959578 | ||
|
c2e47bdd8d | ||
|
a7378539f1 | ||
|
0ccd71060a | ||
|
e7384fd437 | ||
|
b7cd7c2b7c | ||
|
c5b89fa358 | ||
|
e7174545eb | ||
|
977ad98334 | ||
|
2c26e60bf9 | ||
|
2829097547 | ||
|
833e75611f | ||
|
d193f101a7 | ||
|
8621854853 | ||
|
b39485d9e3 | ||
|
90f0fdad2a | ||
|
f16a6cc5aa | ||
|
2b8832bb0e | ||
|
daf73ab7c9 | ||
|
182bd7bc42 | ||
|
b6a0525bcb | ||
|
510cb85241 | ||
|
f88457e638 | ||
|
21b2385fcb | ||
|
69f87d091e | ||
|
a89a630e2a | ||
|
6286195cff | ||
|
4ecf34cce7 | ||
|
761d880766 | ||
|
dd1ae9df09 | ||
|
93964cc239 | ||
|
53a1447a00 | ||
|
b2e3ec8d1c | ||
|
98b3765966 | ||
|
3cdf48fe62 | ||
|
5891b8ba41 | ||
|
777ca20ad9 | ||
|
6194ee76fb | ||
|
4f26118e3b | ||
|
59e353b75d | ||
|
ab8566c904 | ||
|
65ada1f174 | ||
|
cf0786daf1 | ||
|
f6c2b39aac | ||
|
72bcf3c7be | ||
|
47a2717138 | ||
|
6da5b3004c | ||
|
56c62737ee | ||
|
5fbe3d01e6 | ||
|
744d9c0d22 | ||
|
4ea76aea75 | ||
|
4b1a240135 | ||
|
82be4141b6 | ||
|
bc4a38670e | ||
|
dfc3f102e6 | ||
|
7f83633f7e | ||
|
9e4791171c | ||
|
022d142b24 | ||
|
fc8918ad91 | ||
|
cda06ac0e3 | ||
|
9026dea8d2 | ||
|
dcba2e5ce3 | ||
|
68beaa3c57 | ||
|
151da08bbe | ||
|
2c25cc04e0 | ||
|
385d47dde7 | ||
|
7c4ce93bab | ||
|
fae1ae1182 | ||
|
f998596a10 | ||
|
23e8067c74 | ||
|
8157aa285b | ||
|
00af0ebb9d | ||
|
b92bc5ab7c | ||
|
da2a6aee19 | ||
|
6cde53c431 | ||
|
c98fcb6456 | ||
|
6a657c9247 | ||
|
c85a994a37 | ||
|
03d960b8de | ||
|
9b372aa8ba | ||
|
b1811c1d2b | ||
|
e2b4dea253 | ||
|
b1c235dfce | ||
|
08b183fe0b | ||
|
7fbc3bc5a4 | ||
|
a8a3b37c0d | ||
|
6fd0eb0c1e | ||
|
b5cce1ab23 | ||
|
746f3d7ab2 | ||
|
ad8b073e19 | ||
|
c7ba457824 | ||
|
a966092904 | ||
|
c8fe0e2db4 | ||
|
e4f0cc46a0 | ||
|
1a6726dabb | ||
|
8c3237d451 | ||
|
048e1b3b03 | ||
|
8444aedb1d | ||
|
cd803dcd59 | ||
|
71c810df61 | ||
|
a4ab454c0f | ||
|
28c08a7d40 | ||
|
4621622641 | ||
|
bfd69b5f7b | ||
|
ca685e63ef | ||
|
d68b195fb6 | ||
|
a2560cc90c | ||
|
1136702b93 | ||
|
be7fc29e2a | ||
|
780ee4e25c | ||
|
8e0a2b19ab | ||
|
3ed88facdb | ||
|
3ba79772a0 | ||
|
fe21f79693 | ||
|
bcb8fa43ea | ||
|
4eb6e8f464 | ||
|
e3368235ea | ||
|
4514dc74e4 | ||
|
30017a480e | ||
|
d2c909178e | ||
|
434098193a | ||
|
7d7a3e84d7 | ||
|
f2f4e84dca | ||
|
8574e3291f | ||
|
230b2bff00 | ||
|
6985e642f7 | ||
|
c22e576d5e | ||
|
c22f67408d | ||
|
81dc032664 | ||
|
66d61d8a06 | ||
|
024d6f7775 | ||
|
80070d4915 | ||
|
6b55f8e398 | ||
|
7d3225b51a | ||
|
249dd6ed46 | ||
|
a975e06e70 | ||
|
cc77a38d94 | ||
|
2f690078d7 | ||
|
2a9be0e22b | ||
|
2111e96703 | ||
|
2fa4d230bb | ||
|
c0f08310cc | ||
|
e21fec8100 | ||
|
3dffe5f265 | ||
|
bb88f3ff6e | ||
|
4bcc20301e | ||
|
0cb512c013 | ||
|
340054e17a | ||
|
c231f393d3 | ||
|
c3cca01534 | ||
|
956d63467f | ||
|
a41ccd91d9 | ||
|
5b83cdb642 | ||
|
6ca8b6144b | ||
|
f523acf0b4 | ||
|
192b22058b | ||
|
4f4b893546 | ||
|
7c42f3f48d | ||
|
fd3f6bd069 | ||
|
aa17dac878 | ||
|
41f97958c0 | ||
|
1aa738ddd6 | ||
|
569c958248 | ||
|
cba287d62a | ||
|
fe6c26dc50 | ||
|
9294c8f774 | ||
|
905b0e3175 | ||
|
a743814be9 | ||
|
efe9d99730 | ||
|
471a2ca0bf | ||
|
f97095fada | ||
|
22e7073865 | ||
|
d21ddc4f17 | ||
|
51004f1cf9 | ||
|
0ef598d064 | ||
|
fbd0023f75 | ||
|
2783b13ce6 | ||
|
cee2b5567d | ||
|
d7a28edad2 | ||
|
7337535943 | ||
|
359cdde7ed | ||
|
2bc6f71528 | ||
|
a2456ed88a | ||
|
98f5d739e3 |
6
.gitignore
vendored
@@ -1,14 +1,10 @@
|
|||||||
|
|
||||||
# standard directories for derived files in CASROOT
|
# standard directories for derived files in CASROOT
|
||||||
/.adm
|
/.adm
|
||||||
/sun
|
|
||||||
/lin
|
/lin
|
||||||
/mac
|
/mac
|
||||||
/ao1
|
|
||||||
/sil
|
|
||||||
/wnt
|
/wnt
|
||||||
/doc
|
/doc
|
||||||
/drv
|
|
||||||
/inc
|
/inc
|
||||||
/work
|
/work
|
||||||
|
|
||||||
@@ -35,6 +31,8 @@ Release
|
|||||||
*.suo
|
*.suo
|
||||||
*.sdf
|
*.sdf
|
||||||
*.opensdf
|
*.opensdf
|
||||||
|
*.VC.db
|
||||||
|
*.VC.opendb
|
||||||
*.ipch
|
*.ipch
|
||||||
*.aps
|
*.aps
|
||||||
|
|
||||||
|
216
CMakeLists.txt
@@ -32,7 +32,6 @@ if ("${BUILD_LIBRARY_TYPE}" STREQUAL "Shared")
|
|||||||
endif()
|
endif()
|
||||||
else()
|
else()
|
||||||
unset (BUILD_SHARED_LIBS)
|
unset (BUILD_SHARED_LIBS)
|
||||||
message (STATUS "Info: Only 3rdparty's header files are used for building of static OCCT libraries")
|
|
||||||
unset (BUILD_SHARED_LIBRARY_NAME_POSTFIX)
|
unset (BUILD_SHARED_LIBRARY_NAME_POSTFIX)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@@ -64,7 +63,7 @@ set (BUILD_RESOURCES OFF CACHE BOOL "${BUILD_RESOURCES_DESCR}")
|
|||||||
|
|
||||||
# single-configuration generator
|
# single-configuration generator
|
||||||
set (SINGLE_GENERATOR OFF)
|
set (SINGLE_GENERATOR OFF)
|
||||||
if (CMAKE_BUILD_TYPE)
|
if (DEFINED CMAKE_BUILD_TYPE)
|
||||||
set (SINGLE_GENERATOR ON)
|
set (SINGLE_GENERATOR ON)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@@ -87,6 +86,11 @@ if (BUILD_WITH_DEBUG)
|
|||||||
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$<CONFIG:DEBUG>:OCCT_DEBUG>)
|
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$<CONFIG:DEBUG>:OCCT_DEBUG>)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# option disabling OCCT exceptions in Release builds (No_Exception)
|
||||||
|
if (NOT DEFINED BUILD_RELEASE_DISABLE_EXCEPTIONS)
|
||||||
|
set (BUILD_RELEASE_DISABLE_EXCEPTIONS ON CACHE BOOL "${BUILD_RELEASE_DISABLE_EXCEPTIONS_DESCR}")
|
||||||
|
endif()
|
||||||
|
|
||||||
# option to enable or disable use of precompiled headers
|
# option to enable or disable use of precompiled headers
|
||||||
if (NOT DEFINED BUILD_USE_PCH)
|
if (NOT DEFINED BUILD_USE_PCH)
|
||||||
set (BUILD_USE_PCH OFF CACHE BOOL "${BUILD_USE_PCH_DESCR}")
|
set (BUILD_USE_PCH OFF CACHE BOOL "${BUILD_USE_PCH_DESCR}")
|
||||||
@@ -344,8 +348,11 @@ set (BUILD_ADDITIONAL_TOOLKITS "" CACHE STRING "${BUILD_ADDITIONAL_TOOLKITS_DESC
|
|||||||
separate_arguments (BUILD_ADDITIONAL_TOOLKITS)
|
separate_arguments (BUILD_ADDITIONAL_TOOLKITS)
|
||||||
|
|
||||||
if (MSVC)
|
if (MSVC)
|
||||||
set (BUILD_MODULE_MfcSamples OFF CACHE BOOL "${BUILD_MODULE_MfcSamples_DESCR}")
|
set (BUILD_SAMPLES_MFC OFF CACHE BOOL "${BUILD_SAMPLES_MFC_DESCR}")
|
||||||
endif()
|
endif()
|
||||||
|
set (BUILD_SAMPLES_QT OFF CACHE BOOL "${BUILD_SAMPLES_QT_DESCR}")
|
||||||
|
|
||||||
|
set (BUILD_Inspector OFF CACHE BOOL "${BUILD_Inspector_DESCR}")
|
||||||
|
|
||||||
# uwp sample
|
# uwp sample
|
||||||
if (MSVC)
|
if (MSVC)
|
||||||
@@ -365,9 +372,6 @@ if (WIN32)
|
|||||||
set (USE_D3D OFF CACHE BOOL "${USE_D3D_DESCR}")
|
set (USE_D3D OFF CACHE BOOL "${USE_D3D_DESCR}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set (USE_QT_TOOLS OFF CACHE BOOL "${USE_QT_TOOLS_DESCR}")
|
|
||||||
set (USE_QT4 ON CACHE BOOL "${USE_QT4}")
|
|
||||||
|
|
||||||
# Enable/Disable the floating point exceptions (FPE) during runtime.
|
# Enable/Disable the floating point exceptions (FPE) during runtime.
|
||||||
if (NOT BUILD_ENABLE_FPE_SIGNAL_HANDLER)
|
if (NOT BUILD_ENABLE_FPE_SIGNAL_HANDLER)
|
||||||
set (BUILD_ENABLE_FPE_SIGNAL_HANDLER OFF CACHE BOOL "${BUILD_ENABLE_FPE_SIGNAL_HANDLER_DESCR}" FORCE)
|
set (BUILD_ENABLE_FPE_SIGNAL_HANDLER OFF CACHE BOOL "${BUILD_ENABLE_FPE_SIGNAL_HANDLER_DESCR}" FORCE)
|
||||||
@@ -382,7 +386,7 @@ endif()
|
|||||||
# include the patched or original list of modules
|
# include the patched or original list of modules
|
||||||
# list <MODULENAME>_TOOLKITS is created foreach module and contains its toolkits
|
# list <MODULENAME>_TOOLKITS is created foreach module and contains its toolkits
|
||||||
# list <OCCT_MODULES> will contain all modules
|
# list <OCCT_MODULES> will contain all modules
|
||||||
OCCT_MODULES_AND_TOOLKITS (OCCT_MODULES)
|
OCCT_MODULES_AND_TOOLKITS (MODULES "TOOLKITS" OCCT_MODULES)
|
||||||
|
|
||||||
foreach (OCCT_MODULE ${OCCT_MODULES})
|
foreach (OCCT_MODULE ${OCCT_MODULES})
|
||||||
BUILD_MODULE (${OCCT_MODULE})
|
BUILD_MODULE (${OCCT_MODULE})
|
||||||
@@ -482,7 +486,6 @@ OCCT_IS_PRODUCT_REQUIRED (CSF_FreeImagePlus CAN_USE_FREEIMAGE)
|
|||||||
OCCT_IS_PRODUCT_REQUIRED (CSF_TclLibs USE_TCL)
|
OCCT_IS_PRODUCT_REQUIRED (CSF_TclLibs USE_TCL)
|
||||||
OCCT_IS_PRODUCT_REQUIRED (CSF_FREETYPE USE_FREETYPE)
|
OCCT_IS_PRODUCT_REQUIRED (CSF_FREETYPE USE_FREETYPE)
|
||||||
OCCT_IS_PRODUCT_REQUIRED (CSF_OpenGlLibs CAN_USE_GLES2)
|
OCCT_IS_PRODUCT_REQUIRED (CSF_OpenGlLibs CAN_USE_GLES2)
|
||||||
OCCT_IS_PRODUCT_REQUIRED (CSF_GL2PS CAN_USE_GL2PS)
|
|
||||||
OCCT_IS_PRODUCT_REQUIRED (CSF_TBB CAN_USE_TBB)
|
OCCT_IS_PRODUCT_REQUIRED (CSF_TBB CAN_USE_TBB)
|
||||||
OCCT_IS_PRODUCT_REQUIRED (CSF_EIGEN CAN_USE_EIGEN)
|
OCCT_IS_PRODUCT_REQUIRED (CSF_EIGEN CAN_USE_EIGEN)
|
||||||
|
|
||||||
@@ -516,6 +519,7 @@ endif()
|
|||||||
# VTK
|
# VTK
|
||||||
if (USE_VTK)
|
if (USE_VTK)
|
||||||
add_definitions (-DHAVE_VTK)
|
add_definitions (-DHAVE_VTK)
|
||||||
|
set (OCCT_VTK_USED_TARGETS "" CACHE INTERNAL "" FORCE)
|
||||||
OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/vtk")
|
OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/vtk")
|
||||||
else()
|
else()
|
||||||
OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_VTK")
|
OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_VTK")
|
||||||
@@ -583,7 +587,7 @@ else()
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
# OpenGL ES 2.0
|
# OpenGL ES 2.0
|
||||||
if (WIN32 AND CAN_USE_GLES2)
|
if (CAN_USE_GLES2)
|
||||||
if ("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
|
if ("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
|
||||||
set (USE_GLES2 ON)
|
set (USE_GLES2 ON)
|
||||||
else()
|
else()
|
||||||
@@ -609,24 +613,6 @@ else()
|
|||||||
OCCT_CHECK_AND_UNSET ("INSTALL_GLES2")
|
OCCT_CHECK_AND_UNSET ("INSTALL_GLES2")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# GL2PS
|
|
||||||
if (NOT DEFINED ANDROID AND CAN_USE_GL2PS)
|
|
||||||
set (USE_GL2PS OFF CACHE BOOL "${USE_GL2PS_DESCR}")
|
|
||||||
|
|
||||||
if (USE_GL2PS)
|
|
||||||
add_definitions (-DHAVE_GL2PS)
|
|
||||||
OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/gl2ps")
|
|
||||||
else()
|
|
||||||
OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_GL2PS")
|
|
||||||
OCCT_CHECK_AND_UNSET ("INSTALL_GL2PS")
|
|
||||||
endif()
|
|
||||||
else()
|
|
||||||
OCCT_CHECK_AND_UNSET ("USE_GL2PS")
|
|
||||||
|
|
||||||
OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_GL2PS")
|
|
||||||
OCCT_CHECK_AND_UNSET ("INSTALL_GL2PS")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# TBB
|
# TBB
|
||||||
if (NOT DEFINED ANDROID AND CAN_USE_TBB)
|
if (NOT DEFINED ANDROID AND CAN_USE_TBB)
|
||||||
set (USE_TBB OFF CACHE BOOL "${USE_TBB_DESCR}")
|
set (USE_TBB OFF CACHE BOOL "${USE_TBB_DESCR}")
|
||||||
@@ -647,6 +633,26 @@ else()
|
|||||||
OCCT_CHECK_AND_UNSET ("INSTALL_TBB")
|
OCCT_CHECK_AND_UNSET ("INSTALL_TBB")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# RapidJSON
|
||||||
|
# search for CSF_RapidJSON variable in EXTERNLIB of each being used toolkit
|
||||||
|
OCCT_IS_PRODUCT_REQUIRED (CSF_RapidJSON CAN_USE_RAPIDJSON)
|
||||||
|
if (CAN_USE_RAPIDJSON)
|
||||||
|
set (USE_RAPIDJSON OFF CACHE BOOL "${USE_RAPIDJSON_DESCR}")
|
||||||
|
|
||||||
|
if (USE_RAPIDJSON)
|
||||||
|
add_definitions (-DHAVE_RAPIDJSON)
|
||||||
|
OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/rapidjson")
|
||||||
|
else()
|
||||||
|
OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_RAPIDJSON")
|
||||||
|
OCCT_CHECK_AND_UNSET ("INSTALL_RAPIDJSON")
|
||||||
|
endif()
|
||||||
|
else()
|
||||||
|
OCCT_CHECK_AND_UNSET ("USE_RAPIDJSON")
|
||||||
|
|
||||||
|
OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_RAPIDJSON")
|
||||||
|
OCCT_CHECK_AND_UNSET ("INSTALL_RAPIDJSON")
|
||||||
|
endif()
|
||||||
|
|
||||||
# EIGEN
|
# EIGEN
|
||||||
if (CAN_USE_EIGEN)
|
if (CAN_USE_EIGEN)
|
||||||
set (USE_EIGEN OFF CACHE BOOL "${USE_EIGEN_DESCR}")
|
set (USE_EIGEN OFF CACHE BOOL "${USE_EIGEN_DESCR}")
|
||||||
@@ -656,11 +662,13 @@ if (CAN_USE_EIGEN)
|
|||||||
OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/eigen")
|
OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/eigen")
|
||||||
else()
|
else()
|
||||||
OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_EIGEN")
|
OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_EIGEN")
|
||||||
|
OCCT_CHECK_AND_UNSET ("INSTALL_EIGEN")
|
||||||
endif()
|
endif()
|
||||||
else()
|
else()
|
||||||
OCCT_CHECK_AND_UNSET ("USE_EIGEN")
|
OCCT_CHECK_AND_UNSET ("USE_EIGEN")
|
||||||
|
|
||||||
OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_EIGEN")
|
OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_EIGEN")
|
||||||
|
OCCT_CHECK_AND_UNSET ("INSTALL_EIGEN")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Doxygen
|
# Doxygen
|
||||||
@@ -700,11 +708,22 @@ else()
|
|||||||
OCCT_CHECK_AND_UNSET ("3RDPARTY_FLEX_EXECUTABLE")
|
OCCT_CHECK_AND_UNSET ("3RDPARTY_FLEX_EXECUTABLE")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
string (REGEX REPLACE ";" " " 3RDPARTY_NOT_INCLUDED "${3RDPARTY_NOT_INCLUDED}")
|
# qt for inspector and samples
|
||||||
|
if (BUILD_Inspector OR BUILD_SAMPLES_QT)
|
||||||
|
# check qt 3rdparty path
|
||||||
|
add_definitions (-DHAVE_QT)
|
||||||
|
OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/qt")
|
||||||
|
message (STATUS "Info: Qt is used by OCCT")
|
||||||
|
else()
|
||||||
|
OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_QT")
|
||||||
|
OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TQTMALLOC")
|
||||||
|
OCCT_CHECK_AND_UNSET ("INSTALL_QT")
|
||||||
|
endif()
|
||||||
|
|
||||||
# check all 3rdparty paths
|
# check all 3rdparty include paths
|
||||||
|
string (REGEX REPLACE ";" " " 3RDPARTY_NOT_INCLUDED "${3RDPARTY_NOT_INCLUDED}")
|
||||||
if (3RDPARTY_NOT_INCLUDED)
|
if (3RDPARTY_NOT_INCLUDED)
|
||||||
message (FATAL_ERROR "NOT FOUND: ${3RDPARTY_NOT_INCLUDED}" )
|
message (FATAL_ERROR "Could not find headers of used third-party products: ${3RDPARTY_NOT_INCLUDED}" )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (3RDPARTY_INCLUDE_DIRS)
|
if (3RDPARTY_INCLUDE_DIRS)
|
||||||
@@ -717,13 +736,28 @@ endif()
|
|||||||
# include <cmake binary folder>/inc
|
# include <cmake binary folder>/inc
|
||||||
include_directories (${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE})
|
include_directories (${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE})
|
||||||
|
|
||||||
if (3RDPARTY_LIBRARY_DIRS AND BUILD_SHARED_LIBS)
|
# check all 3rdparty library paths
|
||||||
|
string (REGEX REPLACE ";" " " 3RDPARTY_NO_LIBS "${3RDPARTY_NO_LIBS}")
|
||||||
|
if (3RDPARTY_NO_LIBS)
|
||||||
|
if (BUILD_SHARED_LIBS)
|
||||||
|
message (SEND_ERROR "Could not find libraries of used third-party products: ${3RDPARTY_NO_LIBS}" )
|
||||||
|
else()
|
||||||
|
message (WARNING "Could not find libraries of used third-party products: ${3RDPARTY_NO_LIBS}" )
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
if (3RDPARTY_LIBRARY_DIRS)
|
||||||
list (REMOVE_DUPLICATES 3RDPARTY_LIBRARY_DIRS)
|
list (REMOVE_DUPLICATES 3RDPARTY_LIBRARY_DIRS)
|
||||||
string (REGEX REPLACE ";" "\n\t" 3RDPARTY_LIBRARY_DIRS_WITH_ENDS "${3RDPARTY_LIBRARY_DIRS}")
|
string (REGEX REPLACE ";" "\n\t" 3RDPARTY_LIBRARY_DIRS_WITH_ENDS "${3RDPARTY_LIBRARY_DIRS}")
|
||||||
message (STATUS "Info: The directories of 3rdparty libraries: \n\t${3RDPARTY_LIBRARY_DIRS_WITH_ENDS}")
|
message (STATUS "Info: The directories of 3rdparty libraries: \n\t${3RDPARTY_LIBRARY_DIRS_WITH_ENDS}")
|
||||||
link_directories (${3RDPARTY_LIBRARY_DIRS})
|
link_directories (${3RDPARTY_LIBRARY_DIRS})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# report not found 3rdparty dll paths
|
||||||
|
string (REGEX REPLACE ";" " " 3RDPARTY_NO_DLLS "${3RDPARTY_NO_DLLS}")
|
||||||
|
if (3RDPARTY_NO_DLLS)
|
||||||
|
message (WARNING "Could not find DLLs of used third-party products: ${3RDPARTY_NO_DLLS}" )
|
||||||
|
endif()
|
||||||
|
|
||||||
# build directories
|
# build directories
|
||||||
if (SINGLE_GENERATOR)
|
if (SINGLE_GENERATOR)
|
||||||
set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BIN_LETTER}")
|
set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BIN_LETTER}")
|
||||||
@@ -777,27 +811,18 @@ endif()
|
|||||||
# include the patched or original list of tools
|
# include the patched or original list of tools
|
||||||
# list <TOOLNAME>_TOOLKITS is created foreach tool and contains its toolkits
|
# list <TOOLNAME>_TOOLKITS is created foreach tool and contains its toolkits
|
||||||
# list <OCCT_TOOLS> will contain all tools
|
# list <OCCT_TOOLS> will contain all tools
|
||||||
if (NOT USE_QT_TOOLS)
|
if (BUILD_Inspector)
|
||||||
OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_QT")
|
add_definitions (-DHAVE_Inspector)
|
||||||
OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TQTMALLOC")
|
|
||||||
OCCT_CHECK_AND_UNSET ("INSTALL_QT")
|
OCCT_MODULES_AND_TOOLKITS (TOOLS "TOOL_TOOLKITS" OCCT_TOOLS)
|
||||||
else()
|
|
||||||
OCCT_TOOLS_AND_TOOLKITS (OCCT_TOOLS)
|
|
||||||
foreach (OCCT_TOOL ${OCCT_TOOLS})
|
foreach (OCCT_TOOL ${OCCT_TOOLS})
|
||||||
list (APPEND BUILD_TOOL_TOOLKITS ${${OCCT_TOOL}_TOOL_TOOLKITS})
|
list (APPEND BUILD_TOOL_TOOLKITS ${${OCCT_TOOL}_TOOL_TOOLKITS})
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
# collect all the headers to <binary dir>/inc folder
|
# collect all the headers to <binary dir>/inc/inspector folder
|
||||||
string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
|
string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
|
||||||
message (STATUS "\nInfo: \(${CURRENT_TIME}\) Start collecting all OCCT tool header files into ${CMAKE_BINARY_DIR}/tools/inc ...")
|
message (STATUS "\nInfo: \(${CURRENT_TIME}\) Start collecting all OCCT tool header files into ${CMAKE_BINARY_DIR}/inc/inspector ...")
|
||||||
COLLECT_AND_INSTALL_OCCT_HEADER_FILES ("${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE}" "${BUILD_TOOL_TOOLKITS}" "${CMAKE_SOURCE_DIR}/tools" "tools")
|
COLLECT_AND_INSTALL_OCCT_HEADER_FILES ("${CMAKE_BINARY_DIR}" "${BUILD_TOOL_TOOLKITS}" "${CMAKE_SOURCE_DIR}/tools" "${INSTALL_DIR_INCLUDE}/inspector")
|
||||||
include_directories (${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE}/tools)
|
|
||||||
|
|
||||||
|
|
||||||
# check qt 3rdparty path
|
|
||||||
add_definitions (-DHAVE_QT)
|
|
||||||
OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/qt5")
|
|
||||||
message (STATUS "Info: Qt is used by OCCT")
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# OCCT samples
|
# OCCT samples
|
||||||
@@ -872,6 +897,22 @@ else()
|
|||||||
OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}")
|
OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if (WIN32)
|
||||||
|
set (THIRDPARTY_DIR_REPLACE "%THIRDPARTY_DIR%")
|
||||||
|
else()
|
||||||
|
set (THIRDPARTY_DIR_REPLACE "\${THIRDPARTY_DIR}")
|
||||||
|
endif()
|
||||||
|
get_cmake_property(USED_3RDPARTY_CACHE_VARIABLES VARIABLES)
|
||||||
|
string (REGEX MATCHALL "(^|;)USED_3RDPARTY_[^;]+_DIR[^;]*" USED_3RDPARTY_CACHE_VARIABLES "${USED_3RDPARTY_CACHE_VARIABLES}")
|
||||||
|
file (TO_CMAKE_PATH "${3RDPARTY_DIR}" 3RDPARTY_DIR)
|
||||||
|
foreach (USED_3RDPARTY_CACHE_VARIABLE ${USED_3RDPARTY_CACHE_VARIABLES})
|
||||||
|
file (TO_CMAKE_PATH "${${USED_3RDPARTY_CACHE_VARIABLE}}" ${USED_3RDPARTY_CACHE_VARIABLE})
|
||||||
|
string (REPLACE "${3RDPARTY_DIR}" "${THIRDPARTY_DIR_REPLACE}" ${USED_3RDPARTY_CACHE_VARIABLE} "${${USED_3RDPARTY_CACHE_VARIABLE}}")
|
||||||
|
if (NOT WIN32)
|
||||||
|
string (REGEX REPLACE ";" ":" ${USED_3RDPARTY_CACHE_VARIABLE} "${${USED_3RDPARTY_CACHE_VARIABLE}}")
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
|
||||||
# write current custom.bat/sh (for install directory)
|
# write current custom.bat/sh (for install directory)
|
||||||
set (SUB_CUSTOM_BUILD_NAME "custom_${COMPILER}_${COMPILER_BITNESS}.install.${SCRIPT_EXT}")
|
set (SUB_CUSTOM_BUILD_NAME "custom_${COMPILER}_${COMPILER_BITNESS}.install.${SCRIPT_EXT}")
|
||||||
OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.install.${SCRIPT_EXT}.in" "${SUB_CUSTOM_BUILD_NAME}" "${SUB_CUSTOM_NAME}" "${INSTALL_DIR_SCRIPT}")
|
OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.install.${SCRIPT_EXT}.in" "${SUB_CUSTOM_BUILD_NAME}" "${SUB_CUSTOM_NAME}" "${INSTALL_DIR_SCRIPT}")
|
||||||
@@ -879,16 +920,24 @@ OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.install.${SCRIPT_EXT}.in" "${S
|
|||||||
# write current custom.bat/sh (for build directory)
|
# write current custom.bat/sh (for build directory)
|
||||||
OCCT_CONFIGURE ("adm/templates/custom.build.${SCRIPT_EXT}.in" "${SUB_CUSTOM_NAME}")
|
OCCT_CONFIGURE ("adm/templates/custom.build.${SCRIPT_EXT}.in" "${SUB_CUSTOM_NAME}")
|
||||||
|
|
||||||
if (BUILD_MODULE_MfcSamples)
|
if (BUILD_SAMPLES_MFC OR BUILD_SAMPLES_QT)
|
||||||
OCCT_INSTALL_FILE_OR_DIR ("adm/templates/sample.bat" "${INSTALL_DIR_SCRIPT}")
|
OCCT_INSTALL_FILE_OR_DIR ("adm/templates/sample.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}")
|
||||||
OCCT_COPY_FILE_OR_DIR ("adm/templates/sample.bat" "${CMAKE_BINARY_DIR}")
|
OCCT_COPY_FILE_OR_DIR ("adm/templates/sample.${SCRIPT_EXT}" "${CMAKE_BINARY_DIR}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# env script for draw in building environment
|
if (WIN32)
|
||||||
OCCT_CONFIGURE ("adm/templates/env.${SCRIPT_EXT}.in" "env.${SCRIPT_EXT}")
|
# env script for draw in building environment
|
||||||
|
OCCT_CONFIGURE ("adm/templates/env.${SCRIPT_EXT}.in" "env.${SCRIPT_EXT}")
|
||||||
# install env script
|
# install env script
|
||||||
install (FILES "${CMAKE_BINARY_DIR}/env.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}")
|
install (FILES "${CMAKE_BINARY_DIR}/env.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}")
|
||||||
|
else()
|
||||||
|
set (SUB_ENV_NAME "env.${SCRIPT_EXT}")
|
||||||
|
set (SUB_ENV_BUILD_NAME "env.install.${SCRIPT_EXT}")
|
||||||
|
# install env script
|
||||||
|
OCCT_CONFIGURE_AND_INSTALL ("adm/templates/env.install.${SCRIPT_EXT}.in" "${SUB_ENV_BUILD_NAME}" "${SUB_ENV_NAME}" "${INSTALL_DIR_SCRIPT}")
|
||||||
|
# env script for draw in building environment
|
||||||
|
OCCT_CONFIGURE ("adm/templates/env.build.${SCRIPT_EXT}.in" "env.${SCRIPT_EXT}")
|
||||||
|
endif()
|
||||||
|
|
||||||
# copy DrawAppliInit from OCCT source to build directory
|
# copy DrawAppliInit from OCCT source to build directory
|
||||||
if (NOT EXISTS "${CMAKE_BINARY_DIR}/DrawAppliInit")
|
if (NOT EXISTS "${CMAKE_BINARY_DIR}/DrawAppliInit")
|
||||||
@@ -907,6 +956,15 @@ foreach(RESOURCE ${RESOURCES})
|
|||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
|
if (BUILD_SAMPLES_QT)
|
||||||
|
FILE_TO_LIST ("adm/SAMPLES_RESOURCES" SAMPLES_RESOURCES)
|
||||||
|
foreach(RESOURCE ${SAMPLES_RESOURCES})
|
||||||
|
OCCT_INSTALL_FILE_OR_DIR ("samples/${RESOURCE}" "${INSTALL_DIR_RESOURCE}/samples")
|
||||||
|
#message("Copy Sample resources: samples/${RESOURCE} into ${INSTALL_DIR_RESOURCE}/samples")
|
||||||
|
endforeach()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
|
||||||
# patch installed DrawDefault file if BUILD_SHARED_LIBRARY_NAME_POSTFIX is changed
|
# patch installed DrawDefault file if BUILD_SHARED_LIBRARY_NAME_POSTFIX is changed
|
||||||
if (NOT "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}" STREQUAL "")
|
if (NOT "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}" STREQUAL "")
|
||||||
OCCT_UPDATE_DRAW_DEFAULT_FILE()
|
OCCT_UPDATE_DRAW_DEFAULT_FILE()
|
||||||
@@ -951,9 +1009,11 @@ endif()
|
|||||||
|
|
||||||
message (STATUS "Info: \(${CURRENT_TIME}\) OCCT toolkits processed")
|
message (STATUS "Info: \(${CURRENT_TIME}\) OCCT toolkits processed")
|
||||||
# samples do not support patch usage
|
# samples do not support patch usage
|
||||||
if (BUILD_MODULE_MfcSamples)
|
if (BUILD_SAMPLES_MFC OR BUILD_SAMPLES_QT)
|
||||||
set (OCCT_ROOT ${CMAKE_SOURCE_DIR})
|
set (OCCT_ROOT ${CMAKE_SOURCE_DIR})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (BUILD_SAMPLES_MFC)
|
||||||
set (MFC_STANDARD_SAMPLES_DIR ${OCCT_ROOT}/samples/mfc/standard)
|
set (MFC_STANDARD_SAMPLES_DIR ${OCCT_ROOT}/samples/mfc/standard)
|
||||||
set (COMMON_WINMAIN_FILE ${MFC_STANDARD_SAMPLES_DIR}/Common/Winmain.cpp)
|
set (COMMON_WINMAIN_FILE ${MFC_STANDARD_SAMPLES_DIR}/Common/Winmain.cpp)
|
||||||
|
|
||||||
@@ -972,24 +1032,50 @@ if (BUILD_MODULE_MfcSamples)
|
|||||||
message (STATUS "Info: \(${CURRENT_TIME}\) MFC Sample projects added")
|
message (STATUS "Info: \(${CURRENT_TIME}\) MFC Sample projects added")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
OCCT_MODULES_AND_TOOLKITS (SAMPLES "SAMPLES_TOOLKITS" OCCT_SAMPLES)
|
||||||
|
|
||||||
|
if (BUILD_Inspector OR BUILD_SAMPLES_QT)
|
||||||
|
if (BUILD_SAMPLES_QT)
|
||||||
|
if (NOT Qt5_FOUND OR "${Qt5Gui_EGL_INCLUDE_DIRS}" STREQUAL "" OR NOT WIN32)
|
||||||
|
list (REMOVE_ITEM qt_SAMPLES_TOOLKITS AndroidQt)
|
||||||
|
message (STATUS "Info: AndroidQt sample excluded due to OS is not Windows or Qt is configured without ANGLE")
|
||||||
|
endif()
|
||||||
|
else()
|
||||||
|
list (REMOVE_ITEM OCCT_SAMPLES qt)
|
||||||
|
message (STATUS "Info: qt samples excluded due to BUILD_SAMPLES_QT is disabled")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
foreach (OCCT_SAMPLE ${OCCT_SAMPLES})
|
||||||
|
list (APPEND BUILD_SAMPLE_TOOLKITS ${${OCCT_SAMPLE}_SAMPLES_TOOLKITS})
|
||||||
|
|
||||||
|
# collect all the headers to <binary dir>/inc/samples folder
|
||||||
|
string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
|
||||||
|
message (STATUS "Info: \(${CURRENT_TIME}\) ${OCCT_SAMPLE} Sample projects added")
|
||||||
|
|
||||||
|
# include patched toolkit projects or original ones
|
||||||
|
foreach (BUILD_SAMPLE_TOOLKIT ${${OCCT_SAMPLE}_SAMPLES_TOOLKITS})
|
||||||
|
OCCT_ADD_SUBDIRECTORY ("samples/${OCCT_SAMPLE}/${BUILD_SAMPLE_TOOLKIT}")
|
||||||
|
endforeach()
|
||||||
|
endforeach()
|
||||||
|
endif()
|
||||||
|
|
||||||
if (BUILD_MODULE_UwpSample)
|
if (BUILD_MODULE_UwpSample)
|
||||||
add_subdirectory(samples/xaml)
|
add_subdirectory(samples/xaml)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (BUILD_TOOL_TOOLKITS)
|
if (BUILD_TOOL_TOOLKITS)
|
||||||
# copy tinspector script to install script folder
|
# copy tinspector script to install script folder
|
||||||
if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/adm/templates/dfbrowser.${SCRIPT_EXT}")
|
if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/adm/templates/inspector.${SCRIPT_EXT}")
|
||||||
install (FILES "${BUILD_PATCH}/adm/templates/dfbrowser.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}"
|
install (FILES "${BUILD_PATCH}/adm/templates/inspector.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}"
|
||||||
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
|
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
|
||||||
else()
|
else()
|
||||||
install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/dfbrowser.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}"
|
install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/inspector.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}"
|
||||||
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
|
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set (BUILD_SAMPLE_TOOLKITS TInspectorEXE)
|
set (OpenCASCADE_BINARY_DIR "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
|
||||||
foreach (BUILD_SAMPLE_TOOL_TOOLKIT ${BUILD_SAMPLE_TOOLKITS})
|
# patch TInspectorEXE
|
||||||
OCCT_ADD_SUBDIRECTORY ("samples/tools/${BUILD_SAMPLE_TOOL_TOOLKIT}")
|
OCCT_CONFIGURE ("adm/templates/TInspectorEXE.vcxproj.user.in" "${CMAKE_BINARY_DIR}/tools/TInspectorEXE/TInspectorEXE.vcxproj.user")
|
||||||
endforeach()
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Prepare variables for configuration of OpenCASCADE cmake config file
|
# Prepare variables for configuration of OpenCASCADE cmake config file
|
||||||
@@ -1075,10 +1161,6 @@ if (APPLE)
|
|||||||
set (SET_OpenCASCADE_WITH_GLX "set (OpenCASCADE_WITH_GLX ${USE_GLX})")
|
set (SET_OpenCASCADE_WITH_GLX "set (OpenCASCADE_WITH_GLX ${USE_GLX})")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (NOT SINGLE_GENERATOR)
|
|
||||||
OCCT_INSERT_CODE_FOR_TARGET()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Configure and install cmake config file
|
# Configure and install cmake config file
|
||||||
configure_file("${CMAKE_SOURCE_DIR}/adm/templates/OpenCASCADEConfig.cmake.in" "OpenCASCADEConfig.cmake" @ONLY)
|
configure_file("${CMAKE_SOURCE_DIR}/adm/templates/OpenCASCADEConfig.cmake.in" "OpenCASCADEConfig.cmake" @ONLY)
|
||||||
install(FILES "${CMAKE_BINARY_DIR}/OpenCASCADEConfig.cmake" DESTINATION "${INSTALL_DIR_CMAKE}")
|
install(FILES "${CMAKE_BINARY_DIR}/OpenCASCADEConfig.cmake" DESTINATION "${INSTALL_DIR_CMAKE}")
|
||||||
|
1
adm/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
/build-*
|
12
adm/CMPLRS
@@ -1,17 +1,17 @@
|
|||||||
wnt WOKSteps_exec_link DRAWEXE #WOKStep_EXELink(exec.tks)
|
wnt WOKSteps_exec_link DRAWEXE #WOKStep_EXELink(exec.tks)
|
||||||
lin WOKSteps_exec_link DRAWEXE #WOKStep_EXELink(exec.tks)
|
lin WOKSteps_exec_link DRAWEXE #WOKStep_EXELink(exec.tks)
|
||||||
|
|
||||||
wnt cmplrs_cxx f -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
|
wnt cmplrs_cxx f -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
|
||||||
wnt cmplrs_cxx b -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
|
wnt cmplrs_cxx b -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
|
||||||
wnt cmplrs_cxx Aspect (wnt cmplrs_cxx b) -D_AFXDLL
|
wnt cmplrs_cxx Aspect (wnt cmplrs_cxx b) -D_AFXDLL
|
||||||
wnt cmplrs_cxx (wnt cmplrs_cxx b) -D_AFXDLL -D_AFXDLL
|
wnt cmplrs_cxx (wnt cmplrs_cxx b) -D_AFXDLL -D_AFXDLL
|
||||||
|
|
||||||
wnt cmplrs_c f -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
|
wnt cmplrs_c f -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
|
||||||
wnt cmplrs_c b -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
|
wnt cmplrs_c b -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
|
||||||
wnt cmplrs_c NIS (wnt cmplrs_c b) -DSILGL -DSILGL_VRS=50
|
wnt cmplrs_c NIS (wnt cmplrs_c b) -DSILGL -DSILGL_VRS=50
|
||||||
|
|
||||||
lin cmplrs_cxx f -DOCC_CONVERT_SIGNALS -D_GNU_SOURCE=1 -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
|
lin cmplrs_cxx f -DOCC_CONVERT_SIGNALS -D_GNU_SOURCE=1 -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
|
||||||
lin cmplrs_cxx b -DOCC_CONVERT_SIGNALS -D_GNU_SOURCE=1 -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
|
lin cmplrs_cxx b -DOCC_CONVERT_SIGNALS -D_GNU_SOURCE=1 -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
|
||||||
|
|
||||||
lin cmplrs_c f -D_GNU_SOURCE=1 -fexceptions
|
lin cmplrs_c f -D_GNU_SOURCE=1 -fexceptions
|
||||||
lin cmplrs_c b -D_GNU_SOURCE=1 -fexceptions
|
lin cmplrs_c b -D_GNU_SOURCE=1 -fexceptions
|
||||||
|
@@ -3,5 +3,5 @@ ModelingData TKG2d TKG3d TKGeomBase TKBRep
|
|||||||
ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing
|
ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing
|
||||||
Visualization TKService TKV3d TKOpenGl TKMeshVS TKIVtk TKD3DHost
|
Visualization TKService TKV3d TKOpenGl TKMeshVS TKIVtk TKD3DHost
|
||||||
ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml TKStdL TKStd TKTObj TKBinTObj TKXmlTObj TKVCAF
|
ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml TKStdL TKStd TKTObj TKBinTObj TKXmlTObj TKVCAF
|
||||||
DataExchange TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF
|
DataExchange TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh
|
||||||
Draw TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE
|
Draw TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE
|
||||||
|
@@ -3,6 +3,7 @@ StdResource
|
|||||||
SHMessage
|
SHMessage
|
||||||
Textures
|
Textures
|
||||||
Shaders
|
Shaders
|
||||||
|
XRResources
|
||||||
XSMessage
|
XSMessage
|
||||||
XSTEPResource
|
XSTEPResource
|
||||||
XmlOcafResource
|
XmlOcafResource
|
||||||
|
1
adm/SAMPLES
Normal file
@@ -0,0 +1 @@
|
|||||||
|
qt AndroidQt FuncDemo IESample Tutorial
|
2
adm/SAMPLES_RESOURCES
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
qt/Common/res/
|
||||||
|
qt/Tutorial/res/
|
@@ -1,4 +1,4 @@
|
|||||||
TModelingData TKShapeView
|
TModelingData TKShapeView
|
||||||
TVisualization TKView TKVInspector
|
TVisualization TKView TKVInspector
|
||||||
TApplicationFramework TKTreeModel TKTInspectorAPI TKDFBrowser
|
TApplicationFramework TKTreeModel TKTInspectorAPI TKDFBrowser
|
||||||
TTool TKTInspector TKToolsDraw
|
TTool TKTInspector TKToolsDraw TInspectorEXE
|
33
adm/UDLIST
@@ -105,8 +105,10 @@ n BRepIntCurveSurface
|
|||||||
n BRepLib
|
n BRepLib
|
||||||
n BRepMAT2d
|
n BRepMAT2d
|
||||||
n BRepMesh
|
n BRepMesh
|
||||||
|
n BRepMeshData
|
||||||
n BRepOffset
|
n BRepOffset
|
||||||
n BRepOffsetAPI
|
n BRepOffsetAPI
|
||||||
|
n BRepPreviewAPI
|
||||||
n BRepPrim
|
n BRepPrim
|
||||||
n BRepPrimAPI
|
n BRepPrimAPI
|
||||||
n BRepProj
|
n BRepProj
|
||||||
@@ -141,6 +143,8 @@ n HLRTopoBRep
|
|||||||
n HLRAppli
|
n HLRAppli
|
||||||
n Hatch
|
n Hatch
|
||||||
n HatchGen
|
n HatchGen
|
||||||
|
n IMeshData
|
||||||
|
n IMeshTools
|
||||||
n IntCurve
|
n IntCurve
|
||||||
n IntCurveSurface
|
n IntCurveSurface
|
||||||
n IntCurvesFace
|
n IntCurvesFace
|
||||||
@@ -198,8 +202,10 @@ n InterfaceGraphic
|
|||||||
n AIS
|
n AIS
|
||||||
n Aspect
|
n Aspect
|
||||||
n DsgPrs
|
n DsgPrs
|
||||||
|
n PrsDim
|
||||||
n Graphic3d
|
n Graphic3d
|
||||||
n Image
|
n Image
|
||||||
|
n Media
|
||||||
n MeshVS
|
n MeshVS
|
||||||
n OpenGl
|
n OpenGl
|
||||||
n D3DHost
|
n D3DHost
|
||||||
@@ -210,13 +216,13 @@ n SelectBasics
|
|||||||
n SelectMgr
|
n SelectMgr
|
||||||
n StdPrs
|
n StdPrs
|
||||||
n StdSelect
|
n StdSelect
|
||||||
n TColQuantity
|
|
||||||
n V3d
|
n V3d
|
||||||
n WNT
|
n WNT
|
||||||
n Xw
|
n Xw
|
||||||
n Cocoa
|
n Cocoa
|
||||||
r Textures
|
r Textures
|
||||||
r Shaders
|
r Shaders
|
||||||
|
r XRResources
|
||||||
t TKMeshVS
|
t TKMeshVS
|
||||||
t TKOpenGl
|
t TKOpenGl
|
||||||
t TKD3DHost
|
t TKD3DHost
|
||||||
@@ -434,3 +440,28 @@ t TKIVtkDraw
|
|||||||
n Geom2dEvaluator
|
n Geom2dEvaluator
|
||||||
t TKVCAF
|
t TKVCAF
|
||||||
n XCAFView
|
n XCAFView
|
||||||
|
n XCAFNoteObjects
|
||||||
|
t TKRWMesh
|
||||||
|
n RWGltf
|
||||||
|
n RWMesh
|
||||||
|
n RWObj
|
||||||
|
n DFBrowser
|
||||||
|
n DFBrowserPane
|
||||||
|
n DFBrowserPaneXDE
|
||||||
|
n ShapeView
|
||||||
|
n TInspector
|
||||||
|
n TInspectorAPI
|
||||||
|
x TInspectorEXE
|
||||||
|
t TKDFBrowser
|
||||||
|
t TKShapeView
|
||||||
|
t TKTInspector
|
||||||
|
t TKTInspectorAPI
|
||||||
|
t TKToolsDraw
|
||||||
|
t TKTreeModel
|
||||||
|
t TKView
|
||||||
|
t TKVInspector
|
||||||
|
n ToolsDraw
|
||||||
|
n TreeModel
|
||||||
|
n View
|
||||||
|
n ViewControl
|
||||||
|
n VInspector
|
||||||
|
@@ -117,7 +117,7 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
|
|||||||
|
|
||||||
foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
|
foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
|
||||||
string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${LIBRARY_NAME}")
|
string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${LIBRARY_NAME}")
|
||||||
if (BUILD_SHARED_LIBS)
|
# if (BUILD_SHARED_LIBS)
|
||||||
# library
|
# library
|
||||||
if (NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}}")
|
if (NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}}")
|
||||||
set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
|
set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
|
||||||
@@ -133,7 +133,7 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
|
|||||||
# set 3RDPARTY_${PRODUCT_NAME}_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_LIBRARY
|
# set 3RDPARTY_${PRODUCT_NAME}_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_LIBRARY
|
||||||
set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} "3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}-NOTFOUND" CACHE FILEPATH "The path to ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
|
set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} "3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}-NOTFOUND" CACHE FILEPATH "The path to ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
|
||||||
|
|
||||||
if (3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
|
if ((3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}") OR (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}"))
|
||||||
find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME}
|
find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME}
|
||||||
PATHS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}" "${3RDPARTY_${PRODUCT_NAME}_DIR}"
|
PATHS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}" "${3RDPARTY_${PRODUCT_NAME}_DIR}"
|
||||||
PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
|
PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
|
||||||
@@ -167,7 +167,7 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
|
|||||||
if (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}")
|
if (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}")
|
||||||
list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}")
|
list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}")
|
||||||
else()
|
else()
|
||||||
list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX})
|
list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX})
|
||||||
|
|
||||||
set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} "" CACHE FILEPATH "The path to ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
|
set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} "" CACHE FILEPATH "The path to ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
|
||||||
endif()
|
endif()
|
||||||
@@ -181,9 +181,9 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
|
|||||||
# set 3RDPARTY_${PRODUCT_NAME}_DLL as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_DLL
|
# set 3RDPARTY_${PRODUCT_NAME}_DLL as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_DLL
|
||||||
set (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} "3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}-NOTFOUND" CACHE FILEPATH "The path to ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
|
set (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} "3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}-NOTFOUND" CACHE FILEPATH "The path to ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
|
||||||
|
|
||||||
if (3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
|
if ((3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}") OR (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}"))
|
||||||
find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME}
|
find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME}
|
||||||
PATHS "${3RDPARTY_${PRODUCT_NAME}_DIR}"
|
PATHS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}" "${3RDPARTY_${PRODUCT_NAME}_DIR}"
|
||||||
PATH_SUFFIXES bin win${COMPILER_BITNESS}/${COMPILER}/bin
|
PATH_SUFFIXES bin win${COMPILER_BITNESS}/${COMPILER}/bin
|
||||||
NO_DEFAULT_PATH)
|
NO_DEFAULT_PATH)
|
||||||
if (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} STREQUAL "3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}-NOTFOUND")
|
if (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} STREQUAL "3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}-NOTFOUND")
|
||||||
@@ -213,7 +213,7 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
|
|||||||
if (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX} OR EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}}")
|
if (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX} OR EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}}")
|
||||||
list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}}")
|
list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}}")
|
||||||
else()
|
else()
|
||||||
list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX})
|
list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX})
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@@ -277,26 +277,6 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if("${PRODUCT_NAME}" STREQUAL "GL2PS")
|
|
||||||
get_filename_component(GL2PSLIB ${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}} NAME)
|
|
||||||
|
|
||||||
if (SINGLE_GENERATOR)
|
|
||||||
install (FILES "${ABS_PATH}" DESTINATION "${INSTALL_DIR_LIB}" RENAME ${GL2PSLIB}.1)
|
|
||||||
else()
|
|
||||||
install (FILES "${ABS_PATH}"
|
|
||||||
CONFIGURATIONS Release
|
|
||||||
DESTINATION "${INSTALL_DIR_LIB}"
|
|
||||||
RENAME ${GL2PSLIB}.1)
|
|
||||||
install (FILES "${ABS_PATH}"
|
|
||||||
CONFIGURATIONS RelWithDebInfo
|
|
||||||
DESTINATION "${INSTALL_DIR_LIB}i"
|
|
||||||
RENAME ${GL2PSLIB}.1)
|
|
||||||
install (FILES "${ABS_PATH}"
|
|
||||||
CONFIGURATIONS Debug
|
|
||||||
DESTINATION "${INSTALL_DIR_LIB}d"
|
|
||||||
RENAME ${GL2PSLIB}.1)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
endif()
|
endif()
|
||||||
else()
|
else()
|
||||||
# the library directory for using by the executable
|
# the library directory for using by the executable
|
||||||
@@ -311,7 +291,7 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
mark_as_advanced (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} 3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX})
|
mark_as_advanced (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} 3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX})
|
||||||
endif()
|
# endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
|
@@ -1,5 +1,9 @@
|
|||||||
# eigen
|
# eigen
|
||||||
|
|
||||||
|
if (NOT DEFINED INSTALL_EIGEN)
|
||||||
|
set (INSTALL_EIGEN OFF CACHE BOOL "${INSTALL_EIGEN_DESCR}")
|
||||||
|
endif()
|
||||||
|
|
||||||
# eigen directory
|
# eigen directory
|
||||||
if (NOT DEFINED 3RDPARTY_EIGEN_DIR)
|
if (NOT DEFINED 3RDPARTY_EIGEN_DIR)
|
||||||
set (3RDPARTY_EIGEN_DIR "" CACHE PATH "The directory containing eigen")
|
set (3RDPARTY_EIGEN_DIR "" CACHE PATH "The directory containing eigen")
|
||||||
@@ -61,6 +65,18 @@ endif()
|
|||||||
|
|
||||||
if (3RDPARTY_EIGEN_INCLUDE_DIR AND EXISTS "${3RDPARTY_EIGEN_INCLUDE_DIR}")
|
if (3RDPARTY_EIGEN_INCLUDE_DIR AND EXISTS "${3RDPARTY_EIGEN_INCLUDE_DIR}")
|
||||||
list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_EIGEN_INCLUDE_DIR}")
|
list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_EIGEN_INCLUDE_DIR}")
|
||||||
|
|
||||||
|
# Install header files
|
||||||
|
if (INSTALL_EIGEN)
|
||||||
|
file(GLOB EIGEN_SUBDIRS "${3RDPARTY_EIGEN_INCLUDE_DIR}/*")
|
||||||
|
foreach(SUBDIR ${EIGEN_SUBDIRS})
|
||||||
|
if(IS_DIRECTORY "${SUBDIR}")
|
||||||
|
install (DIRECTORY "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
|
||||||
|
else()
|
||||||
|
install (FILES "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
endif()
|
||||||
else()
|
else()
|
||||||
list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_EIGEN_INCLUDE_DIR)
|
list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_EIGEN_INCLUDE_DIR)
|
||||||
|
|
||||||
|
@@ -8,7 +8,7 @@ if (NOT DEFINED 3RDPARTY_FFMPEG_DIR)
|
|||||||
set (3RDPARTY_FFMPEG_DIR "" CACHE PATH "The directory containing FFmpeg")
|
set (3RDPARTY_FFMPEG_DIR "" CACHE PATH "The directory containing FFmpeg")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# include occt macros. compiler_bitness, os_wiht_bit, compiler
|
# include occt macros. compiler_bitness, os_with_bit, compiler
|
||||||
OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
|
OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
|
||||||
|
|
||||||
# specify FFMPEG folder in connection with 3RDPARTY_DIR
|
# specify FFMPEG folder in connection with 3RDPARTY_DIR
|
||||||
@@ -27,49 +27,61 @@ if (NOT DEFINED 3RDPARTY_FFMPEG_INCLUDE_DIR)
|
|||||||
set (3RDPARTY_FFMPEG_INCLUDE_DIR "" CACHE PATH "the path of headers directory")
|
set (3RDPARTY_FFMPEG_INCLUDE_DIR "" CACHE PATH "the path of headers directory")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (NOT DEFINED 3RDPARTY_FFMPEG_LIBRARY OR NOT 3RDPARTY_FFMPEG_LIBRARY_DIR OR NOT EXISTS "${3RDPARTY_FFMPEG_LIBRARY_DIR}")
|
separate_arguments (CSF_FFmpeg)
|
||||||
set (3RDPARTY_FFMPEG_LIBRARY "" CACHE FILEPATH "FFmpeg framework" FORCE)
|
foreach (LIBRARY_NAME ${CSF_FFmpeg})
|
||||||
endif()
|
if (NOT DEFINED 3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} OR NOT 3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}")
|
||||||
|
set (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} "" CACHE FILEPATH "FFmpeg framework (${LIBRARY_NAME})" FORCE)
|
||||||
if (NOT DEFINED 3RDPARTY_FFMPEG_LIBRARY_DIR)
|
|
||||||
set (3RDPARTY_FFMPEG_LIBRARY_DIR "" CACHE PATH "The directory containing FFmpeg framework")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (WIN32)
|
|
||||||
if (NOT DEFINED 3RDPARTY_FFMPEG_DLL OR NOT 3RDPARTY_FFMPEG_DLL_DIR OR NOT EXISTS "${3RDPARTY_FFMPEG_DLL_DIR}")
|
|
||||||
set (3RDPARTY_FFMPEG_DLL "" CACHE FILEPATH "FFmpeg shared libraries" FORCE)
|
|
||||||
endif()
|
endif()
|
||||||
endif()
|
|
||||||
|
|
||||||
if (WIN32)
|
if (NOT DEFINED 3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME})
|
||||||
if (NOT DEFINED 3RDPARTY_FFMPEG_DLL_DIR)
|
set (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "" CACHE PATH "The directory containing FFmpeg framework (${LIBRARY_NAME})")
|
||||||
set (3RDPARTY_FFMPEG_DLL_DIR "" CACHE PATH "The directory containing FFmpeg shared libraries")
|
|
||||||
endif()
|
endif()
|
||||||
endif()
|
|
||||||
|
|
||||||
# check 3RDPARTY_${PRODUCT_NAME}_ paths for consistency with specified 3RDPARTY_${PRODUCT_NAME}_DIR
|
if (NOT DEFINED 3RDPARTY_FFMPEG_LIBRARY_DIR)
|
||||||
if (3RDPARTY_FFMPEG_DIR AND EXISTS "${3RDPARTY_FFMPEG_DIR}")
|
set (3RDPARTY_FFMPEG_LIBRARY_DIR "" CACHE PATH "The directory containing FFmpeg libraries")
|
||||||
CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_INCLUDE_DIR PATH "the path to FFmpeg")
|
|
||||||
CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_LIBRARY FILEPATH "the path to FFmpeg framework")
|
|
||||||
|
|
||||||
if (3RDPARTY_FFMPEG_LIBRARY AND EXISTS "${3RDPARTY_FFMPEG_LIBRARY}")
|
|
||||||
get_filename_component (3RDPARTY_FFMPEG_LIBRARY_DIR "${3RDPARTY_FFMPEG_LIBRARY}" PATH)
|
|
||||||
set (3RDPARTY_FFMPEG_LIBRARY_DIR "${3RDPARTY_FFMPEG_LIBRARY_DIR}" CACHE PATH "The directory containing FFmpeg libraries" FORCE)
|
|
||||||
else()
|
|
||||||
CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_LIBRARY_DIR PATH "The directory containing FFmpeg libraries")
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_DLL FILEPATH "the path to FFmpeg shared libraries")
|
if (NOT DEFINED 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} OR NOT 3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}")
|
||||||
|
set (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} "" CACHE FILEPATH "FFmpeg shared libraries (${LIBRARY_NAME})" FORCE)
|
||||||
if (3RDPARTY_FFMPEG_DLL AND EXISTS "${3RDPARTY_FFMPEG_DLL}")
|
|
||||||
get_filename_component (3RDPARTY_FFMPEG_DLL_DIR "${3RDPARTY_FFMPEG_DLL}" PATH)
|
|
||||||
set (3RDPARTY_FFMPEG_DLL_DIR "${3RDPARTY_FFMPEG_DLL_DIR}" CACHE PATH "The directory containing FFmpeg shared libraries" FORCE)
|
|
||||||
else()
|
|
||||||
CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_DLL_DIR PATH "The directory containing FFmpeg shared libraries")
|
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
|
||||||
|
if (WIN32)
|
||||||
|
if (NOT DEFINED 3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME})
|
||||||
|
set (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "" CACHE PATH "The directory containing FFmpeg shared libraries (${LIBRARY_NAME})")
|
||||||
|
endif()
|
||||||
|
if (NOT DEFINED 3RDPARTY_FFMPEG_DLL_DIR)
|
||||||
|
set (3RDPARTY_FFMPEG_DLL_DIR "" CACHE PATH "The directory containing FFmpeg shared libraries")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# check 3RDPARTY_${PRODUCT_NAME}_ paths for consistency with specified 3RDPARTY_${PRODUCT_NAME}_DIR
|
||||||
|
if (3RDPARTY_FFMPEG_DIR AND EXISTS "${3RDPARTY_FFMPEG_DIR}")
|
||||||
|
CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_INCLUDE_DIR PATH "the path to FFmpeg")
|
||||||
|
CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} FILEPATH "the path to FFmpeg framework (${LIBRARY_NAME})")
|
||||||
|
|
||||||
|
if (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}")
|
||||||
|
get_filename_component (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}" PATH)
|
||||||
|
set (3RDPARTY_FFMPEG_LIBRARY_DIR "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg libraries" FORCE)
|
||||||
|
set (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg library (${LIBRARY_NAME})" FORCE)
|
||||||
|
else()
|
||||||
|
CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} PATH "The directory containing FFmpeg library (${LIBRARY_NAME})")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (WIN32)
|
||||||
|
CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} FILEPATH "the path to FFmpeg shared library (${LIBRARY_NAME})")
|
||||||
|
|
||||||
|
if (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}")
|
||||||
|
get_filename_component (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}" PATH)
|
||||||
|
set (3RDPARTY_FFMPEG_DLL_DIR "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg shared libraries" FORCE)
|
||||||
|
set (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg shared library (${LIBRARY_NAME})" FORCE)
|
||||||
|
else()
|
||||||
|
CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} PATH "The directory containing FFmpeg shared library (${LIBRARY_NAME})")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
|
||||||
# header
|
# header
|
||||||
if (NOT 3RDPARTY_FFMPEG_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_FFMPEG_INCLUDE_DIR}")
|
if (NOT 3RDPARTY_FFMPEG_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_FFMPEG_INCLUDE_DIR}")
|
||||||
@@ -99,130 +111,132 @@ else()
|
|||||||
set (3RDPARTY_FFMPEG_INCLUDE_DIR "" CACHE FILEPATH "the path to avutil.h" FORCE)
|
set (3RDPARTY_FFMPEG_INCLUDE_DIR "" CACHE FILEPATH "the path to avutil.h" FORCE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# library
|
# libraries
|
||||||
if (NOT 3RDPARTY_FFMPEG_LIBRARY OR NOT EXISTS "${3RDPARTY_FFMPEG_LIBRARY}")
|
foreach (LIBRARY_NAME ${CSF_FFmpeg})
|
||||||
set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
|
if (NOT 3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}")
|
||||||
|
set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
|
||||||
|
|
||||||
set (FFMPEG_PATH_SUFFIXES lib)
|
set (FFMPEG_PATH_SUFFIXES lib)
|
||||||
if (ANDROID)
|
if (ANDROID)
|
||||||
set (FFMPEG_PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES} libs/${ANDROID_ABI})
|
set (FFMPEG_PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES} libs/${ANDROID_ABI})
|
||||||
elseif(APPLE)
|
elseif(APPLE)
|
||||||
set (FFMPEG_PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES} Frameworks)
|
set (FFMPEG_PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES} Frameworks)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# set 3RDPARTY_FFMPEG_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FFMPEG_LIBRARY
|
# set 3RDPARTY_FFMPEG_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FFMPEG_LIBRARY
|
||||||
set (3RDPARTY_FFMPEG_LIBRARY "3RDPARTY_FFMPEG_LIBRARY-NOTFOUND" CACHE FILEPATH "The path to FFmpeg library" FORCE)
|
set (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} "3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}-NOTFOUND" CACHE FILEPATH "The path to FFmpeg library (${LIBRARY_NAME})" FORCE)
|
||||||
|
|
||||||
if (3RDPARTY_FFMPEG_DIR AND EXISTS "${3RDPARTY_FFMPEG_DIR}")
|
if (3RDPARTY_FFMPEG_DIR AND EXISTS "${3RDPARTY_FFMPEG_DIR}")
|
||||||
find_library (3RDPARTY_FFMPEG_LIBRARY NAMES avutil
|
find_library (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} NAMES ${LIBRARY_NAME}
|
||||||
PATHS "${3RDPARTY_FFMPEG_LIBRARY_DIR}" "${3RDPARTY_FFMPEG_DIR}"
|
PATHS "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}" "${3RDPARTY_FFMPEG_DIR}"
|
||||||
PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES}
|
PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES}
|
||||||
CMAKE_FIND_ROOT_PATH_BOTH
|
CMAKE_FIND_ROOT_PATH_BOTH
|
||||||
NO_DEFAULT_PATH)
|
NO_DEFAULT_PATH)
|
||||||
else()
|
|
||||||
find_library (3RDPARTY_FFMPEG_LIBRARY NAMES avutil
|
|
||||||
PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES}
|
|
||||||
CMAKE_FIND_ROOT_PATH_BOTH)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (3RDPARTY_FFMPEG_LIBRARY AND EXISTS "${3RDPARTY_FFMPEG_LIBRARY}")
|
|
||||||
get_filename_component (3RDPARTY_FFMPEG_LIBRARY_DIR "${3RDPARTY_FFMPEG_LIBRARY}" PATH)
|
|
||||||
set (3RDPARTY_FFMPEG_LIBRARY_DIR "${3RDPARTY_FFMPEG_LIBRARY_DIR}" CACHE PATH "The directory containing FFmpeg library" FORCE)
|
|
||||||
else()
|
|
||||||
set (3RDPARTY_FFMPEG_LIBRARY_DIR "" CACHE PATH "The directory containing FFmpeg library" FORCE)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (3RDPARTY_FFMPEG_LIBRARY_DIR AND EXISTS "${3RDPARTY_FFMPEG_LIBRARY_DIR}")
|
|
||||||
list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_FFMPEG_LIBRARY_DIR}")
|
|
||||||
else()
|
|
||||||
list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FFMPEG_LIBRARY_DIR)
|
|
||||||
|
|
||||||
set (3RDPARTY_FFMPEG_LIBRARY "" CACHE FILEPATH "The path to FFmpeg library" FORCE)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# shared library
|
|
||||||
if (WIN32)
|
|
||||||
if (NOT 3RDPARTY_FFMPEG_DLL OR NOT EXISTS "${3RDPARTY_FFMPEG_DLL}")
|
|
||||||
|
|
||||||
set (CMAKE_FIND_LIBRARY_SUFFIXES .dll)
|
|
||||||
set (3RDPARTY_FFMPEG_DLL "3RDPARTY_FFMPEG_DLL-NOTFOUND" CACHE FILEPATH "The path to FFmpeg shared library" FORCE)
|
|
||||||
|
|
||||||
# find FFmpeg shared library
|
|
||||||
file (GLOB 3RDPARTY_FFMPEG_DLL "${3RDPARTY_FFMPEG_DIR}/bin/avutil[-][0-9]*")
|
|
||||||
|
|
||||||
if (3RDPARTY_FFMPEG_DLL AND EXISTS "${3RDPARTY_FFMPEG_DLL}")
|
|
||||||
set (3RDPARTY_FFMPEG_DLL "${3RDPARTY_FFMPEG_DLL}" CACHE FILEPATH "FFmpeg shared library" FORCE)
|
|
||||||
get_filename_component (3RDPARTY_FFMPEG_DLL_DIR "${3RDPARTY_FFMPEG_DLL}" PATH)
|
|
||||||
set (3RDPARTY_FFMPEG_DLL_DIR "${3RDPARTY_FFMPEG_DLL_DIR}" CACHE PATH "The directory containing FFmpeg library" FORCE)
|
|
||||||
else()
|
else()
|
||||||
set (3RDPARTY_FFMPEG_DLL_DIR "" CACHE PATH "The directory containing FFmpeg shared library" FORCE)
|
find_library (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} NAMES ${LIBRARY_NAME}
|
||||||
|
PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES}
|
||||||
|
CMAKE_FIND_ROOT_PATH_BOTH)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}")
|
||||||
|
get_filename_component (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}" PATH)
|
||||||
|
set (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg library (${LIBRARY_NAME})" FORCE)
|
||||||
|
else()
|
||||||
|
set (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "" CACHE PATH "The directory containing FFmpeg library (${LIBRARY_NAME})" FORCE)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (3RDPARTY_FFMPEG_DLL_DIR OR EXISTS "${3RDPARTY_FFMPEG_DLL_DIR}")
|
if (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}")
|
||||||
list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_FFMPEG_DLL_DIR}")
|
list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}")
|
||||||
else()
|
else()
|
||||||
list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FFMPEG_DLL_DIR)
|
list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME})
|
||||||
|
|
||||||
|
set (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} "" CACHE FILEPATH "The path to FFmpeg library (${LIBRARY_NAME})" FORCE)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
|
||||||
|
|
||||||
# install instructions
|
|
||||||
if (INSTALL_FFMPEG)
|
|
||||||
OCCT_MAKE_OS_WITH_BITNESS()
|
|
||||||
OCCT_MAKE_COMPILER_SHORT_NAME()
|
|
||||||
|
|
||||||
|
# shared library
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
if (DEFINED INSTALL_BIN_DIR)
|
if (NOT 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}")
|
||||||
install (FILES "${3RDPARTY_FFMPEG_DLL}" DESTINATION "${INSTALL_BIN_DIR}")
|
|
||||||
else()
|
|
||||||
install (FILES "${3RDPARTY_FFMPEG_DLL}"
|
|
||||||
CONFIGURATIONS Release
|
|
||||||
DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
|
|
||||||
install (FILES "${3RDPARTY_FFMPEG_DLL}"
|
|
||||||
CONFIGURATIONS RelWithDebInfo
|
|
||||||
DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
|
|
||||||
install (FILES "${3RDPARTY_FFMPEG_DLL}"
|
|
||||||
CONFIGURATIONS Debug
|
|
||||||
DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
|
|
||||||
endif()
|
|
||||||
else()
|
|
||||||
get_filename_component(3RDPARTY_FFMPEG_LIBRARY_ABS ${3RDPARTY_FFMPEG_LIBRARY} REALPATH)
|
|
||||||
get_filename_component(3RDPARTY_FFMPEG_LIBRARY_NAME ${3RDPARTY_FFMPEG_LIBRARY} NAME)
|
|
||||||
|
|
||||||
if (DEFINED INSTALL_LIB_DIR)
|
set (CMAKE_FIND_LIBRARY_SUFFIXES .dll)
|
||||||
install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
|
set (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} "3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}-NOTFOUND" CACHE FILEPATH "The path to FFmpeg shared library (${LIBRARY_NAME})" FORCE)
|
||||||
DESTINATION "${INSTALL_LIB_DIR}"
|
|
||||||
RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
|
# find FFmpeg shared library
|
||||||
|
file (GLOB 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DIR}/bin/${LIBRARY_NAME}[-][0-9]*")
|
||||||
|
|
||||||
|
if (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}")
|
||||||
|
set (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}" CACHE FILEPATH "FFmpeg shared library (${LIBRARY_NAME})" FORCE)
|
||||||
|
get_filename_component (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}" PATH)
|
||||||
|
set (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg library (${LIBRARY_NAME})" FORCE)
|
||||||
|
else()
|
||||||
|
set (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "" CACHE PATH "The directory containing FFmpeg shared library (${LIBRARY_NAME})" FORCE)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} OR EXISTS "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}")
|
||||||
|
list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}")
|
||||||
else()
|
else()
|
||||||
install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
|
list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME})
|
||||||
CONFIGURATIONS Release
|
|
||||||
DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
|
|
||||||
RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
|
|
||||||
install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
|
|
||||||
CONFIGURATIONS RelWithDebInfo
|
|
||||||
DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
|
|
||||||
RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
|
|
||||||
install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
|
|
||||||
CONFIGURATIONS Debug
|
|
||||||
DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
|
|
||||||
RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
|
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set (USED_3RDPARTY_FFMPEG_DIR "")
|
# install instructions
|
||||||
else()
|
if (INSTALL_FFMPEG)
|
||||||
# the library directory for using by the executable
|
OCCT_MAKE_OS_WITH_BITNESS()
|
||||||
if (WIN32)
|
OCCT_MAKE_COMPILER_SHORT_NAME()
|
||||||
set (USED_3RDPARTY_FFMPEG_DIR ${3RDPARTY_FFMPEG_DLL_DIR})
|
|
||||||
|
if (WIN32)
|
||||||
|
if (DEFINED INSTALL_BIN_DIR)
|
||||||
|
install (FILES "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}" DESTINATION "${INSTALL_BIN_DIR}")
|
||||||
|
else()
|
||||||
|
install (FILES "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}"
|
||||||
|
CONFIGURATIONS Release
|
||||||
|
DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
|
||||||
|
install (FILES "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}"
|
||||||
|
CONFIGURATIONS RelWithDebInfo
|
||||||
|
DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
|
||||||
|
install (FILES "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}"
|
||||||
|
CONFIGURATIONS Debug
|
||||||
|
DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
|
||||||
|
endif()
|
||||||
|
else()
|
||||||
|
get_filename_component(3RDPARTY_FFMPEG_LIBRARY_ABS ${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}} REALPATH)
|
||||||
|
get_filename_component(3RDPARTY_FFMPEG_LIBRARY_NAME ${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}} NAME)
|
||||||
|
|
||||||
|
if (DEFINED INSTALL_LIB_DIR)
|
||||||
|
install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
|
||||||
|
DESTINATION "${INSTALL_LIB_DIR}"
|
||||||
|
RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
|
||||||
|
else()
|
||||||
|
install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
|
||||||
|
CONFIGURATIONS Release
|
||||||
|
DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
|
||||||
|
RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
|
||||||
|
install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
|
||||||
|
CONFIGURATIONS RelWithDebInfo
|
||||||
|
DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
|
||||||
|
RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
|
||||||
|
install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
|
||||||
|
CONFIGURATIONS Debug
|
||||||
|
DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
|
||||||
|
RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set (USED_3RDPARTY_FFMPEG_DIR "")
|
||||||
else()
|
else()
|
||||||
set (USED_3RDPARTY_FFMPEG_DIR ${3RDPARTY_FFMPEG_LIBRARY_DIR})
|
# the library directory for using by the executable
|
||||||
|
if (WIN32)
|
||||||
|
set (USED_3RDPARTY_FFMPEG_DIR ${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}})
|
||||||
|
else()
|
||||||
|
set (USED_3RDPARTY_FFMPEG_DIR ${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}})
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
|
||||||
|
mark_as_advanced (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME})
|
||||||
|
endforeach()
|
||||||
|
|
||||||
# unset all redundant variables
|
# unset all redundant variables
|
||||||
OCCT_CHECK_AND_UNSET (FFMPEG_INCLUDE_DIRS)
|
OCCT_CHECK_AND_UNSET (FFMPEG_INCLUDE_DIRS)
|
||||||
OCCT_CHECK_AND_UNSET (FFMPEG_LIBRARY_DIRS)
|
OCCT_CHECK_AND_UNSET (FFMPEG_LIBRARY_DIRS)
|
||||||
OCCT_CHECK_AND_UNSET (FFMPEG_DIR)
|
OCCT_CHECK_AND_UNSET (FFMPEG_DIR)
|
||||||
|
|
||||||
mark_as_advanced (3RDPARTY_FFMPEG_LIBRARY 3RDPARTY_FFMPEG_DLL)
|
|
||||||
|
@@ -61,8 +61,8 @@ endif()
|
|||||||
|
|
||||||
# check 3RDPARTY_FREETYPE_ paths for consistency with specified 3RDPARTY_FREETYPE_DIR
|
# check 3RDPARTY_FREETYPE_ paths for consistency with specified 3RDPARTY_FREETYPE_DIR
|
||||||
if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
|
if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
|
||||||
CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build FILEPATH "the path to ft2build.h")
|
CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build FILEPATH "The directory containing ft2build.h header")
|
||||||
CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 FILEPATH "the path to ftheader.h")
|
CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 FILEPATH "The directory containing ftheader.h header")
|
||||||
if (BUILD_SHARED_LIBS)
|
if (BUILD_SHARED_LIBS)
|
||||||
CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_LIBRARY FILEPATH "the path to freetype library")
|
CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_LIBRARY FILEPATH "the path to freetype library")
|
||||||
|
|
||||||
@@ -119,8 +119,8 @@ if (IS_BUILTIN_SEARCH_REQUIRED)
|
|||||||
|
|
||||||
# check the found paths for consistency with specified 3RDPARTY_FREETYPE_DIR
|
# check the found paths for consistency with specified 3RDPARTY_FREETYPE_DIR
|
||||||
if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
|
if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
|
||||||
CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_INCLUDE_DIR_ft2build FILEPATH "the path to ft2build.h")
|
CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_INCLUDE_DIR_ft2build FILEPATH "The directory containing ft2build.h header")
|
||||||
CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_INCLUDE_DIR_freetype2 FILEPATH "the path to ftheader.h")
|
CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_INCLUDE_DIR_freetype2 FILEPATH "The directory containing ftheader.h header")
|
||||||
if (BUILD_SHARED_LIBS)
|
if (BUILD_SHARED_LIBS)
|
||||||
CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_LIBRARY FILEPATH "freetype library")
|
CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_LIBRARY FILEPATH "freetype library")
|
||||||
endif()
|
endif()
|
||||||
@@ -129,13 +129,13 @@ if (IS_BUILTIN_SEARCH_REQUIRED)
|
|||||||
# assign the found paths to corresponding 3RDPARTY_FREETYPE_ variables
|
# assign the found paths to corresponding 3RDPARTY_FREETYPE_ variables
|
||||||
if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
|
if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
|
||||||
if (FREETYPE_INCLUDE_DIR_ft2build AND EXISTS "${FREETYPE_INCLUDE_DIR_ft2build}")
|
if (FREETYPE_INCLUDE_DIR_ft2build AND EXISTS "${FREETYPE_INCLUDE_DIR_ft2build}")
|
||||||
set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build "${FREETYPE_INCLUDE_DIR_ft2build}" CACHE FILEPATH "the path to ft2build.h" FORCE)
|
set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build "${FREETYPE_INCLUDE_DIR_ft2build}" CACHE FILEPATH "The directory containing ft2build.h header" FORCE)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
|
if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
|
||||||
if (FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}")
|
if (FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}")
|
||||||
set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "${FREETYPE_INCLUDE_DIR_freetype2}" CACHE FILEPATH "the path to ftheader.h" FORCE)
|
set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "${FREETYPE_INCLUDE_DIR_freetype2}" CACHE FILEPATH "The directory containing ftheader.h header" FORCE)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@@ -162,7 +162,7 @@ if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build OR NOT EXISTS "${3RDPARTY_FREETYP
|
|||||||
set (FT2BUILD_NAMES ft2build.h config/ft2build.h freetype/config/ft2build.h)
|
set (FT2BUILD_NAMES ft2build.h config/ft2build.h freetype/config/ft2build.h)
|
||||||
|
|
||||||
# set 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build
|
# set 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build
|
||||||
set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build "3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build-NOTFOUND" CACHE FILEPATH "the path to ft2build.h" FORCE)
|
set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build "3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build-NOTFOUND" CACHE FILEPATH "The directory containing ft2build.h header" FORCE)
|
||||||
|
|
||||||
# cmake (version < 3.0) doesn't find ft2build.h of freetype (version is >= 2.5.1)
|
# cmake (version < 3.0) doesn't find ft2build.h of freetype (version is >= 2.5.1)
|
||||||
# do search taking into account freetype structure of 2.5.1 version
|
# do search taking into account freetype structure of 2.5.1 version
|
||||||
@@ -185,7 +185,7 @@ if (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build AND EXISTS "${3RDPARTY_FREETYPE_INCLU
|
|||||||
else()
|
else()
|
||||||
list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build)
|
list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build)
|
||||||
|
|
||||||
set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build "" CACHE FILEPATH "the path to ft2build.h" FORCE)
|
set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build "" CACHE FILEPATH "The directory containing ft2build.h header" FORCE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# ftheader.h
|
# ftheader.h
|
||||||
@@ -193,7 +193,7 @@ if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${3RDPARTY_FREETY
|
|||||||
set (FTHEADER_NAMES ftheader.h config/ftheader.h freetype/config/ftheader.h)
|
set (FTHEADER_NAMES ftheader.h config/ftheader.h freetype/config/ftheader.h)
|
||||||
|
|
||||||
# set 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2
|
# set 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2
|
||||||
set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2-NOTFOUND" CACHE FILEPATH "the path to ftheader.h" FORCE)
|
set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2-NOTFOUND" CACHE FILEPATH "The directory containing ftheader.h header" FORCE)
|
||||||
|
|
||||||
if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
|
if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
|
||||||
find_path (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 NAMES ${FTHEADER_NAMES}
|
find_path (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 NAMES ${FTHEADER_NAMES}
|
||||||
@@ -214,11 +214,11 @@ if (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${3RDPARTY_FREETYPE_INCL
|
|||||||
else()
|
else()
|
||||||
list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2)
|
list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2)
|
||||||
|
|
||||||
set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "" CACHE FILEPATH "the path to ftheader.h" FORCE)
|
set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "" CACHE FILEPATH "The directory containing ftheader.h header" FORCE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# freetype library
|
# freetype library
|
||||||
if (BUILD_SHARED_LIBS)
|
#if (BUILD_SHARED_LIBS)
|
||||||
if (NOT 3RDPARTY_FREETYPE_LIBRARY OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
|
if (NOT 3RDPARTY_FREETYPE_LIBRARY OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
|
||||||
set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
|
set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
|
||||||
|
|
||||||
@@ -253,7 +253,7 @@ if (BUILD_SHARED_LIBS)
|
|||||||
if (3RDPARTY_FREETYPE_LIBRARY_DIR AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY_DIR}")
|
if (3RDPARTY_FREETYPE_LIBRARY_DIR AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY_DIR}")
|
||||||
list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_FREETYPE_LIBRARY_DIR}")
|
list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_FREETYPE_LIBRARY_DIR}")
|
||||||
else()
|
else()
|
||||||
list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_LIBRARY_DIR)
|
list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_FREETYPE_LIBRARY_DIR)
|
||||||
|
|
||||||
set (3RDPARTY_FREETYPE_LIBRARY "" CACHE FILEPATH "The path to freetype library" FORCE)
|
set (3RDPARTY_FREETYPE_LIBRARY "" CACHE FILEPATH "The path to freetype library" FORCE)
|
||||||
endif()
|
endif()
|
||||||
@@ -290,7 +290,7 @@ if (BUILD_SHARED_LIBS)
|
|||||||
if (3RDPARTY_FREETYPE_DLL_DIR OR EXISTS "${3RDPARTY_FREETYPE_DLL_DIR}")
|
if (3RDPARTY_FREETYPE_DLL_DIR OR EXISTS "${3RDPARTY_FREETYPE_DLL_DIR}")
|
||||||
list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_FREETYPE_DLL_DIR}")
|
list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_FREETYPE_DLL_DIR}")
|
||||||
else()
|
else()
|
||||||
list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_DLL_DIR)
|
list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_FREETYPE_DLL_DIR)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@@ -345,7 +345,7 @@ if (BUILD_SHARED_LIBS)
|
|||||||
set (USED_3RDPARTY_FREETYPE_DIR ${3RDPARTY_FREETYPE_LIBRARY_DIR})
|
set (USED_3RDPARTY_FREETYPE_DIR ${3RDPARTY_FREETYPE_LIBRARY_DIR})
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
#endif()
|
||||||
|
|
||||||
# unset all redundant variables
|
# unset all redundant variables
|
||||||
OCCT_CHECK_AND_UNSET(FREETYPE_INCLUDE_DIR_ft2build)
|
OCCT_CHECK_AND_UNSET(FREETYPE_INCLUDE_DIR_ft2build)
|
||||||
|
@@ -1,3 +0,0 @@
|
|||||||
#GL2PS
|
|
||||||
|
|
||||||
THIRDPARTY_PRODUCT("GL2PS" "gl2ps.h" "CSF_GL2PS" "d")
|
|
@@ -35,7 +35,11 @@ endif()
|
|||||||
if (USE_FREEIMAGE)
|
if (USE_FREEIMAGE)
|
||||||
set (CSF_FreeImagePlus "freeimage")
|
set (CSF_FreeImagePlus "freeimage")
|
||||||
else()
|
else()
|
||||||
set (CSF_FreeImagePlus)
|
if (WIN32)
|
||||||
|
set (CSF_FreeImagePlus "windowscodecs")
|
||||||
|
else()
|
||||||
|
set (CSF_FreeImagePlus)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# TCL/TK
|
# TCL/TK
|
||||||
@@ -54,59 +58,66 @@ if (USE_TCL)
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# GL2PS
|
|
||||||
if (NOT DEFINED ANDROID)
|
|
||||||
if (USE_GL2PS)
|
|
||||||
set (CSF_GL2PS "gl2ps")
|
|
||||||
else()
|
|
||||||
set (CSF_GL2PS)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
set (CSF_advapi32 "advapi32.lib")
|
set (CSF_advapi32 "advapi32.lib")
|
||||||
set (CSF_gdi32 "gdi32.lib")
|
set (CSF_gdi32 "gdi32.lib")
|
||||||
set (CSF_user32 "user32.lib")
|
set (CSF_user32 "user32.lib")
|
||||||
|
set (CSF_shell32 "shell32.lib")
|
||||||
set (CSF_wsock32 "wsock32.lib")
|
set (CSF_wsock32 "wsock32.lib")
|
||||||
set (CSF_psapi "Psapi.lib")
|
set (CSF_psapi "psapi.lib")
|
||||||
|
set (CSF_winmm "winmm.lib")
|
||||||
|
set (CSF_d3d9 "D3D9.lib")
|
||||||
if ("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore" OR USE_GLES2)
|
if ("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore" OR USE_GLES2)
|
||||||
set (CSF_OpenGlLibs "libEGL libGLESv2")
|
set (CSF_OpenGlLibs "libEGL libGLESv2")
|
||||||
else()
|
else()
|
||||||
set (CSF_OpenGlLibs "opengl32.lib")
|
set (CSF_OpenGlLibs "opengl32.lib")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
else()
|
else()
|
||||||
|
|
||||||
if (APPLE)
|
if (APPLE)
|
||||||
set (CSF_objc "objc")
|
set (CSF_objc "objc")
|
||||||
|
|
||||||
# frameworks
|
# frameworks
|
||||||
find_library (Appkit_LIB NAMES Appkit)
|
if (IOS)
|
||||||
set (CSF_Appkit ${Appkit_LIB})
|
find_library (Appkit_LIB NAMES UIKit)
|
||||||
|
set (CSF_Appkit ${Appkit_LIB})
|
||||||
|
else()
|
||||||
|
find_library (Appkit_LIB NAMES AppKit)
|
||||||
|
set (CSF_Appkit ${Appkit_LIB})
|
||||||
|
endif()
|
||||||
|
OCCT_CHECK_AND_UNSET (Appkit_LIB)
|
||||||
|
|
||||||
find_library (IOKit_LIB NAMES IOKit)
|
find_library (IOKit_LIB NAMES IOKit)
|
||||||
set (CSF_IOKit ${IOKit_LIB})
|
set (CSF_IOKit ${IOKit_LIB})
|
||||||
|
|
||||||
OCCT_CHECK_AND_UNSET (Appkit_LIB)
|
|
||||||
OCCT_CHECK_AND_UNSET (IOKit_LIB)
|
OCCT_CHECK_AND_UNSET (IOKit_LIB)
|
||||||
|
|
||||||
if (USE_GLX)
|
if (IOS)
|
||||||
|
find_library (OpenGlLibs_LIB NAMES OpenGLES)
|
||||||
|
set (CSF_OpenGlLibs ${OpenGlLibs_LIB})
|
||||||
|
OCCT_CHECK_AND_UNSET (OpenGlLibs_LIB)
|
||||||
|
elseif (USE_GLX)
|
||||||
set (CSF_OpenGlLibs GL)
|
set (CSF_OpenGlLibs GL)
|
||||||
set (CSF_XwLibs "X11 Xext Xmu Xi")
|
set (CSF_XwLibs "X11 Xext Xmu Xi")
|
||||||
else()
|
else()
|
||||||
find_library (OpenGlLibs_LIB NAMES OpenGL)
|
find_library (OpenGlLibs_LIB NAMES OpenGL)
|
||||||
set (CSF_OpenGlLibs ${OpenGlLibs_LIB})
|
set (CSF_OpenGlLibs ${OpenGlLibs_LIB})
|
||||||
|
|
||||||
OCCT_CHECK_AND_UNSET (OpenGlLibs_LIB)
|
OCCT_CHECK_AND_UNSET (OpenGlLibs_LIB)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
elseif (ANDROID)
|
elseif (ANDROID)
|
||||||
set (CSF_ThreadLibs "c")
|
set (CSF_ThreadLibs "c")
|
||||||
set (CSF_OpenGlLibs "EGL GLESv2")
|
set (CSF_OpenGlLibs "EGL GLESv2")
|
||||||
|
set (CSF_androidlog "log")
|
||||||
elseif (UNIX)
|
elseif (UNIX)
|
||||||
set (CSF_ThreadLibs "pthread rt stdc++")
|
set (CSF_ThreadLibs "pthread rt stdc++")
|
||||||
set (CSF_OpenGlLibs "GL")
|
if (USE_GLES2)
|
||||||
|
set (CSF_OpenGlLibs "EGL GLESv2")
|
||||||
|
else()
|
||||||
|
set (CSF_OpenGlLibs "GL")
|
||||||
|
endif()
|
||||||
set (CSF_XwLibs "X11 Xext Xmu Xi")
|
set (CSF_XwLibs "X11 Xext Xmu Xi")
|
||||||
set (CSF_dl "dl")
|
set (CSF_dl "dl")
|
||||||
|
set (CSF_fontconfig "fontconfig")
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
@@ -16,16 +16,15 @@ if (MSVC)
|
|||||||
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fp:precise")
|
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fp:precise")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# set compiler short name and choose SSE2 option for appropriate MSVC compilers
|
# add SSE2 option for old MSVC compilers (VS 2005 - 2010, 32 bit only)
|
||||||
# ONLY for 32-bit
|
|
||||||
if (NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
|
if (NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||||
if (MSVC80 OR MSVC90 OR MSVC10)
|
if (MSVC AND ((MSVC_VERSION EQUAL 1400) OR (MSVC_VERSION EQUAL 1500) OR (MSVC_VERSION EQUAL 1600)))
|
||||||
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2")
|
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2")
|
||||||
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:SSE2")
|
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:SSE2")
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (WIN32)
|
if (MSVC)
|
||||||
add_definitions (-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
|
add_definitions (-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
|
||||||
else()
|
else()
|
||||||
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions -fPIC")
|
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions -fPIC")
|
||||||
@@ -82,13 +81,18 @@ if (IS_DEBUG_C)
|
|||||||
string (REGEX REPLACE "-DDEBUG" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
|
string (REGEX REPLACE "-DDEBUG" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
|
||||||
endif()
|
endif()
|
||||||
# enable parallel compilation on MSVC 9 and above
|
# enable parallel compilation on MSVC 9 and above
|
||||||
if (MSVC AND NOT MSVC70 AND NOT MSVC80)
|
if (MSVC AND (MSVC_VERSION GREATER 1400))
|
||||||
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
|
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# generate a single response file which enlist all of the object files
|
# generate a single response file which enlist all of the object files
|
||||||
SET(CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1)
|
if (NOT DEFINED CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS)
|
||||||
SET(CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS 1)
|
SET(CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1)
|
||||||
|
endif()
|
||||||
|
if (NOT DEFINED CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS)
|
||||||
|
SET(CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS 1)
|
||||||
|
endif()
|
||||||
|
|
||||||
# increase compiler warnings level (-W4 for MSVC, -Wextra for GCC)
|
# increase compiler warnings level (-W4 for MSVC, -Wextra for GCC)
|
||||||
if (MSVC)
|
if (MSVC)
|
||||||
if (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
|
if (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
|
||||||
@@ -126,7 +130,9 @@ elseif ("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xClang")
|
|||||||
if (APPLE)
|
if (APPLE)
|
||||||
# CLang can be used with both libstdc++ and libc++, however on OS X libstdc++ is outdated.
|
# CLang can be used with both libstdc++ and libc++, however on OS X libstdc++ is outdated.
|
||||||
set (CMAKE_CXX_FLAGS "-std=c++0x -stdlib=libc++ ${CMAKE_CXX_FLAGS}")
|
set (CMAKE_CXX_FLAGS "-std=c++0x -stdlib=libc++ ${CMAKE_CXX_FLAGS}")
|
||||||
else()
|
elseif(NOT WIN32)
|
||||||
|
# CLang for Windows (at least CLang 8.0 distributed with VS 2019)
|
||||||
|
# does not support option "-std=c++0x"
|
||||||
set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
|
set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
|
||||||
endif()
|
endif()
|
||||||
elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
|
elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
|
||||||
@@ -139,5 +145,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR MINGW)
|
|||||||
set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
|
set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
|
if (BUILD_RELEASE_DISABLE_EXCEPTIONS)
|
||||||
set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
|
set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
|
||||||
|
set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
|
||||||
|
endif()
|
||||||
|
@@ -12,18 +12,12 @@ macro (OCCT_CHECK_AND_UNSET VARNAME)
|
|||||||
endif()
|
endif()
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
macro (OCCT_CHECK_AND_UNSET_GROUP VARNAME)
|
macro (OCCT_CHECK_AND_UNSET_GROUP GROUPNAME)
|
||||||
OCCT_CHECK_AND_UNSET ("${VARNAME}_DIR")
|
get_cmake_property(VARS VARIABLES)
|
||||||
|
string (REGEX MATCHALL "(^|;)${GROUPNAME}[A-Za-z0-9_]*" GROUPNAME_VARS "${VARS}")
|
||||||
OCCT_CHECK_AND_UNSET ("${VARNAME}_INCLUDE_DIR")
|
foreach(GROUPNAME_VAR ${GROUPNAME_VARS})
|
||||||
|
OCCT_CHECK_AND_UNSET(${GROUPNAME_VAR})
|
||||||
OCCT_CHECK_AND_UNSET ("${VARNAME}_LIBRARY")
|
endforeach()
|
||||||
OCCT_CHECK_AND_UNSET ("${VARNAME}_LIBRARY_DIR")
|
|
||||||
|
|
||||||
if (WIN32)
|
|
||||||
OCCT_CHECK_AND_UNSET ("${VARNAME}_DLL")
|
|
||||||
OCCT_CHECK_AND_UNSET ("${VARNAME}_DLL_DIR")
|
|
||||||
endif()
|
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
macro (OCCT_CHECK_AND_UNSET_INSTALL_DIR_SUBDIRS)
|
macro (OCCT_CHECK_AND_UNSET_INSTALL_DIR_SUBDIRS)
|
||||||
@@ -60,25 +54,27 @@ endmacro()
|
|||||||
# COMPILER variable
|
# COMPILER variable
|
||||||
macro (OCCT_MAKE_COMPILER_SHORT_NAME)
|
macro (OCCT_MAKE_COMPILER_SHORT_NAME)
|
||||||
if (MSVC)
|
if (MSVC)
|
||||||
if (MSVC70)
|
if ((MSVC_VERSION EQUAL 1300) OR (MSVC_VERSION EQUAL 1310))
|
||||||
set (COMPILER vc7)
|
set (COMPILER vc7)
|
||||||
elseif (MSVC80)
|
elseif (MSVC_VERSION EQUAL 1400)
|
||||||
set (COMPILER vc8)
|
set (COMPILER vc8)
|
||||||
elseif (MSVC90)
|
elseif (MSVC_VERSION EQUAL 1500)
|
||||||
set (COMPILER vc9)
|
set (COMPILER vc9)
|
||||||
elseif (MSVC10)
|
elseif (MSVC_VERSION EQUAL 1600)
|
||||||
set (COMPILER vc10)
|
set (COMPILER vc10)
|
||||||
elseif (MSVC11)
|
elseif (MSVC_VERSION EQUAL 1700)
|
||||||
set (COMPILER vc11)
|
set (COMPILER vc11)
|
||||||
elseif (MSVC12)
|
elseif (MSVC_VERSION EQUAL 1800)
|
||||||
set (COMPILER vc12)
|
set (COMPILER vc12)
|
||||||
elseif (MSVC14)
|
elseif (MSVC_VERSION EQUAL 1900)
|
||||||
set (COMPILER vc14)
|
set (COMPILER vc14)
|
||||||
elseif (MSVC15)
|
elseif ((MSVC_VERSION GREATER 1900) AND (MSVC_VERSION LESS 2000))
|
||||||
# Since Visual Studio 15 (2017), its version diverged from version of
|
# Since Visual Studio 15 (2017), its version diverged from version of
|
||||||
# compiler which is 14.1; as that compiler uses the same run-time as 14.0,
|
# compiler which is 14.1; as that compiler uses the same run-time as 14.0,
|
||||||
# we keep its id as "vc14" to be compatibille
|
# we keep its id as "vc14" to be compatibille
|
||||||
set (COMPILER vc14)
|
set (COMPILER vc14)
|
||||||
|
else()
|
||||||
|
message (FATAL_ERROR "Unrecognized MSVC_VERSION")
|
||||||
endif()
|
endif()
|
||||||
elseif (DEFINED CMAKE_COMPILER_IS_GNUCC)
|
elseif (DEFINED CMAKE_COMPILER_IS_GNUCC)
|
||||||
set (COMPILER gcc)
|
set (COMPILER gcc)
|
||||||
@@ -116,7 +112,7 @@ function (FIND_SUBDIRECTORY ROOT_DIRECTORY DIRECTORY_SUFFIX SUBDIRECTORY_NAME)
|
|||||||
foreach (SUBDIR_NAME ${SUBDIR_NAME_LIST})
|
foreach (SUBDIR_NAME ${SUBDIR_NAME_LIST})
|
||||||
#message("Subdir: ${SUBDIR_NAME}, ${DIRECTORY_SUFFIX}")
|
#message("Subdir: ${SUBDIR_NAME}, ${DIRECTORY_SUFFIX}")
|
||||||
# REGEX failed if the directory name contains '++' combination, so we replace it
|
# REGEX failed if the directory name contains '++' combination, so we replace it
|
||||||
string(REPLACE "++" "\\+\\+" SUBDIR_NAME_ESCAPED ${SUBDIR_NAME})
|
string(REPLACE "+" "\\+" SUBDIR_NAME_ESCAPED ${SUBDIR_NAME})
|
||||||
string (REGEX MATCH "${SUBDIR_NAME_ESCAPED}" DOES_PATH_CONTAIN "${DIRECTORY_SUFFIX}")
|
string (REGEX MATCH "${SUBDIR_NAME_ESCAPED}" DOES_PATH_CONTAIN "${DIRECTORY_SUFFIX}")
|
||||||
if (DOES_PATH_CONTAIN)
|
if (DOES_PATH_CONTAIN)
|
||||||
set(${SUBDIRECTORY_NAME} "${ROOT_DIRECTORY}/${SUBDIR_NAME}" PARENT_SCOPE)
|
set(${SUBDIRECTORY_NAME} "${ROOT_DIRECTORY}/${SUBDIR_NAME}" PARENT_SCOPE)
|
||||||
@@ -161,13 +157,18 @@ function (FIND_PRODUCT_DIR ROOT_DIR PRODUCT_NAME RESULT)
|
|||||||
OCCT_MAKE_COMPILER_BITNESS()
|
OCCT_MAKE_COMPILER_BITNESS()
|
||||||
|
|
||||||
string (TOLOWER "${PRODUCT_NAME}" lower_PRODUCT_NAME)
|
string (TOLOWER "${PRODUCT_NAME}" lower_PRODUCT_NAME)
|
||||||
|
if ("${lower_PRODUCT_NAME}" STREQUAL "egl")
|
||||||
list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*${COMPILER}.*${COMPILER_BITNESS}")
|
string (SUBSTRING "${lower_PRODUCT_NAME}" 1 -1 lower_PRODUCT_NAME)
|
||||||
list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+.*${COMPILER}.*${COMPILER_BITNESS}")
|
list (APPEND SEARCH_TEMPLATES "[^gl]+${lower_PRODUCT_NAME}.*")
|
||||||
list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+.*${COMPILER_BITNESS}")
|
else()
|
||||||
list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*.*${COMPILER_BITNESS}")
|
list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*${COMPILER}.*${COMPILER_BITNESS}")
|
||||||
list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+")
|
list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+.*${COMPILER}.*${COMPILER_BITNESS}")
|
||||||
list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*")
|
list (APPEND SEARCH_TEMPLATES "^[a-zA-Z]*[0-9]*-${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+.*${COMPILER}.*${COMPILER_BITNESS}")
|
||||||
|
list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+.*${COMPILER_BITNESS}")
|
||||||
|
list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*.*${COMPILER_BITNESS}")
|
||||||
|
list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+")
|
||||||
|
list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*")
|
||||||
|
endif()
|
||||||
|
|
||||||
SUBDIRECTORY_NAMES ("${ROOT_DIR}" SUBDIR_NAME_LIST)
|
SUBDIRECTORY_NAMES ("${ROOT_DIR}" SUBDIR_NAME_LIST)
|
||||||
|
|
||||||
@@ -267,7 +268,7 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOO
|
|||||||
list (LENGTH OCCT_ALL_FILE_NAMES ALL_FILES_NB)
|
list (LENGTH OCCT_ALL_FILE_NAMES ALL_FILES_NB)
|
||||||
math (EXPR ALL_FILES_NB "${ALL_FILES_NB} - 1" )
|
math (EXPR ALL_FILES_NB "${ALL_FILES_NB} - 1" )
|
||||||
|
|
||||||
# emit warnings if there is unprocessed headers
|
# emit warnings if there are unprocessed headers
|
||||||
file (GLOB OCCT_ALL_FILES_IN_DIR "${OCCT_COLLECT_SOURCE_DIR}/${OCCT_PACKAGE}/*.*")
|
file (GLOB OCCT_ALL_FILES_IN_DIR "${OCCT_COLLECT_SOURCE_DIR}/${OCCT_PACKAGE}/*.*")
|
||||||
file (GLOB OCCT_ALL_FILES_IN_PATCH_DIR "${BUILD_PATCH}/src/${OCCT_PACKAGE}/*.*")
|
file (GLOB OCCT_ALL_FILES_IN_PATCH_DIR "${BUILD_PATCH}/src/${OCCT_PACKAGE}/*.*")
|
||||||
|
|
||||||
@@ -300,8 +301,8 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOO
|
|||||||
list (APPEND OCCT_HEADER_FILES_COMPLETE ${OCCT_FILE_IN_DIR})
|
list (APPEND OCCT_HEADER_FILES_COMPLETE ${OCCT_FILE_IN_DIR})
|
||||||
|
|
||||||
# collect header files with name that does not contain its package one
|
# collect header files with name that does not contain its package one
|
||||||
string (FIND "${OCCT_FILE_NAME}" "${OCCT_PACKAGE}_" FOUND_INDEX)
|
string (REGEX MATCH "^${OCCT_PACKAGE}[_.]" IS_HEADER_MATHCING_PACKAGE "${OCCT_FILE_NAME}")
|
||||||
if (NOT ${FOUND_INDEX} EQUAL 0)
|
if (NOT IS_HEADER_MATHCING_PACKAGE)
|
||||||
list (APPEND OCCT_HEADER_FILE_WITH_PROPER_NAMES "${OCCT_FILE_NAME}")
|
list (APPEND OCCT_HEADER_FILE_WITH_PROPER_NAMES "${OCCT_FILE_NAME}")
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
@@ -340,7 +341,7 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOO
|
|||||||
string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
|
string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
|
||||||
message (STATUS "Info: \(${CURRENT_TIME}\) Checking headers in inc folder...")
|
message (STATUS "Info: \(${CURRENT_TIME}\) Checking headers in inc folder...")
|
||||||
|
|
||||||
file (GLOB OCCT_HEADER_FILES_OLD "${ROOT_TARGET_OCCT_DIR}/inc/*")
|
file (GLOB OCCT_HEADER_FILES_OLD "${ROOT_TARGET_OCCT_DIR}/${OCCT_INSTALL_DIR_PREFIX}/*")
|
||||||
foreach (OCCT_HEADER_FILE_OLD ${OCCT_HEADER_FILES_OLD})
|
foreach (OCCT_HEADER_FILE_OLD ${OCCT_HEADER_FILES_OLD})
|
||||||
get_filename_component (HEADER_FILE_NAME ${OCCT_HEADER_FILE_OLD} NAME)
|
get_filename_component (HEADER_FILE_NAME ${OCCT_HEADER_FILE_OLD} NAME)
|
||||||
string (REGEX MATCH "^[a-zA-Z0-9]+" PACKAGE_NAME "${HEADER_FILE_NAME}")
|
string (REGEX MATCH "^[a-zA-Z0-9]+" PACKAGE_NAME "${HEADER_FILE_NAME}")
|
||||||
@@ -348,12 +349,12 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOO
|
|||||||
list (FIND OCCT_USED_PACKAGES ${PACKAGE_NAME} IS_HEADER_FOUND)
|
list (FIND OCCT_USED_PACKAGES ${PACKAGE_NAME} IS_HEADER_FOUND)
|
||||||
if (NOT ${IS_HEADER_FOUND} EQUAL -1)
|
if (NOT ${IS_HEADER_FOUND} EQUAL -1)
|
||||||
if (NOT EXISTS "${OCCT_COLLECT_SOURCE_DIR}/${PACKAGE_NAME}/${HEADER_FILE_NAME}")
|
if (NOT EXISTS "${OCCT_COLLECT_SOURCE_DIR}/${PACKAGE_NAME}/${HEADER_FILE_NAME}")
|
||||||
message (STATUS "Warning. ${OCCT_HEADER_FILE_OLD} is not presented in the sources and will be removed from ${ROOT_TARGET_OCCT_DIR}/inc")
|
message (STATUS "Warning. ${OCCT_HEADER_FILE_OLD} is not present in the sources and will be removed from ${ROOT_TARGET_OCCT_DIR}/inc")
|
||||||
file (REMOVE "${OCCT_HEADER_FILE_OLD}")
|
file (REMOVE "${OCCT_HEADER_FILE_OLD}")
|
||||||
else()
|
else()
|
||||||
list (FIND OCCT_HEADER_FILE_NAMES_NOT_IN_FILES ${PACKAGE_NAME} IS_HEADER_FOUND)
|
list (FIND OCCT_HEADER_FILE_NAMES_NOT_IN_FILES ${PACKAGE_NAME} IS_HEADER_FOUND)
|
||||||
if (NOT ${IS_HEADER_FOUND} EQUAL -1)
|
if (NOT ${IS_HEADER_FOUND} EQUAL -1)
|
||||||
message (STATUS "Warning. ${OCCT_HEADER_FILE_OLD} is presented in the sources but not involved in FILES and will be removed from ${ROOT_TARGET_OCCT_DIR}/inc")
|
message (STATUS "Warning. ${OCCT_HEADER_FILE_OLD} is present in the sources but not involved in FILES and will be removed from ${ROOT_TARGET_OCCT_DIR}/inc")
|
||||||
file (REMOVE "${OCCT_HEADER_FILE_OLD}")
|
file (REMOVE "${OCCT_HEADER_FILE_OLD}")
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
@@ -500,11 +501,11 @@ function (OCCT_TOOLKIT_FULL_DEP TOOLKIT_NAME TOOLKIT_FULL_DEPS)
|
|||||||
set (${TOOLKIT_FULL_DEPS} ${LOCAL_TOOLKIT_FULL_DEPS} PARENT_SCOPE)
|
set (${TOOLKIT_FULL_DEPS} ${LOCAL_TOOLKIT_FULL_DEPS} PARENT_SCOPE)
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
# Function to get list of modules and toolkits from file adm/MODULES.
|
# Function to get list of modules/toolkits/samples from file adm/${FILE_NAME}.
|
||||||
# Creates list <$MODULE_LIST> to store list of MODULES and
|
# Creates list <$MODULE_LIST> to store list of MODULES and
|
||||||
# <NAME_OF_MODULE>_TOOLKITS foreach module to store its toolkits.
|
# <NAME_OF_MODULE>_TOOLKITS foreach module to store its toolkits, where "TOOLKITS" is defined by TOOLKITS_NAME_SUFFIX.
|
||||||
function (OCCT_MODULES_AND_TOOLKITS MODULE_LIST)
|
function (OCCT_MODULES_AND_TOOLKITS FILE_NAME TOOLKITS_NAME_SUFFIX MODULE_LIST)
|
||||||
FILE_TO_LIST ("adm/MODULES" FILE_CONTENT)
|
FILE_TO_LIST ("adm/${FILE_NAME}" FILE_CONTENT)
|
||||||
|
|
||||||
foreach (CONTENT_LINE ${FILE_CONTENT})
|
foreach (CONTENT_LINE ${FILE_CONTENT})
|
||||||
string (REPLACE " " ";" CONTENT_LINE ${CONTENT_LINE})
|
string (REPLACE " " ";" CONTENT_LINE ${CONTENT_LINE})
|
||||||
@@ -512,30 +513,12 @@ function (OCCT_MODULES_AND_TOOLKITS MODULE_LIST)
|
|||||||
list (REMOVE_AT CONTENT_LINE 0)
|
list (REMOVE_AT CONTENT_LINE 0)
|
||||||
list (APPEND ${MODULE_LIST} ${MODULE_NAME})
|
list (APPEND ${MODULE_LIST} ${MODULE_NAME})
|
||||||
# (!) REMOVE THE LINE BELOW (implicit variables)
|
# (!) REMOVE THE LINE BELOW (implicit variables)
|
||||||
set (${MODULE_NAME}_TOOLKITS ${CONTENT_LINE} PARENT_SCOPE)
|
set (${MODULE_NAME}_${TOOLKITS_NAME_SUFFIX} ${CONTENT_LINE} PARENT_SCOPE)
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
set (${MODULE_LIST} ${${MODULE_LIST}} PARENT_SCOPE)
|
set (${MODULE_LIST} ${${MODULE_LIST}} PARENT_SCOPE)
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
# Function to get list of tools and toolkits from file adm/TOOLS.
|
|
||||||
# Creates list <$TOOL_LIST> to store list of TOOLS and
|
|
||||||
# <NAME_OF_TOOL>_TOOLKITS foreach tool to store its toolkits.
|
|
||||||
function (OCCT_TOOLS_AND_TOOLKITS TOOL_LIST)
|
|
||||||
FILE_TO_LIST ("adm/TOOLS" FILE_CONTENT)
|
|
||||||
|
|
||||||
foreach (CONTENT_LINE ${FILE_CONTENT})
|
|
||||||
string (REPLACE " " ";" CONTENT_LINE ${CONTENT_LINE})
|
|
||||||
list (GET CONTENT_LINE 0 TOOL_NAME)
|
|
||||||
list (REMOVE_AT CONTENT_LINE 0)
|
|
||||||
list (APPEND ${TOOL_LIST} ${TOOL_NAME})
|
|
||||||
# (!) REMOVE THE LINE BELOW (implicit variables)
|
|
||||||
set (${TOOL_NAME}_TOOL_TOOLKITS ${CONTENT_LINE} PARENT_SCOPE)
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
set (${TOOL_LIST} ${${TOOL_LIST}} PARENT_SCOPE)
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
# Returns OCC version string from file Standard_Version.hxx (if available)
|
# Returns OCC version string from file Standard_Version.hxx (if available)
|
||||||
function (OCC_VERSION OCC_VERSION_MAJOR OCC_VERSION_MINOR OCC_VERSION_MAINTENANCE OCC_VERSION_DEVELOPMENT OCC_VERSION_STRING_EXT)
|
function (OCC_VERSION OCC_VERSION_MAJOR OCC_VERSION_MINOR OCC_VERSION_MAINTENANCE OCC_VERSION_DEVELOPMENT OCC_VERSION_STRING_EXT)
|
||||||
|
|
||||||
@@ -601,7 +584,7 @@ endmacro()
|
|||||||
# prior to version 3.3 not supporting per-configuration install paths
|
# prior to version 3.3 not supporting per-configuration install paths
|
||||||
# for install target files (see https://cmake.org/Bug/view.php?id=14317)
|
# for install target files (see https://cmake.org/Bug/view.php?id=14317)
|
||||||
macro (OCCT_UPDATE_TARGET_FILE)
|
macro (OCCT_UPDATE_TARGET_FILE)
|
||||||
if (NOT SINGLE_GENERATOR)
|
if (MSVC)
|
||||||
OCCT_INSERT_CODE_FOR_TARGET ()
|
OCCT_INSERT_CODE_FOR_TARGET ()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@@ -68,6 +68,7 @@ FILE_TO_LIST ("adm/RESOURCES" RESOURCES)
|
|||||||
foreach (CurrentResource ${RESOURCES})
|
foreach (CurrentResource ${RESOURCES})
|
||||||
get_filename_component (CurrentResource_FileName "${CurrentResource}" NAME)
|
get_filename_component (CurrentResource_FileName "${CurrentResource}" NAME)
|
||||||
if ("${CurrentResource_FileName}" STREQUAL TObj.msg OR
|
if ("${CurrentResource_FileName}" STREQUAL TObj.msg OR
|
||||||
|
"${CurrentResource_FileName}" STREQUAL BOPAlgo.msg OR
|
||||||
"${CurrentResource_FileName}" STREQUAL Units.dat OR
|
"${CurrentResource_FileName}" STREQUAL Units.dat OR
|
||||||
"${CurrentResource}" STREQUAL XSMessage OR
|
"${CurrentResource}" STREQUAL XSMessage OR
|
||||||
"${CurrentResource}" STREQUAL SHMessage OR
|
"${CurrentResource}" STREQUAL SHMessage OR
|
||||||
|
@@ -1,28 +1,69 @@
|
|||||||
# script for each OCCT toolkit
|
# script for each OCCT toolkit
|
||||||
|
|
||||||
# parce PACKAGES file
|
# filling some variables by default values(src) or using custom(tools, samples)
|
||||||
if ("${PROJECT_NAME}" STREQUAL DRAWEXE)
|
set (RELATIVE_SOURCES_DIR "${RELATIVE_DIR}")
|
||||||
set (USED_PACKAGES DRAWEXE)
|
if ("${RELATIVE_SOURCES_DIR}" STREQUAL "")
|
||||||
else()
|
#if it is not defined, use default directory
|
||||||
FILE_TO_LIST ("src/${PROJECT_NAME}/PACKAGES" USED_PACKAGES)
|
set (RELATIVE_SOURCES_DIR "src")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
set (OCC_MODULES_LIST "${MODULES_LIST}")
|
||||||
|
if ("${OCC_MODULES_LIST}" STREQUAL "")
|
||||||
|
set (OCC_MODULES_LIST ${OCCT_MODULES})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set (OCC_TARGET_FOLDER "${TARGET_FOLDER}")
|
||||||
|
if ("${OCC_TARGET_FOLDER}" STREQUAL "")
|
||||||
|
set (OCC_TARGET_FOLDER "Modules")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set (OCCT_TOOLKITS_NAME_SUFFIX "${TOOLKITS_NAME_SUFFIX}")
|
||||||
|
if ("${OCCT_TOOLKITS_NAME_SUFFIX}" STREQUAL "")
|
||||||
|
set (OCCT_TOOLKITS_NAME_SUFFIX "TOOLKITS")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# parce PACKAGES file
|
||||||
|
FILE_TO_LIST ("${RELATIVE_SOURCES_DIR}/${PROJECT_NAME}/PACKAGES" USED_PACKAGES)
|
||||||
|
if ("${USED_PACKAGES}" STREQUAL "")
|
||||||
|
set (USED_PACKAGES ${PROJECT_NAME})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (USE_QT)
|
||||||
|
# Qt dependencies
|
||||||
|
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/qt_macro)
|
||||||
|
FIND_QT_PACKAGE(PROJECT_LIBRARIES_DEBUG PROJECT_LIBRARIES_RELEASE PROJECT_INCLUDES)
|
||||||
|
include_directories("${PROJECT_INCLUDES}")
|
||||||
|
endif(USE_QT)
|
||||||
|
|
||||||
set (PRECOMPILED_DEFS)
|
set (PRECOMPILED_DEFS)
|
||||||
|
|
||||||
if (NOT BUILD_SHARED_LIBS)
|
if (NOT BUILD_SHARED_LIBS)
|
||||||
list (APPEND PRECOMPILED_DEFS "-DOCCT_NO_PLUGINS")
|
list (APPEND PRECOMPILED_DEFS "-DOCCT_NO_PLUGINS")
|
||||||
|
if (WIN32)
|
||||||
|
list (APPEND PRECOMPILED_DEFS "-DOCCT_STATIC_BUILD")
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Get all used packages from toolkit
|
# Get all used packages from toolkit
|
||||||
|
UNSET(RESOURCE_FILES)
|
||||||
foreach (OCCT_PACKAGE ${USED_PACKAGES})
|
foreach (OCCT_PACKAGE ${USED_PACKAGES})
|
||||||
|
|
||||||
|
#remove part after "/" in the OCCT_PACKAGE variable if exists
|
||||||
|
string (FIND "${OCCT_PACKAGE}" "/" _index)
|
||||||
|
if (_index GREATER -1)
|
||||||
|
math (EXPR _index "${_index}")
|
||||||
|
string (SUBSTRING "${OCCT_PACKAGE}" 0 ${_index} OCCT_PACKAGE_NAME)
|
||||||
|
else()
|
||||||
|
set (OCCT_PACKAGE_NAME "${OCCT_PACKAGE}")
|
||||||
|
endif()
|
||||||
|
|
||||||
# TKService contains platform-dependent packages: Xw and WNT
|
# TKService contains platform-dependent packages: Xw and WNT
|
||||||
if ((WIN32 AND "${OCCT_PACKAGE}" STREQUAL "Xw") OR (NOT WIN32 AND "${OCCT_PACKAGE}" STREQUAL "WNT"))
|
if ((WIN32 AND "${OCCT_PACKAGE}" STREQUAL "Xw") OR (NOT WIN32 AND "${OCCT_PACKAGE}" STREQUAL "WNT"))
|
||||||
# do nothing
|
# do nothing
|
||||||
else()
|
else()
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
list (APPEND PRECOMPILED_DEFS "-D__${OCCT_PACKAGE}_DLL")
|
list (APPEND PRECOMPILED_DEFS "-D__${OCCT_PACKAGE_NAME}_DLL")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set (SOURCE_FILES)
|
set (SOURCE_FILES)
|
||||||
@@ -32,11 +73,11 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
|
|||||||
if (${BUILD_YACCLEX})
|
if (${BUILD_YACCLEX})
|
||||||
|
|
||||||
# flex files
|
# flex files
|
||||||
OCCT_ORIGIN_AND_PATCHED_FILES ("src/${OCCT_PACKAGE}" "*[.]lex" SOURCE_FILES_FLEX)
|
OCCT_ORIGIN_AND_PATCHED_FILES ("${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}" "*[.]lex" SOURCE_FILES_FLEX)
|
||||||
list (LENGTH SOURCE_FILES_FLEX SOURCE_FILES_FLEX_LEN)
|
list (LENGTH SOURCE_FILES_FLEX SOURCE_FILES_FLEX_LEN)
|
||||||
|
|
||||||
# bison files
|
# bison files
|
||||||
OCCT_ORIGIN_AND_PATCHED_FILES ("src/${OCCT_PACKAGE}" "*[.]yacc" SOURCE_FILES_BISON)
|
OCCT_ORIGIN_AND_PATCHED_FILES ("${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}" "*[.]yacc" SOURCE_FILES_BISON)
|
||||||
list (LENGTH SOURCE_FILES_BISON SOURCE_FILES_BISON_LEN)
|
list (LENGTH SOURCE_FILES_BISON SOURCE_FILES_BISON_LEN)
|
||||||
|
|
||||||
if (${SOURCE_FILES_FLEX_LEN} EQUAL ${SOURCE_FILES_BISON_LEN} AND NOT ${SOURCE_FILES_FLEX_LEN} EQUAL 0)
|
if (${SOURCE_FILES_FLEX_LEN} EQUAL ${SOURCE_FILES_BISON_LEN} AND NOT ${SOURCE_FILES_FLEX_LEN} EQUAL 0)
|
||||||
@@ -58,8 +99,8 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
|
|||||||
if (EXISTS "${CURRENT_FLEX_FILE}" AND EXISTS "${CURRENT_BISON_FILE}" AND ${ARE_FILES_EQUAL})
|
if (EXISTS "${CURRENT_FLEX_FILE}" AND EXISTS "${CURRENT_BISON_FILE}" AND ${ARE_FILES_EQUAL})
|
||||||
set (BISON_OUTPUT_FILE ${CURRENT_BISON_FILE_NAME}.tab.c)
|
set (BISON_OUTPUT_FILE ${CURRENT_BISON_FILE_NAME}.tab.c)
|
||||||
set (FLEX_OUTPUT_FILE lex.${CURRENT_FLEX_FILE_NAME}.c)
|
set (FLEX_OUTPUT_FILE lex.${CURRENT_FLEX_FILE_NAME}.c)
|
||||||
BISON_TARGET (Parser_${CURRENT_BISON_FILE_NAME} ${CURRENT_BISON_FILE} ${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${BISON_OUTPUT_FILE} COMPILE_FLAGS "-p ${CURRENT_BISON_FILE_NAME}")
|
BISON_TARGET (Parser_${CURRENT_BISON_FILE_NAME} ${CURRENT_BISON_FILE} ${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${BISON_OUTPUT_FILE} COMPILE_FLAGS "-p ${CURRENT_BISON_FILE_NAME}")
|
||||||
FLEX_TARGET (Scanner_${CURRENT_FLEX_FILE_NAME} ${CURRENT_FLEX_FILE} ${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${FLEX_OUTPUT_FILE} COMPILE_FLAGS "-P${CURRENT_FLEX_FILE_NAME}")
|
FLEX_TARGET (Scanner_${CURRENT_FLEX_FILE_NAME} ${CURRENT_FLEX_FILE} ${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${FLEX_OUTPUT_FILE} COMPILE_FLAGS "-P${CURRENT_FLEX_FILE_NAME}")
|
||||||
ADD_FLEX_BISON_DEPENDENCY (Scanner_${CURRENT_FLEX_FILE_NAME} Parser_${CURRENT_BISON_FILE_NAME})
|
ADD_FLEX_BISON_DEPENDENCY (Scanner_${CURRENT_FLEX_FILE_NAME} Parser_${CURRENT_BISON_FILE_NAME})
|
||||||
|
|
||||||
list (APPEND SOURCE_FILES ${BISON_OUTPUT_FILE} ${FLEX_OUTPUT_FILE})
|
list (APPEND SOURCE_FILES ${BISON_OUTPUT_FILE} ${FLEX_OUTPUT_FILE})
|
||||||
@@ -69,23 +110,23 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
# header files
|
# header files
|
||||||
if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/FILES")
|
if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES")
|
||||||
file (STRINGS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_M REGEX ".+[.]h")
|
file (STRINGS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" HEADER_FILES_M REGEX ".+[.]h")
|
||||||
file (STRINGS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_LXX REGEX ".+[.]lxx")
|
file (STRINGS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" HEADER_FILES_LXX REGEX ".+[.]lxx")
|
||||||
file (STRINGS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_GXX REGEX ".+[.]gxx")
|
file (STRINGS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" HEADER_FILES_GXX REGEX ".+[.]gxx")
|
||||||
|
|
||||||
file (STRINGS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/FILES" SOURCE_FILES_C REGEX ".+[.]c")
|
file (STRINGS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" SOURCE_FILES_C REGEX ".+[.]c")
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
file (STRINGS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/FILES" SOURCE_FILES_M REGEX ".+[.]mm")
|
file (STRINGS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" SOURCE_FILES_M REGEX ".+[.]mm")
|
||||||
endif()
|
endif()
|
||||||
else()
|
else()
|
||||||
file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_M REGEX ".+[.]h")
|
file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" HEADER_FILES_M REGEX ".+[.]h")
|
||||||
file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_LXX REGEX ".+[.]lxx")
|
file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" HEADER_FILES_LXX REGEX ".+[.]lxx")
|
||||||
file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_GXX REGEX ".+[.]gxx")
|
file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" HEADER_FILES_GXX REGEX ".+[.]gxx")
|
||||||
|
|
||||||
file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES" SOURCE_FILES_C REGEX ".+[.]c")
|
file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" SOURCE_FILES_C REGEX ".+[.]c")
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES" SOURCE_FILES_M REGEX ".+[.]mm")
|
file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" SOURCE_FILES_M REGEX ".+[.]mm")
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@@ -96,26 +137,36 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
foreach(HEADER_FILE ${HEADER_FILES})
|
foreach(HEADER_FILE ${HEADER_FILES})
|
||||||
if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
|
if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
|
||||||
message (STATUS "Info: consider patched file: ${BUILD_PATCH}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
|
message (STATUS "Info: consider patched file: ${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
|
||||||
list (APPEND USED_INCFILES "${BUILD_PATCH}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
|
list (APPEND USED_INCFILES "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
|
||||||
SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE}" FILES "${BUILD_PATCH}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
|
SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE_NAME}" FILES "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
|
||||||
else()
|
else()
|
||||||
list (APPEND USED_INCFILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
|
list (APPEND USED_INCFILES "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
|
||||||
SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE}" FILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
|
SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE_NAME}" FILES "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
|
||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
foreach(SOURCE_FILE ${SOURCE_FILES})
|
foreach(SOURCE_FILE ${SOURCE_FILES})
|
||||||
if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
|
if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
|
||||||
message (STATUS "Info: consider patched file: ${BUILD_PATCH}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
|
message (STATUS "Info: consider patched file: ${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
|
||||||
list (APPEND USED_SRCFILES "${BUILD_PATCH}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
|
list (APPEND USED_SRCFILES "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
|
||||||
SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE}" FILES "${BUILD_PATCH}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
|
SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE_NAME}" FILES "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
|
||||||
else()
|
else()
|
||||||
list (APPEND USED_SRCFILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
|
list (APPEND USED_SRCFILES "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
|
||||||
SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE}" FILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
|
SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE_NAME}" FILES "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
|
||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
|
if (USE_QT)
|
||||||
|
FIND_AND_INSTALL_QT_RESOURCES (${OCCT_PACKAGE} RESOURCE_FILES)
|
||||||
|
#message("Qt Resource files are: ${QT_RESOURCE_FILES} in ${OCCT_PACKAGE}")
|
||||||
|
endif(USE_QT)
|
||||||
|
|
||||||
|
#message("Resource files are: ${RESOURCE_FILES} in ${OCCT_PACKAGE}")
|
||||||
|
foreach(RESOURCE_FILE ${RESOURCE_FILES})
|
||||||
|
SOURCE_GROUP ("Resource Files\\${OCCT_PACKAGE_NAME}" FILES "${RESOURCE_FILE}")
|
||||||
|
endforeach()
|
||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
string (REGEX REPLACE ";" " " PRECOMPILED_DEFS "${PRECOMPILED_DEFS}")
|
string (REGEX REPLACE ";" " " PRECOMPILED_DEFS "${PRECOMPILED_DEFS}")
|
||||||
@@ -132,28 +183,34 @@ if (MSVC)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
set (CURRENT_MODULE)
|
set (CURRENT_MODULE)
|
||||||
foreach (OCCT_MODULE ${OCCT_MODULES})
|
foreach (OCCT_MODULE ${OCC_MODULES_LIST})
|
||||||
list (FIND ${OCCT_MODULE}_TOOLKITS ${PROJECT_NAME} CURRENT_PROJECT_IS_BUILT)
|
list (FIND ${OCCT_MODULE}_${OCCT_TOOLKITS_NAME_SUFFIX} ${PROJECT_NAME} CURRENT_PROJECT_IS_BUILT)
|
||||||
|
|
||||||
if (NOT ${CURRENT_PROJECT_IS_BUILT} EQUAL -1)
|
if (NOT ${CURRENT_PROJECT_IS_BUILT} EQUAL -1)
|
||||||
set (CURRENT_MODULE ${OCCT_MODULE})
|
set (CURRENT_MODULE ${OCCT_MODULE})
|
||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
if (NOT SINGLE_GENERATOR)
|
if (MSVC)
|
||||||
OCCT_INSERT_CODE_FOR_TARGET ()
|
OCCT_INSERT_CODE_FOR_TARGET ()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if ("${PROJECT_NAME}" STREQUAL "DRAWEXE")
|
if (USE_QT)
|
||||||
add_executable (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE})
|
FIND_AND_WRAP_MOC_FILES("${USED_INCFILES}" "${PROJECT_NAME}_MOC_FILES")
|
||||||
|
#message("MOC files: ${${PROJECT_NAME}_MOC_FILES}")
|
||||||
|
endif (USE_QT)
|
||||||
|
|
||||||
|
if (EXECUTABLE_PROJECT)
|
||||||
|
add_executable (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES})
|
||||||
|
|
||||||
install (TARGETS ${PROJECT_NAME}
|
install (TARGETS ${PROJECT_NAME}
|
||||||
DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
|
DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
|
||||||
else()
|
else()
|
||||||
add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE})
|
add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES})
|
||||||
|
|
||||||
if (MSVC)
|
if (MSVC)
|
||||||
install (FILES ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind/${PROJECT_NAME}.pdb
|
install (FILES ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb
|
||||||
CONFIGURATIONS Debug
|
CONFIGURATIONS Debug RelWithDebInfo
|
||||||
DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
|
DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@@ -178,7 +235,7 @@ else()
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (CURRENT_MODULE)
|
if (CURRENT_MODULE)
|
||||||
set_target_properties (${PROJECT_NAME} PROPERTIES FOLDER "Modules/${CURRENT_MODULE}")
|
set_target_properties (${PROJECT_NAME} PROPERTIES FOLDER "${OCC_TARGET_FOLDER}/${CURRENT_MODULE}")
|
||||||
set_target_properties (${PROJECT_NAME} PROPERTIES MODULE "${CURRENT_MODULE}")
|
set_target_properties (${PROJECT_NAME} PROPERTIES MODULE "${CURRENT_MODULE}")
|
||||||
if (APPLE)
|
if (APPLE)
|
||||||
if (NOT "${INSTALL_NAME_DIR}" STREQUAL "")
|
if (NOT "${INSTALL_NAME_DIR}" STREQUAL "")
|
||||||
@@ -204,7 +261,7 @@ set (USED_TOOLKITS_BY_CURRENT_PROJECT)
|
|||||||
set (USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT)
|
set (USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT)
|
||||||
|
|
||||||
# parce EXTERNLIB file
|
# parce EXTERNLIB file
|
||||||
FILE_TO_LIST ("src/${PROJECT_NAME}/EXTERNLIB" USED_EXTERNLIB_AND_TOOLKITS)
|
FILE_TO_LIST ("${RELATIVE_SOURCES_DIR}/${PROJECT_NAME}/EXTERNLIB" USED_EXTERNLIB_AND_TOOLKITS)
|
||||||
foreach (USED_ITEM ${USED_EXTERNLIB_AND_TOOLKITS})
|
foreach (USED_ITEM ${USED_EXTERNLIB_AND_TOOLKITS})
|
||||||
string (REGEX MATCH "^ *#" COMMENT_FOUND ${USED_ITEM})
|
string (REGEX MATCH "^ *#" COMMENT_FOUND ${USED_ITEM})
|
||||||
if (NOT COMMENT_FOUND)
|
if (NOT COMMENT_FOUND)
|
||||||
@@ -213,6 +270,9 @@ foreach (USED_ITEM ${USED_EXTERNLIB_AND_TOOLKITS})
|
|||||||
|
|
||||||
if (NOT "${TK_FOUND}" STREQUAL "" OR NOT "${VTK_FOUND}" STREQUAL "")
|
if (NOT "${TK_FOUND}" STREQUAL "" OR NOT "${VTK_FOUND}" STREQUAL "")
|
||||||
list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT ${USED_ITEM})
|
list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT ${USED_ITEM})
|
||||||
|
if (NOT "${VTK_FOUND}" STREQUAL "" AND BUILD_SHARED_LIBS AND INSTALL_VTK AND COMMAND OCCT_INSTALL_VTK)
|
||||||
|
OCCT_INSTALL_VTK(${USED_ITEM})
|
||||||
|
endif()
|
||||||
else()
|
else()
|
||||||
string (REGEX MATCH "^CSF_" CSF_FOUND ${USED_ITEM})
|
string (REGEX MATCH "^CSF_" CSF_FOUND ${USED_ITEM})
|
||||||
if ("${CSF_FOUND}" STREQUAL "")
|
if ("${CSF_FOUND}" STREQUAL "")
|
||||||
@@ -278,15 +338,34 @@ if("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2")
|
|||||||
list (REMOVE_ITEM USED_TOOLKITS_BY_CURRENT_PROJECT ${VTK_EXCLUDE_LIBRARY})
|
list (REMOVE_ITEM USED_TOOLKITS_BY_CURRENT_PROJECT ${VTK_EXCLUDE_LIBRARY})
|
||||||
if (${VTK_EXCLUDE_LIBRARY} STREQUAL vtkRenderingOpenGL)
|
if (${VTK_EXCLUDE_LIBRARY} STREQUAL vtkRenderingOpenGL)
|
||||||
list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT vtkRenderingOpenGL2)
|
list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT vtkRenderingOpenGL2)
|
||||||
|
if(VTK_MAJOR_VERSION GREATER 6)
|
||||||
|
list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT vtkRenderingGL2PSOpenGL2)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
|
else()
|
||||||
|
if(VTK_MAJOR_VERSION EQUAL 6 AND VTK_MINOR_VERSION GREATER 2 OR VTK_MAJOR_VERSION GREATER 6)
|
||||||
|
list (FIND USED_TOOLKITS_BY_CURRENT_PROJECT "vtkRenderingFreeTypeOpenGL" IS_VTK_RENDER_FREETYPE_FOUND)
|
||||||
|
if (NOT ${IS_VTK_RENDER_FREETYPE_FOUND} EQUAL -1)
|
||||||
|
list (REMOVE_ITEM USED_TOOLKITS_BY_CURRENT_PROJECT "vtkRenderingFreeTypeOpenGL")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (BUILD_SHARED_LIBS)
|
if (BUILD_SHARED_LIBS)
|
||||||
target_link_libraries (${PROJECT_NAME} ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
|
target_link_libraries (${PROJECT_NAME} ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if (USE_QT)
|
||||||
|
foreach (PROJECT_LIBRARY_DEBUG ${PROJECT_LIBRARIES_DEBUG})
|
||||||
|
target_link_libraries (${PROJECT_NAME} debug ${PROJECT_LIBRARY_DEBUG})
|
||||||
|
endforeach()
|
||||||
|
foreach (PROJECT_LIBRARY_RELEASE ${PROJECT_LIBRARIES_RELEASE})
|
||||||
|
target_link_libraries (${PROJECT_NAME} optimized ${PROJECT_LIBRARY_RELEASE})
|
||||||
|
endforeach()
|
||||||
|
endif()
|
||||||
|
|
||||||
# suppress deprecation warnings inside OCCT itself for old gcc versions with unavailable Standard_DISABLE_DEPRECATION_WARNINGS
|
# suppress deprecation warnings inside OCCT itself for old gcc versions with unavailable Standard_DISABLE_DEPRECATION_WARNINGS
|
||||||
if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
|
if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
|
||||||
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6.0)
|
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6.0)
|
||||||
|
18
adm/cmake/occt_toolkit_prepare_sample.cmake
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
if ("${TARGET_FOLDER}" STREQUAL "")
|
||||||
|
set (EXECUTABLE_PROJECT ON)
|
||||||
|
set (USE_QT ON)
|
||||||
|
|
||||||
|
set (RELATIVE_DIR "samples/qt")
|
||||||
|
set (MODULES_LIST ${OCCT_SAMPLES})
|
||||||
|
set (TARGET_FOLDER "Samples")
|
||||||
|
set (TOOLKITS_NAME_SUFFIX "SAMPLES_TOOLKITS")
|
||||||
|
|
||||||
|
include_directories("${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE}/${RELATIVE_DIR}")
|
||||||
|
else()
|
||||||
|
unset (USE_QT)
|
||||||
|
unset (RELATIVE_DIR)
|
||||||
|
unset (EXECUTABLE_PROJECT)
|
||||||
|
unset (MODULES_LIST)
|
||||||
|
unset (TARGET_FOLDER)
|
||||||
|
unset (TOOLKITS_NAME_SUFFIX)
|
||||||
|
endif("${TARGET_FOLDER}" STREQUAL "")
|
13
adm/cmake/occt_toolkit_prepare_tool.cmake
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
if ("${TARGET_FOLDER}" STREQUAL "")
|
||||||
|
set (USE_QT ON)
|
||||||
|
set (RELATIVE_DIR "tools")
|
||||||
|
set (MODULES_LIST ${OCCT_TOOLS})
|
||||||
|
set (TARGET_FOLDER "Tools")
|
||||||
|
set (TOOLKITS_NAME_SUFFIX "TOOL_TOOLKITS")
|
||||||
|
else()
|
||||||
|
unset (USE_QT)
|
||||||
|
unset (RELATIVE_DIR)
|
||||||
|
unset (MODULES_LIST)
|
||||||
|
unset (TARGET_FOLDER)
|
||||||
|
unset (TOOLKITS_NAME_SUFFIX)
|
||||||
|
endif("${TARGET_FOLDER}" STREQUAL "")
|
@@ -1,298 +0,0 @@
|
|||||||
# script for each OCCT tool toolkit
|
|
||||||
|
|
||||||
# Qt dependencies
|
|
||||||
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/qt5_macro)
|
|
||||||
|
|
||||||
FIND_QT5_PACKAGE(PROJECT_LIBRARIES_DEBUG PROJECT_LIBRARIES_RELEASE PROJECT_INCLUDES)
|
|
||||||
include_directories("${PROJECT_INCLUDES}"
|
|
||||||
"${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE}/tools")
|
|
||||||
|
|
||||||
FILE_TO_LIST ("tools/${PROJECT_NAME}/PACKAGES" USED_PACKAGES)
|
|
||||||
# parce PACKAGES file
|
|
||||||
|
|
||||||
if ("${PROJECT_NAME}" STREQUAL TInspectorEXE)
|
|
||||||
set (USED_PACKAGES ${PROJECT_NAME})
|
|
||||||
set (PACKAGE_PREFIX_DIR "samples/tools")
|
|
||||||
include_directories("${PROJECT_INCLUDES}"
|
|
||||||
"${CMAKE_SOURCE_DIR}/${PACKAGE_PREFIX_DIR}/${PROJECT_NAME}")
|
|
||||||
else()
|
|
||||||
FILE_TO_LIST ("tools/${PROJECT_NAME}/PACKAGES" USED_PACKAGES)
|
|
||||||
set (PACKAGE_PREFIX_DIR "tools")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
|
|
||||||
SET (RCC_FILES)
|
|
||||||
foreach (OCCT_PACKAGE ${USED_PACKAGES})
|
|
||||||
file (STRINGS "${CMAKE_SOURCE_DIR}/${PACKAGE_PREFIX_DIR}/${OCCT_PACKAGE}/FILES" SOURCE_FILES_C REGEX ".+[.]c")
|
|
||||||
|
|
||||||
#message("Sources are ${SOURCE_FILES_C}")
|
|
||||||
FIND_AND_WRAP_MOC_FILES("${SOURCE_FILES_C}")
|
|
||||||
|
|
||||||
#message("Dir is ${CMAKE_SOURCE_DIR}/${PACKAGE_PREFIX_DIR}/${OCCT_PACKAGE}/${OCCT_PACKAGE}.qrc")
|
|
||||||
FIND_AND_WRAP_RESOURCE_FILE("${CMAKE_SOURCE_DIR}/${PACKAGE_PREFIX_DIR}/${OCCT_PACKAGE}/${OCCT_PACKAGE}.qrc" RCC_FILES)
|
|
||||||
endforeach()
|
|
||||||
#message("RCC_FILES for ${PROJECT_NAME} are ${RCC_FILES}")
|
|
||||||
|
|
||||||
set (PRECOMPILED_DEFS)
|
|
||||||
|
|
||||||
if (NOT BUILD_SHARED_LIBS)
|
|
||||||
list (APPEND PRECOMPILED_DEFS "-DOCCT_NO_PLUGINS")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Get all used packages from toolkit
|
|
||||||
foreach (OCCT_PACKAGE ${USED_PACKAGES})
|
|
||||||
|
|
||||||
ADD_DEFINITIONS(-D${OCCT_PACKAGE}_EXPORTS)
|
|
||||||
|
|
||||||
# TKService contains platform-dependent packages: Xw and WNT
|
|
||||||
if ((WIN32 AND "${OCCT_PACKAGE}" STREQUAL "Xw") OR (NOT WIN32 AND "${OCCT_PACKAGE}" STREQUAL "WNT"))
|
|
||||||
# do nothing
|
|
||||||
else()
|
|
||||||
|
|
||||||
if (WIN32)
|
|
||||||
list (APPEND PRECOMPILED_DEFS "-D__${OCCT_PACKAGE}_DLL")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set (SOURCE_FILES)
|
|
||||||
set (HEADER_FILES)
|
|
||||||
|
|
||||||
# Generate Flex and Bison files
|
|
||||||
if (${BUILD_YACCLEX})
|
|
||||||
|
|
||||||
# flex files
|
|
||||||
OCCT_ORIGIN_AND_PATCHED_FILES ("tools/${OCCT_PACKAGE}" "*[.]lex" SOURCE_FILES_FLEX)
|
|
||||||
list (LENGTH SOURCE_FILES_FLEX SOURCE_FILES_FLEX_LEN)
|
|
||||||
|
|
||||||
# bison files
|
|
||||||
OCCT_ORIGIN_AND_PATCHED_FILES ("tools/${OCCT_PACKAGE}" "*[.]yacc" SOURCE_FILES_BISON)
|
|
||||||
list (LENGTH SOURCE_FILES_BISON SOURCE_FILES_BISON_LEN)
|
|
||||||
|
|
||||||
if (${SOURCE_FILES_FLEX_LEN} EQUAL ${SOURCE_FILES_BISON_LEN} AND NOT ${SOURCE_FILES_FLEX_LEN} EQUAL 0)
|
|
||||||
|
|
||||||
list (SORT SOURCE_FILES_FLEX)
|
|
||||||
list (SORT SOURCE_FILES_BISON)
|
|
||||||
|
|
||||||
math (EXPR SOURCE_FILES_FLEX_LEN "${SOURCE_FILES_FLEX_LEN} - 1")
|
|
||||||
foreach (FLEX_FILE_INDEX RANGE ${SOURCE_FILES_FLEX_LEN})
|
|
||||||
|
|
||||||
list (GET SOURCE_FILES_FLEX ${FLEX_FILE_INDEX} CURRENT_FLEX_FILE)
|
|
||||||
get_filename_component (CURRENT_FLEX_FILE_NAME ${CURRENT_FLEX_FILE} NAME_WE)
|
|
||||||
|
|
||||||
list (GET SOURCE_FILES_BISON ${FLEX_FILE_INDEX} CURRENT_BISON_FILE)
|
|
||||||
get_filename_component (CURRENT_BISON_FILE_NAME ${CURRENT_BISON_FILE} NAME_WE)
|
|
||||||
|
|
||||||
string (COMPARE EQUAL ${CURRENT_FLEX_FILE_NAME} ${CURRENT_BISON_FILE_NAME} ARE_FILES_EQUAL)
|
|
||||||
|
|
||||||
if (EXISTS "${CURRENT_FLEX_FILE}" AND EXISTS "${CURRENT_BISON_FILE}" AND ${ARE_FILES_EQUAL})
|
|
||||||
set (BISON_OUTPUT_FILE ${CURRENT_BISON_FILE_NAME}.tab.c)
|
|
||||||
set (FLEX_OUTPUT_FILE lex.${CURRENT_FLEX_FILE_NAME}.c)
|
|
||||||
BISON_TARGET (Parser_${CURRENT_BISON_FILE_NAME} ${CURRENT_BISON_FILE} ${CMAKE_SOURCE_DIR}/tools/${OCCT_PACKAGE}/${BISON_OUTPUT_FILE} COMPILE_FLAGS "-p ${CURRENT_BISON_FILE_NAME}")
|
|
||||||
FLEX_TARGET (Scanner_${CURRENT_FLEX_FILE_NAME} ${CURRENT_FLEX_FILE} ${CMAKE_SOURCE_DIR}/tools/${OCCT_PACKAGE}/${FLEX_OUTPUT_FILE} COMPILE_FLAGS "-P${CURRENT_FLEX_FILE_NAME}")
|
|
||||||
ADD_FLEX_BISON_DEPENDENCY (Scanner_${CURRENT_FLEX_FILE_NAME} Parser_${CURRENT_BISON_FILE_NAME})
|
|
||||||
|
|
||||||
list (APPEND SOURCE_FILES ${BISON_OUTPUT_FILE} ${FLEX_OUTPUT_FILE})
|
|
||||||
endif()
|
|
||||||
endforeach()
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# header files
|
|
||||||
if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/tools/${OCCT_PACKAGE}/FILES")
|
|
||||||
file (STRINGS "${BUILD_PATCH}/tools/${OCCT_PACKAGE}/FILES" HEADER_FILES_M REGEX ".+[.]h")
|
|
||||||
file (STRINGS "${BUILD_PATCH}/tools/${OCCT_PACKAGE}/FILES" HEADER_FILES_LXX REGEX ".+[.]lxx")
|
|
||||||
file (STRINGS "${BUILD_PATCH}/tools/${OCCT_PACKAGE}/FILES" HEADER_FILES_GXX REGEX ".+[.]gxx")
|
|
||||||
|
|
||||||
file (STRINGS "${BUILD_PATCH}/tools/${OCCT_PACKAGE}/FILES" SOURCE_FILES_C REGEX ".+[.]c")
|
|
||||||
if(APPLE)
|
|
||||||
file (STRINGS "${BUILD_PATCH}/tools/${OCCT_PACKAGE}/FILES" SOURCE_FILES_M REGEX ".+[.]mm")
|
|
||||||
endif()
|
|
||||||
else()
|
|
||||||
file (STRINGS "${CMAKE_SOURCE_DIR}/${PACKAGE_PREFIX_DIR}/${OCCT_PACKAGE}/FILES" HEADER_FILES_M REGEX ".+[.]h")
|
|
||||||
file (STRINGS "${CMAKE_SOURCE_DIR}/${PACKAGE_PREFIX_DIR}/${OCCT_PACKAGE}/FILES" HEADER_FILES_LXX REGEX ".+[.]lxx")
|
|
||||||
file (STRINGS "${CMAKE_SOURCE_DIR}/${PACKAGE_PREFIX_DIR}/${OCCT_PACKAGE}/FILES" HEADER_FILES_GXX REGEX ".+[.]gxx")
|
|
||||||
|
|
||||||
file (STRINGS "${CMAKE_SOURCE_DIR}/${PACKAGE_PREFIX_DIR}/${OCCT_PACKAGE}/FILES" SOURCE_FILES_C REGEX ".+[.]c")
|
|
||||||
if(APPLE)
|
|
||||||
file (STRINGS "${CMAKE_SOURCE_DIR}/${PACKAGE_PREFIX_DIR}/${OCCT_PACKAGE}/FILES" SOURCE_FILES_M REGEX ".+[.]mm")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
list (APPEND HEADER_FILES ${HEADER_FILES_M} ${HEADER_FILES_LXX} ${SOURCE_FILES_GXX})
|
|
||||||
list (APPEND SOURCE_FILES ${SOURCE_FILES_C})
|
|
||||||
if(APPLE)
|
|
||||||
list (APPEND SOURCE_FILES ${SOURCE_FILES_M})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
foreach(HEADER_FILE ${HEADER_FILES})
|
|
||||||
if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/tools/${OCCT_PACKAGE}/${HEADER_FILE}")
|
|
||||||
message (STATUS "Info: consider patched file: ${BUILD_PATCH}/tools/${OCCT_PACKAGE}/${HEADER_FILE}")
|
|
||||||
list (APPEND USED_INCFILES "${BUILD_PATCH}/tools/${OCCT_PACKAGE}/${HEADER_FILE}")
|
|
||||||
SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE}" FILES "${BUILD_PATCH}/tools/${OCCT_PACKAGE}/${HEADER_FILE}")
|
|
||||||
else()
|
|
||||||
list (APPEND USED_INCFILES "${CMAKE_SOURCE_DIR}/${PACKAGE_PREFIX_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
|
|
||||||
SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE}" FILES "${CMAKE_SOURCE_DIR}/${PACKAGE_PREFIX_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
|
|
||||||
endif()
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
|
|
||||||
foreach(SOURCE_FILE ${SOURCE_FILES})
|
|
||||||
if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/tools/${OCCT_PACKAGE}/${SOURCE_FILE}")
|
|
||||||
message (STATUS "Info: consider patched file: ${BUILD_PATCH}/tools/${OCCT_PACKAGE}/${SOURCE_FILE}")
|
|
||||||
list (APPEND USED_SRCFILES "${BUILD_PATCH}/tools/${OCCT_PACKAGE}/${SOURCE_FILE}")
|
|
||||||
SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE}" FILES "${BUILD_PATCH}/tools/${OCCT_PACKAGE}/${SOURCE_FILE}")
|
|
||||||
else()
|
|
||||||
list (APPEND USED_SRCFILES "${CMAKE_SOURCE_DIR}/${PACKAGE_PREFIX_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
|
|
||||||
SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE}" FILES "${CMAKE_SOURCE_DIR}/${PACKAGE_PREFIX_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
|
|
||||||
endif()
|
|
||||||
endforeach()
|
|
||||||
endif()
|
|
||||||
endforeach()
|
|
||||||
string (REGEX REPLACE ";" " " PRECOMPILED_DEFS "${PRECOMPILED_DEFS}")
|
|
||||||
|
|
||||||
set (USED_RCFILE "")
|
|
||||||
if (MSVC)
|
|
||||||
set (USED_RCFILE "${CMAKE_BINARY_DIR}/resources/${PROJECT_NAME}.rc")
|
|
||||||
|
|
||||||
if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/adm/templates/occt_toolkit.rc.in")
|
|
||||||
configure_file("${APPLY_OCCT_PATCH_DIR}/adm/templates/occt_toolkit.rc.in" "${USED_RCFILE}" @ONLY)
|
|
||||||
else()
|
|
||||||
configure_file("${CMAKE_SOURCE_DIR}/adm/templates/occt_toolkit.rc.in" "${USED_RCFILE}" @ONLY)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set (CURRENT_MODULE)
|
|
||||||
foreach (OCCT_MODULE ${OCCT_TOOLS})
|
|
||||||
list (FIND ${OCCT_MODULE}_TOOL_TOOLKITS ${PROJECT_NAME} CURRENT_PROJECT_IS_BUILT)
|
|
||||||
if (NOT ${CURRENT_PROJECT_IS_BUILT} EQUAL -1)
|
|
||||||
set (CURRENT_MODULE ${OCCT_MODULE})
|
|
||||||
endif()
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
if (NOT SINGLE_GENERATOR)
|
|
||||||
OCCT_INSERT_CODE_FOR_TARGET ()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if ("${PROJECT_NAME}" STREQUAL TInspectorEXE)
|
|
||||||
add_executable (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RCC_FILES})
|
|
||||||
|
|
||||||
install (TARGETS ${PROJECT_NAME}
|
|
||||||
DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
|
|
||||||
else()
|
|
||||||
add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RCC_FILES})
|
|
||||||
|
|
||||||
if (MSVC)
|
|
||||||
install (FILES ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind/${PROJECT_NAME}.pdb
|
|
||||||
CONFIGURATIONS Debug
|
|
||||||
DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (BUILD_SHARED_LIBS AND NOT "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}" STREQUAL "")
|
|
||||||
set (CMAKE_SHARED_LIBRARY_SUFFIX_DEFAULT ${CMAKE_SHARED_LIBRARY_SUFFIX})
|
|
||||||
set (CMAKE_SHARED_LIBRARY_SUFFIX "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
install (TARGETS ${PROJECT_NAME}
|
|
||||||
EXPORT OpenCASCADE${CURRENT_MODULE}Targets
|
|
||||||
RUNTIME DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}"
|
|
||||||
ARCHIVE DESTINATION "${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}"
|
|
||||||
LIBRARY DESTINATION "${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}")
|
|
||||||
|
|
||||||
|
|
||||||
if (NOT WIN32)
|
|
||||||
if (BUILD_SHARED_LIBS AND NOT "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}" STREQUAL "")
|
|
||||||
set (LINK_NAME "${INSTALL_DIR}/${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}/lib${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX_DEFAULT}/tools")
|
|
||||||
set (LIBRARY_NAME "${INSTALL_DIR}/${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}/lib${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}/tools")
|
|
||||||
OCCT_CREATE_SYMLINK_TO_FILE (${LIBRARY_NAME} ${LINK_NAME})
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (CURRENT_MODULE)
|
|
||||||
set_target_properties (${PROJECT_NAME} PROPERTIES FOLDER "Tools/${CURRENT_MODULE}")
|
|
||||||
set_target_properties (${PROJECT_NAME} PROPERTIES MODULE "${CURRENT_MODULE}")
|
|
||||||
if (APPLE)
|
|
||||||
if (NOT "${INSTALL_NAME_DIR}" STREQUAL "")
|
|
||||||
set_target_properties (${PROJECT_NAME} PROPERTIES BUILD_WITH_INSTALL_RPATH 1 INSTALL_NAME_DIR "${INSTALL_NAME_DIR}")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
get_property (OCC_VERSION_MAJOR GLOBAL PROPERTY OCC_VERSION_MAJOR)
|
|
||||||
get_property (OCC_VERSION_MINOR GLOBAL PROPERTY OCC_VERSION_MINOR)
|
|
||||||
get_property (OCC_VERSION_MAINTENANCE GLOBAL PROPERTY OCC_VERSION_MAINTENANCE)
|
|
||||||
|
|
||||||
if (ANDROID)
|
|
||||||
# do not append version to the filename
|
|
||||||
set_target_properties (${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${PRECOMPILED_DEFS}")
|
|
||||||
else()
|
|
||||||
set_target_properties (${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${PRECOMPILED_DEFS}"
|
|
||||||
SOVERSION "${OCC_VERSION_MAJOR}"
|
|
||||||
VERSION "${OCC_VERSION_MAJOR}.${OCC_VERSION_MINOR}.${OCC_VERSION_MAINTENANCE}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set (USED_TOOLKITS_BY_CURRENT_PROJECT)
|
|
||||||
set (USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT)
|
|
||||||
|
|
||||||
# parce EXTERNLIB file
|
|
||||||
FILE_TO_LIST ("${PACKAGE_PREFIX_DIR}/${PROJECT_NAME}/EXTERNLIB" USED_EXTERNLIB_AND_TOOLKITS)
|
|
||||||
foreach (USED_ITEM ${USED_EXTERNLIB_AND_TOOLKITS})
|
|
||||||
string (REGEX MATCH "^ *#" COMMENT_FOUND ${USED_ITEM})
|
|
||||||
if (NOT COMMENT_FOUND)
|
|
||||||
string (REGEX MATCH "^TK" TK_FOUND ${USED_ITEM})
|
|
||||||
string (REGEX MATCH "^vtk" VTK_FOUND ${USED_ITEM})
|
|
||||||
|
|
||||||
if (NOT "${TK_FOUND}" STREQUAL "" OR NOT "${VTK_FOUND}" STREQUAL "")
|
|
||||||
list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT ${USED_ITEM})
|
|
||||||
else()
|
|
||||||
string (REGEX MATCH "^CSF_" CSF_FOUND ${USED_ITEM})
|
|
||||||
if ("${CSF_FOUND}" STREQUAL "")
|
|
||||||
message (STATUS "Info: ${USED_ITEM} from ${PROJECT_NAME} skipped due to it is empty")
|
|
||||||
else() # get CSF_ value
|
|
||||||
set (CURRENT_CSF ${${USED_ITEM}})
|
|
||||||
if (NOT "x${CURRENT_CSF}" STREQUAL "x")
|
|
||||||
# prepare a list from a string with whitespaces
|
|
||||||
separate_arguments (CURRENT_CSF)
|
|
||||||
list (APPEND USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT ${CURRENT_CSF})
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
if (APPLE)
|
|
||||||
list (FIND USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT X11 IS_X11_FOUND)
|
|
||||||
if (NOT ${IS_X11_FOUND} EQUAL -1)
|
|
||||||
find_package (X11 COMPONENTS X11 Xext Xmu Xi)
|
|
||||||
if (NOT X11_FOUND)
|
|
||||||
message (STATUS "Warning: X11 is not found. It's required to install The XQuartz project: http://www.xquartz.org")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Update list of used VTK libraries if OpenGL2 Rendering BackEnd is used.
|
|
||||||
# Add VTK_OPENGL2_BACKEND definition.
|
|
||||||
if("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2")
|
|
||||||
add_definitions(-DVTK_OPENGL2_BACKEND)
|
|
||||||
foreach (VTK_EXCLUDE_LIBRARY vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL)
|
|
||||||
list (FIND USED_TOOLKITS_BY_CURRENT_PROJECT "${VTK_EXCLUDE_LIBRARY}" IS_VTK_OPENGL_FOUND)
|
|
||||||
if (NOT ${IS_VTK_OPENGL_FOUND} EQUAL -1)
|
|
||||||
list (REMOVE_ITEM USED_TOOLKITS_BY_CURRENT_PROJECT ${VTK_EXCLUDE_LIBRARY})
|
|
||||||
if (${VTK_EXCLUDE_LIBRARY} STREQUAL vtkRenderingOpenGL)
|
|
||||||
list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT vtkRenderingOpenGL2)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
endforeach()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (BUILD_SHARED_LIBS)
|
|
||||||
target_link_libraries (${PROJECT_NAME} ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Set Qt dependencies
|
|
||||||
target_link_libraries(${PROJECT_NAME} "${PROJECT_LIBRARIES}")
|
|
||||||
|
|
||||||
target_link_libraries(${PROJECT_NAME} debug "${PROJECT_LIBRARIES_DEBUG}")
|
|
||||||
target_link_libraries(${PROJECT_NAME} optimized "${PROJECT_LIBRARIES_RELEASE}")
|
|
||||||
|
|
41
adm/cmake/qt.cmake
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
#qt
|
||||||
|
|
||||||
|
# Qt is searched manually first (just determine root)
|
||||||
|
message (STATUS "Processing Qt 3-rd party")
|
||||||
|
|
||||||
|
if (NOT DEFINED ${3RDPARTY_QT_DIR} AND ${3RDPARTY_QT_DIR} STREQUAL "")
|
||||||
|
FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" Qt 3RDPARTY_QT_DIR_NAME)
|
||||||
|
|
||||||
|
if (NOT DEFINED ${3RDPARTY_QT_DIR_NAME} AND ${3RDPARTY_QT_DIR_NAME} STREQUAL "")
|
||||||
|
set (3RDPARTY_QT_DIR "" CACHE PATH "The directory containing qt")
|
||||||
|
message (FATAL_ERROR "Could not find used third-party product: 3RDPARTY_QT_DIR")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# Combine directory name with absolute path and show in GUI
|
||||||
|
set (3RDPARTY_QT_DIR "${3RDPARTY_DIR}/${3RDPARTY_QT_DIR_NAME}" CACHE PATH "The directory containing Qt" FORCE)
|
||||||
|
message (STATUS "Info: Qt is used from folder: ${3RDPARTY_QT_DIR}")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set (USED_3RDPARTY_QT_DIR "${3RDPARTY_QT_DIR}")
|
||||||
|
|
||||||
|
# Now set CMAKE_PREFIX_PATH to point to local Qt installation.
|
||||||
|
# Without this setting find_package() will not work
|
||||||
|
set(CMAKE_PREFIX_PATH ${3RDPARTY_QT_DIR})
|
||||||
|
|
||||||
|
# Now we can apply standard CMake finder for Qt5. We do this mostly
|
||||||
|
# to have qt5_wrap_cpp() function available and Qt5_FOUND variable filled
|
||||||
|
find_package(Qt5 QUIET COMPONENTS Widgets Quick Xml PATHS ${3RDPARTY_QT_DIR} NO_DEFAULT_PATH)
|
||||||
|
if (NOT ${Qt5_FOUND})
|
||||||
|
# Now we can apply standard CMake finder for Qt. We do this mostly
|
||||||
|
# to have qt4_wrap_cpp() function available
|
||||||
|
find_package(Qt4)
|
||||||
|
#message (STATUS "Qt4 cmake configuration")
|
||||||
|
else()
|
||||||
|
#message (STATUS "Qt5 cmake configuration")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (3RDPARTY_QT_DIR OR EXISTS "${3RDPARTY_QT_DIR}")
|
||||||
|
list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_QT_DIR}/bin")
|
||||||
|
else()
|
||||||
|
list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_QT_DLL_DIR)
|
||||||
|
endif()
|
@@ -1,22 +0,0 @@
|
|||||||
#qt
|
|
||||||
|
|
||||||
#looking for 3RDPARTY_QT_DIR variable used later in qt5_macro.cmake
|
|
||||||
if (${USE_QT4})
|
|
||||||
SET(CSF_QtCore "QtCore")
|
|
||||||
THIRDPARTY_PRODUCT("QT" "" "CSF_QtCore" "d")
|
|
||||||
else()
|
|
||||||
SET(CSF_Qt5Core "Qt5Core")
|
|
||||||
THIRDPARTY_PRODUCT("QT" "" "CSF_Qt5Core" "d")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
list (REMOVE_ITEM 3RDPARTY_NOT_INCLUDED "3RDPARTY_QT_INCLUDE_DIR")
|
|
||||||
list (REMOVE_ITEM 3RDPARTY_NOT_INCLUDED "3RDPARTY_QT_LIBRARY_DIR")
|
|
||||||
list (REMOVE_ITEM 3RDPARTY_NOT_INCLUDED "3RDPARTY_QT_DLL_DIR")
|
|
||||||
|
|
||||||
UNSET (${3RDPARTY_QT_DLL} CACHE)
|
|
||||||
UNSET (${3RDPARTY_QT_DLL_DIR} CACHE)
|
|
||||||
UNSET (${3RDPARTY_QT_INCLUDE_DIR} CACHE)
|
|
||||||
UNSET (${3RDPARTY_QT_LIBRARY} CACHE)
|
|
||||||
UNSET (${3RDPARTY_QT_LIBRARY_DIR} CACHE)
|
|
||||||
|
|
||||||
set (USED_3RDPARTY_QT_DIR "${3RDPARTY_QT_DIR}")
|
|
@@ -1,68 +0,0 @@
|
|||||||
#qt
|
|
||||||
|
|
||||||
macro (FIND_QT5_PACKAGE PROJECT_LIBRARIES_DEBUG PROJECT_LIBRARIES_RELEASE PROJECT_INCLUDES)
|
|
||||||
|
|
||||||
if ("${3RDPARTY_QT_DIR}" STREQUAL "")
|
|
||||||
message (FATAL_ERROR "Empty Qt dir")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Now set CMAKE_PREFIX_PATH to point to local Qt installation.
|
|
||||||
# Without this setting find_package() will not work
|
|
||||||
set(CMAKE_PREFIX_PATH ${3RDPARTY_QT_DIR})
|
|
||||||
if (USE_QT4)
|
|
||||||
# Now we can apply standard CMake finder for Qt. We do this mostly
|
|
||||||
# to have qt5_wrap_cpp() function available
|
|
||||||
find_package(Qt4)
|
|
||||||
#message (STATUS "Qt cmake configuration at directory ${Qt4DIR}")
|
|
||||||
|
|
||||||
set(PROJECT_INCLUDES ${QT_INCLUDES})
|
|
||||||
if (WIN32)
|
|
||||||
set(PROJECT_LIBRARIES_DEBUG "${3RDPARTY_QT_DIR}/lib/QtCored4.lib;${3RDPARTY_QT_DIR}/lib/QtGuid4.lib")
|
|
||||||
set(PROJECT_LIBRARIES_RELEASE "${3RDPARTY_QT_DIR}/lib/QtCore4.lib;${3RDPARTY_QT_DIR}/lib/QtGui4.lib")
|
|
||||||
else()
|
|
||||||
set(PROJECT_LIBRARIES_DEBUG "${3RDPARTY_QT_DIR}/lib/libQtCore.so;${3RDPARTY_QT_DIR}/lib/libQtGui.so")
|
|
||||||
set(PROJECT_LIBRARIES_RELEASE "${3RDPARTY_QT_DIR}/lib/libQtCore.so;${3RDPARTY_QT_DIR}/lib/libQtGui.so")
|
|
||||||
endif(WIN32)
|
|
||||||
else()
|
|
||||||
# Now we can apply standard CMake finder for Qt4. We do this mostly
|
|
||||||
# to have qt5_wrap_cpp() function available
|
|
||||||
find_package(Qt5 REQUIRED COMPONENTS Widgets)
|
|
||||||
#message (STATUS "Qt cmake configuration at directory ${Qt5DIR}")
|
|
||||||
|
|
||||||
set(PROJECT_INCLUDES "${Qt5Widgets_INCLUDE_DIRS}")
|
|
||||||
set(PROJECT_LIBRARIES_DEBUG "${Qt5Widgets_LIBRARIES}")
|
|
||||||
set(PROJECT_LIBRARIES_RELEASE "${Qt5Widgets_LIBRARIES}")
|
|
||||||
endif()
|
|
||||||
endmacro()
|
|
||||||
|
|
||||||
|
|
||||||
macro (FIND_AND_WRAP_MOC_FILES SOURCE_FILES)
|
|
||||||
SET(CMAKE_AUTOMOC ON)
|
|
||||||
|
|
||||||
foreach (FILE ${SOURCE_FILES})
|
|
||||||
set (src_files ${src_files} ${FILE})
|
|
||||||
unset (MOC_FILE)
|
|
||||||
if (USE_QT4)
|
|
||||||
qt4_wrap_cpp(MOC_FILE ${FILE})
|
|
||||||
else()
|
|
||||||
qt5_wrap_cpp(MOC_FILE ${FILE})
|
|
||||||
endif()
|
|
||||||
#message (STATUS "... Info: next MOC file ${MOC_FILE}")
|
|
||||||
|
|
||||||
endforeach (FILE)
|
|
||||||
|
|
||||||
endmacro()
|
|
||||||
|
|
||||||
macro (FIND_AND_WRAP_RESOURCE_FILE RESOURCE_FILE_NAME RCC_FILES)
|
|
||||||
if(EXISTS "${RESOURCE_FILE_NAME}")
|
|
||||||
if (USE_QT4)
|
|
||||||
qt4_add_resources(RCC_FILES "${RESOURCE_FILE_NAME}")
|
|
||||||
# suppress some GCC warnings coming from source files generated from .qrc resources
|
|
||||||
if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
|
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable")
|
|
||||||
endif()
|
|
||||||
else()
|
|
||||||
qt5_add_resources(RCC_FILES "${RESOURCE_FILE_NAME}")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
endmacro()
|
|
117
adm/cmake/qt_macro.cmake
Normal file
@@ -0,0 +1,117 @@
|
|||||||
|
#qt
|
||||||
|
|
||||||
|
macro (FIND_QT_PACKAGE PROJECT_LIBRARIES_DEBUG PROJECT_LIBRARIES_RELEASE PROJECT_INCLUDES)
|
||||||
|
|
||||||
|
if ("${3RDPARTY_QT_DIR}" STREQUAL "")
|
||||||
|
message (FATAL_ERROR "Empty Qt dir")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (${Qt5_FOUND})
|
||||||
|
#message (STATUS "Qt5 cmake configuration")
|
||||||
|
|
||||||
|
set(PROJECT_INCLUDES "${Qt5Widgets_INCLUDE_DIRS}" "${Qt5Quick_INCLUDE_DIRS}" "${Qt5Xml_INCLUDE_DIRS}")
|
||||||
|
set(PROJECT_LIBRARIES_DEBUG "${Qt5Widgets_LIBRARIES}" "${Qt5Quick_LIBRARIES}" "${Qt5Xml_LIBRARIES}")
|
||||||
|
set(PROJECT_LIBRARIES_RELEASE "${Qt5Widgets_LIBRARIES}" "${Qt5Quick_LIBRARIES}" "${Qt5Xml_LIBRARIES}")
|
||||||
|
|
||||||
|
# processing *.ts files to generate *.qm
|
||||||
|
find_package(Qt5LinguistTools)
|
||||||
|
get_target_property(QT_LRELEASE_EXECUTABLE Qt5::lrelease LOCATION)
|
||||||
|
mark_as_advanced(QT_LRELEASE_EXECUTABLE)
|
||||||
|
|
||||||
|
GET_FILENAME_COMPONENT(QT_BINARY_DIR ${QT_LRELEASE_EXECUTABLE} DIRECTORY)
|
||||||
|
MARK_AS_ADVANCED(QT_BINARY_DIR)
|
||||||
|
else()
|
||||||
|
#message (STATUS "Qt4 cmake configuration")
|
||||||
|
set(PROJECT_INCLUDES ${QT_INCLUDES})
|
||||||
|
if (WIN32)
|
||||||
|
set(PROJECT_LIBRARIES_DEBUG "${3RDPARTY_QT_DIR}/lib/QtCored4.lib;${3RDPARTY_QT_DIR}/lib/QtGuid4.lib;${3RDPARTY_QT_DIR}/lib/QtXmld4.lib")
|
||||||
|
set(PROJECT_LIBRARIES_RELEASE "${3RDPARTY_QT_DIR}/lib/QtCore4.lib;${3RDPARTY_QT_DIR}/lib/QtGui4.lib;${3RDPARTY_QT_DIR}/lib/QtXml4.lib")
|
||||||
|
else()
|
||||||
|
set(PROJECT_LIBRARIES_DEBUG "${3RDPARTY_QT_DIR}/lib/libQtCore.so;${3RDPARTY_QT_DIR}/lib/libQtGui.so;${3RDPARTY_QT_DIR}/lib/libQtXml.so")
|
||||||
|
set(PROJECT_LIBRARIES_RELEASE "${3RDPARTY_QT_DIR}/lib/libQtCore.so;${3RDPARTY_QT_DIR}/lib/libQtGui.so;${3RDPARTY_QT_DIR}/lib/libQtXml.so")
|
||||||
|
endif(WIN32)
|
||||||
|
find_program(QT_LRELEASE_EXECUTABLE lrelease)
|
||||||
|
endif()
|
||||||
|
endmacro()
|
||||||
|
|
||||||
|
|
||||||
|
macro (FIND_AND_WRAP_MOC_FILES HEADER_FILES GENERATED_MOC_FILES)
|
||||||
|
set (GENERATED_MOC_FILES "")
|
||||||
|
foreach (FILE ${HEADER_FILES})
|
||||||
|
# processing only files where Q_OBJECT exists
|
||||||
|
file(STRINGS "${FILE}" LINES REGEX "Q_OBJECT")
|
||||||
|
if(LINES)
|
||||||
|
unset (MOC_FILE)
|
||||||
|
if (${Qt5_FOUND})
|
||||||
|
qt5_wrap_cpp(MOC_FILE ${FILE})
|
||||||
|
else()
|
||||||
|
qt4_wrap_cpp(MOC_FILE ${FILE})
|
||||||
|
endif()
|
||||||
|
#message (STATUS "... Info: next MOC file ${MOC_FILE}")
|
||||||
|
list(APPEND ${GENERATED_MOC_FILES} ${MOC_FILE})
|
||||||
|
endif(LINES)
|
||||||
|
endforeach (FILE)
|
||||||
|
|
||||||
|
endmacro()
|
||||||
|
|
||||||
|
macro (FIND_AND_WRAP_RESOURCE_FILE RESOURCE_FILE_NAME RCC_FILES)
|
||||||
|
if(EXISTS "${RESOURCE_FILE_NAME}")
|
||||||
|
if (${Qt5_FOUND})
|
||||||
|
qt5_add_resources(RCC_FILES "${RESOURCE_FILE_NAME}")
|
||||||
|
else()
|
||||||
|
qt4_add_resources(RCC_FILES "${RESOURCE_FILE_NAME}")
|
||||||
|
# suppress some GCC warnings coming from source files generated from .qrc resources
|
||||||
|
if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
|
||||||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endmacro()
|
||||||
|
|
||||||
|
macro (FIND_AND_WRAP_TS_FILE RESOURCE_FILE_NAME TARGET_FOLDER QM_FILES)
|
||||||
|
if(EXISTS "${RESOURCE_FILE_NAME}")
|
||||||
|
if (${Qt5_FOUND})
|
||||||
|
qt5_add_translation(QM_FILES "${RESOURCE_FILE_NAME}")
|
||||||
|
else()
|
||||||
|
qt4_add_translation(QM_FILES "${RESOURCE_FILE_NAME}")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endmacro()
|
||||||
|
|
||||||
|
macro (FIND_AND_INSTALL_QT_RESOURCES OCCT_PACKAGE RESOURCE_FILES)
|
||||||
|
file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" TS_FILES REGEX ".+[.]ts")
|
||||||
|
file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" QRC_FILES REGEX ".+[.]qrc")
|
||||||
|
|
||||||
|
string (FIND "${OCCT_PACKAGE}" "/" _index)
|
||||||
|
if (_index GREATER -1)
|
||||||
|
math (EXPR _index "${_index}")
|
||||||
|
string (SUBSTRING "${OCCT_PACKAGE}" 0 ${_index} OCCT_PACKAGE_NAME)
|
||||||
|
else()
|
||||||
|
set (OCCT_PACKAGE_NAME "${OCCT_PACKAGE}")
|
||||||
|
endif(_index GREATER -1)
|
||||||
|
|
||||||
|
#message("QRC files are: ${QRC_FILES} in ${OCCT_PACKAGE}")
|
||||||
|
foreach (QRC_FILE ${QRC_FILES})
|
||||||
|
set (QRC_FILE_RELATIVE "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${QRC_FILE}")
|
||||||
|
if (EXISTS ${QRC_FILE_RELATIVE})
|
||||||
|
FIND_AND_WRAP_RESOURCE_FILE(${QRC_FILE_RELATIVE} RCC_FILES)
|
||||||
|
list (APPEND ${RESOURCE_FILES} "${RCC_FILES}")
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
#message("TS files are: ${TS_FILES} in ${OCCT_PACKAGE}")
|
||||||
|
foreach (TS_FILE ${TS_FILES})
|
||||||
|
set (TS_FILE_RELATIVE "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${TS_FILE}")
|
||||||
|
FIND_AND_WRAP_TS_FILE(${TS_FILE_RELATIVE} "${TARGET_FOLDER}/${CURRENT_MODULE}" QM_FILES)
|
||||||
|
if (EXISTS ${TS_FILE_RELATIVE})
|
||||||
|
list (APPEND ${RESOURCE_FILES} "${TS_FILE_RELATIVE}")
|
||||||
|
list (APPEND ${RESOURCE_FILES} "${QM_FILES}")
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
foreach (QM_FILE ${QM_FILES})
|
||||||
|
INSTALL(FILES ${QM_FILE} DESTINATION "${INSTALL_DIR_RESOURCE}/samples")
|
||||||
|
#message("install *.qm files (${QM_FILE}) to: ${INSTALL_DIR_RESOURCE}/samples")
|
||||||
|
endforeach (QM_FILE ${QM_FILES})
|
||||||
|
endmacro()
|
||||||
|
|
86
adm/cmake/rapidjson.cmake
Normal file
@@ -0,0 +1,86 @@
|
|||||||
|
# RapidJSON
|
||||||
|
|
||||||
|
if (NOT DEFINED INSTALL_RAPIDJSON)
|
||||||
|
set (INSTALL_RAPIDJSON OFF CACHE BOOL "${INSTALL_RAPIDJSON_DESCR}")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# RapidJSON directory
|
||||||
|
if (NOT DEFINED 3RDPARTY_RAPIDJSON_DIR)
|
||||||
|
set (3RDPARTY_RAPIDJSON_DIR "" CACHE PATH "The directory containing RapidJSON")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# search for RapidJSON in user defined directory
|
||||||
|
if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
|
||||||
|
if (NOT 3RDPARTY_RAPIDJSON_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
|
||||||
|
FIND_PRODUCT_DIR("${3RDPARTY_DIR}" RapidJSON RAPIDJSON_DIR_NAME)
|
||||||
|
if (RAPIDJSON_DIR_NAME)
|
||||||
|
set (3RDPARTY_RAPIDJSON_DIR "${3RDPARTY_DIR}/${RAPIDJSON_DIR_NAME}" CACHE PATH "The directory containing RapidJSON" FORCE)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (NOT DEFINED 3RDPARTY_RAPIDJSON_INCLUDE_DIR)
|
||||||
|
set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of the RAPIDJSON")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (NOT 3RDPARTY_RAPIDJSON_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
|
||||||
|
|
||||||
|
set (HEADER_NAMES rapidjson/rapidjson.h)
|
||||||
|
|
||||||
|
set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "3RDPARTY_RAPIDJSON_INCLUDE_DIR-NOTFOUND" CACHE PATH "the path to RapidJSON header file" FORCE)
|
||||||
|
|
||||||
|
if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
|
||||||
|
find_path (3RDPARTY_RAPIDJSON_INCLUDE_DIR NAMES ${HEADER_NAMES}
|
||||||
|
PATHS ${3RDPARTY_RAPIDJSON_DIR}
|
||||||
|
PATH_SUFFIXES include rapidjson
|
||||||
|
CMAKE_FIND_ROOT_PATH_BOTH
|
||||||
|
NO_DEFAULT_PATH)
|
||||||
|
else()
|
||||||
|
find_path (3RDPARTY_RAPIDJSON_INCLUDE_DIR NAMES ${HEADER_NAMES}
|
||||||
|
PATH_SUFFIXES include rapidjson
|
||||||
|
CMAKE_FIND_ROOT_PATH_BOTH)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# use default (CMake) RapidJSON search
|
||||||
|
if (NOT 3RDPARTY_RAPIDJSON_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
|
||||||
|
if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
|
||||||
|
set (CACHED_RAPIDJSON_DIR $ENV{RapidJSON_DIR})
|
||||||
|
set (ENV{RapidJSON_DIR} "${3RDPARTY_RAPIDJSON_DIR}")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
find_package(RapidJSON QUIET)
|
||||||
|
|
||||||
|
# restore ENV{RapidJSON_DIR}
|
||||||
|
if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
|
||||||
|
set (ENV{RapidJSON_DIR} ${CACHED_RAPIDJSON_DIR})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (${RAPIDJSON_FOUND})
|
||||||
|
set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "${RAPIDJSON_INCLUDE_DIR}" CACHE PATH "the path to RapidJSON header file" FORCE)
|
||||||
|
set (3RDPARTY_RAPIDJSON_DIR "${RAPIDJSON_ROOT_DIR}" CACHE PATH "The directory containing RapidJSON" FORCE)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (3RDPARTY_RAPIDJSON_INCLUDE_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
|
||||||
|
list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
|
||||||
|
|
||||||
|
# Install header files
|
||||||
|
if (INSTALL_RAPIDJSON)
|
||||||
|
file(GLOB RAPIDJSON_SUBDIRS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}/*")
|
||||||
|
foreach(SUBDIR ${RAPIDJSON_SUBDIRS})
|
||||||
|
if(IS_DIRECTORY "${SUBDIR}")
|
||||||
|
install (DIRECTORY "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
|
||||||
|
else()
|
||||||
|
install (FILES "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
endif()
|
||||||
|
else()
|
||||||
|
list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_RAPIDJSON_INCLUDE_DIR)
|
||||||
|
|
||||||
|
set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "" CACHE PATH "the path to RapidJSON header file" FORCE)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# unset all redundant variables
|
||||||
|
OCCT_CHECK_AND_UNSET(RapidJSON_DIR)
|
@@ -173,7 +173,7 @@ macro (TBB_PRODUCT_SEARCH PRODUCT_LIBRARY_NAME)
|
|||||||
if (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR AND EXISTS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR}")
|
if (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR AND EXISTS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR}")
|
||||||
list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR}")
|
list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR}")
|
||||||
else()
|
else()
|
||||||
list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR)
|
list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR)
|
||||||
|
|
||||||
set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY "" CACHE FILEPATH "The path to ${upper_PRODUCT_LIBRARY_NAME} library" FORCE)
|
set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY "" CACHE FILEPATH "The path to ${upper_PRODUCT_LIBRARY_NAME} library" FORCE)
|
||||||
endif()
|
endif()
|
||||||
@@ -226,7 +226,7 @@ macro (TBB_PRODUCT_SEARCH PRODUCT_LIBRARY_NAME)
|
|||||||
if (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR OR EXISTS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR}")
|
if (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR OR EXISTS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR}")
|
||||||
list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR}")
|
list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR}")
|
||||||
else()
|
else()
|
||||||
list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR)
|
list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@@ -275,7 +275,7 @@ macro (TBB_PRODUCT_SEARCH PRODUCT_LIBRARY_NAME)
|
|||||||
mark_as_advanced (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL)
|
mark_as_advanced (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL)
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
if (BUILD_SHARED_LIBS)
|
#if (BUILD_SHARED_LIBS)
|
||||||
separate_arguments (CSF_TBB)
|
separate_arguments (CSF_TBB)
|
||||||
foreach (LIB IN LISTS CSF_TBB)
|
foreach (LIB IN LISTS CSF_TBB)
|
||||||
TBB_PRODUCT_SEARCH (${LIB})
|
TBB_PRODUCT_SEARCH (${LIB})
|
||||||
@@ -291,4 +291,4 @@ if (BUILD_SHARED_LIBS)
|
|||||||
set (USED_3RDPARTY_TBB_DIR ${3RDPARTY_TBB_LIBRARY_DIR})
|
set (USED_3RDPARTY_TBB_DIR ${3RDPARTY_TBB_LIBRARY_DIR})
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
#endif()
|
||||||
|
@@ -184,14 +184,14 @@ if (BUILD_SHARED_LIBS)
|
|||||||
if (3RDPARTY_TCL_LIBRARY AND EXISTS "${3RDPARTY_TCL_LIBRARY}")
|
if (3RDPARTY_TCL_LIBRARY AND EXISTS "${3RDPARTY_TCL_LIBRARY}")
|
||||||
list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_TCL_LIBRARY_DIR}")
|
list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_TCL_LIBRARY_DIR}")
|
||||||
else()
|
else()
|
||||||
list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TCL_LIBRARY_DIR)
|
list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_TCL_LIBRARY_DIR)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
if (3RDPARTY_TCL_DLL OR EXISTS "${3RDPARTY_TCL_DLL}")
|
if (3RDPARTY_TCL_DLL OR EXISTS "${3RDPARTY_TCL_DLL}")
|
||||||
list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_TCL_DLL_DIR}")
|
list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_TCL_DLL_DIR}")
|
||||||
else()
|
else()
|
||||||
list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TCL_DLL_DIR)
|
list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_TCL_DLL_DIR)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@@ -190,14 +190,14 @@ if (BUILD_SHARED_LIBS)
|
|||||||
if (3RDPARTY_TK_LIBRARY AND EXISTS "${3RDPARTY_TK_LIBRARY}")
|
if (3RDPARTY_TK_LIBRARY AND EXISTS "${3RDPARTY_TK_LIBRARY}")
|
||||||
list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_TK_LIBRARY_DIR}")
|
list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_TK_LIBRARY_DIR}")
|
||||||
else()
|
else()
|
||||||
list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TK_LIBRARY_DIR)
|
list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_TK_LIBRARY_DIR)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
if (3RDPARTY_TK_DLL OR EXISTS "${3RDPARTY_TK_DLL}")
|
if (3RDPARTY_TK_DLL OR EXISTS "${3RDPARTY_TK_DLL}")
|
||||||
list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_TK_DLL_DIR}")
|
list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_TK_DLL_DIR}")
|
||||||
else()
|
else()
|
||||||
list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TK_DLL_DIR)
|
list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_TK_DLL_DIR)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@@ -28,6 +28,11 @@ Applies only for Debug configuration.")
|
|||||||
set (BUILD_SHARED_LIBRARY_NAME_POSTFIX_DESCR
|
set (BUILD_SHARED_LIBRARY_NAME_POSTFIX_DESCR
|
||||||
"Append the postfix to names of output libraries")
|
"Append the postfix to names of output libraries")
|
||||||
|
|
||||||
|
set (BUILD_RELEASE_DISABLE_EXCEPTIONS_DESCR
|
||||||
|
"Disables exceptions like Standard_OutOfRange in Release builds.
|
||||||
|
Defines No_Exception macros for Release builds when enabled (default).
|
||||||
|
These exceptions are always enabled in Debug builds, but disable in Release for better performance")
|
||||||
|
|
||||||
set (BUILD_ENABLE_FPE_SIGNAL_HANDLER_DESCR
|
set (BUILD_ENABLE_FPE_SIGNAL_HANDLER_DESCR
|
||||||
"Enable/Disable the floating point exceptions (FPE) during DRAW execution only.
|
"Enable/Disable the floating point exceptions (FPE) during DRAW execution only.
|
||||||
Corresponding environment variable (CSF_FPE) can be changed manually
|
Corresponding environment variable (CSF_FPE) can be changed manually
|
||||||
@@ -40,7 +45,7 @@ Precompiled headers are generated automatically by Cotire tool.")
|
|||||||
# install variables
|
# install variables
|
||||||
set (INSTALL_DIR_DESCR
|
set (INSTALL_DIR_DESCR
|
||||||
"The place where built OCCT libraries, headers, test cases (INSTALL_TEST_CASES variable),
|
"The place where built OCCT libraries, headers, test cases (INSTALL_TEST_CASES variable),
|
||||||
samples (INSTALL_SAMPLES_DESCR variable) and certain 3rdparties (INSTALL_GL2PS, INSTALL_TBB and
|
samples (INSTALL_SAMPLES_DESCR variable) and certain 3rdparties (INSTALL_TBB and
|
||||||
other similar variables) will be placed during the installation process (building INSTALL project)")
|
other similar variables) will be placed during the installation process (building INSTALL project)")
|
||||||
|
|
||||||
set (INSTALL_DIR_WITH_VERSION_DESCR
|
set (INSTALL_DIR_WITH_VERSION_DESCR
|
||||||
@@ -84,15 +89,15 @@ INSTALL_MESSAGE (INSTALL_TEST_CASES "non-regression OCCT test scripts")
|
|||||||
INSTALL_MESSAGE (INSTALL_DOC_Overview "OCCT overview documentation (HTML format)")
|
INSTALL_MESSAGE (INSTALL_DOC_Overview "OCCT overview documentation (HTML format)")
|
||||||
INSTALL_MESSAGE (INSTALL_FFMPEG "FFmpeg binaries")
|
INSTALL_MESSAGE (INSTALL_FFMPEG "FFmpeg binaries")
|
||||||
INSTALL_MESSAGE (INSTALL_FREEIMAGE "FreeImage binaries")
|
INSTALL_MESSAGE (INSTALL_FREEIMAGE "FreeImage binaries")
|
||||||
|
INSTALL_MESSAGE (INSTALL_EIGEN "EIGEN header files")
|
||||||
INSTALL_MESSAGE (INSTALL_EGL "EGL binaries")
|
INSTALL_MESSAGE (INSTALL_EGL "EGL binaries")
|
||||||
INSTALL_MESSAGE (INSTALL_GLES2 "OpenGL ES 2.0 binaries")
|
INSTALL_MESSAGE (INSTALL_GLES2 "OpenGL ES 2.0 binaries")
|
||||||
INSTALL_MESSAGE (INSTALL_FREETYPE "FreeType binaries")
|
INSTALL_MESSAGE (INSTALL_FREETYPE "FreeType binaries")
|
||||||
INSTALL_MESSAGE (INSTALL_GL2PS "GL2PS binaries")
|
|
||||||
INSTALL_MESSAGE (INSTALL_TBB "TBB binaries")
|
INSTALL_MESSAGE (INSTALL_TBB "TBB binaries")
|
||||||
|
INSTALL_MESSAGE (INSTALL_RAPIDJSON "RapidJSON header files")
|
||||||
INSTALL_MESSAGE (INSTALL_TCL "TCL binaries")
|
INSTALL_MESSAGE (INSTALL_TCL "TCL binaries")
|
||||||
INSTALL_MESSAGE (INSTALL_TK "TK binaries")
|
INSTALL_MESSAGE (INSTALL_TK "TK binaries")
|
||||||
|
INSTALL_MESSAGE (INSTALL_VTK "VTK binaries ")
|
||||||
#INSTALL_MESSAGE (INSTALL_VTK "VTK binaries ")
|
|
||||||
|
|
||||||
# build variables
|
# build variables
|
||||||
macro (BUILD_MODULE_MESSAGE BUILD_MODULE_TARGET_VARIABLE BUILD_MODULE_TARGET_STRING)
|
macro (BUILD_MODULE_MESSAGE BUILD_MODULE_TARGET_VARIABLE BUILD_MODULE_TARGET_STRING)
|
||||||
@@ -117,11 +122,23 @@ want to build some particular libraries (toolkits) only, then you may uncheck
|
|||||||
all modules in the corresponding BUILD_MODUE_* options and provide the list of
|
all modules in the corresponding BUILD_MODUE_* options and provide the list of
|
||||||
necessary libraries here. Of course, all dependencies will be resolved automatically")
|
necessary libraries here. Of course, all dependencies will be resolved automatically")
|
||||||
|
|
||||||
set (BUILD_MODULE_MfcSamples_DESCR
|
set (BUILD_SAMPLES_MFC_DESCR
|
||||||
"Indicates whether OCCT MFC samples should be built together with OCCT.
|
"Indicates whether OCCT MFC samples should be built together with OCCT.
|
||||||
These samples show some possibilities of using OCCT and they can be executed
|
These samples show some possibilities of using OCCT and they can be executed
|
||||||
with script samples.bat from the installation directory (INSTALL_DIR)")
|
with script samples.bat from the installation directory (INSTALL_DIR)")
|
||||||
|
|
||||||
|
set (BUILD_SAMPLES_QT_DESCR
|
||||||
|
"Indicates whether OCCT Qt samples should be built together with OCCT.
|
||||||
|
These samples show some possibilities of using OCCT and they can be executed
|
||||||
|
with script samples.bat from the installation directory (INSTALL_DIR)")
|
||||||
|
|
||||||
|
set (BUILD_Inspector_DESCR
|
||||||
|
"Indicates whether OCCT inspector should be built together with OCCT.
|
||||||
|
This inspector provides functionality to interactively inspect low-level content
|
||||||
|
of the OCAF data model, OCCT viewer, etc. have been introduced in OCCT.
|
||||||
|
It can be executed with script inspector.bat from the installation directory (INSTALL_DIR) or
|
||||||
|
using 'tinspector' command in DRAW interpretator")
|
||||||
|
|
||||||
set (BUILD_MODULE_UwpSample_DESCR
|
set (BUILD_MODULE_UwpSample_DESCR
|
||||||
"Indicates whether OCCT UWP sample should be built together with OCCT.")
|
"Indicates whether OCCT UWP sample should be built together with OCCT.")
|
||||||
|
|
||||||
@@ -145,6 +162,10 @@ set (USE_FREEIMAGE_DESCR
|
|||||||
"Indicates whether Freeimage product should be used in OCCT visualization
|
"Indicates whether Freeimage product should be used in OCCT visualization
|
||||||
module for support of popular graphics image formats (PNG, BMP etc)")
|
module for support of popular graphics image formats (PNG, BMP etc)")
|
||||||
|
|
||||||
|
set (USE_RAPIDJSON_DESCR
|
||||||
|
"Indicates whether RapidJSON product should be used in OCCT DataExchange
|
||||||
|
module for support of JSON-based formats like glTF")
|
||||||
|
|
||||||
set (USE_EGL_DESCR
|
set (USE_EGL_DESCR
|
||||||
"Indicates whether EGL should be used in OCCT visualization
|
"Indicates whether EGL should be used in OCCT visualization
|
||||||
module instead of conventional OpenGL context creation APIs")
|
module instead of conventional OpenGL context creation APIs")
|
||||||
@@ -153,10 +174,6 @@ set (USE_GLES2_DESCR
|
|||||||
"Indicates whether OpenGL ES 2.0 should be used in OCCT visualization
|
"Indicates whether OpenGL ES 2.0 should be used in OCCT visualization
|
||||||
module instead of desktop OpenGL")
|
module instead of desktop OpenGL")
|
||||||
|
|
||||||
set (USE_GL2PS_DESCR
|
|
||||||
"Indicates whether GL2PS product should be used in OCCT visualization
|
|
||||||
module for support of vector image formats (PS, EPS etc)")
|
|
||||||
|
|
||||||
set (USE_TBB_DESCR
|
set (USE_TBB_DESCR
|
||||||
"Indicates whether TBB is used or not. TBB stands for Threading Building Blocks,
|
"Indicates whether TBB is used or not. TBB stands for Threading Building Blocks,
|
||||||
the technology of Intel Corp, which comes with different mechanisms and patterns for
|
the technology of Intel Corp, which comes with different mechanisms and patterns for
|
||||||
@@ -172,11 +189,6 @@ set (USE_GLX_DESCR "Indicates whether X11 OpenGl on OSX is used or not")
|
|||||||
|
|
||||||
set (USE_D3D_DESCR "Indicates whether optional Direct3D wrapper in OCCT visualization module should be build or not")
|
set (USE_D3D_DESCR "Indicates whether optional Direct3D wrapper in OCCT visualization module should be build or not")
|
||||||
|
|
||||||
set (BUILD_QT_TOOLS_DESCR "Indicates whether OCCT tools should be build or not")
|
|
||||||
|
|
||||||
set (USE_QT_TOOLS_DESCR "Indicates whether OCCT tools should be used or not
|
|
||||||
The tools will be searched in third-party directory or may be set manually")
|
|
||||||
|
|
||||||
macro (BUILD_MODULE MODULE_NAME)
|
macro (BUILD_MODULE MODULE_NAME)
|
||||||
set (ENABLE_MODULE TRUE)
|
set (ENABLE_MODULE TRUE)
|
||||||
set (BUILD_MODULE_${MODULE_NAME} ${ENABLE_MODULE} CACHE BOOL "${BUILD_MODULE_${MODULE_NAME}_DESCR}")
|
set (BUILD_MODULE_${MODULE_NAME} ${ENABLE_MODULE} CACHE BOOL "${BUILD_MODULE_${MODULE_NAME}_DESCR}")
|
||||||
|
@@ -1,8 +1,8 @@
|
|||||||
# vtk
|
# vtk
|
||||||
|
|
||||||
#if (NOT DEFINED INSTALL_VTK)
|
if (NOT DEFINED INSTALL_VTK)
|
||||||
# set (INSTALL_VTK OFF CACHE BOOL "${INSTALL_VTK_DESCR}")
|
set (INSTALL_VTK OFF CACHE BOOL "${INSTALL_VTK_DESCR}")
|
||||||
#endif()
|
endif()
|
||||||
|
|
||||||
# vtk directory
|
# vtk directory
|
||||||
if (NOT DEFINED 3RDPARTY_VTK_DIR)
|
if (NOT DEFINED 3RDPARTY_VTK_DIR)
|
||||||
@@ -31,7 +31,7 @@ if (NOT DEFINED 3RDPARTY_VTK_INCLUDE_DIR)
|
|||||||
set (3RDPARTY_VTK_INCLUDE_DIR "" CACHE PATH "The directory containing headers of VTK")
|
set (3RDPARTY_VTK_INCLUDE_DIR "" CACHE PATH "The directory containing headers of VTK")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (BUILD_SHARED_LIBS)
|
#if (BUILD_SHARED_LIBS)
|
||||||
# vtk library directory
|
# vtk library directory
|
||||||
if (NOT DEFINED 3RDPARTY_VTK_LIBRARY_DIR)
|
if (NOT DEFINED 3RDPARTY_VTK_LIBRARY_DIR)
|
||||||
set (3RDPARTY_VTK_LIBRARY_DIR "" CACHE PATH "The directory containing VTK libraries")
|
set (3RDPARTY_VTK_LIBRARY_DIR "" CACHE PATH "The directory containing VTK libraries")
|
||||||
@@ -41,7 +41,7 @@ if (BUILD_SHARED_LIBS)
|
|||||||
if (WIN32 AND NOT DEFINED 3RDPARTY_VTK_DLL_DIR)
|
if (WIN32 AND NOT DEFINED 3RDPARTY_VTK_DLL_DIR)
|
||||||
set (3RDPARTY_VTK_DLL_DIR "" CACHE PATH "The directory containing VTK shared libraries")
|
set (3RDPARTY_VTK_DLL_DIR "" CACHE PATH "The directory containing VTK shared libraries")
|
||||||
endif()
|
endif()
|
||||||
endif()
|
#endif()
|
||||||
|
|
||||||
# check 3RDPARTY_VTK_ paths for consistency with specified 3RDPARTY_VTK_DIR
|
# check 3RDPARTY_VTK_ paths for consistency with specified 3RDPARTY_VTK_DIR
|
||||||
if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
|
if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
|
||||||
@@ -75,10 +75,10 @@ if (VTK_FOUND)
|
|||||||
|
|
||||||
set (3RDPARTY_VTK_INCLUDE_DIRS)
|
set (3RDPARTY_VTK_INCLUDE_DIRS)
|
||||||
|
|
||||||
if (BUILD_SHARED_LIBS)
|
# if (BUILD_SHARED_LIBS)
|
||||||
set (3RDPARTY_VTK_LIBRARY_DIRS)
|
set (3RDPARTY_VTK_LIBRARY_DIRS)
|
||||||
set (3RDPARTY_VTK_DLL_DIRS)
|
set (3RDPARTY_VTK_DLL_DIRS)
|
||||||
endif()
|
# endif()
|
||||||
|
|
||||||
foreach (VTK_LIBRARY ${VTK_LIBRARIES})
|
foreach (VTK_LIBRARY ${VTK_LIBRARIES})
|
||||||
string (REGEX MATCH "^vtk" IS_VTK_LIBRARY ${VTK_LIBRARY})
|
string (REGEX MATCH "^vtk" IS_VTK_LIBRARY ${VTK_LIBRARY})
|
||||||
@@ -168,7 +168,7 @@ if (VTK_FOUND)
|
|||||||
set (3RDPARTY_VTK_INCLUDE_DIR "${3RDPARTY_VTK_INCLUDE_DIR}" CACHE PATH "The directory containing headers of VTK" FORCE)
|
set (3RDPARTY_VTK_INCLUDE_DIR "${3RDPARTY_VTK_INCLUDE_DIR}" CACHE PATH "The directory containing headers of VTK" FORCE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (BUILD_SHARED_LIBS)
|
# if (BUILD_SHARED_LIBS)
|
||||||
if (3RDPARTY_VTK_LIBRARY_DIRS)
|
if (3RDPARTY_VTK_LIBRARY_DIRS)
|
||||||
list (REMOVE_DUPLICATES 3RDPARTY_VTK_LIBRARY_DIRS)
|
list (REMOVE_DUPLICATES 3RDPARTY_VTK_LIBRARY_DIRS)
|
||||||
list (APPEND 3RDPARTY_LIBRARY_DIRS ${3RDPARTY_VTK_LIBRARY_DIRS})
|
list (APPEND 3RDPARTY_LIBRARY_DIRS ${3RDPARTY_VTK_LIBRARY_DIRS})
|
||||||
@@ -186,7 +186,7 @@ if (VTK_FOUND)
|
|||||||
set (3RDPARTY_VTK_DLL_DIR "${3RDPARTY_VTK_DLL_DIR}" CACHE PATH "The directory containing VTK shared libraries" FORCE)
|
set (3RDPARTY_VTK_DLL_DIR "${3RDPARTY_VTK_DLL_DIR}" CACHE PATH "The directory containing VTK shared libraries" FORCE)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
# endif()
|
||||||
|
|
||||||
if (3RDPARTY_VTK_INCLUDE_DIR AND EXISTS "${3RDPARTY_VTK_INCLUDE_DIR}")
|
if (3RDPARTY_VTK_INCLUDE_DIR AND EXISTS "${3RDPARTY_VTK_INCLUDE_DIR}")
|
||||||
list (APPEND 3RDPARTY_INCLUDE_DIRS ${3RDPARTY_VTK_INCLUDE_DIR})
|
list (APPEND 3RDPARTY_INCLUDE_DIRS ${3RDPARTY_VTK_INCLUDE_DIR})
|
||||||
@@ -198,23 +198,98 @@ if (BUILD_SHARED_LIBS)
|
|||||||
if (3RDPARTY_VTK_LIBRARY_DIR AND EXISTS "${3RDPARTY_VTK_LIBRARY_DIR}")
|
if (3RDPARTY_VTK_LIBRARY_DIR AND EXISTS "${3RDPARTY_VTK_LIBRARY_DIR}")
|
||||||
list (APPEND 3RDPARTY_LIBRARY_DIRS ${3RDPARTY_VTK_LIBRARY_DIR})
|
list (APPEND 3RDPARTY_LIBRARY_DIRS ${3RDPARTY_VTK_LIBRARY_DIR})
|
||||||
else()
|
else()
|
||||||
list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_VTK_LIBRARY_DIR)
|
list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_VTK_LIBRARY_DIR)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
if (3RDPARTY_VTK_DLL_DIR OR EXISTS "${3RDPARTY_VTK_DLL_DIR}")
|
if (3RDPARTY_VTK_DLL_DIR OR EXISTS "${3RDPARTY_VTK_DLL_DIR}")
|
||||||
list (APPEND 3RDPARTY_DLL_DIRS ${3RDPARTY_VTK_DLL_DIR})
|
list (APPEND 3RDPARTY_DLL_DIRS ${3RDPARTY_VTK_DLL_DIR})
|
||||||
else()
|
else()
|
||||||
list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_VTK_DLL_DIR)
|
list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_VTK_DLL_DIR)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# Install vtk library using vtk targets
|
||||||
|
macro (OCCT_INSTALL_VTK VTK_LIBRARY_NAME)
|
||||||
|
# Check that input library name contains "vtk" prefix
|
||||||
|
string (REGEX MATCH "^vtk" IS_VTK_LIBRARY ${VTK_LIBRARY_NAME})
|
||||||
|
# Check that input library was not already installed
|
||||||
|
list (FIND OCCT_VTK_USED_TARGETS ${VTK_LIBRARY_NAME} VTK_LIBRARY_IS_USED)
|
||||||
|
if (BUILD_SHARED_LIBS AND INSTALL_VTK AND TARGET ${VTK_LIBRARY_NAME} AND VTK_LIBRARY_IS_USED EQUAL -1 AND IS_VTK_LIBRARY)
|
||||||
|
OCCT_MAKE_OS_WITH_BITNESS()
|
||||||
|
|
||||||
|
# Get configuration of vtk
|
||||||
|
get_target_property (TARGET_VTK_IMPORT_CONFS ${VTK_LIBRARY_NAME} IMPORTED_CONFIGURATIONS)
|
||||||
|
list (GET TARGET_VTK_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
|
||||||
|
|
||||||
|
# Get dependencies for current input library
|
||||||
|
get_property(VTK_LIBRARY_PATH TARGET ${VTK_LIBRARY_NAME} PROPERTY LOCATION)
|
||||||
|
get_property(VTK_DEPEND TARGET ${VTK_LIBRARY_NAME} PROPERTY IMPORTED_LINK_DEPENDENT_LIBRARIES_${CHOSEN_IMPORT_CONF})
|
||||||
|
get_property(VTK_IMPORTED_INTERFACE TARGET ${VTK_LIBRARY_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES_${CHOSEN_IMPORT_CONF})
|
||||||
|
get_property(VTK_INTERFACE TARGET ${VTK_LIBRARY_NAME} PROPERTY INTERFACE_LINK_LIBRARIES)
|
||||||
|
list (APPEND VTK_DEPEND ${VTK_INTERFACE} ${VTK_IMPORTED_INTERFACE})
|
||||||
|
|
||||||
|
# Install
|
||||||
|
if (WIN32)
|
||||||
|
if (SINGLE_GENERATOR)
|
||||||
|
install (FILES "${VTK_LIBRARY_PATH}" DESTINATION "${INSTALL_DIR_BIN}")
|
||||||
|
else()
|
||||||
|
install (FILES "${VTK_LIBRARY_PATH}"
|
||||||
|
CONFIGURATIONS Release
|
||||||
|
DESTINATION "${INSTALL_DIR_BIN}")
|
||||||
|
install (FILES "${VTK_LIBRARY_PATH}"
|
||||||
|
CONFIGURATIONS RelWithDebInfo
|
||||||
|
DESTINATION "${INSTALL_DIR_BIN}i")
|
||||||
|
install (FILES "${VTK_LIBRARY_PATH}"
|
||||||
|
CONFIGURATIONS Debug
|
||||||
|
DESTINATION "${INSTALL_DIR_BIN}d")
|
||||||
|
endif()
|
||||||
|
else()
|
||||||
|
get_filename_component(3RDPARTY_VTK_LIBRARY_ABS ${VTK_LIBRARY_PATH} REALPATH)
|
||||||
|
|
||||||
|
if (SINGLE_GENERATOR)
|
||||||
|
install (FILES "${3RDPARTY_VTK_LIBRARY_ABS}"
|
||||||
|
DESTINATION "${INSTALL_DIR_LIB}")
|
||||||
|
else()
|
||||||
|
install (FILES "${3RDPARTY_VTK_LIBRARY_ABS}"
|
||||||
|
CONFIGURATIONS Release
|
||||||
|
DESTINATION "${INSTALL_DIR_LIB}")
|
||||||
|
install (FILES "${3RDPARTY_VTK_LIBRARY_ABS}"
|
||||||
|
CONFIGURATIONS RelWithDebInfo
|
||||||
|
DESTINATION "${INSTALL_DIR_LIB}i")
|
||||||
|
install (FILES "${3RDPARTY_VTK_LIBRARY_ABS}"
|
||||||
|
CONFIGURATIONS Debug
|
||||||
|
DESTINATION "${INSTALL_DIR_LIB}d")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set (USED_3RDPARTY_VTK_DIR "")
|
||||||
|
|
||||||
|
# Mark current library as already installed
|
||||||
|
list (APPEND OCCT_VTK_USED_TARGETS ${VTK_LIBRARY_NAME})
|
||||||
|
set (OCCT_VTK_USED_TARGETS "${OCCT_VTK_USED_TARGETS}" CACHE INTERNAL "" FORCE)
|
||||||
|
|
||||||
|
# Recursively install all depended libraries
|
||||||
|
foreach(VTK_TARGET ${VTK_DEPEND})
|
||||||
|
OCCT_INSTALL_VTK(${VTK_TARGET})
|
||||||
|
endforeach()
|
||||||
|
endif()
|
||||||
|
endmacro()
|
||||||
|
|
||||||
|
if (NOT BUILD_SHARED_LIBS)
|
||||||
|
OCCT_CHECK_AND_UNSET(3RDPARTY_VTK_DLL_DIR)
|
||||||
|
OCCT_CHECK_AND_UNSET(3RDPARTY_VTK_LIBRARY_DIR)
|
||||||
|
OCCT_CHECK_AND_UNSET(INSTALL_VTK)
|
||||||
|
endif()
|
||||||
|
|
||||||
# the library directory for using by the executable
|
# the library directory for using by the executable
|
||||||
if (WIN32)
|
if (NOT INSTALL_VTK)
|
||||||
set (USED_3RDPARTY_VTK_DIR ${3RDPARTY_VTK_DLL_DIR})
|
if (WIN32)
|
||||||
else()
|
set (USED_3RDPARTY_VTK_DIR ${3RDPARTY_VTK_DLL_DIR})
|
||||||
set (USED_3RDPARTY_VTK_DIR ${3RDPARTY_VTK_LIBRARY_DIR})
|
else()
|
||||||
|
set (USED_3RDPARTY_VTK_DIR ${3RDPARTY_VTK_LIBRARY_DIR})
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
OCCT_CHECK_AND_UNSET (VTK_INCLUDE_DIRS)
|
OCCT_CHECK_AND_UNSET (VTK_INCLUDE_DIRS)
|
||||||
|
143
adm/genconf.tcl
@@ -24,21 +24,44 @@
|
|||||||
# load tools
|
# load tools
|
||||||
source [file join [file dirname [info script]] genconfdeps.tcl]
|
source [file join [file dirname [info script]] genconfdeps.tcl]
|
||||||
|
|
||||||
|
# proxy variable for implicit file path normalization
|
||||||
|
set PRODUCTS_PATH_INPUT "$::PRODUCTS_PATH"
|
||||||
|
|
||||||
package require Tk
|
package require Tk
|
||||||
|
|
||||||
set aRowIter 0
|
set aRowIter 0
|
||||||
set aCheckRowIter 0
|
set aCheckRowIter 0
|
||||||
frame .myFrame -padx 5 -pady 5
|
frame .myFrame -padx 5 -pady 5
|
||||||
pack .myFrame -fill both -expand 1
|
pack .myFrame -fill both -expand 1
|
||||||
|
frame .myFrame.myPrjFrame
|
||||||
frame .myFrame.myVsFrame
|
frame .myFrame.myVsFrame
|
||||||
frame .myFrame.myHxxChecks
|
frame .myFrame.myHxxChecks
|
||||||
frame .myFrame.myChecks
|
frame .myFrame.myChecks
|
||||||
|
|
||||||
|
# project file format
|
||||||
|
set SYS_PRJFMT_LIST {}
|
||||||
|
set SYS_PRJNAME_LIST {}
|
||||||
|
if { "$::tcl_platform(platform)" == "windows" } {
|
||||||
|
lappend ::SYS_PRJFMT_LIST "vcxproj"
|
||||||
|
lappend ::SYS_PRJNAME_LIST "Visual Studio (.vcxproj)"
|
||||||
|
}
|
||||||
|
if { "$tcl_platform(os)" == "Darwin" } {
|
||||||
|
lappend ::SYS_PRJFMT_LIST "xcd"
|
||||||
|
lappend ::SYS_PRJNAME_LIST "XCode (.xcd)"
|
||||||
|
}
|
||||||
|
lappend ::SYS_PRJFMT_LIST "cbp"
|
||||||
|
lappend ::SYS_PRJNAME_LIST "Code Blocks (.cbp)"
|
||||||
|
lappend ::SYS_PRJFMT_LIST "pro"
|
||||||
|
lappend ::SYS_PRJNAME_LIST "Qt Creator (.pro)"
|
||||||
|
|
||||||
|
set aPrjIndex [lsearch $::SYS_PRJFMT_LIST $::PRJFMT]
|
||||||
|
set ::PRJNAME [lindex $::SYS_PRJNAME_LIST $aPrjIndex]
|
||||||
|
|
||||||
set SYS_VS_LIST {}
|
set SYS_VS_LIST {}
|
||||||
set SYS_VC_LIST {}
|
set SYS_VC_LIST {}
|
||||||
set SYS_VCVARS_LIST {}
|
set SYS_VCVARS_LIST {}
|
||||||
|
|
||||||
# detect installed Visual Studio 2017 instances by running vswhere.exe
|
# detect installed Visual Studio 2017+ instances by running vswhere.exe
|
||||||
if { ! [catch {exec vswhere.exe -version "\[15.0,15.99\]" -latest -requires Microsoft.VisualStudio.Workload.NativeDesktop -property installationPath} res] } {
|
if { ! [catch {exec vswhere.exe -version "\[15.0,15.99\]" -latest -requires Microsoft.VisualStudio.Workload.NativeDesktop -property installationPath} res] } {
|
||||||
lappend ::SYS_VS_LIST "Visual Studio 2017 (15, toolset v141)"
|
lappend ::SYS_VS_LIST "Visual Studio 2017 (15, toolset v141)"
|
||||||
lappend ::SYS_VC_LIST "vc141"
|
lappend ::SYS_VC_LIST "vc141"
|
||||||
@@ -49,6 +72,21 @@ if { ! [catch {exec vswhere.exe -version "\[15.0,15.99\]" -latest -requires Micr
|
|||||||
lappend ::SYS_VC_LIST "vc141-uwp"
|
lappend ::SYS_VC_LIST "vc141-uwp"
|
||||||
lappend ::SYS_VCVARS_LIST "$res\\VC\\vcvarsall.bat"
|
lappend ::SYS_VCVARS_LIST "$res\\VC\\vcvarsall.bat"
|
||||||
}
|
}
|
||||||
|
if { ! [catch {exec vswhere.exe -version "\[16.0,16.99\]" -latest -requires Microsoft.VisualStudio.Workload.NativeDesktop -property installationPath} res] } {
|
||||||
|
lappend ::SYS_VS_LIST "Visual Studio 2019 (16, toolset v142)"
|
||||||
|
lappend ::SYS_VC_LIST "vc142"
|
||||||
|
lappend ::SYS_VCVARS_LIST "$res\\VC\\vcvarsall.bat"
|
||||||
|
}
|
||||||
|
if { ! [catch {exec vswhere.exe -version "\[16.0,16.99\]" -latest -requires Microsoft.VisualStudio.Workload.Universal -property installationPath} res] } {
|
||||||
|
lappend ::SYS_VS_LIST "Visual Studio 2019 (16, toolset v142) UWP"
|
||||||
|
lappend ::SYS_VC_LIST "vc142-uwp"
|
||||||
|
lappend ::SYS_VCVARS_LIST "$res\\VC\\vcvarsall.bat"
|
||||||
|
}
|
||||||
|
if { ! [catch {exec vswhere.exe -version "\[16.0,16.99\]" -latest -requires Microsoft.VisualStudio.Component.VC.ClangCL -property installationPath} res] } {
|
||||||
|
lappend ::SYS_VS_LIST "Visual Studio 2019 (16, toolset ClangCL)"
|
||||||
|
lappend ::SYS_VC_LIST "vclang"
|
||||||
|
lappend ::SYS_VCVARS_LIST "$res\\VC\\vcvarsall.bat"
|
||||||
|
}
|
||||||
|
|
||||||
# detect installed Visual Studio instances from global environment
|
# detect installed Visual Studio instances from global environment
|
||||||
if { [info exists ::env(VS140COMNTOOLS)] } {
|
if { [info exists ::env(VS140COMNTOOLS)] } {
|
||||||
@@ -101,6 +139,7 @@ proc wokdep:gui:Close {} {
|
|||||||
}
|
}
|
||||||
|
|
||||||
proc wokdep:gui:SwitchConfig {} {
|
proc wokdep:gui:SwitchConfig {} {
|
||||||
|
set ::PRJFMT [lindex $::SYS_PRJFMT_LIST [.myFrame.myPrjFrame.myPrjCombo current]]
|
||||||
set ::VCVER [lindex $::SYS_VC_LIST [.myFrame.myVsFrame.myVsCombo current]]
|
set ::VCVER [lindex $::SYS_VC_LIST [.myFrame.myVsFrame.myVsCombo current]]
|
||||||
set ::VCVARS [lindex $::SYS_VCVARS_LIST [.myFrame.myVsFrame.myVsCombo current]]
|
set ::VCVARS [lindex $::SYS_VCVARS_LIST [.myFrame.myVsFrame.myVsCombo current]]
|
||||||
|
|
||||||
@@ -139,12 +178,6 @@ proc wokdep:gui:UpdateList {} {
|
|||||||
wokdep:SearchFreeType anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
|
wokdep:SearchFreeType anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
|
||||||
wokdep:SearchX11 anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
|
wokdep:SearchX11 anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
|
||||||
if { "$::HAVE_GLES2" == "true" } {
|
if { "$::HAVE_GLES2" == "true" } {
|
||||||
if { "$::HAVE_GL2PS" == "true" } {
|
|
||||||
lappend anIncErrs "Error: gl2ps can not be used with OpenGL ES"
|
|
||||||
}
|
|
||||||
if { "$::HAVE_D3D" == "true" } {
|
|
||||||
lappend anIncErrs "Error: Direct3D can not be used with OpenGL ES"
|
|
||||||
}
|
|
||||||
wokdep:SearchEGL anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
|
wokdep:SearchEGL anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
|
||||||
wokdep:SearchGLES anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
|
wokdep:SearchGLES anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
|
||||||
}
|
}
|
||||||
@@ -154,8 +187,8 @@ proc wokdep:gui:UpdateList {} {
|
|||||||
if { "$::HAVE_FFMPEG" == "true" } {
|
if { "$::HAVE_FFMPEG" == "true" } {
|
||||||
wokdep:SearchFFmpeg anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
|
wokdep:SearchFFmpeg anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
|
||||||
}
|
}
|
||||||
if { "$::HAVE_GL2PS" == "true" } {
|
if { "$::HAVE_OPENVR" == "true" } {
|
||||||
wokdep:SearchStandardLibrary anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "gl2ps" "gl2ps.h" "gl2ps" {"gl2ps"}
|
wokdep:SearchOpenVR anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
|
||||||
}
|
}
|
||||||
if { "$::HAVE_TBB" == "true" } {
|
if { "$::HAVE_TBB" == "true" } {
|
||||||
wokdep:SearchTBB anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
|
wokdep:SearchTBB anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
|
||||||
@@ -168,7 +201,11 @@ proc wokdep:gui:UpdateList {} {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if { "$::HAVE_ZLIB" == "true" } {
|
if { "$::HAVE_ZLIB" == "true" } {
|
||||||
wokdep:SearchStandardLibrary anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "zlib" "zlib.h" "zlib" {"zlib"}
|
set aCheckLib "z"
|
||||||
|
if { "$::tcl_platform(platform)" == "windows" } {
|
||||||
|
set aCheckLib "zlib"
|
||||||
|
}
|
||||||
|
wokdep:SearchStandardLibrary anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "zlib" "zlib.h" "$aCheckLib" {"zlib"}
|
||||||
}
|
}
|
||||||
if { "$::HAVE_LIBLZMA" == "true" } {
|
if { "$::HAVE_LIBLZMA" == "true" } {
|
||||||
set aCheckLib "lzma"
|
set aCheckLib "lzma"
|
||||||
@@ -177,10 +214,26 @@ proc wokdep:gui:UpdateList {} {
|
|||||||
}
|
}
|
||||||
wokdep:SearchStandardLibrary anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "liblzma" "lzma.h" "$aCheckLib" {"lzma" "xz"}
|
wokdep:SearchStandardLibrary anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "liblzma" "lzma.h" "$aCheckLib" {"lzma" "xz"}
|
||||||
}
|
}
|
||||||
|
if { "$::HAVE_E57" == "true" } {
|
||||||
if { "$::CHECK_QT4" == "true" } {
|
wokdep:SearchStandardLibrary anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "e57" "e57/E57Foundation.h" "E57RefImpl" {"e57"}
|
||||||
wokdep:SearchQt4 anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
|
set aCheckLib "xerces-c"
|
||||||
|
if { "$::tcl_platform(platform)" == "windows" } {
|
||||||
|
set aCheckLib "xerces-c_3"
|
||||||
|
}
|
||||||
|
wokdep:SearchStandardLibrary anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "xerces-c" "xercesc/sax2/XMLReaderFactory.hpp" "$aCheckLib" {"xerces"}
|
||||||
}
|
}
|
||||||
|
if { "$::HAVE_RAPIDJSON" == "true" } {
|
||||||
|
wokdep:SearchRapidJson anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
|
||||||
|
}
|
||||||
|
|
||||||
|
if {"$::BUILD_Inspector" == "true" } {
|
||||||
|
set ::CHECK_QT "true"
|
||||||
|
}
|
||||||
|
|
||||||
|
if { "$::CHECK_QT" == "true" } {
|
||||||
|
wokdep:SearchQt anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
|
||||||
|
}
|
||||||
|
|
||||||
if { "$::CHECK_JDK" == "true" } {
|
if { "$::CHECK_JDK" == "true" } {
|
||||||
wokdep:SearchJDK anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
|
wokdep:SearchJDK anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
|
||||||
}
|
}
|
||||||
@@ -200,9 +253,9 @@ proc wokdep:gui:BrowseVcVars {} {
|
|||||||
}
|
}
|
||||||
|
|
||||||
proc wokdep:gui:BrowsePartiesRoot {} {
|
proc wokdep:gui:BrowsePartiesRoot {} {
|
||||||
set aResult [tk_chooseDirectory -initialdir $::PRODUCTS_PATH -title "Choose a directory"]
|
set aResult [tk_chooseDirectory -initialdir $::PRODUCTS_PATH_INPUT -title "Choose a directory"]
|
||||||
if { "$aResult" != "" } {
|
if { "$aResult" != "" } {
|
||||||
set ::PRODUCTS_PATH $aResult
|
set ::PRODUCTS_PATH_INPUT $aResult
|
||||||
wokdep:gui:UpdateList
|
wokdep:gui:UpdateList
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -399,6 +452,8 @@ proc wokdep:gui:Show64Bitness { theRowIter } {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Header
|
# Header
|
||||||
|
ttk::label .myFrame.myPrjFrame.myPrjLbl -text "Project format:" -padding {5 5 20 5}
|
||||||
|
ttk::combobox .myFrame.myPrjFrame.myPrjCombo -values $SYS_PRJNAME_LIST -state readonly -textvariable PRJNAME -width 40
|
||||||
ttk::label .myFrame.myVsFrame.myVsLbl -text "Visual Studio configuration:" -padding {5 5 20 5}
|
ttk::label .myFrame.myVsFrame.myVsLbl -text "Visual Studio configuration:" -padding {5 5 20 5}
|
||||||
ttk::combobox .myFrame.myVsFrame.myVsCombo -values $SYS_VS_LIST -state readonly -textvariable VSVER -width 40
|
ttk::combobox .myFrame.myVsFrame.myVsCombo -values $SYS_VS_LIST -state readonly -textvariable VSVER -width 40
|
||||||
ttk::combobox .myFrame.myVsFrame.myArchCombo -values { {32} {64} } -textvariable ARCH -state readonly -width 6
|
ttk::combobox .myFrame.myVsFrame.myArchCombo -values { {32} {64} } -textvariable ARCH -state readonly -width 6
|
||||||
@@ -414,14 +469,14 @@ ttk::label .myFrame.myHxxChecks.myScutsLbl -text "Strategy for filling he
|
|||||||
|
|
||||||
#
|
#
|
||||||
ttk::label .myFrame.mySrchLbl -text "3rd-parties search path:" -padding {5 5 80 5}
|
ttk::label .myFrame.mySrchLbl -text "3rd-parties search path:" -padding {5 5 80 5}
|
||||||
entry .myFrame.mySrchEntry -textvariable PRODUCTS_PATH -width 80
|
entry .myFrame.mySrchEntry -textvariable PRODUCTS_PATH_INPUT -width 80
|
||||||
ttk::button .myFrame.mySrchBrowseBtn -text "Browse" -command wokdep:gui:BrowsePartiesRoot
|
ttk::button .myFrame.mySrchBrowseBtn -text "Browse" -command wokdep:gui:BrowsePartiesRoot
|
||||||
checkbutton .myFrame.myChecks.myFImageCheck -offvalue "false" -onvalue "true" -variable HAVE_FREEIMAGE -command wokdep:gui:UpdateList
|
checkbutton .myFrame.myChecks.myFImageCheck -offvalue "false" -onvalue "true" -variable HAVE_FREEIMAGE -command wokdep:gui:UpdateList
|
||||||
ttk::label .myFrame.myChecks.myFImageLbl -text "Use FreeImage"
|
ttk::label .myFrame.myChecks.myFImageLbl -text "Use FreeImage"
|
||||||
checkbutton .myFrame.myChecks.myGl2psCheck -offvalue "false" -onvalue "true" -variable HAVE_GL2PS -command wokdep:gui:UpdateList
|
|
||||||
ttk::label .myFrame.myChecks.myGl2psLbl -text "Use GL2PS"
|
|
||||||
checkbutton .myFrame.myChecks.myTbbCheck -offvalue "false" -onvalue "true" -variable HAVE_TBB -command wokdep:gui:UpdateList
|
checkbutton .myFrame.myChecks.myTbbCheck -offvalue "false" -onvalue "true" -variable HAVE_TBB -command wokdep:gui:UpdateList
|
||||||
ttk::label .myFrame.myChecks.myTbbLbl -text "Use Intel TBB"
|
ttk::label .myFrame.myChecks.myTbbLbl -text "Use Intel TBB"
|
||||||
|
checkbutton .myFrame.myChecks.myOpenVrCheck -offvalue "false" -onvalue "true" -variable HAVE_OPENVR -command wokdep:gui:UpdateList
|
||||||
|
ttk::label .myFrame.myChecks.myOpenVrLbl -text "Use OpenVR"
|
||||||
if { "$::tcl_platform(os)" != "Darwin" } {
|
if { "$::tcl_platform(os)" != "Darwin" } {
|
||||||
checkbutton .myFrame.myChecks.myGlesCheck -offvalue "false" -onvalue "true" -variable HAVE_GLES2 -command wokdep:gui:UpdateList
|
checkbutton .myFrame.myChecks.myGlesCheck -offvalue "false" -onvalue "true" -variable HAVE_GLES2 -command wokdep:gui:UpdateList
|
||||||
ttk::label .myFrame.myChecks.myGlesLbl -text "Use OpenGL ES"
|
ttk::label .myFrame.myChecks.myGlesLbl -text "Use OpenGL ES"
|
||||||
@@ -434,6 +489,9 @@ checkbutton .myFrame.myChecks.myFFmpegCheck -offvalue "false" -onvalue "true
|
|||||||
ttk::label .myFrame.myChecks.myFFmpegLbl -text "Use FFmpeg"
|
ttk::label .myFrame.myChecks.myFFmpegLbl -text "Use FFmpeg"
|
||||||
#checkbutton .myFrame.myChecks.myOpenClCheck -offvalue "false" -onvalue "true" -variable HAVE_OPENCL -command wokdep:gui:UpdateList
|
#checkbutton .myFrame.myChecks.myOpenClCheck -offvalue "false" -onvalue "true" -variable HAVE_OPENCL -command wokdep:gui:UpdateList
|
||||||
#ttk::label .myFrame.myChecks.myOpenClLbl -text "Use OpenCL"
|
#ttk::label .myFrame.myChecks.myOpenClLbl -text "Use OpenCL"
|
||||||
|
checkbutton .myFrame.myChecks.myRapidJsonCheck -offvalue "false" -onvalue "true" -variable HAVE_RAPIDJSON -command wokdep:gui:UpdateList
|
||||||
|
ttk::label .myFrame.myChecks.myRapidJsonLbl -text "Use RapidJSON"
|
||||||
|
|
||||||
checkbutton .myFrame.myChecks.myMacGLXCheck -offvalue "false" -onvalue "true" -variable MACOSX_USE_GLX
|
checkbutton .myFrame.myChecks.myMacGLXCheck -offvalue "false" -onvalue "true" -variable MACOSX_USE_GLX
|
||||||
ttk::label .myFrame.myChecks.myMacGLXLbl -text "Use X11 for windows drawing"
|
ttk::label .myFrame.myChecks.myMacGLXLbl -text "Use X11 for windows drawing"
|
||||||
ttk::label .myFrame.myChecks.myVtkLbl -text "Use VTK"
|
ttk::label .myFrame.myChecks.myVtkLbl -text "Use VTK"
|
||||||
@@ -443,12 +501,19 @@ checkbutton .myFrame.myChecks.myZLibCheck -offvalue "false" -onvalue "true
|
|||||||
ttk::label .myFrame.myChecks.myZLibLbl -text "Use zlib"
|
ttk::label .myFrame.myChecks.myZLibLbl -text "Use zlib"
|
||||||
checkbutton .myFrame.myChecks.myLzmaCheck -offvalue "false" -onvalue "true" -variable HAVE_LIBLZMA -command wokdep:gui:UpdateList
|
checkbutton .myFrame.myChecks.myLzmaCheck -offvalue "false" -onvalue "true" -variable HAVE_LIBLZMA -command wokdep:gui:UpdateList
|
||||||
ttk::label .myFrame.myChecks.myLzmaLbl -text "Use liblzma"
|
ttk::label .myFrame.myChecks.myLzmaLbl -text "Use liblzma"
|
||||||
|
checkbutton .myFrame.myChecks.myE57Check -offvalue "false" -onvalue "true" -variable HAVE_E57 -command wokdep:gui:UpdateList
|
||||||
|
ttk::label .myFrame.myChecks.myE57Lbl -text "Use E57"
|
||||||
|
|
||||||
checkbutton .myFrame.myChecks.myQt4Check -offvalue "false" -onvalue "true" -variable CHECK_QT4 -command wokdep:gui:UpdateList
|
checkbutton .myFrame.myChecks.myQtCheck -offvalue "false" -onvalue "true" -variable CHECK_QT -command wokdep:gui:UpdateList
|
||||||
ttk::label .myFrame.myChecks.myQt4Lbl -text "Search Qt4"
|
ttk::label .myFrame.myChecks.myQtLbl -text "Search Qt"
|
||||||
checkbutton .myFrame.myChecks.myJDKCheck -offvalue "false" -onvalue "true" -variable CHECK_JDK -command wokdep:gui:UpdateList
|
checkbutton .myFrame.myChecks.myJDKCheck -offvalue "false" -onvalue "true" -variable CHECK_JDK -command wokdep:gui:UpdateList
|
||||||
ttk::label .myFrame.myChecks.myJDKLbl -text "Search JDK"
|
ttk::label .myFrame.myChecks.myJDKLbl -text "Search JDK"
|
||||||
|
|
||||||
|
if { "$::tcl_platform(platform)" == "windows" } {
|
||||||
|
checkbutton .myFrame.myChecks.myInspectorBuild -offvalue "false" -onvalue "true" -variable BUILD_Inspector -command wokdep:gui:UpdateList
|
||||||
|
ttk::label .myFrame.myChecks.myInspectorLbl -text "Build Inspector"
|
||||||
|
}
|
||||||
|
|
||||||
# Additional headers search paths
|
# Additional headers search paths
|
||||||
ttk::label .myFrame.myIncLbl -text "Additional headers search paths:" -padding {5 5 80 5}
|
ttk::label .myFrame.myIncLbl -text "Additional headers search paths:" -padding {5 5 80 5}
|
||||||
scrollbar .myFrame.myIncScrl -command ".myFrame.myIncList yview"
|
scrollbar .myFrame.myIncScrl -command ".myFrame.myIncList yview"
|
||||||
@@ -505,6 +570,10 @@ ttk::button .myFrame.myClose -text "Close" -command wokdep:gui:Close
|
|||||||
|
|
||||||
# Create grid
|
# Create grid
|
||||||
# Header
|
# Header
|
||||||
|
grid .myFrame.myPrjFrame -row $aRowIter -column 0 -columnspan 10 -sticky w
|
||||||
|
grid .myFrame.myPrjFrame.myPrjLbl -row 0 -column 0
|
||||||
|
grid .myFrame.myPrjFrame.myPrjCombo -row 0 -column 1
|
||||||
|
incr aRowIter
|
||||||
if { "$tcl_platform(platform)" == "windows" } {
|
if { "$tcl_platform(platform)" == "windows" } {
|
||||||
grid .myFrame.myVsFrame -row $aRowIter -column 0 -columnspan 10 -sticky w
|
grid .myFrame.myVsFrame -row $aRowIter -column 0 -columnspan 10 -sticky w
|
||||||
grid .myFrame.myVsFrame.myVsLbl -row 0 -column 0
|
grid .myFrame.myVsFrame.myVsLbl -row 0 -column 0
|
||||||
@@ -548,11 +617,8 @@ if { "$::tcl_platform(os)" != "Darwin" } {
|
|||||||
grid .myFrame.myChecks.myZLibCheck -row $aCheckRowIter -column 6 -sticky e
|
grid .myFrame.myChecks.myZLibCheck -row $aCheckRowIter -column 6 -sticky e
|
||||||
grid .myFrame.myChecks.myZLibLbl -row $aCheckRowIter -column 7 -sticky w
|
grid .myFrame.myChecks.myZLibLbl -row $aCheckRowIter -column 7 -sticky w
|
||||||
|
|
||||||
grid .myFrame.myChecks.myGl2psCheck -row $aCheckRowIter -column 8 -sticky e
|
grid .myFrame.myChecks.myQtCheck -row $aCheckRowIter -column 12 -sticky e
|
||||||
grid .myFrame.myChecks.myGl2psLbl -row $aCheckRowIter -column 9 -sticky w
|
grid .myFrame.myChecks.myQtLbl -row $aCheckRowIter -column 13 -sticky w
|
||||||
|
|
||||||
grid .myFrame.myChecks.myQt4Check -row $aCheckRowIter -column 10 -sticky e
|
|
||||||
grid .myFrame.myChecks.myQt4Lbl -row $aCheckRowIter -column 11 -sticky w
|
|
||||||
|
|
||||||
incr aCheckRowIter
|
incr aCheckRowIter
|
||||||
grid .myFrame.myChecks.myFFmpegCheck -row $aCheckRowIter -column 0 -sticky e
|
grid .myFrame.myChecks.myFFmpegCheck -row $aCheckRowIter -column 0 -sticky e
|
||||||
@@ -562,19 +628,30 @@ grid .myFrame.myChecks.myVtkLbl -row $aCheckRowIter -column 3 -sticky w
|
|||||||
if { "$::tcl_platform(platform)" == "windows" } {
|
if { "$::tcl_platform(platform)" == "windows" } {
|
||||||
grid .myFrame.myChecks.myD3dCheck -row $aCheckRowIter -column 4 -sticky e
|
grid .myFrame.myChecks.myD3dCheck -row $aCheckRowIter -column 4 -sticky e
|
||||||
grid .myFrame.myChecks.myD3dLbl -row $aCheckRowIter -column 5 -sticky w
|
grid .myFrame.myChecks.myD3dLbl -row $aCheckRowIter -column 5 -sticky w
|
||||||
|
} elseif { "$::tcl_platform(os)" == "Darwin" } {
|
||||||
|
grid .myFrame.myChecks.myMacGLXCheck -row $aCheckRowIter -column 4 -sticky e
|
||||||
|
grid .myFrame.myChecks.myMacGLXLbl -row $aCheckRowIter -column 5 -sticky w
|
||||||
}
|
}
|
||||||
grid .myFrame.myChecks.myLzmaCheck -row $aCheckRowIter -column 6 -sticky e
|
grid .myFrame.myChecks.myLzmaCheck -row $aCheckRowIter -column 6 -sticky e
|
||||||
grid .myFrame.myChecks.myLzmaLbl -row $aCheckRowIter -column 7 -sticky w
|
grid .myFrame.myChecks.myLzmaLbl -row $aCheckRowIter -column 7 -sticky w
|
||||||
grid .myFrame.myChecks.myJDKCheck -row $aCheckRowIter -column 10 -sticky e
|
grid .myFrame.myChecks.myJDKCheck -row $aCheckRowIter -column 12 -sticky e
|
||||||
grid .myFrame.myChecks.myJDKLbl -row $aCheckRowIter -column 11 -sticky w
|
grid .myFrame.myChecks.myJDKLbl -row $aCheckRowIter -column 13 -sticky w
|
||||||
|
|
||||||
incr aCheckRowIter
|
incr aCheckRowIter
|
||||||
if { "$::tcl_platform(os)" == "Darwin" } {
|
grid .myFrame.myChecks.myRapidJsonCheck -row $aCheckRowIter -column 0 -sticky e
|
||||||
grid .myFrame.myChecks.myMacGLXCheck -row $aCheckRowIter -column 0 -sticky e
|
grid .myFrame.myChecks.myRapidJsonLbl -row $aCheckRowIter -column 1 -sticky w
|
||||||
grid .myFrame.myChecks.myMacGLXLbl -row $aCheckRowIter -column 1 -sticky w
|
grid .myFrame.myChecks.myOpenVrCheck -row $aCheckRowIter -column 4 -sticky e
|
||||||
incr aCheckRowIter
|
grid .myFrame.myChecks.myOpenVrLbl -row $aCheckRowIter -column 5 -sticky w
|
||||||
|
grid .myFrame.myChecks.myE57Check -row $aCheckRowIter -column 6 -sticky e
|
||||||
|
grid .myFrame.myChecks.myE57Lbl -row $aCheckRowIter -column 7 -sticky w
|
||||||
|
|
||||||
|
if { "$::tcl_platform(platform)" == "windows" } {
|
||||||
|
grid .myFrame.myChecks.myInspectorBuild -row $aCheckRowIter -column 12 -sticky e
|
||||||
|
grid .myFrame.myChecks.myInspectorLbl -row $aCheckRowIter -column 13 -sticky w
|
||||||
}
|
}
|
||||||
|
|
||||||
|
incr aCheckRowIter
|
||||||
|
|
||||||
# Additional headers search paths
|
# Additional headers search paths
|
||||||
grid .myFrame.myIncLbl -row $aRowIter -column 0 -columnspan 10 -sticky w
|
grid .myFrame.myIncLbl -row $aRowIter -column 0 -columnspan 10 -sticky w
|
||||||
incr aRowIter
|
incr aRowIter
|
||||||
@@ -606,6 +683,9 @@ grid .myFrame.mySave -row $aRowIter -column 4 -columnspan 2
|
|||||||
grid .myFrame.myClose -row $aRowIter -column 6 -columnspan 2
|
grid .myFrame.myClose -row $aRowIter -column 6 -columnspan 2
|
||||||
|
|
||||||
# Bind events
|
# Bind events
|
||||||
|
bind .myFrame.myPrjFrame.myPrjCombo <<ComboboxSelected>> {
|
||||||
|
wokdep:gui:SwitchConfig
|
||||||
|
}
|
||||||
bind .myFrame.myVsFrame.myVsCombo <<ComboboxSelected>> {
|
bind .myFrame.myVsFrame.myVsCombo <<ComboboxSelected>> {
|
||||||
wokdep:gui:SwitchConfig
|
wokdep:gui:SwitchConfig
|
||||||
}
|
}
|
||||||
@@ -614,6 +694,7 @@ bind .myFrame.myVsFrame.myArchCombo <<ComboboxSelected>> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.myFrame.mySrchEntry configure -validate all -validatecommand {
|
.myFrame.mySrchEntry configure -validate all -validatecommand {
|
||||||
|
set ::PRODUCTS_PATH [file normalize "$::PRODUCTS_PATH_INPUT"]
|
||||||
#return [file exists "$::PRODUCTS_PATH"]
|
#return [file exists "$::PRODUCTS_PATH"]
|
||||||
wokdep:gui:UpdateList
|
wokdep:gui:UpdateList
|
||||||
return 1
|
return 1
|
||||||
|
@@ -27,8 +27,10 @@ if { "$tcl_platform(platform)" == "unix" } {
|
|||||||
set SYS_EXE_SUFFIX ""
|
set SYS_EXE_SUFFIX ""
|
||||||
if { "$tcl_platform(os)" == "Darwin" } {
|
if { "$tcl_platform(os)" == "Darwin" } {
|
||||||
set SYS_LIB_SUFFIX "dylib"
|
set SYS_LIB_SUFFIX "dylib"
|
||||||
|
set PRJFMT "xcd"
|
||||||
} else {
|
} else {
|
||||||
set SYS_LIB_SUFFIX "so"
|
set SYS_LIB_SUFFIX "so"
|
||||||
|
set PRJFMT "cbp"
|
||||||
}
|
}
|
||||||
set VCVER "gcc"
|
set VCVER "gcc"
|
||||||
set VCVARS ""
|
set VCVARS ""
|
||||||
@@ -39,6 +41,7 @@ if { "$tcl_platform(platform)" == "unix" } {
|
|||||||
set SYS_EXE_SUFFIX ".exe"
|
set SYS_EXE_SUFFIX ".exe"
|
||||||
set VCVER "vc10"
|
set VCVER "vc10"
|
||||||
set VCVARS ""
|
set VCVARS ""
|
||||||
|
set PRJFMT "vcxproj"
|
||||||
}
|
}
|
||||||
|
|
||||||
set SHORTCUT_HEADERS "ShortCut"
|
set SHORTCUT_HEADERS "ShortCut"
|
||||||
@@ -65,7 +68,7 @@ if { [info exists ::env(SHORTCUT_HEADERS)] } {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# fetch environment variables (e.g. set by custom.sh or custom.bat) and set them as tcl variables with the same name
|
# fetch environment variables (e.g. set by custom.sh or custom.bat) and set them as tcl variables with the same name
|
||||||
set THE_ENV_VARIABLES {HAVE_FREEIMAGE HAVE_FFMPEG HAVE_TBB HAVE_GLES2 HAVE_D3D HAVE_VTK HAVE_GL2PS HAVE_ZLIB HAVE_LIBLZMA HAVE_OPENCL CHECK_QT4 CHECK_JDK MACOSX_USE_GLX HAVE_RelWithDebInfo}
|
set THE_ENV_VARIABLES {HAVE_FREEIMAGE HAVE_FFMPEG HAVE_TBB HAVE_GLES2 HAVE_D3D HAVE_VTK HAVE_ZLIB HAVE_LIBLZMA HAVE_E57 HAVE_RAPIDJSON HAVE_OPENVR HAVE_OPENCL CHECK_QT4 CHECK_JDK MACOSX_USE_GLX HAVE_RelWithDebInfo BUILD_Inspector}
|
||||||
foreach anEnvIter $THE_ENV_VARIABLES {
|
foreach anEnvIter $THE_ENV_VARIABLES {
|
||||||
set ${anEnvIter} "false"
|
set ${anEnvIter} "false"
|
||||||
if { [info exists ::env(${anEnvIter})] } {
|
if { [info exists ::env(${anEnvIter})] } {
|
||||||
@@ -82,11 +85,14 @@ if { "$tcl_platform(platform)" != "windows" } {
|
|||||||
set HAVE_D3D ""
|
set HAVE_D3D ""
|
||||||
set HAVE_RelWithDebInfo ""
|
set HAVE_RelWithDebInfo ""
|
||||||
}
|
}
|
||||||
foreach anEnvIter {ARCH VCVER VCVARS PRODUCTS_PATH} {
|
foreach anEnvIter {ARCH VCVER VCVARS PRJFMT } {
|
||||||
if { [info exists ::env(${anEnvIter})] } {
|
if { [info exists ::env(${anEnvIter})] } {
|
||||||
set ${anEnvIter} "$::env(${anEnvIter})"
|
set ${anEnvIter} "$::env(${anEnvIter})"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if { [info exists ::env(PRODUCTS_PATH)] } {
|
||||||
|
set PRODUCTS_PATH [file normalize "$::env(PRODUCTS_PATH)"]
|
||||||
|
}
|
||||||
|
|
||||||
if { [info exists ::env(CSF_OPT_INC)] } {
|
if { [info exists ::env(CSF_OPT_INC)] } {
|
||||||
set CSF_OPT_INC [split "$::env(CSF_OPT_INC)" $::SYS_PATH_SPLITTER]
|
set CSF_OPT_INC [split "$::env(CSF_OPT_INC)" $::SYS_PATH_SPLITTER]
|
||||||
@@ -140,9 +146,12 @@ proc wokdep:SearchHeader {theHeader} {
|
|||||||
# Search library file in $::CSF_OPT_LIB* and standard paths
|
# Search library file in $::CSF_OPT_LIB* and standard paths
|
||||||
proc wokdep:SearchLib {theLib theBitness {theSearchPath ""}} {
|
proc wokdep:SearchLib {theLib theBitness {theSearchPath ""}} {
|
||||||
if { "$theSearchPath" != "" } {
|
if { "$theSearchPath" != "" } {
|
||||||
set aPath "${theSearchPath}/${::SYS_LIB_PREFIX}${theLib}.${::SYS_LIB_SUFFIX}"
|
set aPath "${theSearchPath}/${::SYS_LIB_PREFIX}${theLib}.${::SYS_LIB_SUFFIX}"
|
||||||
|
set aPath2 "${theSearchPath}/${::SYS_LIB_PREFIX}${theLib}.a"
|
||||||
if { [file exists "$aPath"] } {
|
if { [file exists "$aPath"] } {
|
||||||
return "$aPath"
|
return "$aPath"
|
||||||
|
} elseif { "$::tcl_platform(platform)" != "windows" && [file exists "$aPath2"] } {
|
||||||
|
return "$aPath2"
|
||||||
} else {
|
} else {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
@@ -150,31 +159,42 @@ proc wokdep:SearchLib {theLib theBitness {theSearchPath ""}} {
|
|||||||
|
|
||||||
# search in custom paths
|
# search in custom paths
|
||||||
foreach aLibPath [set ::CSF_OPT_LIB$theBitness] {
|
foreach aLibPath [set ::CSF_OPT_LIB$theBitness] {
|
||||||
set aPath "${aLibPath}/${::SYS_LIB_PREFIX}${theLib}.${::SYS_LIB_SUFFIX}"
|
set aPath "${aLibPath}/${::SYS_LIB_PREFIX}${theLib}.${::SYS_LIB_SUFFIX}"
|
||||||
|
set aPath2 "${aLibPath}/${::SYS_LIB_PREFIX}${theLib}.a"
|
||||||
if { [file exists "$aPath"] } {
|
if { [file exists "$aPath"] } {
|
||||||
return "$aPath"
|
return "$aPath"
|
||||||
|
} elseif { "$::tcl_platform(platform)" != "windows" && [file exists "$aPath2"] } {
|
||||||
|
return "$aPath2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# search in system
|
# search in system
|
||||||
if { "$::ARCH" == "$theBitness"} {
|
if { "$::ARCH" == "$theBitness"} {
|
||||||
set aPath "/usr/lib/${::SYS_LIB_PREFIX}${theLib}.${::SYS_LIB_SUFFIX}"
|
set aPath "/usr/lib/${::SYS_LIB_PREFIX}${theLib}.${::SYS_LIB_SUFFIX}"
|
||||||
|
set aPath2 "/usr/lib/${::SYS_LIB_PREFIX}${theLib}.a"
|
||||||
if { [file exists "$aPath"] } {
|
if { [file exists "$aPath"] } {
|
||||||
return "$aPath"
|
return "$aPath"
|
||||||
|
} elseif { [file exists "$aPath2"] } {
|
||||||
|
return "$aPath2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if { "$::tcl_platform(os)" == "Linux" } {
|
if { "$::tcl_platform(os)" == "Linux" } {
|
||||||
if { "$theBitness" == "64" } {
|
if { "$theBitness" == "64" } {
|
||||||
set aPath "/usr/lib/x86_64-linux-gnu/lib${theLib}.so"
|
set aPath "/usr/lib/x86_64-linux-gnu/lib${theLib}.so"
|
||||||
|
set aPath2 "/usr/lib/x86_64-linux-gnu/lib${theLib}.a"
|
||||||
if { [file exists "$aPath"] } {
|
if { [file exists "$aPath"] } {
|
||||||
return "$aPath"
|
return "$aPath"
|
||||||
|
} elseif { [file exists "$aPath2"] } {
|
||||||
|
return "$aPath2"
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
set aPath "/usr/lib/i386-linux-gnu/lib${theLib}.so"
|
set aPath "/usr/lib/i386-linux-gnu/lib${theLib}.so"
|
||||||
|
set aPath2 "/usr/lib/i386-linux-gnu/lib${theLib}.a"
|
||||||
if { [file exists "$aPath"] } {
|
if { [file exists "$aPath"] } {
|
||||||
return "$aPath"
|
return "$aPath"
|
||||||
|
} elseif { [file exists "$aPath2"] } {
|
||||||
|
return "$aPath2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -221,7 +241,11 @@ proc wokdep:Preferred {theList theCmpl theArch} {
|
|||||||
|
|
||||||
# keep only two first digits in "vc141"
|
# keep only two first digits in "vc141"
|
||||||
if { ! [regexp {^vc[0-9][0-9]} $theCmpl aCmpl] } {
|
if { ! [regexp {^vc[0-9][0-9]} $theCmpl aCmpl] } {
|
||||||
set aCmpl $theCmpl
|
if { [regexp {^vclang} $theCmpl] } {
|
||||||
|
set aCmpl vc14
|
||||||
|
} else {
|
||||||
|
set aCmpl $theCmpl
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
set aShortList {}
|
set aShortList {}
|
||||||
@@ -601,6 +625,59 @@ proc wokdep:SearchFFmpeg {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBi
|
|||||||
return "$isFound"
|
return "$isFound"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Search OpenVR SDK placement
|
||||||
|
proc wokdep:SearchOpenVR {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} {
|
||||||
|
upvar $theErrInc anErrInc
|
||||||
|
upvar $theErrLib32 anErrLib32
|
||||||
|
upvar $theErrLib64 anErrLib64
|
||||||
|
upvar $theErrBin32 anErrBin32
|
||||||
|
upvar $theErrBin64 anErrBin64
|
||||||
|
|
||||||
|
set isFound "true"
|
||||||
|
set anOpenVrHPath [wokdep:SearchHeader "openvr.h"]
|
||||||
|
if { "$anOpenVrHPath" == "" } {
|
||||||
|
set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{openvr}*] "$::VCVER" "$::ARCH" ]
|
||||||
|
if { "$aPath" != "" && [file exists "$aPath/include/openvr.h"] } {
|
||||||
|
lappend ::CSF_OPT_INC "$aPath/include"
|
||||||
|
} elseif { "$aPath" != "" && [file exists "$aPath/headers/openvr.h"] } {
|
||||||
|
lappend ::CSF_OPT_INC "$aPath/headers"
|
||||||
|
} else {
|
||||||
|
lappend anErrInc "Error: 'openvr.h' not found (OpenVR)"
|
||||||
|
set isFound "false"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
set aPlatform "unknown"
|
||||||
|
if { "$::tcl_platform(platform)" == "windows" } {
|
||||||
|
set aPlatform "win"
|
||||||
|
} elseif { "$::tcl_platform(os)" == "Darwin" } {
|
||||||
|
set aPlatform "osx"
|
||||||
|
} elseif { "$::tcl_platform(os)" == "Linux" } {
|
||||||
|
set aPlatform "linux"
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach anArchIter {64 32} {
|
||||||
|
set anOpenVrLibPath [wokdep:SearchLib "openvr_api" "$anArchIter"]
|
||||||
|
if { "$anOpenVrLibPath" == "" } {
|
||||||
|
set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{openvr}*] "$::VCVER" "$anArchIter" ]
|
||||||
|
set anOpenVrLibPath [wokdep:SearchLib "openvr_api" "$anArchIter" "$aPath/lib/${aPlatform}${anArchIter}"]
|
||||||
|
set anOpenVrLibPath2 [wokdep:SearchLib "openvr_api" "$anArchIter" "$aPath/lib"]
|
||||||
|
if { "$anOpenVrLibPath" != "" } {
|
||||||
|
lappend ::CSF_OPT_LIB$anArchIter "$aPath/lib/${aPlatform}${anArchIter}"
|
||||||
|
lappend ::CSF_OPT_BIN$anArchIter "$aPath/bin/${aPlatform}${anArchIter}"
|
||||||
|
} elseif { "$anOpenVrLibPath2" != "" } {
|
||||||
|
lappend ::CSF_OPT_LIB$anArchIter "$aPath/lib"
|
||||||
|
lappend ::CSF_OPT_BIN$anArchIter "$aPath/bin"
|
||||||
|
} else {
|
||||||
|
lappend anErrLib$anArchIter "Error: '${::SYS_LIB_PREFIX}openvr_api.${::SYS_LIB_SUFFIX}' not found (OpenVR)"
|
||||||
|
if { "$::ARCH" == "$anArchIter"} { set isFound "false" }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return "$isFound"
|
||||||
|
}
|
||||||
|
|
||||||
# Search TBB library placement
|
# Search TBB library placement
|
||||||
proc wokdep:SearchTBB {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} {
|
proc wokdep:SearchTBB {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} {
|
||||||
upvar $theErrInc anErrInc
|
upvar $theErrInc anErrInc
|
||||||
@@ -611,7 +688,11 @@ proc wokdep:SearchTBB {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64
|
|||||||
|
|
||||||
# keep only two first digits in "vc141"
|
# keep only two first digits in "vc141"
|
||||||
if { ! [regexp {^vc[0-9][0-9]} ${::VCVER} aVcLib] } {
|
if { ! [regexp {^vc[0-9][0-9]} ${::VCVER} aVcLib] } {
|
||||||
set aVcLib ${::VCVER}
|
if { [regexp {^vclang} ${::VCVER}] } {
|
||||||
|
set aVcLib vc14
|
||||||
|
} else {
|
||||||
|
set aVcLib ${::VCVER}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
set isFound "true"
|
set isFound "true"
|
||||||
@@ -855,6 +936,25 @@ proc wokdep:SearchGLES {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin6
|
|||||||
return "$isFound"
|
return "$isFound"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Search RapidJSON headers
|
||||||
|
proc wokdep:SearchRapidJson {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} {
|
||||||
|
upvar $theErrInc anErrInc
|
||||||
|
|
||||||
|
set isFound "true"
|
||||||
|
set aRJHPath [wokdep:SearchHeader "rapidjson/rapidjson.h"]
|
||||||
|
if { "$aRJHPath" == "" } {
|
||||||
|
set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{rapidjson}*] "$::VCVER" "$::ARCH" ]
|
||||||
|
if { "$aPath" != "" && [file exists "$aPath/include/rapidjson/rapidjson.h"] } {
|
||||||
|
lappend ::CSF_OPT_INC "$aPath/include"
|
||||||
|
} else {
|
||||||
|
lappend anErrInc "Error: 'rapidjson/rapidjson.h' not found (RapidJSON)"
|
||||||
|
set isFound "false"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return "$isFound"
|
||||||
|
}
|
||||||
|
|
||||||
# Auxiliary function, gets VTK version to set default search directory
|
# Auxiliary function, gets VTK version to set default search directory
|
||||||
proc wokdep:VtkVersion { thePath } {
|
proc wokdep:VtkVersion { thePath } {
|
||||||
set aResult "6.1"
|
set aResult "6.1"
|
||||||
@@ -975,8 +1075,8 @@ proc wokdep:SearchVTK {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64
|
|||||||
return "$isFound"
|
return "$isFound"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Search Qt4 libraries placement
|
# Search Qt libraries placement
|
||||||
proc wokdep:SearchQt4 {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} {
|
proc wokdep:SearchQt {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} {
|
||||||
upvar $theErrInc anErrInc
|
upvar $theErrInc anErrInc
|
||||||
upvar $theErrLib32 anErrLib32
|
upvar $theErrLib32 anErrLib32
|
||||||
upvar $theErrLib64 anErrLib64
|
upvar $theErrLib64 anErrLib64
|
||||||
@@ -984,53 +1084,46 @@ proc wokdep:SearchQt4 {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64
|
|||||||
upvar $theErrBin64 anErrBin64
|
upvar $theErrBin64 anErrBin64
|
||||||
|
|
||||||
set isFound "true"
|
set isFound "true"
|
||||||
set aQMsgBoxHPath [wokdep:SearchHeader "QtGui/qmessagebox.h"]
|
set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{qt}*] "$::VCVER" "$::ARCH" ]
|
||||||
|
set aQMsgBoxHPath [wokdep:SearchHeader "QtGui/qguiapplication.h"]
|
||||||
if { "$aQMsgBoxHPath" == "" } {
|
if { "$aQMsgBoxHPath" == "" } {
|
||||||
set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{qt4}*] "$::VCVER" "$::ARCH" ]
|
if { "$aPath" != "" && [file exists "$aPath/include/QtGui/qguiapplication.h"] } {
|
||||||
if { "$aPath" != "" && [file exists "$aPath/include/QtGui/qmessagebox.h"] } {
|
|
||||||
lappend ::CSF_OPT_INC "$aPath/include"
|
lappend ::CSF_OPT_INC "$aPath/include"
|
||||||
lappend ::CSF_OPT_INC "$aPath/include/Qt"
|
lappend ::CSF_OPT_INC "$aPath/include/Qt"
|
||||||
lappend ::CSF_OPT_INC "$aPath/include/QtGui"
|
lappend ::CSF_OPT_INC "$aPath/include/QtGui"
|
||||||
lappend ::CSF_OPT_INC "$aPath/include/QtCore"
|
lappend ::CSF_OPT_INC "$aPath/include/QtCore"
|
||||||
|
lappend ::CSF_OPT_INC "$aPath/include/QtWidgets"
|
||||||
|
lappend ::CSF_OPT_INC "$aPath/include/QtXml"
|
||||||
} else {
|
} else {
|
||||||
if { [file exists "/usr/include/qt4/QtGui/qmessagebox.h"] } {
|
lappend anErrInc "Error: 'QtGui/qguiapplication.h' not found"
|
||||||
lappend ::CSF_OPT_INC "/usr/include/qt4"
|
|
||||||
lappend ::CSF_OPT_INC "/usr/include/qt4/Qt"
|
|
||||||
lappend ::CSF_OPT_INC "/usr/include/qt4/QtGui"
|
|
||||||
lappend ::CSF_OPT_INC "/usr/include/qt4/QtCore"
|
|
||||||
} else {
|
|
||||||
lappend anErrInc "Error: 'QtGui/qmessagebox.h' not found (Qt4)"
|
|
||||||
set isFound "false"
|
set isFound "false"
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
set aQtGuiLibName "QtGui"
|
set aQtGuiLibName "QtGui"
|
||||||
if { "$::tcl_platform(platform)" == "windows" } {
|
if { "$::tcl_platform(platform)" == "windows" } {
|
||||||
set aQtGuiLibName "QtGui4"
|
set aQtGuiLibName "Qt5Gui"
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach anArchIter {64 32} {
|
foreach anArchIter {64 32} {
|
||||||
set aQMsgBoxLibPath [wokdep:SearchLib "${aQtGuiLibName}" "$anArchIter"]
|
set aQMsgBoxLibPath [wokdep:SearchLib "${aQtGuiLibName}" "$anArchIter"]
|
||||||
if { "$aQMsgBoxLibPath" == "" } {
|
if { "$aQMsgBoxLibPath" == "" } {
|
||||||
set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{qt4}*] "$::VCVER" "$anArchIter" ]
|
|
||||||
set aQMsgBoxLibPath [wokdep:SearchLib "${aQtGuiLibName}" "$anArchIter" "$aPath/lib"]
|
set aQMsgBoxLibPath [wokdep:SearchLib "${aQtGuiLibName}" "$anArchIter" "$aPath/lib"]
|
||||||
if { "$aQMsgBoxLibPath" != "" } {
|
if { "$aQMsgBoxLibPath" != "" } {
|
||||||
lappend ::CSF_OPT_LIB$anArchIter "$aPath/lib"
|
lappend ::CSF_OPT_LIB$anArchIter "$aPath/lib"
|
||||||
} else {
|
} else {
|
||||||
lappend anErrLib$anArchIter "Error: '${::SYS_LIB_PREFIX}${aQtGuiLibName}.${::SYS_LIB_SUFFIX}' not found (Qt4)"
|
lappend anErrLib$anArchIter "Error: '${::SYS_LIB_PREFIX}${aQtGuiLibName}.${::SYS_LIB_SUFFIX}' not found (Qt)"
|
||||||
if { "$::ARCH" == "$anArchIter"} { set isFound "false" }
|
if { "$::ARCH" == "$anArchIter"} { set isFound "false" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if { "$::tcl_platform(platform)" == "windows" } {
|
if { "$::tcl_platform(platform)" == "windows" } {
|
||||||
set aQMsgBoxDllPath [wokdep:SearchBin "QtGui4.dll" "$anArchIter"]
|
set aQMsgBoxDllPath [wokdep:SearchBin "${aQtGuiLibName}.dll" "$anArchIter"]
|
||||||
if { "$aQMsgBoxDllPath" == "" } {
|
if { "$aQMsgBoxDllPath" == "" } {
|
||||||
set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{qt4}*] "$::VCVER" "$anArchIter" ]
|
set aQMsgBoxDllPath [wokdep:SearchBin "${aQtGuiLibName}.dll" "$anArchIter" "$aPath/bin"]
|
||||||
set aQMsgBoxDllPath [wokdep:SearchBin "QtGui4.dll" "$anArchIter" "$aPath/bin"]
|
|
||||||
if { "$aQMsgBoxDllPath" != "" } {
|
if { "$aQMsgBoxDllPath" != "" } {
|
||||||
lappend ::CSF_OPT_BIN$anArchIter "$aPath/bin"
|
lappend ::CSF_OPT_BIN$anArchIter "$aPath/bin"
|
||||||
} else {
|
} else {
|
||||||
lappend anErrBin$anArchIter "Error: 'QtGui4.dll' not found (Qt4)"
|
lappend anErrBin$anArchIter "Error: '${aQtGuiLibName}.dll' not found (Qt)"
|
||||||
if { "$::ARCH" == "$anArchIter"} { set isFound "false" }
|
if { "$::ARCH" == "$anArchIter"} { set isFound "false" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1118,15 +1211,33 @@ proc wokdep:SearchX11 {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64
|
|||||||
return "$isFound"
|
return "$isFound"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Returns OCCT version string from file Standard_Version.hxx (if available)
|
||||||
|
proc wokdep:DetectCasVersion {} {
|
||||||
|
set occt_ver 7.0.0
|
||||||
|
set aCasRoot [file normalize [file dirname [info script]]]
|
||||||
|
set filename "${aCasRoot}/src/Standard/Standard_Version.hxx"
|
||||||
|
if { [file exists $filename] } {
|
||||||
|
set fh [open $filename "r"]
|
||||||
|
set fh_loaded [read $fh]
|
||||||
|
close $fh
|
||||||
|
regexp {[^/]\s*#\s*define\s+OCC_VERSION_COMPLETE\s+\"([^\s]*)\"} $fh_loaded dummy occt_ver
|
||||||
|
} else {
|
||||||
|
puts "Error: file '$filename' not found"
|
||||||
|
}
|
||||||
|
return $occt_ver
|
||||||
|
}
|
||||||
|
|
||||||
# Generate (override) custom environment file
|
# Generate (override) custom environment file
|
||||||
proc wokdep:SaveCustom {} {
|
proc wokdep:SaveCustom {} {
|
||||||
|
set aGenInfo "This environment file was generated by genconf.tcl script at [clock format [clock seconds] -format "%Y.%m.%d %H:%M"]"
|
||||||
if { "$::tcl_platform(platform)" == "windows" } {
|
if { "$::tcl_platform(platform)" == "windows" } {
|
||||||
set aCustomFilePath "./custom.bat"
|
set aCustomFilePath "./custom.bat"
|
||||||
set aFile [open $aCustomFilePath "w"]
|
set aFile [open $aCustomFilePath "w"]
|
||||||
puts $aFile "@echo off"
|
puts $aFile "@echo off"
|
||||||
puts $aFile "rem This environment file was generated by wok_depsgui.tcl script at [clock format [clock seconds] -format "%Y.%m.%d %H:%M"]"
|
puts $aFile "rem $aGenInfo"
|
||||||
|
|
||||||
puts $aFile ""
|
puts $aFile ""
|
||||||
|
puts $aFile "set PRJFMT=$::PRJFMT"
|
||||||
puts $aFile "set VCVER=$::VCVER"
|
puts $aFile "set VCVER=$::VCVER"
|
||||||
puts $aFile "set ARCH=$::ARCH"
|
puts $aFile "set ARCH=$::ARCH"
|
||||||
puts $aFile "set VCVARS=$::VCVARS"
|
puts $aFile "set VCVARS=$::VCVARS"
|
||||||
@@ -1146,26 +1257,41 @@ proc wokdep:SaveCustom {} {
|
|||||||
}
|
}
|
||||||
|
|
||||||
set aStringInc [join $::CSF_OPT_INC $::SYS_PATH_SPLITTER]
|
set aStringInc [join $::CSF_OPT_INC $::SYS_PATH_SPLITTER]
|
||||||
|
if { "$::PRODUCTS_PATH" != "" } {
|
||||||
|
set aStringInc [regsub -all "$::PRODUCTS_PATH" $aStringInc "%PRODUCTS_PATH%"]
|
||||||
|
}
|
||||||
puts $aFile ""
|
puts $aFile ""
|
||||||
puts $aFile "rem Additional headers search paths"
|
puts $aFile "rem Additional headers search paths"
|
||||||
puts $aFile "set \"CSF_OPT_INC=$aStringInc\""
|
puts $aFile "set \"CSF_OPT_INC=$aStringInc\""
|
||||||
|
|
||||||
set aStringLib32 [join $::CSF_OPT_LIB32 $::SYS_PATH_SPLITTER]
|
set aStringLib32 [join $::CSF_OPT_LIB32 $::SYS_PATH_SPLITTER]
|
||||||
|
if { "$::PRODUCTS_PATH" != "" } {
|
||||||
|
set aStringLib32 [regsub -all "$::PRODUCTS_PATH" $aStringLib32 "%PRODUCTS_PATH%"]
|
||||||
|
}
|
||||||
puts $aFile ""
|
puts $aFile ""
|
||||||
puts $aFile "rem Additional libraries (32-bit) search paths"
|
puts $aFile "rem Additional libraries (32-bit) search paths"
|
||||||
puts $aFile "set \"CSF_OPT_LIB32=$aStringLib32\""
|
puts $aFile "set \"CSF_OPT_LIB32=$aStringLib32\""
|
||||||
|
|
||||||
set aStringLib64 [join $::CSF_OPT_LIB64 $::SYS_PATH_SPLITTER]
|
set aStringLib64 [join $::CSF_OPT_LIB64 $::SYS_PATH_SPLITTER]
|
||||||
|
if { "$::PRODUCTS_PATH" != "" } {
|
||||||
|
set aStringLib64 [regsub -all "$::PRODUCTS_PATH" $aStringLib64 "%PRODUCTS_PATH%"]
|
||||||
|
}
|
||||||
puts $aFile ""
|
puts $aFile ""
|
||||||
puts $aFile "rem Additional libraries (64-bit) search paths"
|
puts $aFile "rem Additional libraries (64-bit) search paths"
|
||||||
puts $aFile "set \"CSF_OPT_LIB64=$aStringLib64\""
|
puts $aFile "set \"CSF_OPT_LIB64=$aStringLib64\""
|
||||||
|
|
||||||
set aStringBin32 [join $::CSF_OPT_BIN32 $::SYS_PATH_SPLITTER]
|
set aStringBin32 [join $::CSF_OPT_BIN32 $::SYS_PATH_SPLITTER]
|
||||||
|
if { "$::PRODUCTS_PATH" != "" } {
|
||||||
|
set aStringBin32 [regsub -all "$::PRODUCTS_PATH" $aStringBin32 "%PRODUCTS_PATH%"]
|
||||||
|
}
|
||||||
puts $aFile ""
|
puts $aFile ""
|
||||||
puts $aFile "rem Additional (32-bit) search paths"
|
puts $aFile "rem Additional (32-bit) search paths"
|
||||||
puts $aFile "set \"CSF_OPT_BIN32=$aStringBin32\""
|
puts $aFile "set \"CSF_OPT_BIN32=$aStringBin32\""
|
||||||
|
|
||||||
set aStringBin64 [join $::CSF_OPT_BIN64 $::SYS_PATH_SPLITTER]
|
set aStringBin64 [join $::CSF_OPT_BIN64 $::SYS_PATH_SPLITTER]
|
||||||
|
if { "$::PRODUCTS_PATH" != "" } {
|
||||||
|
set aStringBin64 [regsub -all "$::PRODUCTS_PATH" $aStringBin64 "%PRODUCTS_PATH%"]
|
||||||
|
}
|
||||||
puts $aFile ""
|
puts $aFile ""
|
||||||
puts $aFile "rem Additional (64-bit) search paths"
|
puts $aFile "rem Additional (64-bit) search paths"
|
||||||
puts $aFile "set \"CSF_OPT_BIN64=$aStringBin64\""
|
puts $aFile "set \"CSF_OPT_BIN64=$aStringBin64\""
|
||||||
@@ -1175,9 +1301,10 @@ proc wokdep:SaveCustom {} {
|
|||||||
set aCustomFilePath "./custom.sh"
|
set aCustomFilePath "./custom.sh"
|
||||||
set aFile [open $aCustomFilePath "w"]
|
set aFile [open $aCustomFilePath "w"]
|
||||||
puts $aFile "#!/bin/bash"
|
puts $aFile "#!/bin/bash"
|
||||||
puts $aFile "# This environment file was generated by wok_depsgui.tcl script at [clock format [clock seconds] -format "%Y.%m.%d %H:%M"]"
|
puts $aFile "# $aGenInfo"
|
||||||
|
|
||||||
puts $aFile ""
|
puts $aFile ""
|
||||||
|
puts $aFile "export PRJFMT=$::PRJFMT"
|
||||||
puts $aFile "export ARCH=$::ARCH"
|
puts $aFile "export ARCH=$::ARCH"
|
||||||
puts $aFile "export SHORTCUT_HEADERS=$::SHORTCUT_HEADERS"
|
puts $aFile "export SHORTCUT_HEADERS=$::SHORTCUT_HEADERS"
|
||||||
|
|
||||||
@@ -1195,22 +1322,88 @@ proc wokdep:SaveCustom {} {
|
|||||||
}
|
}
|
||||||
|
|
||||||
set aStringInc [join $::CSF_OPT_INC $::SYS_PATH_SPLITTER]
|
set aStringInc [join $::CSF_OPT_INC $::SYS_PATH_SPLITTER]
|
||||||
|
if { "$::PRODUCTS_PATH" != "" } {
|
||||||
|
set aStringInc [regsub -all "$::PRODUCTS_PATH" $aStringInc "\${PRODUCTS_PATH}"]
|
||||||
|
}
|
||||||
puts $aFile ""
|
puts $aFile ""
|
||||||
puts $aFile "# Additional headers search paths"
|
puts $aFile "# Additional headers search paths"
|
||||||
puts $aFile "export CSF_OPT_INC=\"$aStringInc\""
|
puts $aFile "export CSF_OPT_INC=\"$aStringInc\""
|
||||||
|
|
||||||
set aStringLib$::ARCH [join [set ::CSF_OPT_LIB$::ARCH] $::SYS_PATH_SPLITTER]
|
set aStringLib [join [set ::CSF_OPT_LIB$::ARCH] $::SYS_PATH_SPLITTER]
|
||||||
|
if { "$::PRODUCTS_PATH" != "" } {
|
||||||
|
set aStringLib [regsub -all "$::PRODUCTS_PATH" $aStringLib "\${PRODUCTS_PATH}"]
|
||||||
|
}
|
||||||
puts $aFile ""
|
puts $aFile ""
|
||||||
puts $aFile "# Additional libraries ($::ARCH-bit) search paths"
|
puts $aFile "# Additional libraries ($::ARCH-bit) search paths"
|
||||||
puts $aFile "export CSF_OPT_LIB$::ARCH=\"[set aStringLib$::ARCH]\""
|
puts $aFile "export CSF_OPT_LIB$::ARCH=\"[set aStringLib]\""
|
||||||
|
|
||||||
set aStringBin$::ARCH [join [set ::CSF_OPT_BIN$::ARCH] $::SYS_PATH_SPLITTER]
|
set aStringBin [join [set ::CSF_OPT_BIN$::ARCH] $::SYS_PATH_SPLITTER]
|
||||||
|
if { "$::PRODUCTS_PATH" != "" } {
|
||||||
|
set aStringBin [regsub -all "$::PRODUCTS_PATH" $aStringBin "\${PRODUCTS_PATH}"]
|
||||||
|
}
|
||||||
puts $aFile ""
|
puts $aFile ""
|
||||||
puts $aFile "# Additional ($::ARCH-bit) search paths"
|
puts $aFile "# Additional ($::ARCH-bit) search paths"
|
||||||
puts $aFile "export CSF_OPT_BIN$::ARCH=\"[set aStringBin$::ARCH]\""
|
puts $aFile "export CSF_OPT_BIN$::ARCH=\"[set aStringBin]\""
|
||||||
|
|
||||||
close $aFile
|
close $aFile
|
||||||
}
|
}
|
||||||
|
|
||||||
puts "Configuration saved to file '$aCustomFilePath'"
|
puts "Configuration saved to file '$aCustomFilePath'"
|
||||||
|
|
||||||
|
# generate custom.auto.pri
|
||||||
|
set toExportCustomPri 1
|
||||||
|
if { $toExportCustomPri == 1 } {
|
||||||
|
set aCasVer [wokdep:DetectCasVersion]
|
||||||
|
set aCustomFilePath "./adm/qmake/custom.auto.pri"
|
||||||
|
set aFile [open $aCustomFilePath "w"]
|
||||||
|
puts $aFile "# $aGenInfo"
|
||||||
|
|
||||||
|
puts $aFile ""
|
||||||
|
puts $aFile "VERSION=$aCasVer"
|
||||||
|
puts $aFile "PRODUCTS_PATH=\"$::PRODUCTS_PATH\""
|
||||||
|
|
||||||
|
puts $aFile ""
|
||||||
|
puts $aFile "# Optional 3rd-parties switches"
|
||||||
|
foreach anEnvIter $::THE_ENV_VARIABLES {
|
||||||
|
set aName ${anEnvIter}
|
||||||
|
set aValue [set ::${anEnvIter}]
|
||||||
|
if { "$aValue" == "true" } {
|
||||||
|
puts $aFile "CONFIG += ${aName}"
|
||||||
|
} else {
|
||||||
|
#puts $aFile "CONFIG -= ${aName}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
puts $aFile ""
|
||||||
|
puts $aFile "# Additional headers search paths"
|
||||||
|
foreach anIncPath $::CSF_OPT_INC {
|
||||||
|
if { "$::PRODUCTS_PATH" != "" } {
|
||||||
|
set anIncPath [regsub -all "$::PRODUCTS_PATH" $anIncPath "\$\$\{PRODUCTS_PATH\}"]
|
||||||
|
}
|
||||||
|
puts $aFile "INCLUDEPATH += \"${anIncPath}\""
|
||||||
|
}
|
||||||
|
|
||||||
|
puts $aFile ""
|
||||||
|
puts $aFile "# Additional libraries search paths"
|
||||||
|
foreach aLibPath [set ::CSF_OPT_LIB$::ARCH] {
|
||||||
|
if { "$::PRODUCTS_PATH" != "" } {
|
||||||
|
set aLibPath [regsub -all "$::PRODUCTS_PATH" $aLibPath "\$\$\{PRODUCTS_PATH\}"]
|
||||||
|
}
|
||||||
|
puts $aFile "LIBS += -L\"${aLibPath}\""
|
||||||
|
}
|
||||||
|
|
||||||
|
if { "$::tcl_platform(platform)" == "windows" } {
|
||||||
|
puts $aFile ""
|
||||||
|
puts $aFile "# Additional DLLs search paths"
|
||||||
|
foreach aDllPath [set ::CSF_OPT_BIN$::ARCH] {
|
||||||
|
if { "$::PRODUCTS_PATH" != "" } {
|
||||||
|
set aDllPath [regsub -all "$::PRODUCTS_PATH" $aDllPath "\$\$\{PRODUCTS_PATH\}"]
|
||||||
|
}
|
||||||
|
puts $aFile "LIBS += -L\"${aDllPath}\""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
puts $aFile ""
|
||||||
|
close $aFile
|
||||||
|
puts "Configuration saved to file '$aCustomFilePath'"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -655,6 +655,8 @@ proc OCCDoc_Main {docType {docfiles {}} {modules {}} generatorMode verboseMode s
|
|||||||
|
|
||||||
# Generates Doxygen configuration file for Overview documentation
|
# Generates Doxygen configuration file for Overview documentation
|
||||||
proc OCCDoc_MakeDoxyfile {docType outDir tagFileDir {doxyFileName} {generatorMode ""} {DocFilesList {}} {ModulesList {}} verboseMode searchMode hhcPath mathjaxLocation graphvizPath productsPath} {
|
proc OCCDoc_MakeDoxyfile {docType outDir tagFileDir {doxyFileName} {generatorMode ""} {DocFilesList {}} {ModulesList {}} verboseMode searchMode hhcPath mathjaxLocation graphvizPath productsPath} {
|
||||||
|
global module_dependency
|
||||||
|
|
||||||
set inputDir [OCCDoc_GetDoxDir [OCCDoc_GetProdRootDir]]
|
set inputDir [OCCDoc_GetDoxDir [OCCDoc_GetProdRootDir]]
|
||||||
|
|
||||||
set TEMPLATES_DIR [OCCDoc_GetDoxDir]/resources
|
set TEMPLATES_DIR [OCCDoc_GetDoxDir]/resources
|
||||||
@@ -725,6 +727,16 @@ proc OCCDoc_MakeDoxyfile {docType outDir tagFileDir {doxyFileName} {generatorMod
|
|||||||
set name OCCT
|
set name OCCT
|
||||||
}
|
}
|
||||||
|
|
||||||
|
OCCDoc_LoadData "${productsPath}"
|
||||||
|
|
||||||
|
# Add all dependencies of modules to the graph
|
||||||
|
set additional_modules {}
|
||||||
|
foreach module $modules {
|
||||||
|
set additional_modules [list {*}$additional_modules {*}$module_dependency($module)]
|
||||||
|
}
|
||||||
|
set modules [list {*}$modules {*}$additional_modules]
|
||||||
|
set modules [lsort -unique $modules]
|
||||||
|
|
||||||
# Get list of header files in the specified modules
|
# Get list of header files in the specified modules
|
||||||
set filelist {}
|
set filelist {}
|
||||||
foreach module $modules {
|
foreach module $modules {
|
||||||
|
884
adm/genproj.tcl
5
adm/qmake/.gitignore
vendored
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
/*/*.pro
|
||||||
|
/*/*/*.pro
|
||||||
|
*.pro.user
|
||||||
|
custom.pri
|
||||||
|
custom.auto.pri
|
157
adm/qmake/OccCppConfig.pri
Normal file
@@ -0,0 +1,157 @@
|
|||||||
|
# This is project defines C++ compilation rules for building an OCCT Toolkit.
|
||||||
|
|
||||||
|
exists(custom.auto.pri) { include(custom.auto.pri) }
|
||||||
|
exists(custom.pri) { include(custom.pri) }
|
||||||
|
|
||||||
|
# Disable some dummy Qt defaults
|
||||||
|
QT -= core gui
|
||||||
|
CONFIG -= qt app_bundle
|
||||||
|
CONFIG -= qml_debug
|
||||||
|
CONFIG -= debug_and_release
|
||||||
|
|
||||||
|
OccGitRoot = $$_PRO_FILE_PWD_/../../../..
|
||||||
|
|
||||||
|
# Define compilation flags
|
||||||
|
CONFIG += warn_on
|
||||||
|
QMAKE_CFLAGS_WARN_ON = -Wall
|
||||||
|
QMAKE_CXXFLAGS_WARN_ON = -Wall
|
||||||
|
win32 {
|
||||||
|
QMAKE_CFLAGS_WARN_ON = -W4
|
||||||
|
QMAKE_CXXFLAGS_WARN_ON = -W4
|
||||||
|
QMAKE_CXXFLAGS_EXCEPTIONS_ON = /EHa
|
||||||
|
QMAKE_CXXFLAGS_STL_ON = /EHa
|
||||||
|
|
||||||
|
QMAKE_CXXFLAGS += -fp:precise
|
||||||
|
#QMAKE_CXXFLAGS -= -Zc:throwingNew
|
||||||
|
#QMAKE_CXXFLAGS -= -Zc:rvalueCast
|
||||||
|
|
||||||
|
QMAKE_LFLAGS += -INCREMENTAL:NO
|
||||||
|
|
||||||
|
CONFIG(debug, debug|release) {
|
||||||
|
QMAKE_CXXFLAGS += -Od
|
||||||
|
QMAKE_CXXFLAGS += -Ob1
|
||||||
|
}
|
||||||
|
|
||||||
|
DEFINES -= WIN32
|
||||||
|
DEFINES -= WIN64
|
||||||
|
DEFINES += _CRT_SECURE_NO_WARNINGS
|
||||||
|
DEFINES += _CRT_NONSTDC_NO_DEPRECATE
|
||||||
|
DEFINES += _SCL_SECURE_NO_WARNINGS
|
||||||
|
} else {
|
||||||
|
CONFIG += c++11
|
||||||
|
QMAKE_CFLAGS += -fexceptions
|
||||||
|
QMAKE_CXXFLAGS += -fexceptions
|
||||||
|
QMAKE_CXXFLAGS += -fvisibility=default
|
||||||
|
DEFINES += OCC_CONVERT_SIGNALS
|
||||||
|
mac {
|
||||||
|
iphoneos {
|
||||||
|
QMAKE_IOS_DEPLOYMENT_TARGET = 8.0
|
||||||
|
} else {
|
||||||
|
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
!CONFIG(debug, debug|release) {
|
||||||
|
# disable exceptions in Release builds
|
||||||
|
DEFINES += No_Exception
|
||||||
|
HAVE_RelWithDebInfo {
|
||||||
|
win32 {
|
||||||
|
CONFIG += force_debug_info
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# Define output folder depending on compiler name
|
||||||
|
MY_BITNESS = 32
|
||||||
|
|
||||||
|
equals(QMAKE_TARGET.arch, x86_64) | equals(QMAKE_HOST.arch, x86_64) { MY_BITNESS = 64 }
|
||||||
|
equals(ANDROID_TARGET_ARCH, arm64-v8a) { MY_BITNESS = 64 }
|
||||||
|
has64Target = $$find(QMAKE_TARGET.arch, "x64")
|
||||||
|
count(has64Target, 1) { MY_BITNESS = 64 }
|
||||||
|
|
||||||
|
MY_PLATFORM = platform
|
||||||
|
CONFIG(iphonesimulator, iphoneos|iphonesimulator) { MY_PLATFORM = iphonesimulator
|
||||||
|
} else:CONFIG(iphoneos, iphoneos|iphonesimulator) { MY_PLATFORM = iphoneos
|
||||||
|
} else:android { MY_PLATFORM = android-$$ANDROID_TARGET_ARCH
|
||||||
|
} else:win32 { MY_PLATFORM = win$$MY_BITNESS
|
||||||
|
} else:mac { MY_PLATFORM = mac
|
||||||
|
} else:linux { MY_PLATFORM = lin
|
||||||
|
} else:unix { MY_PLATFORM = unix
|
||||||
|
} else { warning (Unknown platform. "$$MY_PLATFORM" is used) }
|
||||||
|
|
||||||
|
MY_COMPILER = compiler
|
||||||
|
MY_VC_VER = 0
|
||||||
|
android-g++ {
|
||||||
|
MY_COMPILER = gcc
|
||||||
|
} else:clang {
|
||||||
|
MY_COMPILER = clang
|
||||||
|
} else:gcc {
|
||||||
|
MY_COMPILER = gcc
|
||||||
|
} else:win32-msvc2010 {
|
||||||
|
MY_COMPILER = vc10
|
||||||
|
MY_VC_VER = 10
|
||||||
|
} else:win32-msvc2012 {
|
||||||
|
MY_COMPILER = vc11
|
||||||
|
MY_VC_VER = 11
|
||||||
|
} else:win32-msvc2013 {
|
||||||
|
MY_COMPILER = vc12
|
||||||
|
MY_VC_VER = 12
|
||||||
|
} else:win32-msvc2015 {
|
||||||
|
MY_COMPILER = vc14
|
||||||
|
MY_VC_VER = 14
|
||||||
|
} else:win32-msvc2017 {
|
||||||
|
MY_COMPILER = vc14
|
||||||
|
MY_VC_VER = 14
|
||||||
|
} else:win32-msvc {
|
||||||
|
MY_COMPILER = vc14
|
||||||
|
MY_VC_VER = 14
|
||||||
|
aMsvcVer = $$(VisualStudioVersion)
|
||||||
|
equals(aMsvcVer, 14.0){
|
||||||
|
# VS2015, vc140
|
||||||
|
} else:equals(aMsvcVer, 15.0){
|
||||||
|
# VS2015, vc141
|
||||||
|
} else:equals(aMsvcVer, 16.0){
|
||||||
|
# VS2019, vc142
|
||||||
|
} else {
|
||||||
|
warning (Unknown msvc version. "$$MY_COMPILER" is used)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
warning (Unknown compiler. "$$MY_COMPILER" is used)
|
||||||
|
}
|
||||||
|
MY_PLATFORM_AND_COMPILER = $$MY_PLATFORM/$$MY_COMPILER
|
||||||
|
#warning (The platform is "$$MY_PLATFORM"; bitness is "$$MY_BITNESS"; compiler is "$$MY_COMPILER")
|
||||||
|
|
||||||
|
CONFIG(debug, debug|release) { MY_BUILDTYPE = d }
|
||||||
|
|
||||||
|
DESTDIR = $$OccGitRoot/$${MY_PLATFORM_AND_COMPILER}/lib$${MY_BUILDTYPE}
|
||||||
|
win32 {
|
||||||
|
DESTDIR = $$OccGitRoot/win$${MY_BITNESS}/vc$${MY_VC_VER}/bin$${MY_BUILDTYPE}
|
||||||
|
aLibDest = $$DESTDIR/../lib$${MY_BUILDTYPE}
|
||||||
|
#DLLDESTDIR = $$DESTDIR/../bin$${MY_BUILDTYPE}
|
||||||
|
|
||||||
|
# dummy target creating lib/libd folder
|
||||||
|
occtkgen_libfolder.input = $$_PRO_FILE_PWD_/../../OcctDummy.in
|
||||||
|
occtkgen_libfolder.output = $$aLibDest/dummy.tmp
|
||||||
|
occtkgen_libfolder.config = verbatim
|
||||||
|
QMAKE_SUBSTITUTES += occtkgen_libfolder
|
||||||
|
|
||||||
|
LIBS += -L$$aLibDest
|
||||||
|
equals(TEMPLATE, lib) {
|
||||||
|
QMAKE_CLEAN += $$DESTDIR/$${TARGET}.dll
|
||||||
|
QMAKE_CLEAN += $$aLibDest/$${TARGET}.lib
|
||||||
|
QMAKE_CLEAN += $$aLibDest/$${TARGET}.exp
|
||||||
|
} else {
|
||||||
|
QMAKE_CLEAN += $$DESTDIR/$${TARGET}.exe
|
||||||
|
}
|
||||||
|
QMAKE_CLEAN += $$DESTDIR/$${TARGET}.pdb
|
||||||
|
QMAKE_LFLAGS += -PDB:"$$DESTDIR/$${TARGET}.pdb"
|
||||||
|
QMAKE_LFLAGS += -IMPLIB:"$$aLibDest/$${TARGET}.lib"
|
||||||
|
} else {
|
||||||
|
LIBS += -L$$DESTDIR
|
||||||
|
equals(TEMPLATE, app) {
|
||||||
|
DESTDIR = $$OccGitRoot/$${MY_PLATFORM_AND_COMPILER}/bin$${MY_BUILDTYPE}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#OBJECTS_DIR = $$DESTDIR/../obj$${MY_BUILDTYPE}/$${TARGET}
|
||||||
|
OBJECTS_DIR = $$DESTDIR/../obj$${MY_BUILDTYPE}
|
36
adm/qmake/OccModule.pri
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
# This is a project template file defining an OCCT Module.
|
||||||
|
# This project should be included with predefined OCC_MODULE_NAME variable.
|
||||||
|
TEMPLATE = subdirs
|
||||||
|
exists(custom.auto.pri) { include(custom.auto.pri) }
|
||||||
|
exists(custom.pri) { include(custom.pri) }
|
||||||
|
|
||||||
|
# Iterate over Toolkits within current Module and generate sub-project per Toolkit
|
||||||
|
aModuleList = $$cat(../MODULES, lines)
|
||||||
|
for (aModuleIter, aModuleList) {
|
||||||
|
#aTkList = $$list($$aModuleIter) - this doesn't work, qmake bug?
|
||||||
|
aModule = $$first($$list($$aModuleIter))
|
||||||
|
equals (aModule, $$OCC_MODULE_NAME) {
|
||||||
|
for (aToolKit, $$list($$aModuleIter)) {
|
||||||
|
toSkipToolkit = 0
|
||||||
|
equals (aToolKit, $$OCC_MODULE_NAME) { toSkipToolkit = 1 }
|
||||||
|
!HAVE_VTK:equals (aToolKit, "TKIVtk") { toSkipToolkit = 1 }
|
||||||
|
!HAVE_VTK:equals (aToolKit, "TKIVtkDraw") { toSkipToolkit = 1 }
|
||||||
|
!win32: equals (aToolKit, "TKD3DHost") { toSkipToolkit = 1 }
|
||||||
|
equals (toSkipToolkit, 0) {
|
||||||
|
#warning(aToolKit($$OCC_MODULE_NAME)=$$aToolKit)
|
||||||
|
eval(occtkgen_$${aToolKit}.input = $$_PRO_FILE_PWD_/../OccToolkit.pro.in)
|
||||||
|
eval(occtkgen_$${aToolKit}.output = $$_PRO_FILE_PWD_/$${aToolKit}/$${aToolKit}.pro)
|
||||||
|
eval(occtkgen_$${aToolKit}.config = verbatim)
|
||||||
|
eval(QMAKE_SUBSTITUTES += occtkgen_$${aToolKit})
|
||||||
|
SUBDIRS += $${aToolKit}
|
||||||
|
|
||||||
|
aModExtList = $$cat(../../src/$${aToolKit}/EXTERNLIB, lines)
|
||||||
|
aTkDepends = $${aToolKit}.depends
|
||||||
|
for (aModExtIter, aModExtList) {
|
||||||
|
contains ($$list($$aModuleIter), $$aModExtIter) { eval ($${aTkDepends} += $$aModExtIter) }
|
||||||
|
}
|
||||||
|
#warning($$aToolKit depends on: $$reverse($${aTkDepends}))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
2
adm/qmake/OccModule.pro.in
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
OCC_MODULE_NAME = \$\$TARGET
|
||||||
|
include(../OccModule.pri)
|
144
adm/qmake/OccToolkit.pri
Normal file
@@ -0,0 +1,144 @@
|
|||||||
|
# This is a project template file defining an OCCT Toolkit.
|
||||||
|
# This project should be included with predefined OCC_TOOLKIT_NAME variable.
|
||||||
|
|
||||||
|
TEMPLATE = lib
|
||||||
|
!exists(../../src/$$OCC_TOOLKIT_NAME/PACKAGES) {
|
||||||
|
TEMPLATE = app
|
||||||
|
CONFIG += console
|
||||||
|
}
|
||||||
|
win32 {
|
||||||
|
# do not append version to DLL name
|
||||||
|
CONFIG += skip_target_version_ext
|
||||||
|
}
|
||||||
|
|
||||||
|
include(OccCppConfig.pri)
|
||||||
|
|
||||||
|
aSrcRoot = $$OccGitRoot/src
|
||||||
|
aHxxRoot = $$OccGitRoot/inc
|
||||||
|
INCLUDEPATH += $$aHxxRoot
|
||||||
|
|
||||||
|
# CSF variables
|
||||||
|
CSF_FREETYPE = -lfreetype
|
||||||
|
CSF_TclLibs = -ltcl8.6
|
||||||
|
CSF_TclTkLibs = -ltk8.6
|
||||||
|
HAVE_FREEIMAGE { CSF_FreeImagePlus = -lfreeimage } else:win32 { CSF_FreeImagePlus = -lwindowscodecs -lole32 }
|
||||||
|
HAVE_FFMPEG { CSF_FFmpeg = -lavcodec -lavformat -lswscale -lavutil }
|
||||||
|
HAVE_TBB { CSF_TBB = -ltbb -ltbbmalloc }
|
||||||
|
HAVE_ZLIB { CSF_ZLIB = -lzlib }
|
||||||
|
HAVE_LIBLZMA { CSF_LIBLZMA = -lliblzma }
|
||||||
|
win32 {
|
||||||
|
CSF_kernel32 = -lkernel32
|
||||||
|
CSF_advapi32 = -ladvapi32
|
||||||
|
CSF_gdi32 = -lgdi32
|
||||||
|
CSF_user32 = -luser32 -lcomdlg32
|
||||||
|
CSF_shell32 = -lShell32
|
||||||
|
CSF_opengl32 = -lopengl32
|
||||||
|
CSF_wsock32 = -lwsock32
|
||||||
|
CSF_netapi32 = -lnetapi32
|
||||||
|
CSF_OpenGlLibs = -lopengl32
|
||||||
|
HAVE_GLES2 { CSF_OpenGlLibs = -llibEGL -llibGLESv2 }
|
||||||
|
CSF_psapi = -lPsapi
|
||||||
|
CSF_winmm = -lwinmm
|
||||||
|
CSF_d3d9 = -ld3d9
|
||||||
|
CSF_TclLibs = -ltcl86
|
||||||
|
CSF_TclTkLibs = -ltk86
|
||||||
|
CSF_TBB =
|
||||||
|
} else:mac {
|
||||||
|
CSF_dl = -ldl
|
||||||
|
CSF_objc = -lobjc
|
||||||
|
iphoneos {
|
||||||
|
CSF_Appkit = -framework UIKit
|
||||||
|
CSF_OpenGlLibs = -framework OpenGLES
|
||||||
|
} else {
|
||||||
|
CSF_Appkit = -framework AppKit
|
||||||
|
CSF_OpenGlLibs = -framework OpenGL
|
||||||
|
}
|
||||||
|
CSF_IOKit = -framework IOKit
|
||||||
|
CSF_TclLibs = -framework Tcl
|
||||||
|
CSF_TclTkLibs = -framework Tk
|
||||||
|
} else {
|
||||||
|
CSF_dl = -ldl
|
||||||
|
CSF_ThreadLibs = -lpthread -lrt
|
||||||
|
CSF_OpenGlLibs = -lGL
|
||||||
|
CSF_TclTkLibs = -lX11 -ltk8.6
|
||||||
|
CSF_XwLibs = -lX11 -lXext -lXmu -lXi
|
||||||
|
CSF_MotifLibs = -lX11
|
||||||
|
CSF_fontconfig = -lfontconfig
|
||||||
|
HAVE_GLES2 { CSF_OpenGlLibs = -lEGL -lGLESv2 }
|
||||||
|
}
|
||||||
|
|
||||||
|
for (aCfgIter, CONFIG) {
|
||||||
|
aRes = $$find(aCfgIter, "^HAVE_")
|
||||||
|
count(aRes, 1) {
|
||||||
|
DEFINES += $$aCfgIter
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# Define the list of standard OCCT file extensions
|
||||||
|
aHxxRegex = ^.*\.(hxx|h|lxx|gxx)$
|
||||||
|
aPxxRegex = ^.*\.(pxx)$
|
||||||
|
aCxxRegex = ^.*\.(cxx|c)$
|
||||||
|
mac { aCxxRegex = ^.*\.(cxx|c|m|mm)$ }
|
||||||
|
|
||||||
|
# Auxiliary function for probing file extension
|
||||||
|
defineTest (occCheckExtension) {
|
||||||
|
aProbe = $$find(1, "$$2")
|
||||||
|
count(aProbe, 1) { return(true) } else { return(false) }
|
||||||
|
}
|
||||||
|
|
||||||
|
# Auxiliary function for probing compilable files
|
||||||
|
defineTest (occIsCxxFile) { occCheckExtension ($$1, $$aCxxRegex) { return(true) } else { return(false) } }
|
||||||
|
|
||||||
|
# Auxiliary function for probing header files
|
||||||
|
defineTest (occIsHxxFile) { occCheckExtension ($$1, $$aHxxRegex) { return(true) } else { return(false) } }
|
||||||
|
|
||||||
|
aTkFiles = $$cat($$aSrcRoot/$$OCC_TOOLKIT_NAME/FILES, lines)
|
||||||
|
aTkFiles += CMakeLists.txt
|
||||||
|
aPackages = $$cat($$aSrcRoot/$$OCC_TOOLKIT_NAME/PACKAGES, lines)
|
||||||
|
anExternLibs = $$cat($$aSrcRoot/$$OCC_TOOLKIT_NAME/EXTERNLIB, lines)
|
||||||
|
|
||||||
|
for (aTkFileIter, aTkFiles) { OTHER_FILES += $$aSrcRoot/$$OCC_TOOLKIT_NAME/$$aTkFileIter }
|
||||||
|
for (anExternLib, anExternLibs) {
|
||||||
|
hasCsf = $$find(anExternLib, CSF_)
|
||||||
|
count(hasCsf, 1) {
|
||||||
|
aList = $$split($$anExternLib, "\n")
|
||||||
|
LIBS += $$aList
|
||||||
|
} else {
|
||||||
|
LIBS += -l$$anExternLib
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# Iterate over Packages and add compilable files into this project
|
||||||
|
isEmpty (aPackages) { aPackages = $$OCC_TOOLKIT_NAME }
|
||||||
|
for (aPackage, aPackages) {
|
||||||
|
aPackageFolder = $$aSrcRoot/$$OCC_TOOLKIT_NAME/$$aPackage
|
||||||
|
aPackageFiles = $$cat($$aSrcRoot/$$aPackage/FILES, lines)
|
||||||
|
for (aFileIter, aPackageFiles) {
|
||||||
|
occIsCxxFile($$aFileIter) {
|
||||||
|
SOURCES += $$aSrcRoot/$$aPackage/$$aFileIter
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# extend clean with versioned .so files
|
||||||
|
!win32 {
|
||||||
|
aVerList = $$split(VERSION, ".")
|
||||||
|
aVerMaj = $$member(aVerList, 0)
|
||||||
|
aVerMin = $$member(aVerList, 1)
|
||||||
|
aVerMic = $$member(aVerList, 2)
|
||||||
|
equals(TEMPLATE, app) {
|
||||||
|
QMAKE_CLEAN += $$DESTDIR/$${TARGET}
|
||||||
|
} else {
|
||||||
|
mac {
|
||||||
|
QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.dylib
|
||||||
|
QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.dylib
|
||||||
|
QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.$${aVerMin}.dylib
|
||||||
|
QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.$${aVerMin}.$${aVerMic}.dylib
|
||||||
|
} else {
|
||||||
|
QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so
|
||||||
|
QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so.$${aVerMaj}
|
||||||
|
QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so.$${aVerMaj}.$${aVerMin}
|
||||||
|
QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so.$${aVerMaj}.$${aVerMin}.$${aVerMic}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
2
adm/qmake/OccToolkit.pro.in
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
OCC_TOOLKIT_NAME = \$\$TARGET
|
||||||
|
include(../../OccToolkit.pri)
|
41
adm/qmake/Occt.pro
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
# This is an experimental Solution project for building entire OCCT framework using qmake.
|
||||||
|
# It can be also used for just source code navigation in Qt Creator without actually building OCCT.
|
||||||
|
# Note, as this is an experimental project, compiler flags might differ from official builds - use it on your own risk!
|
||||||
|
# Building OCCT using CMake is a preferred solution.
|
||||||
|
#
|
||||||
|
# This project GENERATES sub-projects (OCCT modules) dynamically, so to start using it:
|
||||||
|
# - Launch genconf, select Project Format "Qt Project" and configure dependencies; this will also generate "custom.auto.pri".
|
||||||
|
# - Launch genproj to fill in "inc" folder with links to header files.
|
||||||
|
# - Open project in Qt Creator, and call "Run qmake".
|
||||||
|
# - Close the project in Qt Creator, open it again so that you should see the sub-modules in Project tree; call "Run qmake" again.
|
||||||
|
# - "Run qmake" and perform Build.
|
||||||
|
TEMPLATE = subdirs
|
||||||
|
exists(custom.auto.pri) { include(custom.auto.pri) }
|
||||||
|
exists(custom.pri) { include(custom.pri) }
|
||||||
|
|
||||||
|
OTHER_FILES += OccModule.pro.in \
|
||||||
|
OcctHeaderLink.hxx.in \
|
||||||
|
OccToolkit.pro.in \
|
||||||
|
OccCppConfig.pri \
|
||||||
|
OccModule.pri \
|
||||||
|
OccToolkit.pri \
|
||||||
|
custom.pri.template
|
||||||
|
|
||||||
|
# Iterate over Modules and generate sub-projects
|
||||||
|
aSolModuleList = $$cat(../MODULES, lines)
|
||||||
|
for (aSolModuleIter, aSolModuleList) {
|
||||||
|
aSolModule = $$first($$list($$aSolModuleIter))
|
||||||
|
eval(occtkgen_$${aSolModule}.input = $$_PRO_FILE_PWD_/OccModule.pro.in)
|
||||||
|
eval(occtkgen_$${aSolModule}.output = $$_PRO_FILE_PWD_/$${aSolModule}/$${aSolModule}.pro)
|
||||||
|
eval(occtkgen_$${aSolModule}.config = verbatim)
|
||||||
|
eval(QMAKE_SUBSTITUTES += occtkgen_$${aSolModule})
|
||||||
|
SUBDIRS += $${aSolModule}
|
||||||
|
}
|
||||||
|
|
||||||
|
# These dependencies are manually defined
|
||||||
|
ModelingData.depends = FoundationClasses
|
||||||
|
ModelingAlgorithms.depends = FoundationClasses ModelingData
|
||||||
|
Visualization.depends = FoundationClasses ModelingData ModelingAlgorithms
|
||||||
|
ApplicationFramework.depends = FoundationClasses ModelingData ModelingAlgorithms Visualization
|
||||||
|
DataExchange.depends = FoundationClasses ModelingData ModelingAlgorithms ApplicationFramework
|
||||||
|
Draw.depends = FoundationClasses ModelingData ModelingAlgorithms ApplicationFramework DataExchange Visualization
|
1
adm/qmake/OcctHeaderLink.hxx.in
Normal file
@@ -0,0 +1 @@
|
|||||||
|
#include \"../src/$${OCCT_PACKAGE}/$${OCCT_HEADER}\"
|
17
adm/qmake/custom.pri.template
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
PRODUCTS_PATH = c:/3rdparty/vc14
|
||||||
|
|
||||||
|
#CONFIG += HAVE_FREEIMAGE
|
||||||
|
#CONFIG += HAVE_FFMPEG
|
||||||
|
#CONFIG += HAVE_TBB
|
||||||
|
#CONFIG += HAVE_GLES2
|
||||||
|
#CONFIG += HAVE_D3D
|
||||||
|
#CONFIG += HAVE_VTK
|
||||||
|
|
||||||
|
aFreeType = $$PRODUCTS_PATH/freetype-2.5.5-vc14-64
|
||||||
|
aTclTk = $$PRODUCTS_PATH/tcltk-86-64
|
||||||
|
|
||||||
|
INCLUDEPATH += $$aFreeType/include
|
||||||
|
LIBS += -L$$aFreeType/lib
|
||||||
|
|
||||||
|
INCLUDEPATH += $$aTclTk/include
|
||||||
|
LIBS += -L$$aTclTk/lib
|
31
adm/svgdiff.bat
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
@echo off
|
||||||
|
rem Script to diff SVG images visually (as PNG) in TortoiseGit client
|
||||||
|
rem
|
||||||
|
rem It assumes that Inkscape and TortoiseGitIDiff executables are either
|
||||||
|
rem installed in default locations in Program Files, or are accessible by PATH
|
||||||
|
rem
|
||||||
|
rem To use this script for diffing SVG images, open TortoiseGit settings
|
||||||
|
rem (Start -> Programs -> TortoiseGit -> Settings), select "Diff Viewer",
|
||||||
|
rem click button "Advanced..." on the right tab and then add new record:
|
||||||
|
rem - Extension: .svg
|
||||||
|
rem - External program: <path to OCCT>\adm\svgdiff.bat %base %mine %bname %yname
|
||||||
|
|
||||||
|
rem Remove double quotes around arguments
|
||||||
|
set "f1=%1"
|
||||||
|
set "f2=%2"
|
||||||
|
set "f1=%f1:~1,-1%.png"
|
||||||
|
set "f2=%f2:~1,-1%.png"
|
||||||
|
|
||||||
|
rem Check if Inkscape and TortoiseGit are installed in default locations in
|
||||||
|
rem ProgramFiles; if not, assume they still may be accessible by PATH
|
||||||
|
set "inkscape=%ProgramFiles%\Inkscape\inkscape.exe"
|
||||||
|
if not exist "%inkscape%" set inkscape=inkscape.exe
|
||||||
|
set "tgitidiff=%ProgramFiles%\TortoiseGit\bin\TortoiseGitIDiff.exe"
|
||||||
|
if not exist "%tgitidiff%" set tgitidiff=TortoiseGitIDiff.exe
|
||||||
|
|
||||||
|
rem Convert SVG to PNG using Inkscape
|
||||||
|
"%inkscape%" -e "%f1%" %1
|
||||||
|
"%inkscape%" -e "%f2%" %2
|
||||||
|
|
||||||
|
rem Call Tortoise differ
|
||||||
|
"%tgitidiff%" /left:"%f1%" /right:"%f2%" /lefttitle:%3 /righttitle:%4
|
@@ -58,7 +58,6 @@ set (OpenCASCADE_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
|
|||||||
set (OpenCASCADE_WITH_TCL @USE_TCL@)
|
set (OpenCASCADE_WITH_TCL @USE_TCL@)
|
||||||
set (OpenCASCADE_WITH_FREETYPE @USE_FREETYPE@)
|
set (OpenCASCADE_WITH_FREETYPE @USE_FREETYPE@)
|
||||||
set (OpenCASCADE_WITH_FREEIMAGE @USE_FREEIMAGE@)
|
set (OpenCASCADE_WITH_FREEIMAGE @USE_FREEIMAGE@)
|
||||||
set (OpenCASCADE_WITH_GL2PS @USE_GL2PS@)
|
|
||||||
set (OpenCASCADE_WITH_TBB @USE_TBB@)
|
set (OpenCASCADE_WITH_TBB @USE_TBB@)
|
||||||
set (OpenCASCADE_WITH_VTK @USE_VTK@)
|
set (OpenCASCADE_WITH_VTK @USE_VTK@)
|
||||||
set (OpenCASCADE_WITH_FFMPEG @USE_FFMPEG@)
|
set (OpenCASCADE_WITH_FFMPEG @USE_FFMPEG@)
|
||||||
|
30
adm/templates/TInspectorEXE.vcxproj.user.in
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@X_COMPILER_BITNESS@'">
|
||||||
|
<LocalDebuggerEnvironment>CASROOT=@CMAKE_SOURCE_DIR@
|
||||||
|
CSF_OCCTDataPath=@CMAKE_SOURCE_DIR@/data
|
||||||
|
QTDIR=@3RDPARTY_QT_DIR@
|
||||||
|
PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;@OpenCASCADE_BINARY_DIR@;%PATH%
|
||||||
|
</LocalDebuggerEnvironment>
|
||||||
|
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||||
|
<LocalDebuggerWorkingDirectory>@CMAKE_BINARY_DIR@</LocalDebuggerWorkingDirectory>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|@X_COMPILER_BITNESS@'">
|
||||||
|
<LocalDebuggerEnvironment>CASROOT=@CMAKE_SOURCE_DIR@
|
||||||
|
CSF_OCCTDataPath=@CMAKE_SOURCE_DIR@/data
|
||||||
|
QTDIR=@3RDPARTY_QT_DIR@
|
||||||
|
PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;@OpenCASCADE_BINARY_DIR@i;%PATH%
|
||||||
|
</LocalDebuggerEnvironment>
|
||||||
|
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||||
|
<LocalDebuggerWorkingDirectory>@CMAKE_BINARY_DIR@</LocalDebuggerWorkingDirectory>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@X_COMPILER_BITNESS@'">
|
||||||
|
<LocalDebuggerEnvironment>CASROOT=@CMAKE_SOURCE_DIR@
|
||||||
|
CSF_OCCTDataPath=@CMAKE_SOURCE_DIR@/data
|
||||||
|
QTDIR=@3RDPARTY_QT_DIR@
|
||||||
|
PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;@OpenCASCADE_BINARY_DIR@d;%PATH%
|
||||||
|
</LocalDebuggerEnvironment>
|
||||||
|
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||||
|
<LocalDebuggerWorkingDirectory>@CMAKE_BINARY_DIR@</LocalDebuggerWorkingDirectory>
|
||||||
|
</PropertyGroup>
|
||||||
|
</Project>
|
@@ -1,11 +1,12 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
# This file has been generated by genproj.tcl script from CASROOT/adm/templates/codeblocks.sh
|
||||||
|
|
||||||
export TARGET="cbp"
|
export TARGET="cbp"
|
||||||
|
|
||||||
source ./env.sh "$1" "$TARGET"
|
source ./env.sh "$1" "$TARGET"
|
||||||
|
|
||||||
if [ -e "/Applications/CodeBlocks.app/Contents/MacOS/CodeBlocks" ]; then
|
if [ -e "/Applications/CodeBlocks.app/Contents/MacOS/CodeBlocks" ]; then
|
||||||
/Applications/CodeBlocks.app/Contents/MacOS/CodeBlocks ./adm/$WOKSTATION/cbp/OCCT.workspace
|
/Applications/CodeBlocks.app/Contents/MacOS/CodeBlocks ./adm/$WOKSTATION/cbp/__SOLUTION__.workspace
|
||||||
else
|
else
|
||||||
codeblocks ./adm/$WOKSTATION/cbp/OCCT.workspace
|
codeblocks ./adm/$WOKSTATION/cbp/__SOLUTION__.workspace
|
||||||
fi
|
fi
|
||||||
|
@@ -11,7 +11,6 @@ if /I "%VCVER%" == "@COMPILER@" (
|
|||||||
set "FREEIMAGE_DIR=@3RDPARTY_FREEIMAGE_DLL_DIRS@"
|
set "FREEIMAGE_DIR=@3RDPARTY_FREEIMAGE_DLL_DIRS@"
|
||||||
set "EGL_DIR=@3RDPARTY_EGL_DLL_DIRS@"
|
set "EGL_DIR=@3RDPARTY_EGL_DLL_DIRS@"
|
||||||
set "GLES2_DIR=@3RDPARTY_GLES2_DLL_DIRS@"
|
set "GLES2_DIR=@3RDPARTY_GLES2_DLL_DIRS@"
|
||||||
set "GL2PS_DIR=@3RDPARTY_GL2PS_DLL_DIRS@"
|
|
||||||
set "TBB_DIR=@3RDPARTY_TBB_DLL_DIR@"
|
set "TBB_DIR=@3RDPARTY_TBB_DLL_DIR@"
|
||||||
set "VTK_DIR=@3RDPARTY_VTK_DLL_DIR@"
|
set "VTK_DIR=@3RDPARTY_VTK_DLL_DIR@"
|
||||||
set "FFMPEG_DIR=@3RDPARTY_FFMPEG_DLL_DIR@"
|
set "FFMPEG_DIR=@3RDPARTY_FFMPEG_DLL_DIR@"
|
||||||
|
@@ -9,7 +9,6 @@ if [ "$1" == "@BIN_LETTER@" ]; then
|
|||||||
export TK_DIR="@3RDPARTY_TK_LIBRARY_DIR@"
|
export TK_DIR="@3RDPARTY_TK_LIBRARY_DIR@"
|
||||||
export FREETYPE_DIR="@3RDPARTY_FREETYPE_LIBRARY_DIR@"
|
export FREETYPE_DIR="@3RDPARTY_FREETYPE_LIBRARY_DIR@"
|
||||||
export FREEIMAGE_DIR="@3RDPARTY_FREEIMAGE_LIBRARY_DIRS@"
|
export FREEIMAGE_DIR="@3RDPARTY_FREEIMAGE_LIBRARY_DIRS@"
|
||||||
export GL2PS_DIR="@3RDPARTY_GL2PS_LIBRARY_DIRS@"
|
|
||||||
export TBB_DIR="@3RDPARTY_TBB_LIBRARY_DIR@"
|
export TBB_DIR="@3RDPARTY_TBB_LIBRARY_DIR@"
|
||||||
export VTK_DIR="@3RDPARTY_VTK_LIBRARY_DIR@"
|
export VTK_DIR="@3RDPARTY_VTK_LIBRARY_DIR@"
|
||||||
export FFMPEG_DIR="@3RDPARTY_FFMPEG_LIBRARY_DIR@"
|
export FFMPEG_DIR="@3RDPARTY_FFMPEG_LIBRARY_DIR@"
|
||||||
|
@@ -13,7 +13,6 @@ if /I "%VCVER%" == "@COMPILER@" (
|
|||||||
set "FREEIMAGE_DIR=@USED_3RDPARTY_FREEIMAGE_DIRS@"
|
set "FREEIMAGE_DIR=@USED_3RDPARTY_FREEIMAGE_DIRS@"
|
||||||
set "EGL_DIR=@USED_3RDPARTY_EGL_DIRS@"
|
set "EGL_DIR=@USED_3RDPARTY_EGL_DIRS@"
|
||||||
set "GLES2_DIR=@USED_3RDPARTY_GLES2_DIRS@"
|
set "GLES2_DIR=@USED_3RDPARTY_GLES2_DIRS@"
|
||||||
set "GL2PS_DIR=@USED_3RDPARTY_GL2PS_DIRS@"
|
|
||||||
set "TBB_DIR=@USED_3RDPARTY_TBB_DIR@"
|
set "TBB_DIR=@USED_3RDPARTY_TBB_DIR@"
|
||||||
set "VTK_DIR=@USED_3RDPARTY_VTK_DIR@"
|
set "VTK_DIR=@USED_3RDPARTY_VTK_DIR@"
|
||||||
set "FFMPEG_DIR=@USED_3RDPARTY_FFMPEG_DIR@"
|
set "FFMPEG_DIR=@USED_3RDPARTY_FFMPEG_DIR@"
|
||||||
@@ -24,18 +23,15 @@ if /I "%VCVER%" == "@COMPILER@" (
|
|||||||
set "TCL_VERSION_WITH_DOT=@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
|
set "TCL_VERSION_WITH_DOT=@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
|
||||||
set "TK_VERSION_WITH_DOT=@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@"
|
set "TK_VERSION_WITH_DOT=@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@"
|
||||||
|
|
||||||
set "CSF_OCCTBinPath=@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_BIN@%3"
|
set "CSF_OCCTBinPath=%CASROOT%/@INSTALL_DIR_BIN@%3"
|
||||||
set "CSF_OCCTLibPath=@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_LIB@%3"
|
set "CSF_OCCTLibPath=%CASROOT%/@INSTALL_DIR_LIB@%3"
|
||||||
|
|
||||||
set "CSF_OCCTIncludePath=@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_INCLUDE@"
|
set "CSF_OCCTIncludePath=%CASROOT%/@INSTALL_DIR_INCLUDE@"
|
||||||
set "CSF_OCCTResourcePath=@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_RESOURCE@"
|
set "CSF_OCCTResourcePath=%CASROOT%/@INSTALL_DIR_RESOURCE@"
|
||||||
set "CSF_OCCTDataPath=@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_DATA@"
|
set "CSF_OCCTDataPath=%CASROOT%/@INSTALL_DIR_DATA@"
|
||||||
set "CSF_OCCTSamplesPath=@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_SAMPLES@"
|
set "CSF_OCCTSamplesPath=%CASROOT%/@INSTALL_DIR_SAMPLES@"
|
||||||
set "CSF_OCCTTestsPath=@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_TESTS@"
|
set "CSF_OCCTTestsPath=%CASROOT%/@INSTALL_DIR_TESTS@"
|
||||||
set "CSF_OCCTDocPath=@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_DOC@"
|
set "CSF_OCCTDocPath=%CASROOT%/@INSTALL_DIR_DOC@"
|
||||||
|
|
||||||
rem for compatability with external application using CASROOT
|
|
||||||
set "CASROOT=@INSTALL_DIR_ABSOLUTE@"
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@@ -9,7 +9,6 @@ if [ "$1" == "@BIN_LETTER@" ]; then
|
|||||||
export TK_DIR="@USED_3RDPARTY_TK_DIR@"
|
export TK_DIR="@USED_3RDPARTY_TK_DIR@"
|
||||||
export FREETYPE_DIR="@USED_3RDPARTY_FREETYPE_DIR@"
|
export FREETYPE_DIR="@USED_3RDPARTY_FREETYPE_DIR@"
|
||||||
export FREEIMAGE_DIR="@USED_3RDPARTY_FREEIMAGE_DIRS@"
|
export FREEIMAGE_DIR="@USED_3RDPARTY_FREEIMAGE_DIRS@"
|
||||||
export GL2PS_DIR="@USED_3RDPARTY_GL2PS_DIRS@"
|
|
||||||
export TBB_DIR="@USED_3RDPARTY_TBB_DIR@"
|
export TBB_DIR="@USED_3RDPARTY_TBB_DIR@"
|
||||||
export VTK_DIR="@USED_3RDPARTY_VTK_DIR@"
|
export VTK_DIR="@USED_3RDPARTY_VTK_DIR@"
|
||||||
export FFMPEG_DIR="@USED_3RDPARTY_FFMPEG_DIR@"
|
export FFMPEG_DIR="@USED_3RDPARTY_FFMPEG_DIR@"
|
||||||
@@ -21,17 +20,14 @@ if [ "$1" == "@BIN_LETTER@" ]; then
|
|||||||
export TCL_VERSION_WITH_DOT="@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
|
export TCL_VERSION_WITH_DOT="@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
|
||||||
export TK_VERSION_WITH_DOT="@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@"
|
export TK_VERSION_WITH_DOT="@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@"
|
||||||
|
|
||||||
export CSF_OCCTBinPath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_BIN@"
|
export CSF_OCCTBinPath="${CASROOT}/@INSTALL_DIR_BIN@"
|
||||||
export CSF_OCCTLibPath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_LIB@"
|
export CSF_OCCTLibPath="${CASROOT}/@INSTALL_DIR_LIB@"
|
||||||
export CSF_OCCTIncludePath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_INCLUDE@"
|
export CSF_OCCTIncludePath="${CASROOT}/@INSTALL_DIR_INCLUDE@"
|
||||||
export CSF_OCCTResourcePath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_RESOURCE@"
|
export CSF_OCCTResourcePath="${CASROOT}/@INSTALL_DIR_RESOURCE@"
|
||||||
export CSF_OCCTDataPath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_DATA@"
|
export CSF_OCCTDataPath="${CASROOT}/@INSTALL_DIR_DATA@"
|
||||||
export CSF_OCCTSamplesPath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_SAMPLES@"
|
export CSF_OCCTSamplesPath="${CASROOT}/@INSTALL_DIR_SAMPLES@"
|
||||||
export CSF_OCCTTestsPath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_TESTS@"
|
export CSF_OCCTTestsPath="${CASROOT}/@INSTALL_DIR_TESTS@"
|
||||||
export CSF_OCCTDocPath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_DOC@"
|
export CSF_OCCTDocPath="${CASROOT}/@INSTALL_DIR_DOC@"
|
||||||
|
|
||||||
# for compatability with external application using CASROOT
|
|
||||||
export CASROOT="@INSTALL_DIR_ABSOLUTE@"
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@@ -1,7 +0,0 @@
|
|||||||
@echo off
|
|
||||||
|
|
||||||
rem Setup environment and launch TInspector
|
|
||||||
call "%~dp0env.bat" %1 %2 %3
|
|
||||||
|
|
||||||
TInspectorEXE.exe --dfbrowser
|
|
||||||
|
|
@@ -1,9 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
aCurrentPath="$PWD"
|
|
||||||
aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
|
|
||||||
|
|
||||||
source "${aScriptPath}/env.sh" "$1"
|
|
||||||
|
|
||||||
cd ${aCurrentPath}
|
|
||||||
TInspectorEXE --dfbrowser
|
|
@@ -19,26 +19,29 @@ set "HAVE_TBB=false"
|
|||||||
set "HAVE_OPENCL=false"
|
set "HAVE_OPENCL=false"
|
||||||
set "HAVE_FREEIMAGE=false"
|
set "HAVE_FREEIMAGE=false"
|
||||||
set "HAVE_FFMPEG=false"
|
set "HAVE_FFMPEG=false"
|
||||||
set "HAVE_GL2PS=false"
|
|
||||||
set "HAVE_VTK=false"
|
set "HAVE_VTK=false"
|
||||||
set "HAVE_GLES2=false"
|
set "HAVE_GLES2=false"
|
||||||
set "HAVE_D3D=false"
|
set "HAVE_D3D=false"
|
||||||
set "HAVE_ZLIB=false"
|
set "HAVE_ZLIB=false"
|
||||||
set "HAVE_LIBLZMA=false"
|
set "HAVE_LIBLZMA=false"
|
||||||
|
set "HAVE_RAPIDJSON=false"
|
||||||
|
set "HAVE_OPENVR=false"
|
||||||
|
set "HAVE_E57=false"
|
||||||
set "CSF_OPT_INC="
|
set "CSF_OPT_INC="
|
||||||
set "CSF_OPT_LIB32="
|
set "CSF_OPT_LIB32="
|
||||||
set "CSF_OPT_LIB64="
|
set "CSF_OPT_LIB64="
|
||||||
set "CSF_OPT_BIN32="
|
set "CSF_OPT_BIN32="
|
||||||
set "CSF_OPT_BIN64="
|
set "CSF_OPT_BIN64="
|
||||||
|
set "CSF_DEFINES=%CSF_DEFINES_EXTRA%"
|
||||||
rem ----- Load local settings -----
|
|
||||||
if exist "%~dp0custom.bat" (
|
|
||||||
call "%~dp0custom.bat" %1 %2 %3 %4 %5
|
|
||||||
)
|
|
||||||
|
|
||||||
if not ["%CASROOT%"] == [""] if exist "%SCRIPTROOT%\%CASROOT%" set "CASROOT=%SCRIPTROOT%\%CASROOT%"
|
if not ["%CASROOT%"] == [""] if exist "%SCRIPTROOT%\%CASROOT%" set "CASROOT=%SCRIPTROOT%\%CASROOT%"
|
||||||
if ["%CASROOT%"] == [""] set "CASROOT=%SCRIPTROOT%"
|
if ["%CASROOT%"] == [""] set "CASROOT=%SCRIPTROOT%"
|
||||||
|
|
||||||
|
rem ----- Load local settings -----
|
||||||
|
if exist "%CASROOT%\custom.bat" (
|
||||||
|
call "%CASROOT%\custom.bat" %1 %2 %3 %4 %5
|
||||||
|
)
|
||||||
|
|
||||||
rem ----- Read script arguments (override local settings) -----
|
rem ----- Read script arguments (override local settings) -----
|
||||||
if not ["%1"] == [""] set "VCVER=%1"
|
if not ["%1"] == [""] set "VCVER=%1"
|
||||||
if not ["%2"] == [""] set "ARCH=%2"
|
if not ["%2"] == [""] set "ARCH=%2"
|
||||||
@@ -49,14 +52,44 @@ if /I ["%3"] == ["d"] set "CASDEB=d"
|
|||||||
if /I ["%3"] == ["i"] set "CASDEB=i"
|
if /I ["%3"] == ["i"] set "CASDEB=i"
|
||||||
if /I ["%3"] == ["relwithdeb"] set "CASDEB=i"
|
if /I ["%3"] == ["relwithdeb"] set "CASDEB=i"
|
||||||
|
|
||||||
rem Decode VCVER
|
rem Decode VCVER variable and define related ones:
|
||||||
call "%~dp0adm\vcver.bat"
|
rem
|
||||||
|
rem VCFMT - "vc" followed by full version number of Visual Studio toolset
|
||||||
|
rem (same as VCVER without optional suffix "-uwp")
|
||||||
|
rem VCLIB - name of folder contining binaries
|
||||||
|
rem (same as VCVER except without third version in number)
|
||||||
|
rem VCPROP - name of required Visual Studion Workload (starting with VS 2017)
|
||||||
|
rem
|
||||||
|
rem Note that for VS before 2015 (vc14) always
|
||||||
|
rem VCFMT=VCLIB=VCVER and VCPROP=NativeDesktop
|
||||||
|
|
||||||
|
rem Since VS 2017, environment variables like VS100COMNTOOLS are not defined
|
||||||
|
rem any more, we can only use vswhere.exe tool to find Visual Studio.
|
||||||
|
rem Add path to vswhere.exe
|
||||||
|
set "PATH=%PATH%;%ProgramFiles(x86)%\Microsoft Visual Studio\Installer"
|
||||||
|
|
||||||
|
rem for vc10-12, interpretation is trivial
|
||||||
|
set VCFMT=%VCVER%
|
||||||
|
set VCLIB=%VCVER:~0,4%
|
||||||
|
set VCPROP=NativeDesktop
|
||||||
|
rem vc14 and later can have optional suffix "-uwp"
|
||||||
|
if "%VCVER:~-4%" == "-uwp" (
|
||||||
|
set VCFMT=%VCVER:~0,-4%
|
||||||
|
set VCLIB=%VCLIB%-uwp
|
||||||
|
set VCPROP=Universal
|
||||||
|
)
|
||||||
|
if "%VCFMT%" == "vclang" (
|
||||||
|
set VCLIB=vc14
|
||||||
|
)
|
||||||
|
rem echo VCVER=%VCVER% VCFMT=%VCFMT% VCLIB=%VCLIB% VCPROP=%VCPROP%
|
||||||
|
|
||||||
rem ----- Parsing of Visual Studio platform -----
|
rem ----- Parsing of Visual Studio platform -----
|
||||||
set "VisualStudioExpressName=VCExpress"
|
set "VisualStudioExpressName=VCExpress"
|
||||||
|
|
||||||
if not "%DevEnvDir%" == "" (
|
if not "%DevEnvDir%" == "" (
|
||||||
rem If DevEnvDir is already defined (e.g. in custom.bat), use that value
|
rem If DevEnvDir is already defined (e.g. in custom.bat), use that value
|
||||||
|
) else if /I "%VCFMT%" == "vc9" (
|
||||||
|
set "DevEnvDir=%VS90COMNTOOLS%..\IDE"
|
||||||
) else if /I "%VCFMT%" == "vc10" (
|
) else if /I "%VCFMT%" == "vc10" (
|
||||||
set "DevEnvDir=%VS100COMNTOOLS%..\IDE"
|
set "DevEnvDir=%VS100COMNTOOLS%..\IDE"
|
||||||
) else if /I "%VCFMT%" == "vc11" (
|
) else if /I "%VCFMT%" == "vc11" (
|
||||||
@@ -73,13 +106,35 @@ if not "%DevEnvDir%" == "" (
|
|||||||
for /f "usebackq delims=" %%i in (`vswhere.exe -version "[15.0,15.99]" -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
|
for /f "usebackq delims=" %%i in (`vswhere.exe -version "[15.0,15.99]" -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
|
||||||
set "DevEnvDir=%%i\Common7\IDE\"
|
set "DevEnvDir=%%i\Common7\IDE\"
|
||||||
)
|
)
|
||||||
|
) else if /I "%VCFMT%" == "vc142" (
|
||||||
|
for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
|
||||||
|
set "DevEnvDir=%%i\Common7\IDE\"
|
||||||
|
)
|
||||||
|
) else if /I "%VCFMT%" == "vclang" (
|
||||||
|
for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
|
||||||
|
set "DevEnvDir=%%i\Common7\IDE\"
|
||||||
|
)
|
||||||
|
) else if /I "%VCFMT%" == "gcc" (
|
||||||
|
rem MinGW
|
||||||
) else (
|
) else (
|
||||||
echo Error: wrong VS identifier
|
echo Error: first argument ^(%VCVER%^) should specify supported version of Visual C++,
|
||||||
|
echo one of:
|
||||||
|
echo vc9 = VS 2008 ^(SP1^)
|
||||||
|
echo vc10 = VS 2010 ^(SP3^)
|
||||||
|
echo vc11 = VS 2012 ^(SP3^)
|
||||||
|
echo vc12 = VS 2013 ^(SP3^)
|
||||||
|
echo vc14 = VS 2015
|
||||||
|
echo vc141 = VS 2017
|
||||||
|
echo vc142 = VS 2019
|
||||||
|
echo vclang = VS 2019 with ClangCL toolset
|
||||||
exit /B
|
exit /B
|
||||||
)
|
)
|
||||||
|
|
||||||
rem ----- Parsing vcvarsall for qt samples and define PlatformToolset -----
|
rem ----- Parsing vcvarsall for qt samples and define PlatformToolset -----
|
||||||
if /I "%VCFMT%" == "vc10" (
|
if /I "%VCFMT%" == "vc9" (
|
||||||
|
set "VCVARS=%VS90COMNTOOLS%..\..\VC\vcvarsall.bat"
|
||||||
|
set "VCPlatformToolSet=v90"
|
||||||
|
) else if /I "%VCFMT%" == "vc10" (
|
||||||
set "VCVARS=%VS100COMNTOOLS%..\..\VC\vcvarsall.bat"
|
set "VCVARS=%VS100COMNTOOLS%..\..\VC\vcvarsall.bat"
|
||||||
set "VCPlatformToolSet=v100"
|
set "VCPlatformToolSet=v100"
|
||||||
) else if /I "%VCFMT%" == "vc11" (
|
) else if /I "%VCFMT%" == "vc11" (
|
||||||
@@ -96,10 +151,21 @@ if /I "%VCFMT%" == "vc10" (
|
|||||||
set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
|
set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
|
||||||
)
|
)
|
||||||
set "VCPlatformToolSet=v141"
|
set "VCPlatformToolSet=v141"
|
||||||
|
) else if /I "%VCFMT%" == "vc142" (
|
||||||
|
for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
|
||||||
|
set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
|
||||||
|
)
|
||||||
|
set "VCPlatformToolSet=v142"
|
||||||
|
) else if /I "%VCFMT%" == "vclang" (
|
||||||
|
for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
|
||||||
|
set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
|
||||||
|
)
|
||||||
|
set "VCPlatformToolSet=ClangCL"
|
||||||
|
) else if /I "%VCFMT%" == "gcc" (
|
||||||
|
rem MinGW
|
||||||
) else (
|
) else (
|
||||||
echo Error: first argument ^(%VCVER%^) should specify supported version of Visual C++,
|
echo Error: wrong VS identifier
|
||||||
echo one of: vc10 ^(VS 2010 SP3^), vc11 ^(VS 2012 SP3^), vc12 ^(VS 2013^) or vc14 ^(VS 2015^)
|
exit /B
|
||||||
exit
|
|
||||||
)
|
)
|
||||||
|
|
||||||
set "CSF_OPT_LIB32D=%CSF_OPT_LIB32%"
|
set "CSF_OPT_LIB32D=%CSF_OPT_LIB32%"
|
||||||
@@ -116,7 +182,6 @@ set "CSF_OPT_CMPL="
|
|||||||
set "PRODUCTS_DEFINES="
|
set "PRODUCTS_DEFINES="
|
||||||
if ["%HAVE_TBB%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_TBB" & set "CSF_DEFINES=HAVE_TBB;%CSF_DEFINES%"
|
if ["%HAVE_TBB%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_TBB" & set "CSF_DEFINES=HAVE_TBB;%CSF_DEFINES%"
|
||||||
if ["%HAVE_OPENCL%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_OPENCL" & set "CSF_DEFINES=HAVE_OPENCL;%CSF_DEFINES%"
|
if ["%HAVE_OPENCL%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_OPENCL" & set "CSF_DEFINES=HAVE_OPENCL;%CSF_DEFINES%"
|
||||||
if ["%HAVE_GL2PS%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_GL2PS" & set "CSF_DEFINES=HAVE_GL2PS;%CSF_DEFINES%"
|
|
||||||
if ["%HAVE_FREEIMAGE%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_FREEIMAGE" & set "CSF_DEFINES=HAVE_FREEIMAGE;%CSF_DEFINES%"
|
if ["%HAVE_FREEIMAGE%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_FREEIMAGE" & set "CSF_DEFINES=HAVE_FREEIMAGE;%CSF_DEFINES%"
|
||||||
if ["%HAVE_FFMPEG%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_FFMPEG" & set "CSF_DEFINES=HAVE_FFMPEG;%CSF_DEFINES%"
|
if ["%HAVE_FFMPEG%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_FFMPEG" & set "CSF_DEFINES=HAVE_FFMPEG;%CSF_DEFINES%"
|
||||||
if ["%HAVE_VTK%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_VTK" & set "CSF_DEFINES=HAVE_VTK;%CSF_DEFINES%"
|
if ["%HAVE_VTK%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_VTK" & set "CSF_DEFINES=HAVE_VTK;%CSF_DEFINES%"
|
||||||
@@ -124,6 +189,9 @@ if ["%HAVE_GLES2%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DH
|
|||||||
if ["%HAVE_D3D%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_D3D" & set "CSF_DEFINES=HAVE_D3D;%CSF_DEFINES%"
|
if ["%HAVE_D3D%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_D3D" & set "CSF_DEFINES=HAVE_D3D;%CSF_DEFINES%"
|
||||||
if ["%HAVE_ZLIB%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_ZLIB" & set "CSF_DEFINES=HAVE_ZLIB;%CSF_DEFINES%"
|
if ["%HAVE_ZLIB%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_ZLIB" & set "CSF_DEFINES=HAVE_ZLIB;%CSF_DEFINES%"
|
||||||
if ["%HAVE_LIBLZMA%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_LIBLZMA" & set "CSF_DEFINES=HAVE_LIBLZMA;%CSF_DEFINES%"
|
if ["%HAVE_LIBLZMA%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_LIBLZMA" & set "CSF_DEFINES=HAVE_LIBLZMA;%CSF_DEFINES%"
|
||||||
|
if ["%HAVE_RAPIDJSON%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_RAPIDJSON" & set "CSF_DEFINES=HAVE_RAPIDJSON;%CSF_DEFINES%"
|
||||||
|
if ["%HAVE_OPENVR%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_OPENVR" & set "CSF_DEFINES=HAVE_OPENVR;%CSF_DEFINES%"
|
||||||
|
if ["%HAVE_E57%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_E57" & set "CSF_DEFINES=HAVE_E57;%CSF_DEFINES%"
|
||||||
|
|
||||||
rem Eliminate VS warning
|
rem Eliminate VS warning
|
||||||
if ["%CSF_DEFINES%"] == [""] set "CSF_DEFINES=;"
|
if ["%CSF_DEFINES%"] == [""] set "CSF_DEFINES=;"
|
||||||
|
@@ -31,7 +31,9 @@ rem VCFMT=VCLIB=VCVER and VCPROP=NativeDesktop
|
|||||||
rem Since VS 2017, environment variables like VS100COMNTOOLS are not defined
|
rem Since VS 2017, environment variables like VS100COMNTOOLS are not defined
|
||||||
rem any more, we can only use vswhere.exe tool to find Visual Studio.
|
rem any more, we can only use vswhere.exe tool to find Visual Studio.
|
||||||
rem Add path to vswhere.exe
|
rem Add path to vswhere.exe
|
||||||
set "PATH=%PATH%;%ProgramFiles(x86)%\Microsoft Visual Studio\Installer"
|
if /I not "%VCFMT%" == "gcc" (
|
||||||
|
set "PATH=%PATH%;%ProgramFiles(x86)%\Microsoft Visual Studio\Installer"
|
||||||
|
)
|
||||||
|
|
||||||
rem for vc10-12, interpretation is trivial
|
rem for vc10-12, interpretation is trivial
|
||||||
set VCFMT=%VCVER%
|
set VCFMT=%VCVER%
|
||||||
@@ -50,6 +52,8 @@ set "VisualStudioExpressName=VCExpress"
|
|||||||
|
|
||||||
if not "%DevEnvDir%" == "" (
|
if not "%DevEnvDir%" == "" (
|
||||||
rem If DevEnvDir is already defined (e.g. in custom.bat), use that value
|
rem If DevEnvDir is already defined (e.g. in custom.bat), use that value
|
||||||
|
) else if /I "%VCFMT%" == "vc9" (
|
||||||
|
set "DevEnvDir=%VS90COMNTOOLS%..\IDE"
|
||||||
) else if /I "%VCFMT%" == "vc10" (
|
) else if /I "%VCFMT%" == "vc10" (
|
||||||
set "DevEnvDir=%VS100COMNTOOLS%..\IDE"
|
set "DevEnvDir=%VS100COMNTOOLS%..\IDE"
|
||||||
) else if /I "%VCFMT%" == "vc11" (
|
) else if /I "%VCFMT%" == "vc11" (
|
||||||
@@ -66,13 +70,22 @@ if not "%DevEnvDir%" == "" (
|
|||||||
for /f "usebackq delims=" %%i in (`vswhere.exe -version "[15.0,15.99]" -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
|
for /f "usebackq delims=" %%i in (`vswhere.exe -version "[15.0,15.99]" -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
|
||||||
set "DevEnvDir=%%i\Common7\IDE\"
|
set "DevEnvDir=%%i\Common7\IDE\"
|
||||||
)
|
)
|
||||||
|
) else if /I "%VCFMT%" == "vc142" (
|
||||||
|
for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
|
||||||
|
set "DevEnvDir=%%i\Common7\IDE\"
|
||||||
|
)
|
||||||
|
) else if /I "%VCFMT%" == "gcc" (
|
||||||
|
rem MinGW
|
||||||
) else (
|
) else (
|
||||||
echo Error: wrong VS identifier
|
echo Error: wrong VS identifier
|
||||||
exit /B
|
exit /B
|
||||||
)
|
)
|
||||||
|
|
||||||
rem ----- Parsing vcvarsall for qt samples and define PlatformToolset -----
|
rem ----- Parsing vcvarsall for qt samples and define PlatformToolset -----
|
||||||
if /I "%VCFMT%" == "vc10" (
|
if /I "%VCFMT%" == "vc9" (
|
||||||
|
set "VCVARS=%VS90COMNTOOLS%..\..\VC\vcvarsall.bat"
|
||||||
|
set "VCPlatformToolSet=v90"
|
||||||
|
) else if /I "%VCFMT%" == "vc10" (
|
||||||
set "VCVARS=%VS100COMNTOOLS%..\..\VC\vcvarsall.bat"
|
set "VCVARS=%VS100COMNTOOLS%..\..\VC\vcvarsall.bat"
|
||||||
set "VCPlatformToolSet=v100"
|
set "VCPlatformToolSet=v100"
|
||||||
) else if /I "%VCFMT%" == "vc11" (
|
) else if /I "%VCFMT%" == "vc11" (
|
||||||
@@ -89,30 +102,39 @@ if /I "%VCFMT%" == "vc10" (
|
|||||||
set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
|
set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
|
||||||
)
|
)
|
||||||
set "VCPlatformToolSet=v141"
|
set "VCPlatformToolSet=v141"
|
||||||
|
) else if /I "%VCFMT%" == "vc142" (
|
||||||
|
for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
|
||||||
|
set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
|
||||||
|
)
|
||||||
|
set "VCPlatformToolSet=v142"
|
||||||
|
) else if /I "%VCFMT%" == "gcc" (
|
||||||
|
rem MinGW
|
||||||
) else (
|
) else (
|
||||||
echo Error: first argument ^(%VCVER%^) should specify supported version of Visual C++,
|
echo Error: first argument ^(%VCVER%^) should specify supported version of Visual C++,
|
||||||
echo one of: vc10 ^(VS 2010 SP3^), vc11 ^(VS 2012 SP3^), vc12 ^(VS 2013^) or vc14 ^(VS 2015^)
|
echo one of: vc10 ^(VS 2010 SP3^), vc11 ^(VS 2012 SP3^), vc12 ^(VS 2013^) or vc14 ^(VS 2015^)
|
||||||
exit
|
exit
|
||||||
)
|
)
|
||||||
|
|
||||||
|
rem ----- For compatability with external application using CASROOT -----
|
||||||
|
if ["%CASROOT%"] == [""] set "CASROOT=%SCRIPTROOT%"
|
||||||
|
|
||||||
|
rem ----- Define path to 3rdparty products -----
|
||||||
|
set "THIRDPARTY_DIR=@3RDPARTY_DIR@"
|
||||||
|
|
||||||
if ["%ARCH%"] == ["32"] set VCARCH=x86
|
if ["%ARCH%"] == ["32"] set VCARCH=x86
|
||||||
if ["%ARCH%"] == ["64"] set VCARCH=amd64
|
if ["%ARCH%"] == ["64"] set VCARCH=amd64
|
||||||
|
|
||||||
if /I ["%1"] == ["vc141"] set "VCVER=vc14"
|
if /I ["%1"] == ["vc141"] set "VCVER=vc14"
|
||||||
if exist "%~dp0custom.bat" (
|
if exist "%CASROOT%\custom.bat" (
|
||||||
call "%~dp0custom.bat" %VCVER% %ARCH% %CASDEB%
|
call "%CASROOT%\custom.bat" %VCVER% %ARCH% %CASDEB%
|
||||||
)
|
)
|
||||||
|
|
||||||
rem for compatability with external application using CASROOT
|
|
||||||
if ["%CASROOT%"] == [""] set "CASROOT=%SCRIPTROOT%"
|
|
||||||
|
|
||||||
if not ["%TCL_DIR%"] == [""] set "PATH=%TCL_DIR%;%PATH%"
|
if not ["%TCL_DIR%"] == [""] set "PATH=%TCL_DIR%;%PATH%"
|
||||||
if not ["%TK_DIR%"] == [""] set "PATH=%TK_DIR%;%PATH%"
|
if not ["%TK_DIR%"] == [""] set "PATH=%TK_DIR%;%PATH%"
|
||||||
if not ["%FREETYPE_DIR%"] == [""] set "PATH=%FREETYPE_DIR%;%PATH%"
|
if not ["%FREETYPE_DIR%"] == [""] set "PATH=%FREETYPE_DIR%;%PATH%"
|
||||||
if not ["%FREEIMAGE_DIR%"] == [""] set "PATH=%FREEIMAGE_DIR%;%PATH%"
|
if not ["%FREEIMAGE_DIR%"] == [""] set "PATH=%FREEIMAGE_DIR%;%PATH%"
|
||||||
if not ["%EGL_DIR%"] == [""] set "PATH=%EGL_DIR%;%PATH%"
|
if not ["%EGL_DIR%"] == [""] set "PATH=%EGL_DIR%;%PATH%"
|
||||||
if not ["%GLES2_DIR%"] == [""] set "PATH=%GLES2_DIR%;%PATH%"
|
if not ["%GLES2_DIR%"] == [""] set "PATH=%GLES2_DIR%;%PATH%"
|
||||||
if not ["%GL2PS_DIR%"] == [""] set "PATH=%GL2PS_DIR%;%PATH%"
|
|
||||||
if not ["%TBB_DIR%"] == [""] set "PATH=%TBB_DIR%;%PATH%"
|
if not ["%TBB_DIR%"] == [""] set "PATH=%TBB_DIR%;%PATH%"
|
||||||
if not ["%VTK_DIR%"] == [""] set "PATH=%VTK_DIR%;%PATH%"
|
if not ["%VTK_DIR%"] == [""] set "PATH=%VTK_DIR%;%PATH%"
|
||||||
if not ["%FFMPEG_DIR%"] == [""] set "PATH=%FFMPEG_DIR%;%PATH%"
|
if not ["%FFMPEG_DIR%"] == [""] set "PATH=%FFMPEG_DIR%;%PATH%"
|
||||||
@@ -146,7 +168,7 @@ set "CSF_STEPDefaults=%CSF_OCCTResourcePath%\XSTEPResource"
|
|||||||
set "CSF_XmlOcafResource=%CSF_OCCTResourcePath%\XmlOcafResource"
|
set "CSF_XmlOcafResource=%CSF_OCCTResourcePath%\XmlOcafResource"
|
||||||
set "CSF_MIGRATION_TYPES=%CSF_OCCTResourcePath%\StdResource\MigrationSheet.txt"
|
set "CSF_MIGRATION_TYPES=%CSF_OCCTResourcePath%\StdResource\MigrationSheet.txt"
|
||||||
|
|
||||||
rem Draw Harness special stuff
|
rem ----- Draw Harness special stuff -----
|
||||||
if exist "%CSF_OCCTResourcePath%\DrawResources" (
|
if exist "%CSF_OCCTResourcePath%\DrawResources" (
|
||||||
set "DRAWHOME=%CSF_OCCTResourcePath%\DrawResources"
|
set "DRAWHOME=%CSF_OCCTResourcePath%\DrawResources"
|
||||||
set "CSF_DrawPluginDefaults=%CSF_OCCTResourcePath%\DrawResources"
|
set "CSF_DrawPluginDefaults=%CSF_OCCTResourcePath%\DrawResources"
|
||||||
|
137
adm/templates/env.build.sh.in
Normal file
@@ -0,0 +1,137 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
|
||||||
|
|
||||||
|
# ----- For compatability with external application using CASROOT -----
|
||||||
|
if [ "${CASROOT}" == "" ]; then
|
||||||
|
export CASROOT="${aScriptPath}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ----- Define path to 3rdparty products -----
|
||||||
|
export THIRDPARTY_DIR="@3RDPARTY_DIR@"
|
||||||
|
|
||||||
|
# ----- Read script arguments -----
|
||||||
|
shopt -s nocasematch
|
||||||
|
export CASDEB="";
|
||||||
|
if [[ "$1" == "debug" ]]; then export CASDEB="d"; fi
|
||||||
|
if [[ "$1" == "d" ]]; then export CASDEB="d"; fi
|
||||||
|
if [[ "$1" == "relwithdeb" ]]; then export CASDEB="i"; fi
|
||||||
|
if [[ "$1" == "i" ]]; then export CASDEB="i"; fi
|
||||||
|
shopt -u nocasematch
|
||||||
|
|
||||||
|
# ----- Set path to 3rd party and OCCT libraries -----
|
||||||
|
anArch=`uname -m`
|
||||||
|
if [ "$anArch" != "x86_64" ] && [ "$anArch" != "ia64" ]; then
|
||||||
|
export ARCH="32";
|
||||||
|
else
|
||||||
|
export ARCH="64";
|
||||||
|
fi
|
||||||
|
|
||||||
|
aSystem=`uname -s`
|
||||||
|
if [ "$aSystem" == "Darwin" ]; then
|
||||||
|
export WOKSTATION="mac";
|
||||||
|
export ARCH="64";
|
||||||
|
else
|
||||||
|
export WOKSTATION="lin";
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ----- Set local settings -----
|
||||||
|
if [ -e "${CASROOT}/custom.sh" ]; then
|
||||||
|
source "${CASROOT}/custom.sh" "${CASDEB}" "${ARCH}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
THRDPARTY_PATH=""
|
||||||
|
if [ "$TCL_DIR" != "" ]; then
|
||||||
|
THRDPARTY_PATH="${TCL_DIR}:${THRDPARTY_PATH}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$TK_DIR" != "" ]; then
|
||||||
|
THRDPARTY_PATH="${TK_DIR}:${THRDPARTY_PATH}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$FREETYPE_DIR" != "" ]; then
|
||||||
|
THRDPARTY_PATH="${FREETYPE_DIR}:${THRDPARTY_PATH}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$FREEIMAGE_DIR" != "" ]; then
|
||||||
|
THRDPARTY_PATH="${FREEIMAGE_DIR}:${THRDPARTY_PATH}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$TBB_DIR" != "" ]; then
|
||||||
|
THRDPARTY_PATH="${TBB_DIR}:${THRDPARTY_PATH}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$VTK_DIR" != "" ]; then
|
||||||
|
THRDPARTY_PATH="${VTK_DIR}:${THRDPARTY_PATH}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$FFMPEG_DIR" != "" ]; then
|
||||||
|
THRDPARTY_PATH="${FFMPEG_DIR}:${THRDPARTY_PATH}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$QTDIR" != "" ]; then
|
||||||
|
THRDPARTY_PATH="${QTDIR}/lib:${THRDPARTY_PATH}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$TK_DIR" != "$TCL_DIR" ]; then
|
||||||
|
if [ "$TK_DIR" != "" ]; then
|
||||||
|
export TK_LIBRARY="${TK_DIR}/../lib/tk${TK_VERSION_WITH_DOT}"
|
||||||
|
fi
|
||||||
|
if [ "$TCL_DIR" != "" ]; then
|
||||||
|
export TCL_LIBRARY="${TCL_DIR}/../lib/tcl${TCL_VERSION_WITH_DOT}"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$LD_LIBRARY_PATH" != "" ]; then
|
||||||
|
export LD_LIBRARY_PATH="${THRDPARTY_PATH}:${LD_LIBRARY_PATH}"
|
||||||
|
else
|
||||||
|
export LD_LIBRARY_PATH="${THRDPARTY_PATH}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$CSF_OCCTBinPath" != "" ]; then
|
||||||
|
export PATH="${CSF_OCCTBinPath}:${PATH}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$CSF_OCCTLibPath" != "" ]; then
|
||||||
|
if [ "$LD_LIBRARY_PATH" != "" ]; then
|
||||||
|
export LD_LIBRARY_PATH="${CSF_OCCTLibPath}:${LD_LIBRARY_PATH}"
|
||||||
|
else
|
||||||
|
export LD_LIBRARY_PATH="${CSF_OCCTLibPath}"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$WOKSTATION" == "mac" ]; then
|
||||||
|
if [ "$DYLD_LIBRARY_PATH" != "" ]; then
|
||||||
|
export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${DYLD_LIBRARY_PATH}"
|
||||||
|
else
|
||||||
|
export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ----- Set envoronment variables used by OCCT -----
|
||||||
|
export CSF_LANGUAGE=us
|
||||||
|
export MMGT_CLEAR=1
|
||||||
|
export CSF_SHMessage="${CSF_OCCTResourcePath}/SHMessage"
|
||||||
|
export CSF_MDTVTexturesDirectory="${CSF_OCCTResourcePath}/Textures"
|
||||||
|
export CSF_ShadersDirectory="${CSF_OCCTResourcePath}/Shaders"
|
||||||
|
export CSF_XSMessage="${CSF_OCCTResourcePath}/XSMessage"
|
||||||
|
export CSF_TObjMessage="${CSF_OCCTResourcePath}/TObj"
|
||||||
|
export CSF_StandardDefaults="${CSF_OCCTResourcePath}/StdResource"
|
||||||
|
export CSF_PluginDefaults="${CSF_OCCTResourcePath}/StdResource"
|
||||||
|
export CSF_XCAFDefaults="${CSF_OCCTResourcePath}/StdResource"
|
||||||
|
export CSF_TObjDefaults="${CSF_OCCTResourcePath}/StdResource"
|
||||||
|
export CSF_StandardLiteDefaults="${CSF_OCCTResourcePath}/StdResource"
|
||||||
|
export CSF_IGESDefaults="${CSF_OCCTResourcePath}/XSTEPResource"
|
||||||
|
export CSF_STEPDefaults="${CSF_OCCTResourcePath}/XSTEPResource"
|
||||||
|
export CSF_XmlOcafResource="${CSF_OCCTResourcePath}/XmlOcafResource"
|
||||||
|
export CSF_MIGRATION_TYPES="${CSF_OCCTResourcePath}/StdResource/MigrationSheet.txt"
|
||||||
|
|
||||||
|
# ----- Draw Harness special stuff -----
|
||||||
|
if [ -e "${CSF_OCCTResourcePath}/DrawResources" ]; then
|
||||||
|
export DRAWHOME="${CSF_OCCTResourcePath}/DrawResources"
|
||||||
|
export CSF_DrawPluginDefaults="${CSF_OCCTResourcePath}/DrawResources"
|
||||||
|
|
||||||
|
if [ -e "${CSF_OCCTResourcePath}/DrawResources/DrawDefault" ]; then
|
||||||
|
export DRAWDEFAULT="${CSF_OCCTResourcePath}/DrawResources/DrawDefault"
|
||||||
|
fi
|
||||||
|
fi
|
137
adm/templates/env.install.sh.in
Normal file
@@ -0,0 +1,137 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
|
||||||
|
|
||||||
|
# ----- For compatability with external application using CASROOT -----
|
||||||
|
if [ "${CASROOT}" == "" ]; then
|
||||||
|
export CASROOT="@INSTALL_DIR@"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ----- Define path to 3rdparty products -----
|
||||||
|
export THIRDPARTY_DIR="@3RDPARTY_DIR@"
|
||||||
|
|
||||||
|
# ----- Read script arguments -----
|
||||||
|
shopt -s nocasematch
|
||||||
|
export CASDEB="";
|
||||||
|
if [[ "$1" == "debug" ]]; then export CASDEB="d"; fi
|
||||||
|
if [[ "$1" == "d" ]]; then export CASDEB="d"; fi
|
||||||
|
if [[ "$1" == "relwithdeb" ]]; then export CASDEB="i"; fi
|
||||||
|
if [[ "$1" == "i" ]]; then export CASDEB="i"; fi
|
||||||
|
shopt -u nocasematch
|
||||||
|
|
||||||
|
# ----- Set path to 3rd party and OCCT libraries -----
|
||||||
|
anArch=`uname -m`
|
||||||
|
if [ "$anArch" != "x86_64" ] && [ "$anArch" != "ia64" ]; then
|
||||||
|
export ARCH="32";
|
||||||
|
else
|
||||||
|
export ARCH="64";
|
||||||
|
fi
|
||||||
|
|
||||||
|
aSystem=`uname -s`
|
||||||
|
if [ "$aSystem" == "Darwin" ]; then
|
||||||
|
export WOKSTATION="mac";
|
||||||
|
export ARCH="64";
|
||||||
|
else
|
||||||
|
export WOKSTATION="lin";
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ----- Set local settings -----
|
||||||
|
if [ -e "${CASROOT}/@INSTALL_DIR_SCRIPT@/custom.sh" ]; then
|
||||||
|
source "${CASROOT}/@INSTALL_DIR_SCRIPT@/custom.sh" "${CASDEB}" "${ARCH}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
THRDPARTY_PATH=""
|
||||||
|
if [ "$TCL_DIR" != "" ]; then
|
||||||
|
THRDPARTY_PATH="${TCL_DIR}:${THRDPARTY_PATH}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$TK_DIR" != "" ]; then
|
||||||
|
THRDPARTY_PATH="${TK_DIR}:${THRDPARTY_PATH}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$FREETYPE_DIR" != "" ]; then
|
||||||
|
THRDPARTY_PATH="${FREETYPE_DIR}:${THRDPARTY_PATH}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$FREEIMAGE_DIR" != "" ]; then
|
||||||
|
THRDPARTY_PATH="${FREEIMAGE_DIR}:${THRDPARTY_PATH}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$TBB_DIR" != "" ]; then
|
||||||
|
THRDPARTY_PATH="${TBB_DIR}:${THRDPARTY_PATH}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$VTK_DIR" != "" ]; then
|
||||||
|
THRDPARTY_PATH="${VTK_DIR}:${THRDPARTY_PATH}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$FFMPEG_DIR" != "" ]; then
|
||||||
|
THRDPARTY_PATH="${FFMPEG_DIR}:${THRDPARTY_PATH}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$QTDIR" != "" ]; then
|
||||||
|
THRDPARTY_PATH="${QTDIR}/lib:${THRDPARTY_PATH}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$TK_DIR" != "$TCL_DIR" ]; then
|
||||||
|
if [ "$TK_DIR" != "" ]; then
|
||||||
|
export TK_LIBRARY="${TK_DIR}/../lib/tk${TK_VERSION_WITH_DOT}"
|
||||||
|
fi
|
||||||
|
if [ "$TCL_DIR" != "" ]; then
|
||||||
|
export TCL_LIBRARY="${TCL_DIR}/../lib/tcl${TCL_VERSION_WITH_DOT}"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$LD_LIBRARY_PATH" != "" ]; then
|
||||||
|
export LD_LIBRARY_PATH="${THRDPARTY_PATH}:${LD_LIBRARY_PATH}"
|
||||||
|
else
|
||||||
|
export LD_LIBRARY_PATH="${THRDPARTY_PATH}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$CSF_OCCTBinPath" != "" ]; then
|
||||||
|
export PATH="${CSF_OCCTBinPath}:${PATH}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$CSF_OCCTLibPath" != "" ]; then
|
||||||
|
if [ "$LD_LIBRARY_PATH" != "" ]; then
|
||||||
|
export LD_LIBRARY_PATH="${CSF_OCCTLibPath}:${LD_LIBRARY_PATH}"
|
||||||
|
else
|
||||||
|
export LD_LIBRARY_PATH="${CSF_OCCTLibPath}"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$WOKSTATION" == "mac" ]; then
|
||||||
|
if [ "$DYLD_LIBRARY_PATH" != "" ]; then
|
||||||
|
export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${DYLD_LIBRARY_PATH}"
|
||||||
|
else
|
||||||
|
export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ----- Set envoronment variables used by OCCT -----
|
||||||
|
export CSF_LANGUAGE=us
|
||||||
|
export MMGT_CLEAR=1
|
||||||
|
export CSF_SHMessage="${CSF_OCCTResourcePath}/SHMessage"
|
||||||
|
export CSF_MDTVTexturesDirectory="${CSF_OCCTResourcePath}/Textures"
|
||||||
|
export CSF_ShadersDirectory="${CSF_OCCTResourcePath}/Shaders"
|
||||||
|
export CSF_XSMessage="${CSF_OCCTResourcePath}/XSMessage"
|
||||||
|
export CSF_TObjMessage="${CSF_OCCTResourcePath}/TObj"
|
||||||
|
export CSF_StandardDefaults="${CSF_OCCTResourcePath}/StdResource"
|
||||||
|
export CSF_PluginDefaults="${CSF_OCCTResourcePath}/StdResource"
|
||||||
|
export CSF_XCAFDefaults="${CSF_OCCTResourcePath}/StdResource"
|
||||||
|
export CSF_TObjDefaults="${CSF_OCCTResourcePath}/StdResource"
|
||||||
|
export CSF_StandardLiteDefaults="${CSF_OCCTResourcePath}/StdResource"
|
||||||
|
export CSF_IGESDefaults="${CSF_OCCTResourcePath}/XSTEPResource"
|
||||||
|
export CSF_STEPDefaults="${CSF_OCCTResourcePath}/XSTEPResource"
|
||||||
|
export CSF_XmlOcafResource="${CSF_OCCTResourcePath}/XmlOcafResource"
|
||||||
|
export CSF_MIGRATION_TYPES="${CSF_OCCTResourcePath}/StdResource/MigrationSheet.txt"
|
||||||
|
|
||||||
|
# ----- Draw Harness special stuff -----
|
||||||
|
if [ -e "${CSF_OCCTResourcePath}/DrawResources" ]; then
|
||||||
|
export DRAWHOME="${CSF_OCCTResourcePath}/DrawResources"
|
||||||
|
export CSF_DrawPluginDefaults="${CSF_OCCTResourcePath}/DrawResources"
|
||||||
|
|
||||||
|
if [ -e "${CSF_OCCTResourcePath}/DrawResources/DrawDefault" ]; then
|
||||||
|
export DRAWDEFAULT="${CSF_OCCTResourcePath}/DrawResources/DrawDefault"
|
||||||
|
fi
|
||||||
|
fi
|
@@ -6,16 +6,18 @@ aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath
|
|||||||
# Reset values
|
# Reset values
|
||||||
export CASROOT="__CASROOT__"
|
export CASROOT="__CASROOT__"
|
||||||
export CASDEB=""
|
export CASDEB=""
|
||||||
export TARGET="";
|
export PRJFMT="";
|
||||||
export HAVE_TBB="false";
|
export HAVE_TBB="false";
|
||||||
export HAVE_OPENCL="false";
|
export HAVE_OPENCL="false";
|
||||||
export HAVE_FREEIMAGE="false";
|
export HAVE_FREEIMAGE="false";
|
||||||
export HAVE_FFMPEG="false";
|
export HAVE_FFMPEG="false";
|
||||||
export HAVE_GL2PS="false";
|
|
||||||
export HAVE_VTK="false";
|
export HAVE_VTK="false";
|
||||||
export HAVE_GLES2="false";
|
export HAVE_GLES2="false";
|
||||||
export HAVE_ZLIB="false";
|
export HAVE_ZLIB="false";
|
||||||
export HAVE_LIBLZMA="false";
|
export HAVE_LIBLZMA="false";
|
||||||
|
export HAVE_RAPIDJSON="false";
|
||||||
|
export HAVE_OPENVR="false";
|
||||||
|
export HAVE_E57="false";
|
||||||
export MACOSX_USE_GLX="false";
|
export MACOSX_USE_GLX="false";
|
||||||
export CSF_OPT_INC=""
|
export CSF_OPT_INC=""
|
||||||
export CSF_OPT_LIB32=""
|
export CSF_OPT_LIB32=""
|
||||||
@@ -24,15 +26,13 @@ export CSF_OPT_BIN32=""
|
|||||||
export CSF_OPT_BIN64=""
|
export CSF_OPT_BIN64=""
|
||||||
|
|
||||||
# ----- Set local settings -----
|
# ----- Set local settings -----
|
||||||
if [ "${CASROOT}" != "" ] && [ -e "${CASROOT}/custom.sh" ]; then source "${CASROOT}/custom.sh"; fi
|
|
||||||
if [ -e "${aScriptPath}/custom.sh" ]; then source "${aScriptPath}/custom.sh"; fi
|
|
||||||
|
|
||||||
if [ "${CASROOT}" != "" ] && [ -d "${aScriptPath}/${CASROOT}" ]; then
|
if [ "${CASROOT}" != "" ] && [ -d "${aScriptPath}/${CASROOT}" ]; then
|
||||||
export CASROOT="${aScriptPath}/${CASROOT}"
|
export CASROOT="${aScriptPath}/${CASROOT}"
|
||||||
fi
|
fi
|
||||||
if [ "${CASROOT}" == "" ]; then
|
if [ "${CASROOT}" == "" ]; then
|
||||||
export CASROOT="${aScriptPath}"
|
export CASROOT="${aScriptPath}"
|
||||||
fi
|
fi
|
||||||
|
if [ -e "${CASROOT}/custom.sh" ]; then source "${CASROOT}/custom.sh"; fi
|
||||||
|
|
||||||
# Read script arguments
|
# Read script arguments
|
||||||
shopt -s nocasematch
|
shopt -s nocasematch
|
||||||
@@ -43,9 +43,9 @@ do
|
|||||||
elif [ "$i" == "i" ] || [ "$i" == "relwithdeb" ]; then
|
elif [ "$i" == "i" ] || [ "$i" == "relwithdeb" ]; then
|
||||||
export CASDEB="i"
|
export CASDEB="i"
|
||||||
elif [ "$i" == "cbp" ]; then
|
elif [ "$i" == "cbp" ]; then
|
||||||
export TARGET="cbp";
|
export PRJFMT="cbp";
|
||||||
elif [ "$i" == "xcd" ] || [ "$i" == "xcode" ]; then
|
elif [ "$i" == "xcd" ] || [ "$i" == "xcode" ]; then
|
||||||
export TARGET="xcd";
|
export PRJFMT="xcd";
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
shopt -u nocasematch
|
shopt -u nocasematch
|
||||||
@@ -67,28 +67,32 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
export CASBIN=""
|
export CASBIN=""
|
||||||
if [ "${TARGET}" == "cbp" ]; then
|
if [ "${PRJFMT}" == "xcd" ]; then
|
||||||
export CASBIN="${WOKSTATION}/cbp"
|
|
||||||
elif [ "${TARGET}" == "xcd" ]; then
|
|
||||||
export CASBIN="adm/mac/xcd/build"
|
export CASBIN="adm/mac/xcd/build"
|
||||||
|
else
|
||||||
|
if [ "$aSystem" == "Darwin" ]; then
|
||||||
|
export CASBIN="${WOKSTATION}/clang"
|
||||||
|
else
|
||||||
|
export CASBIN="${WOKSTATION}/gcc"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export CSF_OPT_INC="${CSF_OPT_INC}:${CASROOT}/inc"
|
export CSF_OPT_INC="${CSF_OPT_INC}:${CASROOT}/inc"
|
||||||
|
|
||||||
if [ "${TARGET}" == "cbp" ]; then
|
if [ "${PRJFMT}" == "xcd" ]; then
|
||||||
export CSF_OPT_LIB32D="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/libd"
|
|
||||||
export CSF_OPT_LIB64D="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/libd"
|
|
||||||
export CSF_OPT_LIB32="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/lib"
|
|
||||||
export CSF_OPT_LIB64="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/lib"
|
|
||||||
export CSF_OPT_LIB32I="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/libi"
|
|
||||||
export CSF_OPT_LIB64I="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/libi"
|
|
||||||
elif [ "${TARGET}" == "xcd" ]; then
|
|
||||||
export CSF_OPT_LIB32D="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/Debug"
|
export CSF_OPT_LIB32D="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/Debug"
|
||||||
export CSF_OPT_LIB64D="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/Debug"
|
export CSF_OPT_LIB64D="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/Debug"
|
||||||
export CSF_OPT_LIB32="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/Release"
|
export CSF_OPT_LIB32="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/Release"
|
||||||
export CSF_OPT_LIB64="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/Release"
|
export CSF_OPT_LIB64="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/Release"
|
||||||
export CSF_OPT_LIB32I="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/RelWithDebInfo"
|
export CSF_OPT_LIB32I="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/RelWithDebInfo"
|
||||||
export CSF_OPT_LIB64I="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/RelWithDebInfo"
|
export CSF_OPT_LIB64I="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/RelWithDebInfo"
|
||||||
|
else
|
||||||
|
export CSF_OPT_LIB32D="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/libd"
|
||||||
|
export CSF_OPT_LIB64D="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/libd"
|
||||||
|
export CSF_OPT_LIB32="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/lib"
|
||||||
|
export CSF_OPT_LIB64="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/lib"
|
||||||
|
export CSF_OPT_LIB32I="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/libi"
|
||||||
|
export CSF_OPT_LIB64I="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/libi"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export CSF_OPT_CMPL=""
|
export CSF_OPT_CMPL=""
|
||||||
@@ -98,11 +102,13 @@ if [ "$HAVE_TBB" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -D
|
|||||||
if [ "$HAVE_OPENCL" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_OPENCL"; fi
|
if [ "$HAVE_OPENCL" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_OPENCL"; fi
|
||||||
if [ "$HAVE_FREEIMAGE" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_FREEIMAGE"; fi
|
if [ "$HAVE_FREEIMAGE" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_FREEIMAGE"; fi
|
||||||
if [ "$HAVE_FFMPEG" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_FFMPEG"; fi
|
if [ "$HAVE_FFMPEG" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_FFMPEG"; fi
|
||||||
if [ "$HAVE_GL2PS" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_GL2PS"; fi
|
|
||||||
if [ "$HAVE_GLES2" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_GLES2"; fi
|
if [ "$HAVE_GLES2" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_GLES2"; fi
|
||||||
if [ "$HAVE_VTK" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_VTK"; fi
|
if [ "$HAVE_VTK" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_VTK"; fi
|
||||||
if [ "$HAVE_ZLIB" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_ZLIB"; fi
|
if [ "$HAVE_ZLIB" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_ZLIB"; fi
|
||||||
if [ "$HAVE_LIBLZMA" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_LIBLZMA"; fi
|
if [ "$HAVE_LIBLZMA" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_LIBLZMA"; fi
|
||||||
|
if [ "$HAVE_RAPIDJSON" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_RAPIDJSON"; fi
|
||||||
|
if [ "$HAVE_OPENVR" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_OPENVR"; fi
|
||||||
|
if [ "$HAVE_E57" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_E57"; fi
|
||||||
# Option to compile OCCT with X11 libs on Mac OS X
|
# Option to compile OCCT with X11 libs on Mac OS X
|
||||||
if [ "$MACOSX_USE_GLX" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DMACOSX_USE_GLX"; fi
|
if [ "$MACOSX_USE_GLX" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DMACOSX_USE_GLX"; fi
|
||||||
|
|
||||||
@@ -178,7 +184,7 @@ export CSF_OCCTSamplesPath="${CSF_OCCTSamplesPath:-$CASROOT/samples}"
|
|||||||
export CSF_OCCTDataPath="${CSF_OCCTDataPath:-$CASROOT/data}"
|
export CSF_OCCTDataPath="${CSF_OCCTDataPath:-$CASROOT/data}"
|
||||||
export CSF_OCCTTestsPath="${CSF_OCCTTestsPath:-$CASROOT/tests}"
|
export CSF_OCCTTestsPath="${CSF_OCCTTestsPath:-$CASROOT/tests}"
|
||||||
|
|
||||||
if [ "${TARGET}" == "xcd" ]; then
|
if [ "${PRJFMT}" == "xcd" ]; then
|
||||||
if [ "${CASDEB}" == "d" ]; then
|
if [ "${CASDEB}" == "d" ]; then
|
||||||
export CSF_OCCTBinPath="${CSF_OCCTBinPath:-$CASROOT/$CASBIN/Debug}"
|
export CSF_OCCTBinPath="${CSF_OCCTBinPath:-$CASROOT/$CASBIN/Debug}"
|
||||||
else
|
else
|
||||||
|
@@ -1,138 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
|
|
||||||
|
|
||||||
# ----- for compatability with external application using CASROOT -----
|
|
||||||
if [ "${CASROOT}" == "" ]; then
|
|
||||||
export CASROOT="${aScriptPath}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Read script arguments
|
|
||||||
shopt -s nocasematch
|
|
||||||
export CASDEB="";
|
|
||||||
if [[ "$1" == "debug" ]]; then export CASDEB="d"; fi
|
|
||||||
if [[ "$1" == "d" ]]; then export CASDEB="d"; fi
|
|
||||||
if [[ "$1" == "relwithdeb" ]]; then export CASDEB="i"; fi
|
|
||||||
if [[ "$1" == "i" ]]; then export CASDEB="i"; fi
|
|
||||||
shopt -u nocasematch
|
|
||||||
|
|
||||||
# ----- Set path to 3rd party and OCCT libraries -----
|
|
||||||
anArch=`uname -m`
|
|
||||||
if [ "$anArch" != "x86_64" ] && [ "$anArch" != "ia64" ]; then
|
|
||||||
export ARCH="32";
|
|
||||||
else
|
|
||||||
export ARCH="64";
|
|
||||||
fi
|
|
||||||
|
|
||||||
aSystem=`uname -s`
|
|
||||||
if [ "$aSystem" == "Darwin" ]; then
|
|
||||||
export WOKSTATION="mac";
|
|
||||||
export ARCH="64";
|
|
||||||
else
|
|
||||||
export WOKSTATION="lin";
|
|
||||||
fi
|
|
||||||
|
|
||||||
# ----- Set local settings -----
|
|
||||||
if [ -e "${aScriptPath}/custom.sh" ]; then
|
|
||||||
source "${aScriptPath}/custom.sh" "${CASDEB}" "${ARCH}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
THRDPARTY_PATH=""
|
|
||||||
if [ "$TCL_DIR" != "" ]; then
|
|
||||||
THRDPARTY_PATH="${TCL_DIR}:${THRDPARTY_PATH}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$TK_DIR" != "" ]; then
|
|
||||||
THRDPARTY_PATH="${TK_DIR}:${THRDPARTY_PATH}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$FREETYPE_DIR" != "" ]; then
|
|
||||||
THRDPARTY_PATH="${FREETYPE_DIR}:${THRDPARTY_PATH}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$FREEIMAGE_DIR" != "" ]; then
|
|
||||||
THRDPARTY_PATH="${FREEIMAGE_DIR}:${THRDPARTY_PATH}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$GL2PS_DIR" != "" ]; then
|
|
||||||
THRDPARTY_PATH="${GL2PS_DIR}:${THRDPARTY_PATH}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$TBB_DIR" != "" ]; then
|
|
||||||
THRDPARTY_PATH="${TBB_DIR}:${THRDPARTY_PATH}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$VTK_DIR" != "" ]; then
|
|
||||||
THRDPARTY_PATH="${VTK_DIR}:${THRDPARTY_PATH}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$FFMPEG_DIR" != "" ]; then
|
|
||||||
THRDPARTY_PATH="${FFMPEG_DIR}:${THRDPARTY_PATH}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$QTDIR" != "" ]; then
|
|
||||||
THRDPARTY_PATH="${QTDIR}/lib:${THRDPARTY_PATH}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$TK_DIR" != "$TCL_DIR" ]; then
|
|
||||||
if [ "$TK_DIR" != "" ]; then
|
|
||||||
export TK_LIBRARY="${TK_DIR}/../lib/tk${TK_VERSION_WITH_DOT}"
|
|
||||||
fi
|
|
||||||
if [ "$TCL_DIR" != "" ]; then
|
|
||||||
export TCL_LIBRARY="${TCL_DIR}/../lib/tcl${TCL_VERSION_WITH_DOT}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$LD_LIBRARY_PATH" != "" ]; then
|
|
||||||
export LD_LIBRARY_PATH="${THRDPARTY_PATH}:${LD_LIBRARY_PATH}"
|
|
||||||
else
|
|
||||||
export LD_LIBRARY_PATH="${THRDPARTY_PATH}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$CSF_OCCTBinPath" != "" ]; then
|
|
||||||
export PATH="${CSF_OCCTBinPath}:${PATH}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$CSF_OCCTLibPath" != "" ]; then
|
|
||||||
if [ "$LD_LIBRARY_PATH" != "" ]; then
|
|
||||||
export LD_LIBRARY_PATH="${CSF_OCCTLibPath}:${LD_LIBRARY_PATH}"
|
|
||||||
else
|
|
||||||
export LD_LIBRARY_PATH="${CSF_OCCTLibPath}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$WOKSTATION" == "mac" ]; then
|
|
||||||
if [ "$DYLD_LIBRARY_PATH" != "" ]; then
|
|
||||||
export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${DYLD_LIBRARY_PATH}"
|
|
||||||
else
|
|
||||||
export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# ----- Set envoronment variables used by OCCT -----
|
|
||||||
export CSF_LANGUAGE=us
|
|
||||||
export MMGT_CLEAR=1
|
|
||||||
export CSF_SHMessage="${CSF_OCCTResourcePath}/SHMessage"
|
|
||||||
export CSF_MDTVTexturesDirectory="${CSF_OCCTResourcePath}/Textures"
|
|
||||||
export CSF_ShadersDirectory="${CSF_OCCTResourcePath}/Shaders"
|
|
||||||
export CSF_XSMessage="${CSF_OCCTResourcePath}/XSMessage"
|
|
||||||
export CSF_TObjMessage="${CSF_OCCTResourcePath}/TObj"
|
|
||||||
export CSF_StandardDefaults="${CSF_OCCTResourcePath}/StdResource"
|
|
||||||
export CSF_PluginDefaults="${CSF_OCCTResourcePath}/StdResource"
|
|
||||||
export CSF_XCAFDefaults="${CSF_OCCTResourcePath}/StdResource"
|
|
||||||
export CSF_TObjDefaults="${CSF_OCCTResourcePath}/StdResource"
|
|
||||||
export CSF_StandardLiteDefaults="${CSF_OCCTResourcePath}/StdResource"
|
|
||||||
export CSF_IGESDefaults="${CSF_OCCTResourcePath}/XSTEPResource"
|
|
||||||
export CSF_STEPDefaults="${CSF_OCCTResourcePath}/XSTEPResource"
|
|
||||||
export CSF_XmlOcafResource="${CSF_OCCTResourcePath}/XmlOcafResource"
|
|
||||||
export CSF_MIGRATION_TYPES="${CSF_OCCTResourcePath}/StdResource/MigrationSheet.txt"
|
|
||||||
|
|
||||||
# Draw Harness special stuff
|
|
||||||
if [ -e "${CSF_OCCTResourcePath}/DrawResources" ]; then
|
|
||||||
export DRAWHOME="${CSF_OCCTResourcePath}/DrawResources"
|
|
||||||
export CSF_DrawPluginDefaults="${CSF_OCCTResourcePath}/DrawResources"
|
|
||||||
|
|
||||||
if [ -e "${CSF_OCCTResourcePath}/DrawResources/DrawDefault" ]; then
|
|
||||||
export DRAWDEFAULT="${CSF_OCCTResourcePath}/DrawResources/DrawDefault"
|
|
||||||
fi
|
|
||||||
fi
|
|
17
adm/templates/inspector.bat
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
@echo off
|
||||||
|
|
||||||
|
rem Use:
|
||||||
|
rem - first argument specifies version of Visual Studio (vc8, vc9, or vc10),
|
||||||
|
rem - second argument specifies architecture (win32 or win64),
|
||||||
|
rem - third argument specifies build mode (Debug or Release)
|
||||||
|
rem - fourth and next arguments specify loaded tool plugins
|
||||||
|
rem The arguments are: dfbrowser shapeview vinspector
|
||||||
|
rem If there are no tool plugins are specified, all plugins will be loaded
|
||||||
|
rem Default options are:
|
||||||
|
rem vc8 win32 Release
|
||||||
|
|
||||||
|
rem Setup environment and launch TInspector
|
||||||
|
call "%~dp0env.bat" %1 %2 %3
|
||||||
|
|
||||||
|
TInspectorEXE.exe %*
|
||||||
|
|
9
adm/templates/inspector.sh
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
aCurrentPath="$PWD"
|
||||||
|
aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
|
||||||
|
|
||||||
|
source "${aScriptPath}/env.sh" "$1"
|
||||||
|
|
||||||
|
cd ${aCurrentPath}
|
||||||
|
TInspectorEXE
|
@@ -1,10 +1,11 @@
|
|||||||
@echo off
|
@echo off
|
||||||
|
rem This file has been generated by genproj.tcl script from CASROOT/adm/templates/msvc.bat
|
||||||
|
|
||||||
rem Setup environment
|
rem Setup environment
|
||||||
call "%~dp0env.bat" %1 %2 %3
|
call "%~dp0env.bat" %1 %2 %3
|
||||||
|
|
||||||
rem Define path to project file
|
rem Define path to project file
|
||||||
set "PRJFILE=%~dp0\adm\msvc\%VCVER%\OCCT.sln"
|
set "PRJFILE=%~dp0\adm\msvc\%VCVER%\__SOLUTION__.sln"
|
||||||
if not exist "%PRJFILE%" set "PRJFILE=%~dp0\adm\msvc\%VCVER%\Products.sln"
|
if not exist "%PRJFILE%" set "PRJFILE=%~dp0\adm\msvc\%VCVER%\Products.sln"
|
||||||
if not "%4" == "" (
|
if not "%4" == "" (
|
||||||
set "PRJFILE=%4"
|
set "PRJFILE=%4"
|
||||||
|
@@ -16,11 +16,16 @@ if ["%1"] == [""] (
|
|||||||
echo HLR
|
echo HLR
|
||||||
echo Animation
|
echo Animation
|
||||||
echo Convert
|
echo Convert
|
||||||
|
echo AndroidQt
|
||||||
|
echo FuncDemo
|
||||||
|
echo IESample
|
||||||
|
echo Tutorial
|
||||||
PAUSE
|
PAUSE
|
||||||
exit /B
|
exit /B
|
||||||
)
|
)
|
||||||
|
|
||||||
call "%~dp0env.bat" %2 %3 %4
|
call "%~dp0env.bat" %2 %3 %4
|
||||||
|
if not ["%QTDIR%"] == [""] if exist "%QTDIR%\qml" if ["%QML2_IMPORT_PATH%"] == [""] set "QML2_IMPORT_PATH=%QTDIR%/qml"
|
||||||
set "EXE_PATH=%CSF_OCCTBinPath%/%1.exe"
|
set "EXE_PATH=%CSF_OCCTBinPath%/%1.exe"
|
||||||
|
|
||||||
if not exist "%EXE_PATH%" (
|
if not exist "%EXE_PATH%" (
|
||||||
|
35
adm/templates/sample.sh
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
if [ "$1" == "" ]; then
|
||||||
|
echo Launch selected sample as follows:
|
||||||
|
echo sample.sh SampleName d
|
||||||
|
echo or to use last sample build configuration:
|
||||||
|
echo sample.sh SampleName
|
||||||
|
echo available samples:
|
||||||
|
echo FuncDemo
|
||||||
|
echo IESample
|
||||||
|
echo Tutorial
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
aCurrentPath="$PWD"
|
||||||
|
aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
|
||||||
|
|
||||||
|
source "${aScriptPath}/env.sh" "$2"
|
||||||
|
|
||||||
|
if test "${QTDIR}" == ""; then
|
||||||
|
if [ -d "$QTDIR%\qml" ];
|
||||||
|
then export QML2_IMPORT_PATH="$QTDIR\qml";
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
export "EXE_PATH=$CSF_OCCTBinPath/$1"
|
||||||
|
|
||||||
|
if [ ! -f "$EXE_PATH" ]; then
|
||||||
|
echo "Executable \"$EXE_PATH\" not found."
|
||||||
|
echo "Probably you didn't compile the application."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
cd ${aCurrentPath}
|
||||||
|
"$EXE_PATH"
|
@@ -90,7 +90,7 @@
|
|||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
<Optimization>MaxSpeed</Optimization>
|
<Optimization>MaxSpeed</Optimization>
|
||||||
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
||||||
<PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<StringPooling>true</StringPooling>
|
<StringPooling>true</StringPooling>
|
||||||
<ExceptionHandling>Async</ExceptionHandling>
|
<ExceptionHandling>Async</ExceptionHandling>
|
||||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||||
@@ -107,10 +107,10 @@
|
|||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ResourceCompile>
|
<ResourceCompile>
|
||||||
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
</ResourceCompile>
|
</ResourceCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>__TKDEP__;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>__TKDEP__</AdditionalDependencies>
|
||||||
<OutputFile>.\..\..\..\win32\__VCVER__\bin\__TKNAM__.dll</OutputFile>
|
<OutputFile>.\..\..\..\win32\__VCVER__\bin\__TKNAM__.dll</OutputFile>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
@@ -138,7 +138,7 @@
|
|||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
||||||
<PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<ExceptionHandling>Async</ExceptionHandling>
|
<ExceptionHandling>Async</ExceptionHandling>
|
||||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||||
<AssemblerListingLocation>.\..\..\..\win32\__VCVER__\objd\__TKNAM__/</AssemblerListingLocation>
|
<AssemblerListingLocation>.\..\..\..\win32\__VCVER__\objd\__TKNAM__/</AssemblerListingLocation>
|
||||||
@@ -156,10 +156,10 @@
|
|||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ResourceCompile>
|
<ResourceCompile>
|
||||||
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
</ResourceCompile>
|
</ResourceCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>__TKDEP__;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>__TKDEP_DEBUG__</AdditionalDependencies>
|
||||||
<OutputFile>.\..\..\..\win32\__VCVER__\bind\__TKNAM__.dll</OutputFile>
|
<OutputFile>.\..\..\..\win32\__VCVER__\bind\__TKNAM__.dll</OutputFile>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
@@ -186,7 +186,7 @@
|
|||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
<Optimization>MaxSpeed</Optimization>
|
<Optimization>MaxSpeed</Optimization>
|
||||||
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
||||||
<PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<StringPooling>true</StringPooling>
|
<StringPooling>true</StringPooling>
|
||||||
<ExceptionHandling>Async</ExceptionHandling>
|
<ExceptionHandling>Async</ExceptionHandling>
|
||||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||||
@@ -203,10 +203,10 @@
|
|||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ResourceCompile>
|
<ResourceCompile>
|
||||||
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
</ResourceCompile>
|
</ResourceCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>__TKDEP__;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>__TKDEP__</AdditionalDependencies>
|
||||||
<OutputFile>.\..\..\..\win64\__VCVER__\bin\__TKNAM__.dll</OutputFile>
|
<OutputFile>.\..\..\..\win64\__VCVER__\bin\__TKNAM__.dll</OutputFile>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
@@ -234,7 +234,7 @@
|
|||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
||||||
<PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<ExceptionHandling>Async</ExceptionHandling>
|
<ExceptionHandling>Async</ExceptionHandling>
|
||||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||||
<AssemblerListingLocation>.\..\..\..\win64\__VCVER__\objd\__TKNAM__/</AssemblerListingLocation>
|
<AssemblerListingLocation>.\..\..\..\win64\__VCVER__\objd\__TKNAM__/</AssemblerListingLocation>
|
||||||
@@ -252,10 +252,10 @@
|
|||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ResourceCompile>
|
<ResourceCompile>
|
||||||
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
</ResourceCompile>
|
</ResourceCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>__TKDEP__;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>__TKDEP_DEBUG__</AdditionalDependencies>
|
||||||
<OutputFile>.\..\..\..\win64\__VCVER__\bind\__TKNAM__.dll</OutputFile>
|
<OutputFile>.\..\..\..\win64\__VCVER__\bind\__TKNAM__.dll</OutputFile>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
|
@@ -85,7 +85,7 @@
|
|||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
<Optimization>MaxSpeed</Optimization>
|
<Optimization>MaxSpeed</Optimization>
|
||||||
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
||||||
<PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<StringPooling>true</StringPooling>
|
<StringPooling>true</StringPooling>
|
||||||
<ExceptionHandling>Async</ExceptionHandling>
|
<ExceptionHandling>Async</ExceptionHandling>
|
||||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||||
@@ -100,10 +100,10 @@
|
|||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ResourceCompile>
|
<ResourceCompile>
|
||||||
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
</ResourceCompile>
|
</ResourceCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>__TKDEP__</AdditionalDependencies>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
<GenerateDebugInformation>__VCReleasePDB__</GenerateDebugInformation>
|
<GenerateDebugInformation>__VCReleasePDB__</GenerateDebugInformation>
|
||||||
@@ -130,7 +130,7 @@
|
|||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
||||||
<PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<ExceptionHandling>Async</ExceptionHandling>
|
<ExceptionHandling>Async</ExceptionHandling>
|
||||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||||
<AssemblerListingLocation>.\..\..\..\win32\__VCVER__\objd\__XQTNAM__/</AssemblerListingLocation>
|
<AssemblerListingLocation>.\..\..\..\win32\__VCVER__\objd\__XQTNAM__/</AssemblerListingLocation>
|
||||||
@@ -146,10 +146,10 @@
|
|||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ResourceCompile>
|
<ResourceCompile>
|
||||||
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
</ResourceCompile>
|
</ResourceCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>__TKDEP_DEBUG__</AdditionalDependencies>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
@@ -175,7 +175,7 @@
|
|||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
<Optimization>MaxSpeed</Optimization>
|
<Optimization>MaxSpeed</Optimization>
|
||||||
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
||||||
<PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<StringPooling>true</StringPooling>
|
<StringPooling>true</StringPooling>
|
||||||
<ExceptionHandling>Async</ExceptionHandling>
|
<ExceptionHandling>Async</ExceptionHandling>
|
||||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||||
@@ -190,10 +190,10 @@
|
|||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ResourceCompile>
|
<ResourceCompile>
|
||||||
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
</ResourceCompile>
|
</ResourceCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>__TKDEP__</AdditionalDependencies>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
<GenerateDebugInformation>__VCReleasePDB__</GenerateDebugInformation>
|
<GenerateDebugInformation>__VCReleasePDB__</GenerateDebugInformation>
|
||||||
@@ -219,7 +219,7 @@
|
|||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
||||||
<PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<ExceptionHandling>Async</ExceptionHandling>
|
<ExceptionHandling>Async</ExceptionHandling>
|
||||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||||
<AssemblerListingLocation>.\..\..\..\win64\__VCVER__\objd\__XQTNAM__/</AssemblerListingLocation>
|
<AssemblerListingLocation>.\..\..\..\win64\__VCVER__\objd\__XQTNAM__/</AssemblerListingLocation>
|
||||||
@@ -235,10 +235,10 @@
|
|||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ResourceCompile>
|
<ResourceCompile>
|
||||||
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
</ResourceCompile>
|
</ResourceCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>__TKDEP_DEBUG__</AdditionalDependencies>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
@@ -248,7 +248,11 @@
|
|||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
__FILES__ </ItemGroup>
|
__FILES__
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ResourceCompile Include="__XQTNAM__.rc" />
|
||||||
|
</ItemGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
<ImportGroup Label="ExtensionTargets">
|
<ImportGroup Label="ExtensionTargets">
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
|
@@ -22,7 +22,7 @@
|
|||||||
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
||||||
Optimization="2"
|
Optimization="2"
|
||||||
InlineFunctionExpansion="1"
|
InlineFunctionExpansion="1"
|
||||||
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
|
||||||
StringPooling="TRUE"
|
StringPooling="TRUE"
|
||||||
RuntimeLibrary="2"
|
RuntimeLibrary="2"
|
||||||
EnableFunctionLevelLinking="TRUE"
|
EnableFunctionLevelLinking="TRUE"
|
||||||
@@ -62,7 +62,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCResourceCompilerTool"
|
Name="VCResourceCompilerTool"
|
||||||
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
||||||
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
|
||||||
Culture="1036"/>
|
Culture="1036"/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCWebServiceProxyGeneratorTool"/>
|
Name="VCWebServiceProxyGeneratorTool"/>
|
||||||
@@ -89,7 +89,7 @@
|
|||||||
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
||||||
Optimization="0"
|
Optimization="0"
|
||||||
InlineFunctionExpansion="1"
|
InlineFunctionExpansion="1"
|
||||||
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="3"
|
RuntimeLibrary="3"
|
||||||
PrecompiledHeaderFile=".\..\..\..\win32\vc7\objd\__TKNAM__\__TKNAM__.pch"
|
PrecompiledHeaderFile=".\..\..\..\win32\vc7\objd\__TKNAM__\__TKNAM__.pch"
|
||||||
@@ -131,7 +131,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCResourceCompilerTool"
|
Name="VCResourceCompilerTool"
|
||||||
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
||||||
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
|
||||||
Culture="1036"/>
|
Culture="1036"/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCWebServiceProxyGeneratorTool"/>
|
Name="VCWebServiceProxyGeneratorTool"/>
|
||||||
|
@@ -22,7 +22,7 @@
|
|||||||
Name="VCCLCompilerTool"
|
Name="VCCLCompilerTool"
|
||||||
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
||||||
Optimization="0"
|
Optimization="0"
|
||||||
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="3"
|
RuntimeLibrary="3"
|
||||||
AssemblerListingLocation=".\..\..\..\win32\vc7\objd\__XQTNAM__/"
|
AssemblerListingLocation=".\..\..\..\win32\vc7\objd\__XQTNAM__/"
|
||||||
@@ -61,7 +61,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCResourceCompilerTool"
|
Name="VCResourceCompilerTool"
|
||||||
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
||||||
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
|
||||||
Culture="1033"/>
|
Culture="1033"/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCWebServiceProxyGeneratorTool"/>
|
Name="VCWebServiceProxyGeneratorTool"/>
|
||||||
@@ -86,7 +86,7 @@
|
|||||||
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
||||||
Optimization="2"
|
Optimization="2"
|
||||||
InlineFunctionExpansion="1"
|
InlineFunctionExpansion="1"
|
||||||
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
|
||||||
StringPooling="TRUE"
|
StringPooling="TRUE"
|
||||||
RuntimeLibrary="2"
|
RuntimeLibrary="2"
|
||||||
EnableFunctionLevelLinking="TRUE"
|
EnableFunctionLevelLinking="TRUE"
|
||||||
@@ -124,7 +124,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCResourceCompilerTool"
|
Name="VCResourceCompilerTool"
|
||||||
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
||||||
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
|
||||||
Culture="1033"/>
|
Culture="1033"/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCWebServiceProxyGeneratorTool"/>
|
Name="VCWebServiceProxyGeneratorTool"/>
|
||||||
|
@@ -50,7 +50,7 @@
|
|||||||
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
||||||
Optimization="2"
|
Optimization="2"
|
||||||
InlineFunctionExpansion="1"
|
InlineFunctionExpansion="1"
|
||||||
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
|
||||||
StringPooling="true"
|
StringPooling="true"
|
||||||
ExceptionHandling="2"
|
ExceptionHandling="2"
|
||||||
RuntimeLibrary="2"
|
RuntimeLibrary="2"
|
||||||
@@ -70,7 +70,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCResourceCompilerTool"
|
Name="VCResourceCompilerTool"
|
||||||
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
||||||
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
|
||||||
Culture="1036"
|
Culture="1036"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
@@ -148,7 +148,7 @@
|
|||||||
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
||||||
Optimization="0"
|
Optimization="0"
|
||||||
InlineFunctionExpansion="1"
|
InlineFunctionExpansion="1"
|
||||||
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
|
||||||
ExceptionHandling="2"
|
ExceptionHandling="2"
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="3"
|
RuntimeLibrary="3"
|
||||||
@@ -170,7 +170,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCResourceCompilerTool"
|
Name="VCResourceCompilerTool"
|
||||||
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
||||||
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
|
||||||
Culture="1036"
|
Culture="1036"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
@@ -249,7 +249,7 @@
|
|||||||
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
||||||
Optimization="2"
|
Optimization="2"
|
||||||
InlineFunctionExpansion="1"
|
InlineFunctionExpansion="1"
|
||||||
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
|
||||||
StringPooling="true"
|
StringPooling="true"
|
||||||
ExceptionHandling="2"
|
ExceptionHandling="2"
|
||||||
RuntimeLibrary="2"
|
RuntimeLibrary="2"
|
||||||
@@ -268,7 +268,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCResourceCompilerTool"
|
Name="VCResourceCompilerTool"
|
||||||
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
||||||
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
|
||||||
Culture="1036"
|
Culture="1036"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
@@ -347,7 +347,7 @@
|
|||||||
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
||||||
Optimization="0"
|
Optimization="0"
|
||||||
InlineFunctionExpansion="1"
|
InlineFunctionExpansion="1"
|
||||||
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
|
||||||
ExceptionHandling="2"
|
ExceptionHandling="2"
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="3"
|
RuntimeLibrary="3"
|
||||||
@@ -368,7 +368,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCResourceCompilerTool"
|
Name="VCResourceCompilerTool"
|
||||||
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
||||||
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
|
||||||
Culture="1036"
|
Culture="1036"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
|
@@ -49,7 +49,7 @@
|
|||||||
Name="VCCLCompilerTool"
|
Name="VCCLCompilerTool"
|
||||||
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
||||||
Optimization="0"
|
Optimization="0"
|
||||||
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;"
|
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);"
|
||||||
ExceptionHandling="2"
|
ExceptionHandling="2"
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="3"
|
RuntimeLibrary="3"
|
||||||
@@ -68,7 +68,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCResourceCompilerTool"
|
Name="VCResourceCompilerTool"
|
||||||
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
||||||
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__;"
|
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES);"
|
||||||
Culture="1033"
|
Culture="1033"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
@@ -145,7 +145,7 @@
|
|||||||
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
||||||
Optimization="2"
|
Optimization="2"
|
||||||
InlineFunctionExpansion="1"
|
InlineFunctionExpansion="1"
|
||||||
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;"
|
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);"
|
||||||
StringPooling="true"
|
StringPooling="true"
|
||||||
ExceptionHandling="2"
|
ExceptionHandling="2"
|
||||||
RuntimeLibrary="2"
|
RuntimeLibrary="2"
|
||||||
@@ -164,7 +164,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCResourceCompilerTool"
|
Name="VCResourceCompilerTool"
|
||||||
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
||||||
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;"
|
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES);"
|
||||||
Culture="1033"
|
Culture="1033"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
@@ -240,7 +240,7 @@
|
|||||||
AdditionalOptions="/favor:blend"
|
AdditionalOptions="/favor:blend"
|
||||||
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
||||||
Optimization="0"
|
Optimization="0"
|
||||||
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
|
||||||
ExceptionHandling="2"
|
ExceptionHandling="2"
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="3"
|
RuntimeLibrary="3"
|
||||||
@@ -258,7 +258,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCResourceCompilerTool"
|
Name="VCResourceCompilerTool"
|
||||||
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
||||||
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
|
||||||
Culture="1033"
|
Culture="1033"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
@@ -337,7 +337,7 @@
|
|||||||
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
||||||
Optimization="2"
|
Optimization="2"
|
||||||
InlineFunctionExpansion="1"
|
InlineFunctionExpansion="1"
|
||||||
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
|
||||||
StringPooling="true"
|
StringPooling="true"
|
||||||
ExceptionHandling="2"
|
ExceptionHandling="2"
|
||||||
RuntimeLibrary="2"
|
RuntimeLibrary="2"
|
||||||
@@ -355,7 +355,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCResourceCompilerTool"
|
Name="VCResourceCompilerTool"
|
||||||
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
||||||
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
|
||||||
Culture="1033"
|
Culture="1033"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
|
@@ -24,6 +24,7 @@
|
|||||||
ConfigurationType="2"
|
ConfigurationType="2"
|
||||||
UseOfMFC="0"
|
UseOfMFC="0"
|
||||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||||
|
CharacterSet="1"
|
||||||
>
|
>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreBuildEventTool"
|
Name="VCPreBuildEventTool"
|
||||||
@@ -52,7 +53,7 @@
|
|||||||
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
||||||
Optimization="2"
|
Optimization="2"
|
||||||
InlineFunctionExpansion="1"
|
InlineFunctionExpansion="1"
|
||||||
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
|
||||||
StringPooling="true"
|
StringPooling="true"
|
||||||
ExceptionHandling="2"
|
ExceptionHandling="2"
|
||||||
RuntimeLibrary="2"
|
RuntimeLibrary="2"
|
||||||
@@ -72,7 +73,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCResourceCompilerTool"
|
Name="VCResourceCompilerTool"
|
||||||
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
||||||
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreLinkEventTool"
|
Name="VCPreLinkEventTool"
|
||||||
@@ -120,7 +121,7 @@
|
|||||||
ConfigurationType="2"
|
ConfigurationType="2"
|
||||||
UseOfMFC="0"
|
UseOfMFC="0"
|
||||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||||
ManagedExtensions="0"
|
CharacterSet="1"
|
||||||
>
|
>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreBuildEventTool"
|
Name="VCPreBuildEventTool"
|
||||||
@@ -149,7 +150,7 @@
|
|||||||
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
||||||
Optimization="0"
|
Optimization="0"
|
||||||
InlineFunctionExpansion="1"
|
InlineFunctionExpansion="1"
|
||||||
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
|
||||||
ExceptionHandling="2"
|
ExceptionHandling="2"
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="3"
|
RuntimeLibrary="3"
|
||||||
@@ -171,7 +172,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCResourceCompilerTool"
|
Name="VCResourceCompilerTool"
|
||||||
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
||||||
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreLinkEventTool"
|
Name="VCPreLinkEventTool"
|
||||||
@@ -218,6 +219,7 @@
|
|||||||
ConfigurationType="2"
|
ConfigurationType="2"
|
||||||
UseOfMFC="0"
|
UseOfMFC="0"
|
||||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||||
|
CharacterSet="1"
|
||||||
>
|
>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreBuildEventTool"
|
Name="VCPreBuildEventTool"
|
||||||
@@ -246,7 +248,7 @@
|
|||||||
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
||||||
Optimization="2"
|
Optimization="2"
|
||||||
InlineFunctionExpansion="1"
|
InlineFunctionExpansion="1"
|
||||||
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
|
||||||
StringPooling="true"
|
StringPooling="true"
|
||||||
ExceptionHandling="2"
|
ExceptionHandling="2"
|
||||||
RuntimeLibrary="2"
|
RuntimeLibrary="2"
|
||||||
@@ -265,7 +267,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCResourceCompilerTool"
|
Name="VCResourceCompilerTool"
|
||||||
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
||||||
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreLinkEventTool"
|
Name="VCPreLinkEventTool"
|
||||||
@@ -311,7 +313,7 @@
|
|||||||
ConfigurationType="2"
|
ConfigurationType="2"
|
||||||
UseOfMFC="0"
|
UseOfMFC="0"
|
||||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||||
ManagedExtensions="0"
|
CharacterSet="1"
|
||||||
>
|
>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreBuildEventTool"
|
Name="VCPreBuildEventTool"
|
||||||
@@ -340,7 +342,7 @@
|
|||||||
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
||||||
Optimization="0"
|
Optimization="0"
|
||||||
InlineFunctionExpansion="1"
|
InlineFunctionExpansion="1"
|
||||||
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
|
||||||
ExceptionHandling="2"
|
ExceptionHandling="2"
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="3"
|
RuntimeLibrary="3"
|
||||||
@@ -361,7 +363,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCResourceCompilerTool"
|
Name="VCResourceCompilerTool"
|
||||||
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
||||||
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreLinkEventTool"
|
Name="VCPreLinkEventTool"
|
||||||
|
@@ -52,7 +52,7 @@
|
|||||||
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
||||||
Optimization="2"
|
Optimization="2"
|
||||||
InlineFunctionExpansion="1"
|
InlineFunctionExpansion="1"
|
||||||
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
|
||||||
StringPooling="true"
|
StringPooling="true"
|
||||||
ExceptionHandling="2"
|
ExceptionHandling="2"
|
||||||
RuntimeLibrary="2"
|
RuntimeLibrary="2"
|
||||||
@@ -71,7 +71,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCResourceCompilerTool"
|
Name="VCResourceCompilerTool"
|
||||||
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
||||||
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreLinkEventTool"
|
Name="VCPreLinkEventTool"
|
||||||
@@ -143,7 +143,7 @@
|
|||||||
AdditionalOptions="-MP"
|
AdditionalOptions="-MP"
|
||||||
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
||||||
Optimization="0"
|
Optimization="0"
|
||||||
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
|
||||||
ExceptionHandling="2"
|
ExceptionHandling="2"
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="3"
|
RuntimeLibrary="3"
|
||||||
@@ -162,7 +162,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCResourceCompilerTool"
|
Name="VCResourceCompilerTool"
|
||||||
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
||||||
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreLinkEventTool"
|
Name="VCPreLinkEventTool"
|
||||||
@@ -236,7 +236,7 @@
|
|||||||
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
||||||
Optimization="2"
|
Optimization="2"
|
||||||
InlineFunctionExpansion="1"
|
InlineFunctionExpansion="1"
|
||||||
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
|
||||||
StringPooling="true"
|
StringPooling="true"
|
||||||
ExceptionHandling="2"
|
ExceptionHandling="2"
|
||||||
RuntimeLibrary="2"
|
RuntimeLibrary="2"
|
||||||
@@ -254,7 +254,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCResourceCompilerTool"
|
Name="VCResourceCompilerTool"
|
||||||
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
||||||
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreLinkEventTool"
|
Name="VCPreLinkEventTool"
|
||||||
@@ -327,7 +327,7 @@
|
|||||||
AdditionalOptions="-MP -favor:blend"
|
AdditionalOptions="-MP -favor:blend"
|
||||||
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
|
||||||
Optimization="0"
|
Optimization="0"
|
||||||
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
|
||||||
ExceptionHandling="2"
|
ExceptionHandling="2"
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="3"
|
RuntimeLibrary="3"
|
||||||
@@ -345,7 +345,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCResourceCompilerTool"
|
Name="VCResourceCompilerTool"
|
||||||
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
|
||||||
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
|
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreLinkEventTool"
|
Name="VCPreLinkEventTool"
|
||||||
|
@@ -1,7 +1,8 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
# This file has been generated by genproj.tcl script from CASROOT/adm/templates/xcode.sh
|
||||||
|
|
||||||
export TARGET="xcd"
|
export TARGET="xcd"
|
||||||
|
|
||||||
source ./env.sh "$1" "$TARGET"
|
source ./env.sh "$1" "$TARGET"
|
||||||
|
|
||||||
open -a Xcode ./adm/mac/xcd/OCCT.xcworkspace
|
open -a Xcode ./adm/mac/xcd/__SOLUTION__.xcworkspace
|
||||||
|
@@ -1,8 +1,76 @@
|
|||||||
[rename]
|
[rename]
|
||||||
|
Adaptor3d_OffsetCurve Adaptor2d_OffsetCurve
|
||||||
BRepExtrema_OverlappedSubShapes BRepExtrema_MapOfIntegerPackedMapOfInteger
|
BRepExtrema_OverlappedSubShapes BRepExtrema_MapOfIntegerPackedMapOfInteger
|
||||||
ShapeConstruct_CompBezierCurves2dToBSplineCurve2d Convert_CompBezierCurves2dToBSplineCurve2d
|
ShapeConstruct_CompBezierCurves2dToBSplineCurve2d Convert_CompBezierCurves2dToBSplineCurve2d
|
||||||
ShapeConstruct_CompBezierCurves2dToBSplineCurve Convert_CompBezierCurves2dToBSplineCurve
|
ShapeConstruct_CompBezierCurves2dToBSplineCurve Convert_CompBezierCurves2dToBSplineCurve
|
||||||
Image_PixMap::Img Image_Format_
|
Image_PixMap::Img Image_Format_
|
||||||
|
V3d_TypeOfShadingModel Graphic3d_TypeOfShadingModel
|
||||||
|
Graphic3d_TOSM_NONE Graphic3d_TOSM_UNLIT
|
||||||
|
V3d_COLOR Graphic3d_TOSM_UNLIT
|
||||||
|
V3d_FLAT Graphic3d_TOSM_FACET
|
||||||
|
V3d_GOURAUD Graphic3d_TOSM_VERTEX
|
||||||
|
V3d_PHONG Graphic3d_TOSM_FRAGMENT
|
||||||
|
V3d_TypeOfLight Graphic3d_TypeOfLightSource
|
||||||
|
V3d_AMBIENT Graphic3d_TOLS_AMBIENT
|
||||||
|
V3d_DIRECTIONAL Graphic3d_TOLS_DIRECTIONAL
|
||||||
|
V3d_POSITIONAL Graphic3d_TOLS_POSITIONAL
|
||||||
|
V3d_SPOT Graphic3d_TOLS_SPOT
|
||||||
|
BOPCol_BaseAllocator Handle(NCollection_BaseAllocator)
|
||||||
|
BOPCol_BoxBndTree is replaced with BOPTools_BoxBndTree
|
||||||
|
BOPCol_DataMapOfIntegerInteger TColStd_DataMapOfIntegerInteger
|
||||||
|
BOPCol_DataMapOfIntegerListOfInteger TColStd_DataMapOfIntegerListOfInteger
|
||||||
|
BOPCol_DataMapOfIntegerListOfShape TopTools_DataMapOfIntegerListOfShape
|
||||||
|
BOPCol_DataMapOfIntegerReal TColStd_DataMapOfIntegerReal
|
||||||
|
BOPCol_DataMapOfIntegerShape TopTools_DataMapOfIntegerShape
|
||||||
|
BOPCol_DataMapOfShapeBox TopTools_DataMapOfShapeBox
|
||||||
|
BOPCol_DataMapOfShapeInteger TopTools_DataMapOfShapeInteger
|
||||||
|
BOPCol_DataMapOfShapeListOfShape TopTools_DataMapOfShapeListOfShape
|
||||||
|
BOPCol_DataMapOfShapeReal TopTools_DataMapOfShapeReal
|
||||||
|
BOPCol_DataMapOfShapeShape TopTools_DataMapOfShapeShape
|
||||||
|
BOPCol_IndexedDataMapOfShapeListOfShape TopTools_IndexedDataMapOfShapeListOfShape
|
||||||
|
BOPCol_IndexedDataMapOfShapeShape TopTools_IndexedDataMapOfShapeShape
|
||||||
|
BOPCol_IndexedMapOfInteger TColStd_IndexedMapOfInteger
|
||||||
|
BOPCol_IndexedMapOfOrientedShape TopTools_IndexedMapOfOrientedShape
|
||||||
|
BOPCol_IndexedMapOfShape TopTools_IndexedMapOfShape
|
||||||
|
BOPCol_ListOfInteger TColStd_ListOfInteger
|
||||||
|
BOPCol_ListOfListOfShape TopTools_ListOfListOfShape
|
||||||
|
BOPCol_ListOfShape TopTools_ListOfShape
|
||||||
|
BOPCol_MapOfInteger TColStd_MapOfInteger
|
||||||
|
BOPCol_MapOfOrientedShapeTopTools_MapOfOrientedShape
|
||||||
|
BOPCol_MapOfShape TopTools_MapOfShape
|
||||||
|
BOPCol_SequenceOfPnt2d TColgp_SequenceOfPnt2d
|
||||||
|
BOPCol_SequenceOfReal TColStd_SequenceOfReal
|
||||||
|
BOPCol_SequenceOfShape TopTools_SequenceOfShape
|
||||||
|
BOPCol_Parallel BOPTools_Parallel
|
||||||
|
BOPCol_NCVector NCollection_Vector
|
||||||
|
BOPCol_DataMapOfShapeAddress DataMapOfShapeAddress
|
||||||
|
BOPCol_DataMapOfTransientAddress DataMapOfTransientAddress
|
||||||
|
BOPCol_DataMapIteratorOfDataMapOfIntegerReal TColStd_DataMapIteratorOfDataMapOfIntegerReal
|
||||||
|
BOPCol_DataMapIteratorOfDataMapOfShapeAddress DataMapOfShapeAddress::Iterator
|
||||||
|
BOPCol_DataMapIteratorOfDataMapOfTransientAddress DataMapOfTransientAddress::Iterator
|
||||||
|
BOPCol_ListIteratorOfListOfInteger TColStd_ListIteratorOfListOfInteger
|
||||||
|
BOPCol_ListIteratorOfListOfShape TopTools_ListIteratorOfListOfShape
|
||||||
|
BOPCol_MapIteratorOfMapOfInteger TColStd_MapIteratorOfMapOfInteger
|
||||||
|
BOPCol_BoxBndTreeSelector BOPTools_BoxBndTreeSelector
|
||||||
|
BOPCol_BoxBndTree BOPTools_BoxBndTree
|
||||||
|
BOPCol_PListOfInteger TColStd_ListOfInteger*
|
||||||
|
BOPCol_IndexedDataMapOfShapeReal TopTools_IndexedDataMapOfShapeReal
|
||||||
|
BOPCol_MapOfOrientedShape TopTools_MapOfOrientedShape
|
||||||
|
BOPCol_DataMapIteratorOfDataMapOfIntegerInteger TColStd_DataMapIteratorOfDataMapOfIntegerInteger
|
||||||
|
BOPCol_MapIteratorOfMapOfShape TopTools_MapIteratorOfMapOfShape
|
||||||
|
BOPCol_ContextFunctor BOPTools_ContextFunctor
|
||||||
|
BOPCol_ContextCnt BOPTools_ContextCnt
|
||||||
|
BOPCol_Functor BOPTools_Functor
|
||||||
|
BOPCol_Cnt BOPTools_Cnt
|
||||||
|
BOPCol_DataMapIteratorOfDataMapOfIntegerListOfShape TopTools_DataMapIteratorOfDataMapOfIntegerListOfShape
|
||||||
|
BOPCol_MapIteratorOfMapOfOrientedShape TopTools_MapIteratorOfMapOfOrientedShape
|
||||||
|
BOPCol_DataMapIteratorOfDataMapOfIntegerListOfInteger TColStd_DataMapIteratorOfDataMapOfIntegerListOfInteger
|
||||||
|
BOPCol_DataMapIteratorOfDataMapOfShapeShape TopTools_DataMapIteratorOfDataMapOfShapeShape
|
||||||
|
BOPTools::MapShapes TopExp::MapShapes
|
||||||
|
BOPTools::MapShapesAndAncestors TopExp::MapShapesAndAncestors
|
||||||
|
BOPCol_Box2DBndTreeSelector BOPTools_BoxSelector<Bnd_Box2d>
|
||||||
|
BiTgte_DataMapOfShapeBox TopTools_DataMapOfShapeBox
|
||||||
|
CDM_MessageDriver Message_Messenger
|
||||||
|
|
||||||
[tcollection]
|
[tcollection]
|
||||||
AdvApp2Var_SequenceOfNode
|
AdvApp2Var_SequenceOfNode
|
||||||
|
@@ -1,30 +0,0 @@
|
|||||||
@echo off
|
|
||||||
rem Decode VCVER variable and define related ones:
|
|
||||||
rem
|
|
||||||
rem VCFMT - "vc" followed by full version number of Visual Studio toolset
|
|
||||||
rem (same as VCVER without optional suffix "-uwp")
|
|
||||||
rem VCLIB - name of folder contining binaries
|
|
||||||
rem (same as VCVER except without third version in number)
|
|
||||||
rem VCPROP - name of required Visual Studion Workload (starting with VS 2017)
|
|
||||||
rem
|
|
||||||
rem Note that for VS before 2015 (vc14) always
|
|
||||||
rem VCFMT=VCLIB=VCVER and VCPROP=NativeDesktop
|
|
||||||
|
|
||||||
rem Since VS 2017, environment variables like VS100COMNTOOLS are not defined
|
|
||||||
rem any more, we can only use vswhere.exe tool to find Visual Studio.
|
|
||||||
rem Add path to vswhere.exe
|
|
||||||
set "PATH=%PATH%;%ProgramFiles(x86)%\Microsoft Visual Studio\Installer"
|
|
||||||
|
|
||||||
rem for vc10-12, interpretation is trivial
|
|
||||||
set VCFMT=%VCVER%
|
|
||||||
set VCLIB=%VCVER:~0,4%
|
|
||||||
set VCPROP=NativeDesktop
|
|
||||||
|
|
||||||
rem vc14 and later can have optional suffix "-uwp"
|
|
||||||
if "%VCVER:~-4%" == "-uwp" (
|
|
||||||
set VCFMT=%VCVER:~0,-4%
|
|
||||||
set VCLIB=%VCLIB%-uwp
|
|
||||||
set VCPROP=Universal
|
|
||||||
)
|
|
||||||
|
|
||||||
rem echo VCVER=%VCVER% VCFMT=%VCFMT% VCLIB=%VCLIB% VCPROP=%VCPROP%
|
|
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 11 KiB |
BIN
data/images/hatch_1_.png
Normal file
After Width: | Height: | Size: 670 B |
BIN
data/images/hatch_2.png
Normal file
After Width: | Height: | Size: 679 B |
BIN
data/images/hatch_3.png
Normal file
After Width: | Height: | Size: 761 B |
BIN
data/images/hatch_4.png
Normal file
After Width: | Height: | Size: 674 B |
BIN
data/images/hatch_5.png
Normal file
After Width: | Height: | Size: 887 B |
BIN
data/images/hatch_6.png
Normal file
After Width: | Height: | Size: 933 B |
BIN
data/images/hatch_7.png
Normal file
After Width: | Height: | Size: 633 B |
BIN
data/images/hatch_8.png
Normal file
After Width: | Height: | Size: 1.5 KiB |
@@ -1,282 +0,0 @@
|
|||||||
DBRep_DrawableShape
|
|
||||||
|
|
||||||
CASCADE Topology V1, (c) Matra-Datavision
|
|
||||||
Locations 0
|
|
||||||
Curve2ds 24
|
|
||||||
1 0 0 1 0
|
|
||||||
1 0 0 1 0
|
|
||||||
1 50 0 0 -1
|
|
||||||
1 0 0 0 1
|
|
||||||
1 0 -80 1 0
|
|
||||||
1 0 0 1 0
|
|
||||||
1 0 0 0 -1
|
|
||||||
1 0 0 0 1
|
|
||||||
1 0 0 1 0
|
|
||||||
1 0 77 1 0
|
|
||||||
1 50 0 0 -1
|
|
||||||
1 77 0 0 1
|
|
||||||
1 0 -80 1 0
|
|
||||||
1 0 77 1 0
|
|
||||||
1 0 0 0 -1
|
|
||||||
1 77 0 0 1
|
|
||||||
1 0 0 0 1
|
|
||||||
1 0 0 1 0
|
|
||||||
1 50 0 0 1
|
|
||||||
1 0 0 1 0
|
|
||||||
1 0 0 0 1
|
|
||||||
1 0 80 1 0
|
|
||||||
1 50 0 0 1
|
|
||||||
1 0 80 1 0
|
|
||||||
Curves 12
|
|
||||||
1 821 803 0 0 0 1
|
|
||||||
1 821 803 50 0 1 0
|
|
||||||
1 821 883 0 0 0 1
|
|
||||||
1 821 803 0 0 1 0
|
|
||||||
1 898 803 0 0 0 1
|
|
||||||
1 898 803 50 0 1 0
|
|
||||||
1 898 883 0 0 0 1
|
|
||||||
1 898 803 0 0 1 0
|
|
||||||
1 821 803 0 1 0 0
|
|
||||||
1 821 803 50 1 0 0
|
|
||||||
1 821 883 0 1 0 0
|
|
||||||
1 821 883 50 1 0 0
|
|
||||||
Polygon3D 0
|
|
||||||
PolygonOnTriangulations 0
|
|
||||||
Surfaces 6
|
|
||||||
1 821 803 0 1 0 0 0 0 1 0 -1 0
|
|
||||||
1 821 803 0 0 1 0 0 0 1 1 0 0
|
|
||||||
1 821 803 50 0 0 1 1 0 0 0 1 0
|
|
||||||
1 821 883 0 0 1 0 0 0 1 1 0 0
|
|
||||||
1 821 803 0 0 0 1 1 0 0 0 1 0
|
|
||||||
1 898 803 0 1 0 0 0 0 1 0 -1 0
|
|
||||||
Triangulations 0
|
|
||||||
|
|
||||||
TShapes 34
|
|
||||||
Ve
|
|
||||||
1e-007
|
|
||||||
821 803 50
|
|
||||||
0 0
|
|
||||||
|
|
||||||
0101100
|
|
||||||
*
|
|
||||||
Ve
|
|
||||||
1e-007
|
|
||||||
821 803 0
|
|
||||||
0 0
|
|
||||||
|
|
||||||
0101100
|
|
||||||
*
|
|
||||||
Ed
|
|
||||||
1e-007 1 1 0
|
|
||||||
1 1 0 0 50
|
|
||||||
2 1 1 0 0 50
|
|
||||||
2 2 2 0 0 50
|
|
||||||
0
|
|
||||||
|
|
||||||
0101000
|
|
||||||
-34 0 +33 0 *
|
|
||||||
Ve
|
|
||||||
1e-007
|
|
||||||
821 883 50
|
|
||||||
0 0
|
|
||||||
|
|
||||||
0101100
|
|
||||||
*
|
|
||||||
Ed
|
|
||||||
1e-007 1 1 0
|
|
||||||
1 2 0 0 80
|
|
||||||
2 3 1 0 0 80
|
|
||||||
2 4 3 0 0 80
|
|
||||||
0
|
|
||||||
|
|
||||||
0101000
|
|
||||||
-31 0 +34 0 *
|
|
||||||
Ve
|
|
||||||
1e-007
|
|
||||||
821 883 0
|
|
||||||
0 0
|
|
||||||
|
|
||||||
0101100
|
|
||||||
*
|
|
||||||
Ed
|
|
||||||
1e-007 1 1 0
|
|
||||||
1 3 0 0 50
|
|
||||||
2 5 1 0 0 50
|
|
||||||
2 6 4 0 0 50
|
|
||||||
0
|
|
||||||
|
|
||||||
0101000
|
|
||||||
-31 0 +29 0 *
|
|
||||||
Ed
|
|
||||||
1e-007 1 1 0
|
|
||||||
1 4 0 0 80
|
|
||||||
2 7 1 0 0 80
|
|
||||||
2 8 5 0 0 80
|
|
||||||
0
|
|
||||||
|
|
||||||
0101000
|
|
||||||
-29 0 +33 0 *
|
|
||||||
Wi
|
|
||||||
|
|
||||||
0101000
|
|
||||||
-32 0 -30 0 +28 0 +27 0 *
|
|
||||||
Fa
|
|
||||||
0 1e-007 1 0
|
|
||||||
|
|
||||||
0111000
|
|
||||||
+26 0 *
|
|
||||||
Ve
|
|
||||||
1e-007
|
|
||||||
898 803 50
|
|
||||||
0 0
|
|
||||||
|
|
||||||
0101100
|
|
||||||
*
|
|
||||||
Ve
|
|
||||||
1e-007
|
|
||||||
898 803 0
|
|
||||||
0 0
|
|
||||||
|
|
||||||
0101100
|
|
||||||
*
|
|
||||||
Ed
|
|
||||||
1e-007 1 1 0
|
|
||||||
1 5 0 0 50
|
|
||||||
2 9 6 0 0 50
|
|
||||||
2 10 2 0 0 50
|
|
||||||
0
|
|
||||||
|
|
||||||
0101000
|
|
||||||
-24 0 +23 0 *
|
|
||||||
Ve
|
|
||||||
1e-007
|
|
||||||
898 883 50
|
|
||||||
0 0
|
|
||||||
|
|
||||||
0101100
|
|
||||||
*
|
|
||||||
Ed
|
|
||||||
1e-007 1 1 0
|
|
||||||
1 6 0 0 80
|
|
||||||
2 11 6 0 0 80
|
|
||||||
2 12 3 0 0 80
|
|
||||||
0
|
|
||||||
|
|
||||||
0101000
|
|
||||||
-21 0 +24 0 *
|
|
||||||
Ve
|
|
||||||
1e-007
|
|
||||||
898 883 0
|
|
||||||
0 0
|
|
||||||
|
|
||||||
0101100
|
|
||||||
*
|
|
||||||
Ed
|
|
||||||
1e-007 1 1 0
|
|
||||||
1 7 0 0 50
|
|
||||||
2 13 6 0 0 50
|
|
||||||
2 14 4 0 0 50
|
|
||||||
0
|
|
||||||
|
|
||||||
0101000
|
|
||||||
-21 0 +19 0 *
|
|
||||||
Ed
|
|
||||||
1e-007 1 1 0
|
|
||||||
1 8 0 0 80
|
|
||||||
2 15 6 0 0 80
|
|
||||||
2 16 5 0 0 80
|
|
||||||
0
|
|
||||||
|
|
||||||
0101000
|
|
||||||
-19 0 +23 0 *
|
|
||||||
Wi
|
|
||||||
|
|
||||||
0101000
|
|
||||||
-22 0 -20 0 +18 0 +17 0 *
|
|
||||||
Fa
|
|
||||||
0 1e-007 6 0
|
|
||||||
|
|
||||||
0111000
|
|
||||||
+16 0 *
|
|
||||||
Ed
|
|
||||||
1e-007 1 1 0
|
|
||||||
1 9 0 0 77
|
|
||||||
2 17 2 0 0 77
|
|
||||||
2 18 5 0 0 77
|
|
||||||
0
|
|
||||||
|
|
||||||
0101000
|
|
||||||
-23 0 +33 0 *
|
|
||||||
Ed
|
|
||||||
1e-007 1 1 0
|
|
||||||
1 10 0 0 77
|
|
||||||
2 19 2 0 0 77
|
|
||||||
2 20 3 0 0 77
|
|
||||||
0
|
|
||||||
|
|
||||||
0101000
|
|
||||||
-24 0 +34 0 *
|
|
||||||
Wi
|
|
||||||
|
|
||||||
0101000
|
|
||||||
-14 0 -22 0 +13 0 +32 0 *
|
|
||||||
Fa
|
|
||||||
0 1e-007 2 0
|
|
||||||
|
|
||||||
0111000
|
|
||||||
+12 0 *
|
|
||||||
Ed
|
|
||||||
1e-007 1 1 0
|
|
||||||
1 11 0 0 77
|
|
||||||
2 21 4 0 0 77
|
|
||||||
2 22 5 0 0 77
|
|
||||||
0
|
|
||||||
|
|
||||||
0101000
|
|
||||||
-19 0 +29 0 *
|
|
||||||
Ed
|
|
||||||
1e-007 1 1 0
|
|
||||||
1 12 0 0 77
|
|
||||||
2 23 4 0 0 77
|
|
||||||
2 24 3 0 0 77
|
|
||||||
0
|
|
||||||
|
|
||||||
0101000
|
|
||||||
-21 0 +31 0 *
|
|
||||||
Wi
|
|
||||||
|
|
||||||
0101000
|
|
||||||
-10 0 -18 0 +9 0 +28 0 *
|
|
||||||
Fa
|
|
||||||
0 1e-007 4 0
|
|
||||||
|
|
||||||
0111000
|
|
||||||
+8 0 *
|
|
||||||
Wi
|
|
||||||
|
|
||||||
0101000
|
|
||||||
-27 0 -10 0 +17 0 +14 0 *
|
|
||||||
Fa
|
|
||||||
0 1e-007 5 0
|
|
||||||
|
|
||||||
0111000
|
|
||||||
+6 0 *
|
|
||||||
Wi
|
|
||||||
|
|
||||||
0101000
|
|
||||||
-30 0 -9 0 +20 0 +13 0 *
|
|
||||||
Fa
|
|
||||||
0 1e-007 3 0
|
|
||||||
|
|
||||||
0111000
|
|
||||||
+4 0 *
|
|
||||||
Sh
|
|
||||||
|
|
||||||
0101100
|
|
||||||
-25 0 +15 0 -11 0 +7 0 -5 0 +3 0 *
|
|
||||||
So
|
|
||||||
|
|
||||||
1100000
|
|
||||||
+2 0 *
|
|
||||||
|
|
||||||
+1 0
|
|
2562
data/occ/hammer.brep
@@ -89,6 +89,14 @@ file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nEXTERNAL_SEARCH = NO")
|
|||||||
# Formula options
|
# Formula options
|
||||||
file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nMATHJAX_RELPATH = ${3RDPARTY_MATHJAX_RELATIVE_PATH}")
|
file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nMATHJAX_RELPATH = ${3RDPARTY_MATHJAX_RELATIVE_PATH}")
|
||||||
|
|
||||||
|
# If MSVC is used as build system, change warning format to the one recognized by MSVC
|
||||||
|
if (MSVC)
|
||||||
|
file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nWARN_FORMAT = \"$file($line): $text\"")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# Avoid Doxygen parsing messages in the build log
|
||||||
|
file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nQUIET = YES")
|
||||||
|
|
||||||
# Copy index file to provide fast access to HTML documentation
|
# Copy index file to provide fast access to HTML documentation
|
||||||
file(COPY "${OCCT_OVERVIEW_RESOURCE_DIR}/index.html" DESTINATION "${OCCT_GENERATED_OVERVIEW_DIR}")
|
file(COPY "${OCCT_OVERVIEW_RESOURCE_DIR}/index.html" DESTINATION "${OCCT_GENERATED_OVERVIEW_DIR}")
|
||||||
|
|
||||||
|
@@ -13,6 +13,8 @@ overview/overview.md
|
|||||||
|
|
||||||
../samples/qt/AndroidQt/ReadMe.md
|
../samples/qt/AndroidQt/ReadMe.md
|
||||||
../samples/java/jniviewer/ReadMe.md
|
../samples/java/jniviewer/ReadMe.md
|
||||||
|
../samples/ios/UIKitSample/ReadMe.md
|
||||||
|
../samples/webgl/ReadMe.md
|
||||||
|
|
||||||
tutorial/tutorial.md
|
tutorial/tutorial.md
|
||||||
|
|
||||||
@@ -31,6 +33,7 @@ user_guides/xde/xde.md
|
|||||||
user_guides/ocaf/ocaf.md
|
user_guides/ocaf/ocaf.md
|
||||||
user_guides/tobj/tobj.md
|
user_guides/tobj/tobj.md
|
||||||
user_guides/draw_test_harness/draw_test_harness.md
|
user_guides/draw_test_harness/draw_test_harness.md
|
||||||
|
user_guides/inspector/inspector.md
|
||||||
user_guides/brep_wp/brep_wp.md
|
user_guides/brep_wp/brep_wp.md
|
||||||
user_guides/vis/vis.md
|
user_guides/vis/vis.md
|
||||||
|
|
||||||
|
@@ -14,6 +14,7 @@ user_guides/shape_healing/shape_healing.md
|
|||||||
user_guides/ocaf/ocaf.md
|
user_guides/ocaf/ocaf.md
|
||||||
user_guides/step/step.md
|
user_guides/step/step.md
|
||||||
user_guides/draw_test_harness/draw_test_harness.md
|
user_guides/draw_test_harness/draw_test_harness.md
|
||||||
|
user_guides/inspector/inspector.md
|
||||||
user_guides/tobj/tobj.md
|
user_guides/tobj/tobj.md
|
||||||
user_guides/visualization/visualization.md
|
user_guides/visualization/visualization.md
|
||||||
user_guides/xde/xde.md
|
user_guides/xde/xde.md
|
||||||
|
@@ -10,7 +10,7 @@ products used by Open CASCADE Technology and samples on Linux platform.
|
|||||||
|
|
||||||
The links for downloading the third-party products are available on the web site
|
The links for downloading the third-party products are available on the web site
|
||||||
of OPEN CASCADE SAS at
|
of OPEN CASCADE SAS at
|
||||||
http://www.opencascade.com/content/3rd-party-components.
|
https://www.opencascade.com/content/3rd-party-components.
|
||||||
|
|
||||||
There are two types of third-party products, which are necessary to build OCCT:
|
There are two types of third-party products, which are necessary to build OCCT:
|
||||||
|
|
||||||
@@ -19,7 +19,6 @@ There are two types of third-party products, which are necessary to build OCCT:
|
|||||||
* FreeType 2.4.10 - 2.5.3;
|
* FreeType 2.4.10 - 2.5.3;
|
||||||
* Optional products:
|
* Optional products:
|
||||||
* TBB 3.x - 4.x;
|
* TBB 3.x - 4.x;
|
||||||
* gl2ps 1.3.5 - 1.3.8;
|
|
||||||
* FreeImage 3.14.1 - 3.16.0;
|
* FreeImage 3.14.1 - 3.16.0;
|
||||||
* VTK 6.1.0.
|
* VTK 6.1.0.
|
||||||
|
|
||||||
@@ -31,7 +30,7 @@ Tcl/Tk is required for DRAW test harness.
|
|||||||
|
|
||||||
@subsubsection dev_guides__building_3rdparty_linux_2_1_2 Installation from sources: Tcl
|
@subsubsection dev_guides__building_3rdparty_linux_2_1_2 Installation from sources: Tcl
|
||||||
|
|
||||||
Download the necessary archive from http://www.tcl.tk/software/tcltk/download.html and unpack it.
|
Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
|
||||||
|
|
||||||
1. Enter the unix sub-directory of the directory where the Tcl source files are located <i>(TCL_SRC_DIR)</i>.
|
1. Enter the unix sub-directory of the directory where the Tcl source files are located <i>(TCL_SRC_DIR)</i>.
|
||||||
|
|
||||||
@@ -54,7 +53,7 @@ Download the necessary archive from http://www.tcl.tk/software/tcltk/download.ht
|
|||||||
|
|
||||||
@subsubsection dev_guides__building_3rdparty_linux_2_1_3 Installation from sources: Tk
|
@subsubsection dev_guides__building_3rdparty_linux_2_1_3 Installation from sources: Tk
|
||||||
|
|
||||||
Download the necessary archive from http://www.tcl.tk/software/tcltk/download.html and unpack it.
|
Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
|
||||||
|
|
||||||
1. Enter the unix sub-directory of the directory where the Tk source files are located <i>(TK_SRC_DIR)</i>
|
1. Enter the unix sub-directory of the directory where the Tk source files are located <i>(TK_SRC_DIR)</i>
|
||||||
|
|
||||||
@@ -79,7 +78,7 @@ Download the necessary archive from http://www.tcl.tk/software/tcltk/download.ht
|
|||||||
@subsection dev_guides__building_3rdparty_linux_2_2 FreeType
|
@subsection dev_guides__building_3rdparty_linux_2_2 FreeType
|
||||||
|
|
||||||
FreeType is required for text display in the 3D viewer.
|
FreeType is required for text display in the 3D viewer.
|
||||||
Download the necessary archive from http://sourceforge.net/projects/freetype/files/ and unpack it.
|
Download the necessary archive from https://sourceforge.net/projects/freetype/files/ and unpack it.
|
||||||
|
|
||||||
1. Enter the directory where the source files of FreeType are located <i>(FREETYPE_SRC_DIR)</i>.
|
1. Enter the directory where the source files of FreeType are located <i>(FREETYPE_SRC_DIR)</i>.
|
||||||
|
|
||||||
@@ -104,39 +103,13 @@ Download the necessary archive from http://sourceforge.net/projects/freetype/fil
|
|||||||
|
|
||||||
@subsection dev_guides__building_3rdparty_linux_3_1 TBB
|
@subsection dev_guides__building_3rdparty_linux_3_1 TBB
|
||||||
|
|
||||||
This third-party product is installed with binaries from the archive that can be downloaded from http://threadingbuildingblocks.org.
|
This third-party product is installed with binaries from the archive that can be downloaded from https://github.com/intel/tbb.
|
||||||
Go to the **Download** page, find the release version you need and pick the archive for Linux platform.
|
Go to the **Download** page, find the release version you need and pick the archive for Linux platform.
|
||||||
To install, unpack the downloaded archive of TBB product.
|
To install, unpack the downloaded archive of TBB product.
|
||||||
|
|
||||||
@subsection dev_guides__building_3rdparty_linux_3_2 gl2ps
|
|
||||||
|
|
||||||
Download the necessary archive from http://geuz.org/gl2ps/ and unpack it.
|
|
||||||
|
|
||||||
1. Install or build *cmake* product from the source file.
|
|
||||||
2. Start *cmake* in GUI mode with the directory where the source files of gl2ps are located:
|
|
||||||
|
|
||||||
ccmake GL2PS_SRC_DIR
|
|
||||||
|
|
||||||
* Press <i>[c]</i> to make the initial configuration;
|
|
||||||
* Define the necessary options in *CMAKE_INSTALL_PREFIX*
|
|
||||||
* Press <i>[c]</i> to make the final configuration
|
|
||||||
* Press <i>[g]</i> to generate Makefile and exit
|
|
||||||
|
|
||||||
or just run the following command:
|
|
||||||
|
|
||||||
cmake –DCMAKE_INSTALL_PREFIX=GL2PS_INSTALL_DIR –DCMAKE_BUILD_TYPE=Release
|
|
||||||
|
|
||||||
3. Start the building of gl2ps:
|
|
||||||
|
|
||||||
make
|
|
||||||
|
|
||||||
4. Start the installation of gl2ps. Binaries will be installed according to the *CMAKE_INSTALL_PREFIX* option.
|
|
||||||
|
|
||||||
make install
|
|
||||||
|
|
||||||
@subsection dev_guides__building_3rdparty_linux_3_3 FreeImage
|
@subsection dev_guides__building_3rdparty_linux_3_3 FreeImage
|
||||||
|
|
||||||
Download the necessary archive from http://sourceforge.net/projects/freeimage/files/Source%20Distribution/
|
Download the necessary archive from https://sourceforge.net/projects/freeimage/files/Source%20Distribution/
|
||||||
and unpack it. The directory with unpacked sources is further referred to as *FREEIMAGE_SRC_DIR*.
|
and unpack it. The directory with unpacked sources is further referred to as *FREEIMAGE_SRC_DIR*.
|
||||||
|
|
||||||
1. Modify *FREEIMAGE_SRC_DIR/Source/OpenEXR/Imath/ImathMatrix.h*:
|
1. Modify *FREEIMAGE_SRC_DIR/Source/OpenEXR/Imath/ImathMatrix.h*:
|
||||||
@@ -201,11 +174,11 @@ and unpack it. The directory with unpacked sources is further referred to as *F
|
|||||||
|
|
||||||
@subsection dev_guides__building_3rdparty_linux_3_4 VTK
|
@subsection dev_guides__building_3rdparty_linux_3_4 VTK
|
||||||
|
|
||||||
You can download VTK sources from http://www.vtk.org/VTK/resources/software.html
|
You can download VTK sources from https://www.vtk.org/VTK/resources/software.html
|
||||||
|
|
||||||
### The building procedure:
|
### The building procedure:
|
||||||
|
|
||||||
Download the necessary archive from http://www.vtk.org/VTK/resources/software.html and unpack it.
|
Download the necessary archive from https://www.vtk.org/VTK/resources/software.html and unpack it.
|
||||||
|
|
||||||
1. Install or build *cmake* product from the source file.
|
1. Install or build *cmake* product from the source file.
|
||||||
2. Start *cmake* in GUI mode with the directory where the source files of *VTK* are located:
|
2. Start *cmake* in GUI mode with the directory where the source files of *VTK* are located:
|
||||||
@@ -221,7 +194,7 @@ Download the necessary archive from http://www.vtk.org/VTK/resources/software.ht
|
|||||||
|
|
||||||
make
|
make
|
||||||
|
|
||||||
4. Start the installation of gl2ps. Binaries will be installed according to the *VTK_INSTALL_PREFIX* option.
|
4. Start the installation of VTK. Binaries will be installed according to the *VTK_INSTALL_PREFIX* option.
|
||||||
|
|
||||||
make install
|
make install
|
||||||
|
|
||||||
@@ -232,7 +205,7 @@ Download the necessary archive from http://www.vtk.org/VTK/resources/software.ht
|
|||||||
All 3rd-party products required for building of OCCT could be installed
|
All 3rd-party products required for building of OCCT could be installed
|
||||||
from official repositories. You may install them from console using apt-get utility:
|
from official repositories. You may install them from console using apt-get utility:
|
||||||
|
|
||||||
sudo apt-get install tcllib tklib tcl-dev tk-dev libfreetype-dev libxt-dev libxmu-dev libxi-dev libgl1-mesa-dev libglu1-mesa-dev libfreeimage-dev libtbb-dev libgl2ps-dev
|
sudo apt-get install tcllib tklib tcl-dev tk-dev libfreetype-dev libxt-dev libxmu-dev libxi-dev libgl1-mesa-dev libglu1-mesa-dev libfreeimage-dev libtbb-dev
|
||||||
|
|
||||||
To launch binaries built with WOK you need to install C shell and 32-bit libraries on x86_64 distributives:
|
To launch binaries built with WOK you need to install C shell and 32-bit libraries on x86_64 distributives:
|
||||||
|
|
||||||
|
42
dox/dev_guides/building/3rdparty/3rdparty_osx.md
vendored
@@ -8,7 +8,7 @@ This document presents additional guidelines for building third-party products
|
|||||||
used by Open CASCADE Technology and samples on Mac OS X platform (10.6.4 and later).
|
used by Open CASCADE Technology and samples on Mac OS X platform (10.6.4 and later).
|
||||||
|
|
||||||
The links for downloading the third-party products are available
|
The links for downloading the third-party products are available
|
||||||
on the web site of OPEN CASCADE SAS at http://www.opencascade.com/content/3rd-party-components.
|
on the web site of OPEN CASCADE SAS at https://www.opencascade.com/content/3rd-party-components.
|
||||||
|
|
||||||
There are two types of third-party products, which are necessary to build OCCT:
|
There are two types of third-party products, which are necessary to build OCCT:
|
||||||
|
|
||||||
@@ -17,7 +17,6 @@ There are two types of third-party products, which are necessary to build OCCT:
|
|||||||
* FreeType 2.4.10 - 2.5.3.
|
* FreeType 2.4.10 - 2.5.3.
|
||||||
* Optional products:
|
* Optional products:
|
||||||
* TBB 3.x - 4.x;
|
* TBB 3.x - 4.x;
|
||||||
* gl2ps 1.3.5 - 1.3.8;
|
|
||||||
* FreeImage 3.14.1 - 3.16.0
|
* FreeImage 3.14.1 - 3.16.0
|
||||||
|
|
||||||
@section dev_guides__building_3rdparty_osx_2 Building Mandatory Third-party Products
|
@section dev_guides__building_3rdparty_osx_2 Building Mandatory Third-party Products
|
||||||
@@ -28,7 +27,7 @@ Tcl/Tk is required for DRAW test harness. Version 8.5 or 8.6 can be used with O
|
|||||||
|
|
||||||
@subsubsection dev_guides__building_3rdparty_osx_2_1_2 Installation from sources: Tcl 8.5
|
@subsubsection dev_guides__building_3rdparty_osx_2_1_2 Installation from sources: Tcl 8.5
|
||||||
|
|
||||||
Download the necessary archive from http://www.tcl.tk/software/tcltk/download.html and unpack it.
|
Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
|
||||||
|
|
||||||
1. Enter the *macosx* sub-directory of the directory where the Tcl source files are located <i>(TCL_SRC_DIR)</i>.
|
1. Enter the *macosx* sub-directory of the directory where the Tcl source files are located <i>(TCL_SRC_DIR)</i>.
|
||||||
|
|
||||||
@@ -51,7 +50,7 @@ Download the necessary archive from http://www.tcl.tk/software/tcltk/download.ht
|
|||||||
|
|
||||||
@subsubsection dev_guides__building_3rdparty_osx_2_1_3 Installation from sources: Tk 8.5
|
@subsubsection dev_guides__building_3rdparty_osx_2_1_3 Installation from sources: Tk 8.5
|
||||||
|
|
||||||
Download the necessary archive from http://www.tcl.tk/software/tcltk/download.html and unpack it.
|
Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
|
||||||
|
|
||||||
1. Enter the *macosx* sub-directory of the directory where the source files of Tk are located <i>(TK_SRC_DIR)</i>.
|
1. Enter the *macosx* sub-directory of the directory where the source files of Tk are located <i>(TK_SRC_DIR)</i>.
|
||||||
|
|
||||||
@@ -75,7 +74,7 @@ Download the necessary archive from http://www.tcl.tk/software/tcltk/download.ht
|
|||||||
|
|
||||||
FreeType is required for text display in the 3D viewer.
|
FreeType is required for text display in the 3D viewer.
|
||||||
|
|
||||||
Download the necessary archive from http://sourceforge.net/projects/freetype/files/ and unpack it.
|
Download the necessary archive from https://sourceforge.net/projects/freetype/files/ and unpack it.
|
||||||
|
|
||||||
1. Enter the directory where the source files of FreeType are located <i>(FREETYPE_SRC_DIR)</i>.
|
1. Enter the directory where the source files of FreeType are located <i>(FREETYPE_SRC_DIR)</i>.
|
||||||
|
|
||||||
@@ -101,47 +100,20 @@ Download the necessary archive from http://sourceforge.net/projects/freetype/fil
|
|||||||
@subsection dev_guides__building_3rdparty_osx_3_1 TBB 3.x or 4.x
|
@subsection dev_guides__building_3rdparty_osx_3_1 TBB 3.x or 4.x
|
||||||
|
|
||||||
This third-party product is installed with binaries from the archive
|
This third-party product is installed with binaries from the archive
|
||||||
that can be downloaded from http://threadingbuildingblocks.org/.
|
that can be downloaded from https://github.com/intel/tbb.
|
||||||
Go to the **Download** page, find the release version you need (e.g. *tbb30_018oss*)
|
Go to the **Download** page, find the release version you need (e.g. *tbb30_018oss*)
|
||||||
and pick the archive for Mac OS X platform.
|
and pick the archive for Mac OS X platform.
|
||||||
To install, unpack the downloaded archive of TBB 3.0 product (*tbb30_018oss_osx.tgz*).
|
To install, unpack the downloaded archive of TBB 3.0 product (*tbb30_018oss_osx.tgz*).
|
||||||
|
|
||||||
@subsection dev_guides__building_3rdparty_osx_3_2 gl2ps 1.3.5
|
|
||||||
|
|
||||||
Download the necessary archive from http://geuz.org/gl2ps/ and unpack it.
|
|
||||||
|
|
||||||
1. Install or build cmake product from the source file.
|
|
||||||
|
|
||||||
2. Start cmake in GUI mode with the directory, where the source files of *fl2ps* are located:
|
|
||||||
|
|
||||||
ccmake GL2PS_SRC_DIR
|
|
||||||
|
|
||||||
* Press <i>[c]</i> to make the initial configuration;
|
|
||||||
* Define the necessary options in *CMAKE_INSTALL_PREFIX*;
|
|
||||||
* Press <i>[c]</i> to make the final configuration;
|
|
||||||
* Press <i>[g]</i> to generate Makefile and exit.
|
|
||||||
|
|
||||||
or just run the following command:
|
|
||||||
|
|
||||||
cmake –DCMAKE_INSTALL_PREFIX=GL2PS_INSTALL_DIR –DCMAKE_BUILD_TYPE=Release
|
|
||||||
|
|
||||||
3. Start the building of gl2ps
|
|
||||||
|
|
||||||
make
|
|
||||||
|
|
||||||
4. Start the installation of gl2ps. Binaries will be installed according to the *CMAKE_INSTALL_PREFIX* option
|
|
||||||
|
|
||||||
make install
|
|
||||||
|
|
||||||
@subsection dev_guides__building_3rdparty_osx_3_3 FreeImage 3.14.1 or 3.15.x
|
@subsection dev_guides__building_3rdparty_osx_3_3 FreeImage 3.14.1 or 3.15.x
|
||||||
|
|
||||||
Download the necessary archive from
|
Download the necessary archive from
|
||||||
http://sourceforge.net/projects/freeimage/files/Source%20Distribution/
|
https://sourceforge.net/projects/freeimage/files/Source%20Distribution/
|
||||||
and unpack it. The directory with unpacked sources is further referred to as *FREEIMAGE_SRC_DIR*.
|
and unpack it. The directory with unpacked sources is further referred to as *FREEIMAGE_SRC_DIR*.
|
||||||
|
|
||||||
Note that for building FreeImage on Mac OS X 10.7 you should replace *Makefile.osx*
|
Note that for building FreeImage on Mac OS X 10.7 you should replace *Makefile.osx*
|
||||||
in *FREEIMAGE_SRC_DIR* by the corrected file, which you can find in attachment to issue #22811 in OCCT Mantis bug tracker
|
in *FREEIMAGE_SRC_DIR* by the corrected file, which you can find in attachment to issue #22811 in OCCT Mantis bug tracker
|
||||||
(http://tracker.dev.opencascade.org/file_download.php?file_id=6937&type=bug).
|
(https://tracker.dev.opencascade.org/file_download.php?file_id=6937&type=bug).
|
||||||
|
|
||||||
1. If you build FreeImage 3.15.x you can skip this step.
|
1. If you build FreeImage 3.15.x you can skip this step.
|
||||||
Modify <i>FREEIMAGE_SRC_DIR/Source/OpenEXR/Imath/ImathMatrix.h:</i>
|
Modify <i>FREEIMAGE_SRC_DIR/Source/OpenEXR/Imath/ImathMatrix.h:</i>
|
||||||
|
@@ -8,7 +8,7 @@ This document presents guidelines for building third-party products used by Open
|
|||||||
|
|
||||||
You need to use the same version of MS Visual Studio for building all third-party products and OCCT itself, in order to receive a consistent set of run-time binaries.
|
You need to use the same version of MS Visual Studio for building all third-party products and OCCT itself, in order to receive a consistent set of run-time binaries.
|
||||||
|
|
||||||
The links for downloading the third-party products are available on the web site of OPEN CASCADE SAS at http://www.opencascade.com/content/3rd-party-components.
|
The links for downloading the third-party products are available on the web site of OPEN CASCADE SAS at https://www.opencascade.com/content/3rd-party-components.
|
||||||
|
|
||||||
There are two types of third-party products used by OCCT:
|
There are two types of third-party products used by OCCT:
|
||||||
|
|
||||||
@@ -17,7 +17,6 @@ There are two types of third-party products used by OCCT:
|
|||||||
* FreeType 2.4.10 -- 2.5.3.
|
* FreeType 2.4.10 -- 2.5.3.
|
||||||
* Optional products:
|
* Optional products:
|
||||||
* TBB 3.x -- 4.x;
|
* TBB 3.x -- 4.x;
|
||||||
* gl2ps 1.3.5 -- 1.3.8;
|
|
||||||
* FreeImage 3.14.1 -- 3.16.0;
|
* FreeImage 3.14.1 -- 3.16.0;
|
||||||
* VTK 6.1.0.
|
* VTK 6.1.0.
|
||||||
|
|
||||||
@@ -33,7 +32,7 @@ Tcl/Tk is required for DRAW test harness.
|
|||||||
|
|
||||||
@subsubsection dev_guides__building_3rdparty_win_2_1_1 Installation from sources: Tcl
|
@subsubsection dev_guides__building_3rdparty_win_2_1_1 Installation from sources: Tcl
|
||||||
|
|
||||||
Download the necessary archive from http://www.tcl.tk/software/tcltk/download.html and unpack it.
|
Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
|
||||||
|
|
||||||
1. In the *win* sub-directory, edit file *buildall.vc.bat*:
|
1. In the *win* sub-directory, edit file *buildall.vc.bat*:
|
||||||
|
|
||||||
@@ -86,7 +85,7 @@ Download the necessary archive from http://www.tcl.tk/software/tcltk/download.ht
|
|||||||
|
|
||||||
@subsubsection dev_guides__building_3rdparty_win_2_1_2 Installation from sources: Tk
|
@subsubsection dev_guides__building_3rdparty_win_2_1_2 Installation from sources: Tk
|
||||||
|
|
||||||
Download the necessary archive from http://www.tcl.tk/software/tcltk/download.html and unpack it.
|
Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
|
||||||
|
|
||||||
Apply the same steps as described for building Tcl above, with the same INSTALLDIR.
|
Apply the same steps as described for building Tcl above, with the same INSTALLDIR.
|
||||||
Note that Tk produces its own executable, called *wish*.
|
Note that Tk produces its own executable, called *wish*.
|
||||||
@@ -95,7 +94,7 @@ You might need to edit default value of *TCLDIR* variable defined in *buildall.v
|
|||||||
|
|
||||||
@subsection dev_guides__building_3rdparty_win_2_2 FreeType
|
@subsection dev_guides__building_3rdparty_win_2_2 FreeType
|
||||||
|
|
||||||
FreeType is required for text display in a 3D viewer. You can download its sources from http://sourceforge.net/projects/freetype/files/
|
FreeType is required for text display in a 3D viewer. You can download its sources from https://sourceforge.net/projects/freetype/files/
|
||||||
|
|
||||||
### The building procedure
|
### The building procedure
|
||||||
|
|
||||||
@@ -149,97 +148,18 @@ FreeType is required for text display in a 3D viewer. You can download its sourc
|
|||||||
@subsection dev_guides__building_3rdparty_win_3_1 TBB
|
@subsection dev_guides__building_3rdparty_win_3_1 TBB
|
||||||
|
|
||||||
This third-party product is installed with binaries
|
This third-party product is installed with binaries
|
||||||
from the archive that can be downloaded from http://threadingbuildingblocks.org/.
|
from the archive that can be downloaded from https://github.com/intel/tbb.
|
||||||
Go to the **Download** page, find the release version you need (e.g. *tbb30_018oss*) and pick the archive for Windows platform.
|
Go to the **Download** page, find the release version you need (e.g. *tbb30_018oss*) and pick the archive for Windows platform.
|
||||||
|
|
||||||
Unpack the downloaded archive of TBB product into the *3rdparty* folder.
|
Unpack the downloaded archive of TBB product into the *3rdparty* folder.
|
||||||
|
|
||||||
Further in this document, this folder is referred to as *tbb*.
|
Further in this document, this folder is referred to as *tbb*.
|
||||||
|
|
||||||
@subsection dev_guides__building_3rdparty_win_3_2 gl2ps
|
|
||||||
|
|
||||||
This third-party product should be built as a dynamically loadable library (dll file).
|
|
||||||
You can download its sources from http://geuz.org/gl2ps/src/.
|
|
||||||
|
|
||||||
### The building procedure
|
|
||||||
|
|
||||||
1. Unpack the downloaded archive of gl2ps product (e.g. *gl2ps-1.3.5.tgz*) into the *3rdparty* folder.
|
|
||||||
|
|
||||||
As a result, you will get a folder named, for example, *3rdparty\\gl2ps-1.3.5-source*.
|
|
||||||
|
|
||||||
Rename it into <i>gl2ps-platform-compiler-building mode</i>, where
|
|
||||||
* **platform** -- *win32* or *win64*;
|
|
||||||
* **compiler** -- *vc8*, *vc9* or *vc10*;
|
|
||||||
* **building mode** -- *opt* (for release) or *deb* (for debug).
|
|
||||||
|
|
||||||
For example, <i>gl2ps-win64-vc10-deb</i>
|
|
||||||
|
|
||||||
Further in this document, this folder is referred to as *gl2ps*.
|
|
||||||
|
|
||||||
2. Download (from http://www.cmake.org/cmake/resources/software.html)
|
|
||||||
and install the *CMake* build system.
|
|
||||||
|
|
||||||
3. Edit the file *gl2ps\\CMakeLists.txt*.
|
|
||||||
|
|
||||||
After line 113 in *CMakeLists.txt*:
|
|
||||||
|
|
||||||
set_target_properties(shared PROPERTIES COMPILE_FLAGS \"-DGL2PSDLL -DGL2PSDLL_EXPORTS\")
|
|
||||||
|
|
||||||
add the following line:
|
|
||||||
|
|
||||||
add_definitions(-D_USE_MATH_DEFINES)
|
|
||||||
|
|
||||||
Attention: If Cygwin was installed on your computer, make sure that there is no path to it in the *PATH* variable to avoid possible conflicts during the configuration.
|
|
||||||
|
|
||||||
4. Launch CMake <i>(cmake-gui.exe)</i> using the Program menu.
|
|
||||||
|
|
||||||
In CMake:
|
|
||||||
|
|
||||||
* Define where the source code is.
|
|
||||||
This path must point to *gl2ps* folder.
|
|
||||||
|
|
||||||
* Define where to build the binaries.
|
|
||||||
This path must point to the folder where generated gl2ps project binaries will be placed
|
|
||||||
(for example, *gl2ps\\bin*).
|
|
||||||
Further in this document, this folder is referred to as *gl2ps_bin*.
|
|
||||||
|
|
||||||
* Press **Configure** button.
|
|
||||||
|
|
||||||
@figure{/dev_guides/building/3rdparty/images/3rdparty_image004.png}
|
|
||||||
|
|
||||||
* Select the generator (the compiler and the target platform -- 32 or 64 bit) in the pop-up window.
|
|
||||||
|
|
||||||
@figure{/dev_guides/building/3rdparty/images/3rdparty_image005.png}
|
|
||||||
|
|
||||||
* Press **Finish** button to return to the main CMake window.
|
|
||||||
Expand the ENABLE group and uncheck ENABLE_PNG and ENABLE_ZLIB check boxes.
|
|
||||||
|
|
||||||
@figure{/dev_guides/building/3rdparty/images/3rdparty_image006.png}
|
|
||||||
|
|
||||||
* Expand the CMAKE group and define *CMAKE_INSTALL_PREFIX* which is the path where you want to install the build results, for example, *c:\\occ3rdparty\\gl2ps-1.3.5*.
|
|
||||||
|
|
||||||
@figure{/dev_guides/building/3rdparty/images/3rdparty_image007.png}
|
|
||||||
|
|
||||||
* Press **Configure** button again, then press **Generate** button to generate Visual Studio projects. After completion, close CMake application.
|
|
||||||
|
|
||||||
5. Open the solution file *gl2ps_bin\\gl2ps.sln* in Visual Studio.
|
|
||||||
|
|
||||||
* Select a configuration to build
|
|
||||||
* Choose **Release** to build Release binaries.
|
|
||||||
* Choose **Debug** to build Debug binaries.
|
|
||||||
* Select a platform to build.
|
|
||||||
* Choose **Win32** to build for a 32 bit platform.
|
|
||||||
* Choose **x64** to build for a 64 bit platform.
|
|
||||||
* Build the solution.
|
|
||||||
* Build the *INSTALL* project.
|
|
||||||
|
|
||||||
As a result, you should have the installed gl2ps product in the *CMAKE_INSTALL_PREFIX* path.
|
|
||||||
|
|
||||||
@subsection dev_guides__building_3rdparty_win_3_3 FreeImage
|
@subsection dev_guides__building_3rdparty_win_3_3 FreeImage
|
||||||
|
|
||||||
This third-party product should be built as a dynamically loadable library (.dll file).
|
This third-party product should be built as a dynamically loadable library (.dll file).
|
||||||
You can download its sources from
|
You can download its sources from
|
||||||
http://sourceforge.net/projects/freeimage/files/Source%20Distribution/
|
https://sourceforge.net/projects/freeimage/files/Source%20Distribution/
|
||||||
|
|
||||||
### The building procedure:
|
### The building procedure:
|
||||||
|
|
||||||
@@ -312,7 +232,7 @@ VTK is an open-source, freely available software system for 3D computer graphics
|
|||||||
|
|
||||||
### The building procedure:
|
### The building procedure:
|
||||||
|
|
||||||
1. Download the necessary archive from http://www.vtk.org/VTK/resources/software.html and unpack it into *3rdparty* folder.
|
1. Download the necessary archive from https://www.vtk.org/VTK/resources/software.html and unpack it into *3rdparty* folder.
|
||||||
|
|
||||||
As a result, you will get a folder named, for example, <i>3rdparty\VTK-6.1.0.</i>
|
As a result, you will get a folder named, for example, <i>3rdparty\VTK-6.1.0.</i>
|
||||||
|
|
||||||
|
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 68 KiB |
Before Width: | Height: | Size: 130 KiB After Width: | Height: | Size: 37 KiB |
@@ -10,9 +10,9 @@ The steps on Windows and Ubuntu are similar. There is the only one difference: m
|
|||||||
on Windows and native GNU make on Ubuntu.
|
on Windows and native GNU make on Ubuntu.
|
||||||
|
|
||||||
Required tools (download and install if it is required):
|
Required tools (download and install if it is required):
|
||||||
- CMake v3.7+ http://www.cmake.org/cmake/resources/software.html
|
- CMake v3.7+ https://www.cmake.org/cmake/resources/software.html
|
||||||
- Android NDK rev.10+ https://developer.android.com/tools/sdk/ndk/index.html
|
- Android NDK rev.10+ https://developer.android.com/tools/sdk/ndk/index.html
|
||||||
- GNU Make: MinGW v4.82+ for Windows (http://sourceforge.net/projects/mingw/files/), GNU Make 4.0 for Ubuntu.
|
- GNU Make: MinGW v4.82+ for Windows (https://sourceforge.net/projects/mingw/files/), GNU Make 4.0 for Ubuntu.
|
||||||
|
|
||||||
## Prerequisites
|
## Prerequisites
|
||||||
|
|
||||||
@@ -64,7 +64,7 @@ Then makefiles will appear in the build folder (e.g. <i> D:/occt/build-android <
|
|||||||
|
|
||||||
Alternatively one may specify the values without a toolchain file:
|
Alternatively one may specify the values without a toolchain file:
|
||||||
|
|
||||||
> cmake -G "MinGW Makefiles" -DCMAKE_SYSTEM_NAME=Android -DCMAKE_ANDROID_NDK=D:/DevTools/android-ndk-r13b -DCMAKE_ANDROID_STL_TYPE=gnustl_shared -DCMAKE_SYSTEM_VERSION=15 -DCMAKE_ANDROID_ARCH_ABI=armeabi-v7a -DCMAKE_MAKE_PROGRAM=D:/DevTools/MinGW/bin/mingw32-make.exe -D3RDPARTY_DIR=D:/occt-3rdparty D:/occt
|
> cmake -G "MinGW Makefiles" -DCMAKE_SYSTEM_NAME=Android -DCMAKE_ANDROID_NDK=D:/DevTools/android-ndk-r13b -DCMAKE_ANDROID_STL_TYPE=gnustl_shared -DCMAKE_SYSTEM_VERSION=21 -DCMAKE_ANDROID_ARCH_ABI=armeabi-v7a -DCMAKE_MAKE_PROGRAM=D:/DevTools/MinGW/bin/mingw32-make.exe -D3RDPARTY_DIR=D:/occt-3rdparty D:/occt
|
||||||
|
|
||||||
@figure{/dev_guides/building/android/images/android_image006.png}
|
@figure{/dev_guides/building/android/images/android_image006.png}
|
||||||
|
|
||||||
|
@@ -6,7 +6,7 @@ The list of required libraries depends on what OCCT modules will be used, and yo
|
|||||||
The typical minimum is **Freetype** (necessary for Visualization) and **Tcl/Tk** (for DRAW Test Harness).
|
The typical minimum is **Freetype** (necessary for Visualization) and **Tcl/Tk** (for DRAW Test Harness).
|
||||||
See "Third-party libraries" section in \ref OCCT_OVW_SECTION_5 "Overview" for a full list.
|
See "Third-party libraries" section in \ref OCCT_OVW_SECTION_5 "Overview" for a full list.
|
||||||
|
|
||||||
On Windows, the easiest way to install third-party libraries is to download archive with pre-built binaries from http://www.opencascade.com/content/3rd-party-components.
|
On Windows, the easiest way to install third-party libraries is to download archive with pre-built binaries from https://www.opencascade.com/content/3rd-party-components.
|
||||||
On Linux and OS X, it is recommended to use the version installed in the system natively.
|
On Linux and OS X, it is recommended to use the version installed in the system natively.
|
||||||
|
|
||||||
You can also build third-party libraries from their sources:
|
You can also build third-party libraries from their sources:
|
||||||
|