aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2015-07-16 00:02:12 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2015-07-16 00:02:12 +0300
commit3061b8f1aef70de818585945e99073fe282e2db2 (patch)
tree2367cf6bd4521c680504c76877825c75c08612b7
parentREADME updates (diff)
downloadwindows7-drivers-3061b8f1aef70de818585945e99073fe282e2db2.tar.gz
windows7-drivers-3061b8f1aef70de818585945e99073fe282e2db2.zip
utils: CMakeLists.txt updates
Diffstat (limited to '')
-rw-r--r--utils/CMakeLists.txt1
-rw-r--r--utils/libnt_path_converter/CMakeLists.txt13
-rw-r--r--utils/libservice/CMakeLists.txt12
-rw-r--r--utils/libservice/test/CMakeLists.txt2
4 files changed, 15 insertions, 13 deletions
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 73b2498..7f09d88 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -1,3 +1,4 @@
project(windows_drivers_utils)
+
add_subdirectory(libservice)
add_subdirectory(libnt_path_converter)
diff --git a/utils/libnt_path_converter/CMakeLists.txt b/utils/libnt_path_converter/CMakeLists.txt
index 626a4b1..69f85d0 100644
--- a/utils/libnt_path_converter/CMakeLists.txt
+++ b/utils/libnt_path_converter/CMakeLists.txt
@@ -1,9 +1,10 @@
project(libnt_path_converter)
-file(GLOB ${PROJECT_NAME}_sources "src/*.cpp")
-file(GLOB_RECURSE ${PROJECT_NAME}_headers "include/*.hpp")
-add_library(${PROJECT_NAME} ${${PROJECT_NAME}_sources}
- ${${PROJECT_NAME}_headers})
-target_link_libraries(${PROJECT_NAME} libservice)
-target_include_directories(${PROJECT_NAME} PUBLIC include/)
+file(GLOB libnt_path_converter_sources "src/*.cpp")
+file(GLOB_RECURSE libnt_path_converter_headers "include/*.hpp")
+add_library(libnt_path_converter
+ ${libnt_path_converter_sources}
+ ${libnt_path_converter_headers})
+target_link_libraries(libnt_path_converter libservice)
+target_include_directories(libnt_path_converter PUBLIC include/)
add_subdirectory(utils)
diff --git a/utils/libservice/CMakeLists.txt b/utils/libservice/CMakeLists.txt
index ad9e065..720a44b 100644
--- a/utils/libservice/CMakeLists.txt
+++ b/utils/libservice/CMakeLists.txt
@@ -1,9 +1,9 @@
-project(libservice)
-file(GLOB ${PROJECT_NAME}_sources "src/*.cpp")
-file(GLOB_RECURSE ${PROJECT_NAME}_headers "include/*.hpp")
-add_library(${PROJECT_NAME} ${${PROJECT_NAME}_sources}
- ${${PROJECT_NAME}_headers})
-target_include_directories(${PROJECT_NAME} PUBLIC include)
+file(GLOB libservice_sources "src/*.cpp")
+file(GLOB_RECURSE libservice_headers "include/*.hpp")
+add_library(libservice
+ ${libservice_sources}
+ ${libservice_headers})
+target_include_directories(libservice PUBLIC include)
add_subdirectory(test)
add_subdirectory(utils)
diff --git a/utils/libservice/test/CMakeLists.txt b/utils/libservice/test/CMakeLists.txt
index f05eeab..4780deb 100644
--- a/utils/libservice/test/CMakeLists.txt
+++ b/utils/libservice/test/CMakeLists.txt
@@ -1,4 +1,4 @@
add_executable(libservice_test_windows_error windows_error.cpp)
target_link_libraries(libservice_test_windows_error libservice)
set_target_properties(libservice_test_windows_error PROPERTIES
- OUTPUT_NAME windows_error)
+ OUTPUT_NAME windows_error)