diff options
| author | Jose Fonseca <jfonseca@vmware.com> | 2016-05-05 10:51:19 +0100 |
|---|---|---|
| committer | Jose Fonseca <jfonseca@vmware.com> | 2016-05-05 11:02:35 +0100 |
| commit | 79b8e8db623de83c738157fae37f0486a5c81032 (patch) | |
| tree | 7e944287f253bbfa5db18295c6bbe2326db487ae | |
| parent | 8e0a030ddc1257de3b1d2e602548383fcdbd0ce9 (diff) | |
Create a top level lib directory, and move guids into it.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | common/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | lib/guids/CMakeLists.txt (renamed from guids/CMakeLists.txt) | 3 | ||||
| -rw-r--r-- | lib/guids/guids.cpp (renamed from guids/guids.cpp) | 0 | ||||
| -rw-r--r-- | lib/guids/guids.hpp (renamed from guids/guids.hpp) | 0 | ||||
| -rw-r--r-- | lib/guids/guids_defs.hpp (renamed from guids/guids_defs.hpp) | 0 | ||||
| -rw-r--r-- | lib/guids/guids_entries.h (renamed from guids/guids_entries.h) | 0 | ||||
| -rw-r--r-- | lib/guids/guids_test.cpp (renamed from guids/guids_test.cpp) | 0 | ||||
| -rw-r--r-- | wrappers/CMakeLists.txt | 2 |
10 files changed, 7 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 26ded14d..c1a5cb4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -530,7 +530,7 @@ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/compat ) -add_subdirectory (guids) +add_subdirectory (lib) add_subdirectory (common) add_subdirectory (dispatch) add_subdirectory (helpers) diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index cbbc9ef3..6de7b4e1 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -1,5 +1,5 @@ include_directories ( - ${CMAKE_SOURCE_DIR}/guids + ${CMAKE_SOURCE_DIR}/lib/guids ${CMAKE_SOURCE_DIR}/thirdparty ) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt new file mode 100644 index 00000000..2bdad31e --- /dev/null +++ b/lib/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory (guids) diff --git a/guids/CMakeLists.txt b/lib/guids/CMakeLists.txt index 69dddc20..ce0f86da 100644 --- a/guids/CMakeLists.txt +++ b/lib/guids/CMakeLists.txt @@ -1,5 +1,8 @@ add_library (guids STATIC guids.cpp + guids_defs.hpp + guids_entries.h + guids.hpp ) add_gtest (guids_test guids_test.cpp) diff --git a/guids/guids.cpp b/lib/guids/guids.cpp index 0a72a5c2..0a72a5c2 100644 --- a/guids/guids.cpp +++ b/lib/guids/guids.cpp diff --git a/guids/guids.hpp b/lib/guids/guids.hpp index 8fc9f4c6..8fc9f4c6 100644 --- a/guids/guids.hpp +++ b/lib/guids/guids.hpp diff --git a/guids/guids_defs.hpp b/lib/guids/guids_defs.hpp index 2c335b6a..2c335b6a 100644 --- a/guids/guids_defs.hpp +++ b/lib/guids/guids_defs.hpp diff --git a/guids/guids_entries.h b/lib/guids/guids_entries.h index 93bbdef5..93bbdef5 100644 --- a/guids/guids_entries.h +++ b/lib/guids/guids_entries.h diff --git a/guids/guids_test.cpp b/lib/guids/guids_test.cpp index 03988f0d..03988f0d 100644 --- a/guids/guids_test.cpp +++ b/lib/guids/guids_test.cpp diff --git a/wrappers/CMakeLists.txt b/wrappers/CMakeLists.txt index 2f0d1cf4..1e703406 100644 --- a/wrappers/CMakeLists.txt +++ b/wrappers/CMakeLists.txt @@ -53,7 +53,7 @@ include_directories ( ${CMAKE_SOURCE_DIR}/helpers ${CMAKE_BINARY_DIR}/dispatch ${CMAKE_SOURCE_DIR}/dispatch - ${CMAKE_SOURCE_DIR}/guids + ${CMAKE_SOURCE_DIR}/lib/guids ) if (NOT WIN32 AND NOT APPLE) |