4 files changed, 18 insertions, 21 deletions
diff --git a/um/wrappers/simple/CMakeLists.txt b/um/wrappers/simple/CMakeLists.txt
index ff61bd7..85bc34b 100644
--- a/um/wrappers/simple/CMakeLists.txt
+++ b/um/wrappers/simple/CMakeLists.txt
@@ -1,9 +1,7 @@
-file(GLOB_RECURSE libsimple_headers "include/*.hpp")
-file(GLOB libsimple_sources "src/*.cpp")
-add_library(libsimple
-    ${libsimple_sources}
-    ${libsimple_headers})
-target_link_libraries(libsimple libservice)
-target_include_directories(libsimple PUBLIC include/)
+file(GLOB_RECURSE simple_include "include/*.hpp")
+file(GLOB simple_src "src/*.cpp")
+add_library(simple ${simple_src} ${simple_include})
+target_include_directories(simple PUBLIC include/)
+target_link_libraries(simple PRIVATE service)
 
 add_subdirectory(utils)
diff --git a/um/wrappers/simple/utils/CMakeLists.txt b/um/wrappers/simple/utils/CMakeLists.txt
index 2a653fe..c4d3bdd 100644
--- a/um/wrappers/simple/utils/CMakeLists.txt
+++ b/um/wrappers/simple/utils/CMakeLists.txt
@@ -1,2 +1,3 @@
-add_executable(exchange_ints exchange_ints.cpp)
-target_link_libraries(exchange_ints PRIVATE libsimple)
+add_executable(simple_exchange_ints exchange_ints.cpp)
+target_link_libraries(simple_exchange_ints PRIVATE simple)
+set_target_properties(simple_exchange_ints PROPERTIES OUTPUT_NAME exchange_ints)
diff --git a/um/wrappers/special/nt_namespace/CMakeLists.txt b/um/wrappers/special/nt_namespace/CMakeLists.txt
index ede2673..c9c6395 100644
--- a/um/wrappers/special/nt_namespace/CMakeLists.txt
+++ b/um/wrappers/special/nt_namespace/CMakeLists.txt
@@ -1,10 +1,7 @@
-project(libnt_namespace)
-file(GLOB libnt_namespace_sources "src/*.cpp")
-file(GLOB_RECURSE libnt_namespace_headers "include/*.hpp")
-add_library(libnt_namespace
-    ${libnt_namespace_sources}
-    ${libnt_namespace_headers})
-target_link_libraries(libnt_namespace libservice)
-target_include_directories(libnt_namespace PUBLIC include/)
+file(GLOB_RECURSE nt_namespace_include "include/*.hpp")
+file(GLOB nt_namespace_src "src/*.cpp")
+add_library(nt_namespace ${nt_namespace_src} ${nt_namespace_include})
+target_include_directories(nt_namespace PUBLIC include/)
+target_link_libraries(nt_namespace PRIVATE service)
 
 add_subdirectory(utils)
diff --git a/um/wrappers/special/nt_namespace/utils/CMakeLists.txt b/um/wrappers/special/nt_namespace/utils/CMakeLists.txt
index 294a713..9657693 100644
--- a/um/wrappers/special/nt_namespace/utils/CMakeLists.txt
+++ b/um/wrappers/special/nt_namespace/utils/CMakeLists.txt
@@ -1,6 +1,7 @@
-add_executable(convert_nt_path convert_nt_path.cpp)
-target_link_libraries(convert_nt_path PRIVATE libnt_namespace)
+add_executable(nt_namespace_convert convert_nt_path.cpp)
+target_link_libraries(nt_namespace_convert PRIVATE nt_namespace)
+set_target_properties(nt_namespace_convert PROPERTIES OUTPUT_NAME convert_nt_path)
 if(MINGW)
-    target_compile_options(convert_nt_path PRIVATE -municode)
-    target_link_libraries(convert_nt_path PRIVATE -municode)
+    target_compile_options(nt_namespace_convert PRIVATE -municode)
+    target_link_libraries(nt_namespace_convert PRIVATE -municode)
 endif()