diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2018-07-09 05:33:58 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-07-09 05:35:08 +0200 |
| commit | 793cea587159a0ba01fec6af28e899697ef4da79 (patch) | |
| tree | b4ec4477862ed74dc2c180d2b002915f8df040e8 /cmake | |
| parent | 841e163ae4b86317cca29748cf0f2730418e4fa5 (diff) | |
cleanup only
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/msvc.cmake | 4 | ||||
| -rw-r--r-- | cmake/opentrack-boilerplate.cmake | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmake/msvc.cmake b/cmake/msvc.cmake index 4c629861..def8b7dc 100644 --- a/cmake/msvc.cmake +++ b/cmake/msvc.cmake @@ -42,8 +42,8 @@ if(CMAKE_PROJECT_NAME STREQUAL "opentrack") #C4266 - no override available for virtual member function from base type, function is hidden #C4928 - illegal copy-initialization, more than one user-defined conversion has been implicitly applied - set(warns 4263 4264 4266 4928) - set(warns-noerr 4265) + set(warns 4265) + set(warns-noerr) foreach(i ${warns}) set(warns_ "${warns_} -w1${i} -we${i}") diff --git a/cmake/opentrack-boilerplate.cmake b/cmake/opentrack-boilerplate.cmake index 694c644d..78d0e1dd 100644 --- a/cmake/opentrack-boilerplate.cmake +++ b/cmake/opentrack-boilerplate.cmake @@ -158,7 +158,7 @@ function(otr_module n_) set(link-mode STATIC) endif() add_library(${n} ${link-mode} "${${n}-all}") - set_property(TARGET "${n}" PROPERTY PREFIX "lib") + set_property(TARGET "${n}" PROPERTY PREFIX "") endif() set_property(SOURCE ${${n}-moc} ${${n}-uih} ${${n}-rcc} PROPERTY GENERATED TRUE) |