From 7964d9a3607a6af44678f3843d39a809c30a1d45 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Thu, 29 Aug 2013 17:50:38 +0400 Subject: [PATCH] Editet cmakelists --- mathmech/CMakeLists.txt | 10 ++++++++++ mathmech/PKGBUILD | 8 ++++++-- mathmech/mathmech-1.0.1.zip | Bin 1022859 -> 1023096 bytes mathmech/mathmech/src/CMakeLists.txt | 4 +++- mathmech/mathmech/src/statgengraphwindow.cpp | 6 +++--- mathmech/mathmech/src/statgengraphwindow.h | 2 +- mathmech/mm_agl/CMakeLists.txt | 2 +- mathmech/mm_envir/CMakeLists.txt | 2 +- mathmech/mm_radf/CMakeLists.txt | 2 +- mathmech/mm_statgen/CMakeLists.txt | 2 +- mathmech/mm_trj/CMakeLists.txt | 2 +- mathmech/mm_trj2pdb/CMakeLists.txt | 2 +- 12 files changed, 29 insertions(+), 13 deletions(-) diff --git a/mathmech/CMakeLists.txt b/mathmech/CMakeLists.txt index a4e9312..4db8f88 100644 --- a/mathmech/CMakeLists.txt +++ b/mathmech/CMakeLists.txt @@ -6,6 +6,16 @@ set (COMPS mathmech mm_trj mm_trj2pdb) +# install options +set (MM_PREFIX "mm_" CACHE STRING "Prefix for mathmech tools") +if (CMAKE_COMPILER_IS_GNUCXX) + set (QWT_INCLUDE_PATH "/usr/include" CACHE STRING "Path to qwt include") + set (QWT_LIBRARY_PATH "/usr/lib" CACHE STRING "Path to qwt library") +else () + set (QWT_INCLUDE_PATH "C:/Qwt-6.1.0/include" CACHE STRING "Path to qwt include") + set (QWT_LIBRARY_PATH "C:/Qwt-6.1.0/lib" CACHE STRING "Path to qwt library") +endif() + foreach (COMP ${COMPS}) add_subdirectory (${COMP}) endforeach() \ No newline at end of file diff --git a/mathmech/PKGBUILD b/mathmech/PKGBUILD index eccbd7c..d9db907 100644 --- a/mathmech/PKGBUILD +++ b/mathmech/PKGBUILD @@ -11,7 +11,11 @@ license=('GPL') depends=('qt4' 'qwt') makedepends=('unzip' 'cmake' 'automoc4') source=(https://github.com/arcan1s/moldyn/releases/download/mm-1.0.1/${pkgname}-${pkgver}.zip) -md5sums=('5fab4bc7707d580ff41d384b1875b32c') +md5sums=('393d4ec5beb06a1ed1c62df67446ee3c') +_cmakekeys="-DCMAKE_INSTALL_PREFIX=/usr + -DQWT_INCLUDE_PATH=/usr/include/qwt + -DMM_PREFIX=mm_ + -DCMAKE_BUILD_TYPE=Release" build () { @@ -20,7 +24,7 @@ build () rm -rf build fi mkdir ${srcdir}/${pkgname}/build && cd ${srcdir}/${pkgname}/build - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ../ + cmake ${_cmakekeys} ../ make } diff --git a/mathmech/mathmech-1.0.1.zip b/mathmech/mathmech-1.0.1.zip index a4b960152fb5b006bdde5e807e7625e5c929b265..813a463834101b9b0433aa6becea598cf1173ee6 100644 GIT binary patch delta 9212 zcmeC)Zuet{U44KzGm8i_0|N(xPmio~waW7bbw&n;CME_3J_ZH`XWzu^RG-Y^l48A* zijuXH{Qa991dhJ1>Ef(vXkJ_O;Q_B;bka(Zj3bxR5~puUYuvRvLi+Oichi0?zqF*Y zv%1Fk^X%_t$}5>p*K!<^&{}h<>)BF9`}L~?;y%oCdL6D-HLL!>k{6yqiCY(x`iDOH z8L%^E(iyWJ;e@U89?8sFn&hk7doE63fx)MDe?)xl<~6Z)~p0 z`-B^^r1X4mC$#d3TYQ(h<@QBAuH}zJ@3LZZ-`w2AhtJCiKk>hN^3OHrg_C;@%4`eb ziJbd++J)xQs`h7xPkS8<4?V4a<;ecdIWIEhk4Bd9EI!TDz4cgto@RvmoSoMX-}IUr z%d5xs{Qr{z`Je2|O%q$ovR>3Lx6m(lXIcLKu5RwO-v){v+awd4o~;th-cWYc*Zi+# z`c3(b3pEXxzV}Q%V_?Jdy=OC*;XD-(y(*MPli8zJcCwGWluU6^vOXg4J$hxGHxz4# zrZ6)w_;5~sU#DDux@fk6$lcGPv$k;WHZJ`YmFm9X(FLgutr?f6x-lMI_E415|I*7J z_p4cFv~M*2cu4u>yx$jgx{IrNnM4Y{x8A1lyR$RDTCe!bdpXDX%a3KQe%ti*vgGSi zORl}O)UNvfK4sls9-hZ0YZK=r+MD)-XdE?X@~z3bbiiF)x2(Rkj;ns{DJ*+SwY=nLHGIZ9%TxfbiP-e zUf=tJ(O2jApT?O_Ew!sVIXBmCD`0;8E-z~Vmv!W=>qk_~miSz}Tx@CTvPj{}je8NB zHR>3$bB*u1Cg^S8Px#T96RiKF-p`byiC_FxgvFeVJAJ=R4_Z;9?z}L~-^j)_Q}_Xw zl8N_&e4f=WS0;S@Wa6_qwDHTLrWau?l~D|f-4s9DE4A#}ZI>1FSjVSqVgjrFb~mB) zew{AW2St+HOAo$|pK{gZ@3lu4Ze`T8o#;5bJr5V0PFoPX|J>T-cRE{MRyfpi zlxgnX7OU|}ls&d4`rN{b3*ll1OAjCK+EeLV-3l>ifg&5R4Y1tU&!q{9OiKL zwdy+U*B|;a58Hm^+Fkr6YJYaNDRb1d9qeWfcWO|mbQugVb9 zSGqIxkDcIO&Ca@;@2=}Nht17=9;oT=d2EaH))f(^WvlgXU(~poVfWTOE57_o#r|bc zr`iR116MCx=QU4-Bdty`h10S3@Wmz5di$$9pWRr#EqZF}yT>`V8nZX0Z9Xkx$G?(e z`(}?7$Bp#)-e){my)CB8J5Iz?=33L98r^HhRqj98taN*i(3+0;ptu(n{~0$YHr4d< zzV4BA{_@={;wB3N!;9&!_!&(ZS*9xpFe=y2&z9`Bf3YNM=kfRN>g;|$x|e>3J81qQ z@w;N({n^~-^&=gkdsr?Oc>ZZScPshS(@6ym%QxvKdmVawtLe{cmt9I7OH8fqDU|Lt zk-J

y+#!d|iE#M(R>iA^Vrq=?+S0&YSNQkf8!{+9ba$Vq68OP(D{%Kj)9OoFFdC3yH$@f9p z+udfC7Je&yj;bCmIwG_=ka=bFqs3{W-m4oz_Opg0Y-aRldgR5sYTonN+`l(2+@!P1 zpIJ*&Wnrznt<&3ol0t^QLM~SqT{|ZD`J&nxX{+KXbK|OG>dP3bR_tBL-=xE`+ik}r zS(#>Kv%t-ryDn{We6&rtpCjv#czwGW!|Jc5pC-aV~+KIv}U&2KBJj_eG|)od?P(FmV*vc)sM zWy74*-cPpKVv_<&GG6}=U&KG-&ZO5%_tf?Eax-_`IUKk=W+&&{upf?fzH{r<-pzA$ z6nT8u>QCqa%TqJ0t|r8%9FJajM*j4+wLXP)$5I}Ky(wL!rQ#BQT~M>rTUjAzCkG#Fce|qnAcGmCRBUJCTiT&cWkilUxZ`R+Yew)Fn`nPD&H zO`mOhZFkLe#`vBcZz}ZD*YU9Se2!3jHC@nDBGy#A&{QwZ#{SNJ@+f}b9m1EZvMPk#(m-s?XPK~ zk8~_t%r7>xZ(n-HQu50=dlSW|d1j|xHbu0CD>12=@0hYaUaeg)?WKq|KP!bHw?0d|5L2bDly%< zbv$~8>u$?j*O#FiW(aASy?@_mf0OOpf0kdDO~35kV1M6?``_ZDXQIsRYq~zs`j*A~ zf3n;Pi}mLX1v~hTqFlO=SN!z_rin_n3 zYvV!z0q&C%lqN+?OPvwjb2Xo18}E9aS8i_vIK{U`C&XL74Yw+6k&lXJk)74sCVX_# z0j)!&u6~Ptuw^pMoIa(kNqcv&TI1xP3Q;cMvRK14??p=@bS~yLo!&V^a*E%ttpDF$ zY_Ju*5zrYT9iiW}RBYv!mCAE>E?k_dTqnNlfwkh??s%t`rgFu3Wpj86`Fwv0Bia@3 zdSsndh1PD2XJlYl&cwi=IQ<6wHxE~3#@~CrXJ%z)^Rsi0WR6X4_gruNVy|t_ug%LH(=9I7UKMDSxz@ePQO}dR zyFh%uRFQF!+3hV_U#_=p^*7!ZwQWk#GvQ`)&O=ikL^G2sgh2)v(BFzxn4dCic^7rbwm-fgd{NQ1 zNv_&0Z?;WuVzcrt-jR3hpGijC>UdDVPp{48m)gETj4_CvxvWQa`ov3IBGV=17&~~& zdSsoYvR*6iXJlZAoW4$uQLa8Vf3|^0?ep-MjW!1kUn;r0Br~67&NR(No-@1bBKgWX z!tH{1R;}vzA15soBsx{S_`K!!In{5sEbyNrvPi@=dcrLG?TeoAtl6*8_1B;w|MUE9 zi9BnPr*?n2+9k+VzByJ$?7m`5^*8kwZ*^H-JPiJFyg@47;S*b5>DT$od8cf7P~WB( zaa-e0Zw$}o%W2Nr1fzcbx0?0zTcm@eaPJDQSxiB}c zAATXSUmc|$ioG^m%PxOkm|u6Y^(IbRmS>wpEt|zJ$~1h8o$VNCnCG-3>gM7TA8j77 zzq7i?)NUy8r`=$adcW|qr0~m81(rSAzfG^7DEw1n8*f8xXz?sLy{qn~UpmTXEznq$ zlJeps*R)DSo3a#9wZ`;A5f_{OY44a~5`4O2WAkJQpYI1Qt7q{2k(F!-S()nmdCune z1;1PKv^7}7bSbA*s=e-H)yPP9ZgWlCXl(UrU zYHKn)YiJ!iU#j!4N|E5lKPxuhXJ~IwU~F$tVA|fGz#JaT+}a~M{Z=va0^ZghS!da_ zQy!qGj-K9L!mLp54~pvjpEc)2@D)VN%9~~K)~)HXk?I7=&Fj>=6VyMRnt!G(H1tUM zdS1?zU8hd&`TqO+yt$$;g_pN#xLy4z2_PCtzPzKaU$w+h>NB5sa^ zV8j~p%{Sj@yJ+A4yP&$7Te0fLhTm)7N6mNmDAl*=*Xhktr?xzpRa>lKX0 z_c6#t@9LR!VSC~V38(L(F)K^fPZt#KS24WN&3t~|0=p092?Acr!%Am8pYxYt@#nZ| z0TJuRHt%i=2=~;f-s5sRXxA?IQg~kIv4gv=b{6qZ{}^)hM9*sN!!a_UXQy$lobTz7 zYGyF^Ud&pa&uM!Y;*5kN|Id27A?5qs;1$6;pMU)s*U|o7;Nr|J)!{qb=k*uFZ#ZVD zw)}PQ;=(BpSQphbM1L2Z-k`uJ)m~o4++JSBvc0^F)z61{Vvp?f6Ngym)lcY=bv~%x z*}9LBfgy^SfkBLcfgv|Hz9=yzO&_%rT^fWdAv8u_pZpY@5U#LcCWJ4Ylbxn4%HUG^ zS*)y*{@{;mp^%GW&Fp_Ax~tt~>sQC5toLg&(787IX3jU+MN{9`UD~_1Rlv69*58Ze zYxNgY@VZC-eICiHs=FhV>zrC&-D1|ZlbL(fW=rTc*RNfY^L(D<6vM#oRZA>O_%;Yz zZg-jal=txiAHVd*vRhlXPFCBe9O_;i5VqxDn%{H91K*FhfBw?9Mp?emHs9sk1J^6{ z>GkH_idl~v0s&)w8Fu#(@(?zqwT+~e$hyqtX(=U<6FsBz=E!J*nin@?Fp zY_|%0_t0qGDyf-;rKvNzl~>&~Qv9mD@(kOu%d=NcO}y75e!x3T>2-Xu%(ORk65nof-ck<=0D;`2iKQam0cSL{Zg`|VTqpaMITh1?NF}&EZ%BSds zYl41JUWd`y=wk z?9Sjj@MGQC1uG=X6=T-E5qwf1_m#O^HoM`l1kbN#$(#KB(a(~?)wezxOT*|)CU_EuQuSb5kA(%_9gz{QXeBxHy0Tp z_k>;S^XwdpAG~jK^mrQ8I{W#Yzf5O8PpnoEsa|XIcD8_E&%Yz*q|}b>V^frrnHRb2 z*sm8ZGY_WPMs6)V^;C4Be&4CG<1TBRijX{O=pUnzobRPuhF$O#B_ z{qz0SgbAxw*vzaxxAXa(>~z;(XEGJN0!>(_{;7v#a|^yj0{eXHcTKyxxi3_2Q@FYt zi`eV4IcC54E}km4cg)XMbm5=B$iC{zFQ%^R1yimHpU={`+*BXE>_JY!7inD%AHUb8 zcN4bo{M)*F*Ri)y!vmm^4+Q@wmj7f3*@< zC$@7IZ=4Fs9Ew}!`4e>+C-qQnx zewp!zD!94$&nJ}9{xGqnJvf&uw(DNyYS+EWydFxTL13x~7XiSJ-lN%`KGs4vPK#!id<{dYo|gmCMfd(-o_-QjT4nnyA;e zD($p$%N72mM$$9<^4Ep6RT{@J=+Eq2Q-8KFV$<)3npald`TVO!|H$F*9WQ)t?bWtX zIPbngKjN{>714C|NNk(pJa>n$DdHk}|v*P*rn5r13SH<(&Fnwd3oWLkKy}pB=XZqcE zemTYm)BnWt+cGiAO}9?qw_ysGpI({3Z_RjU`ql(~JI0UGza;QmG07-QH%R1nV|+Ee zJdxjpap&|sAl|&`50d!Brb{OAYcZY&vnTr*@ahD3GcwsTgGTWg7{2$&Ix`>v1vp!v z;jLql;q-?|{7OhVIKVpOC%*a+C&Iw6&X0jX4X#6>VM*f#u#O<6AUBXswdv8x{CrH` zd!}b6^UE*=gnYnG}94#;oa%sr)k2SETdvPghFimt(5xpM0@TW_nyI zzZTQ936l@@N>5*!%CEzeJaxKE8o$)^x2gQPjE|>Fr}4Wn&6@)et4-tAVVb;P@_}Vg zldh%l%Q0mxpL}4M?DULGexB*_>HKm`@+-kAqSN_xm=3L-tg}ge`pRs6{^{F6l2@#tj5D^k;~viNnGPFGTO%{BleVH^7poviNlvnWo!i^UF*Z&gR!*n)6}0eKx-r)8!wNbND#*Z~ z4Dl@k0|UszGXxl?f8b|SnZ7!mpGOg6tN}&sCQ-0j#p&sp{JhhfbNS_%1H_?1M|1gg zm^h`T+kCdU|C(zZKUm8%9v8JTX0I`olhcL&lfW-{#zc&Q)LsSEks&uR8rlKR+LnvCs4;1^o7mkEg2?@;fnkES;WF$ZyMa+M5|> zWa12d#pxFc`S}>XOut{q@5VIAce;8JzdiE`Kj!HIfy|=Q>x%fbnRf+(d1BM;oA_m> z-z(zhW1bzvJpE%Jv&i(5Gx=qv%NO(WF@KB%3kgr>oyE^PJ)oFhj%j7o^nzl3TPBH= z>FbO69U0F}|5(iL#8j9uy{3d;YPx?3zc!O@Hi+ZO{34rqx?MK2*z{W^{8~&*dDGcS z`5l=S=1uP_<(HVASjw->Bwh&OICC8=g!>@3mS1lW(h-c3gvGr#m8bJA8>j*0-(Sv%o(+fKIr9l;&!1Nh){CrF@$EL5Sc`hU-5BrtYXu18~C-DPJf<0vw`24$#GG%yF-?aHaPJ+Dt6AAdV{Y%pTe4>n89^Gaa;@ez1k#oblE4pDp}~ ziYUEDNV^ge@Zb_R!;WM623rm(NRqu9&o3~2`BZ*BrUZxSjjjB4OwCc#4}$31(bE~* z_-z?qOmAr87n^=EfuCo(dn^Ym1%X0XGH!Zf8^1eKP~7xWZT!~E^>G~255#haOqXfr z*J5(ZnLe?dUt)SfJHI~Tzv&a&`MsFxjzYw~wDaroeVEDxN(03ui6!Z&dD9bT@ar?l zPMe<4!SBhue>&H+>0A<^ikoNpg${l>#)s42cksJ0U7t7oLkGXqbh{>g+35>r^7Api zm|ok-@51D?e0p6czXYVTd(p`+$NXbx_;9*pH@_QG$ARgI-TdxMYmS0wnd!&6`L&r6kAXO1 z(>Z(ijhM<#K{#hla&b(L?%~&B(mM?incKr}z?66n!g&hfu$`YS-plXFwD=N;mYd$t z%g+n${DEtxgv-;{_VOEZwO$4XNJ&u^q)bHV6k=3S|1Wb*ceudm_I*vk)im^agHTaK*(tef>m!IVKOD>E|c%J2I>C z@=kB$=M|r>HHlxF*;4?_lbBvGiC>HH+w|F!`0bchNlllV%r6Fs9lpt+R4NA&ab#ka zpPo3G--+pvB8V2BzGpJOHdCq6^p}(Q9hv;pr|V4NcVw2-;GG_*&MQ8>eG0!8^J;A{ zPi*?BDg3<5YhaltL1+5+Dg5S4ojTJErt&K&VCj`1=2yT^avR-!_%so=M4b z`uC~)c1%@X)6J*x+cH&oPcNIsZ_m8in|JzcFJ37~ne%2EKOfTr@9BT0@mn+T`b@W+ z&Tr3rC6af#{w7}W>651O>ofO6LwUES^BXe$pUyjj-;GJraeC+servukM}AO7DJjY_ zDo9D19_Y<142kr;Gx+5ge@wqKgWrXZ!v#fAK@q?7bkCXma!gy@rf1INcV+5#pT1!x zzcbTIKM)PhDB4U*{ij>a;&)_v5k9?k7QZXgqG%8;1uBZPnLJ~rbI<1YWa5km(Q?yE PX7dZOorvdWU|;|M3yeP3 delta 8678 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 diff --git a/mathmech/mathmech/src/CMakeLists.txt b/mathmech/mathmech/src/CMakeLists.txt index 626b9d8..7c4c898 100644 --- a/mathmech/mathmech/src/CMakeLists.txt +++ b/mathmech/mathmech/src/CMakeLists.txt @@ -28,9 +28,11 @@ message (STATUS "FORMS: ${FORMS}") # compile project (${PROJECT}) # include_path +link_directories (${QWT_LIBRARY_PATH}) include_directories (${PROJECT_INCLUDE_DIR}/${PROJECT} ${PROJECT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR}) + ${CMAKE_CURRENT_BINARY_DIR} + ${QWT_INCLUDE_PATH}) find_package (Qt4 REQUIRED) include (${QT_USE_FILE}) diff --git a/mathmech/mathmech/src/statgengraphwindow.cpp b/mathmech/mathmech/src/statgengraphwindow.cpp index 896d79a..cb2253b 100644 --- a/mathmech/mathmech/src/statgengraphwindow.cpp +++ b/mathmech/mathmech/src/statgengraphwindow.cpp @@ -3,9 +3,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "statgengraphwindow.h" #include "ui_statgengraphwindow.h" diff --git a/mathmech/mathmech/src/statgengraphwindow.h b/mathmech/mathmech/src/statgengraphwindow.h index 4a571ba..79ec9b6 100644 --- a/mathmech/mathmech/src/statgengraphwindow.h +++ b/mathmech/mathmech/src/statgengraphwindow.h @@ -2,7 +2,7 @@ #define STATGENGRAPHWINDOW_H #include -#include +#include namespace Ui { class StatgenGraphWindow; diff --git a/mathmech/mm_agl/CMakeLists.txt b/mathmech/mm_agl/CMakeLists.txt index 88b9baa..141c6bb 100644 --- a/mathmech/mm_agl/CMakeLists.txt +++ b/mathmech/mm_agl/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_policy(SET CMP0011 NEW) cmake_policy(SET CMP0015 NEW) # set project name -set (PROJECT mm_agl) +set (PROJECT ${MM_PREFIX}agl) # set additional cmake file include (${PROJECT}.cmake) diff --git a/mathmech/mm_envir/CMakeLists.txt b/mathmech/mm_envir/CMakeLists.txt index 33e0374..80477b1 100644 --- a/mathmech/mm_envir/CMakeLists.txt +++ b/mathmech/mm_envir/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_policy(SET CMP0011 NEW) cmake_policy(SET CMP0015 NEW) # set project name -set (PROJECT mm_envir) +set (PROJECT ${MM_PREFIX}envir) # set additional cmake file include (${PROJECT}.cmake) diff --git a/mathmech/mm_radf/CMakeLists.txt b/mathmech/mm_radf/CMakeLists.txt index cc49d11..1cfa66b 100644 --- a/mathmech/mm_radf/CMakeLists.txt +++ b/mathmech/mm_radf/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_policy(SET CMP0011 NEW) cmake_policy(SET CMP0015 NEW) # set project name -set (PROJECT mm_radf) +set (PROJECT ${MM_PREFIX}radf) # set additional cmake file include (${PROJECT}.cmake) diff --git a/mathmech/mm_statgen/CMakeLists.txt b/mathmech/mm_statgen/CMakeLists.txt index c822ceb..8b3efcb 100644 --- a/mathmech/mm_statgen/CMakeLists.txt +++ b/mathmech/mm_statgen/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_policy(SET CMP0011 NEW) cmake_policy(SET CMP0015 NEW) # set project name -set (PROJECT mm_statgen) +set (PROJECT ${MM_PREFIX}statgen) # set additional cmake file include (${PROJECT}.cmake) diff --git a/mathmech/mm_trj/CMakeLists.txt b/mathmech/mm_trj/CMakeLists.txt index 36fd1bf..3f45411 100644 --- a/mathmech/mm_trj/CMakeLists.txt +++ b/mathmech/mm_trj/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_policy(SET CMP0011 NEW) cmake_policy(SET CMP0015 NEW) # set project name -set (PROJECT mm_trj) +set (PROJECT ${MM_PREFIX}trj) # set additional cmake file include (${PROJECT}.cmake) diff --git a/mathmech/mm_trj2pdb/CMakeLists.txt b/mathmech/mm_trj2pdb/CMakeLists.txt index bf3402e..ee9316a 100644 --- a/mathmech/mm_trj2pdb/CMakeLists.txt +++ b/mathmech/mm_trj2pdb/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_policy(SET CMP0011 NEW) cmake_policy(SET CMP0015 NEW) # set project name -set (PROJECT mm_trj2pdb) +set (PROJECT ${MM_PREFIX}trj2pdb) # set additional cmake file include (${PROJECT}.cmake)