From 1fa2e67e227b64bc316c66eb79c389b032bf941f Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sat, 29 Apr 2017 14:10:29 +0300 Subject: um: strip the 'lib' prefix from CMake targets --- um/wrappers/special/nt_namespace/CMakeLists.txt | 13 +++++-------- um/wrappers/special/nt_namespace/utils/CMakeLists.txt | 9 +++++---- 2 files changed, 10 insertions(+), 12 deletions(-) (limited to 'um/wrappers/special/nt_namespace') 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() -- cgit v1.2.3