summaryrefslogtreecommitdiffhomepage
path: root/cmake
diff options
context:
space:
mode:
Diffstat (limited to 'cmake')
-rw-r--r--cmake/msvc.cmake4
-rw-r--r--cmake/opentrack-boilerplate.cmake2
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)