From 569de14c1e59ba8194fd46eebcbec7a4d57885f3 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Sun, 25 Oct 2015 12:16:34 -0700 Subject: [PATCH] Rename libps to libpsnative And impl to native --- CMakeLists.txt | 2 +- impl/CMakeLists.txt | 9 --------- native/CMakeLists.txt | 9 +++++++++ {impl => native}/getcomputername.cpp | 0 {impl => native}/getcomputername.h | 0 {impl => native}/getcurrentprocessorid.cpp | 0 {impl => native}/getcurrentprocessorid.h | 0 {impl => native}/getcurrentthreadid.cpp | 0 {impl => native}/getcurrentthreadid.h | 0 {impl => native}/getlinkcount.cpp | 0 {impl => native}/getlinkcount.h | 0 {impl => native}/getusername.cpp | 0 {impl => native}/getusername.h | 0 {impl => native}/pal.h | 0 {impl => native}/terminal.cpp | 0 {impl => native}/terminal.h | 0 tests/CMakeLists.txt | 2 +- 17 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 impl/CMakeLists.txt create mode 100644 native/CMakeLists.txt rename {impl => native}/getcomputername.cpp (100%) rename {impl => native}/getcomputername.h (100%) rename {impl => native}/getcurrentprocessorid.cpp (100%) rename {impl => native}/getcurrentprocessorid.h (100%) rename {impl => native}/getcurrentthreadid.cpp (100%) rename {impl => native}/getcurrentthreadid.h (100%) rename {impl => native}/getlinkcount.cpp (100%) rename {impl => native}/getlinkcount.h (100%) rename {impl => native}/getusername.cpp (100%) rename {impl => native}/getusername.h (100%) rename {impl => native}/pal.h (100%) rename {impl => native}/terminal.cpp (100%) rename {impl => native}/terminal.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 07c663219..5de641170 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,6 @@ project(MONAD_NATIVE) add_compile_options(-std=c++11 -Wall) -add_subdirectory(impl) +add_subdirectory(native) add_subdirectory(host) add_subdirectory(tests) diff --git a/impl/CMakeLists.txt b/impl/CMakeLists.txt deleted file mode 100644 index 5b9c123fb..000000000 --- a/impl/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -add_library(ps SHARED - getcurrentprocessorid.cpp - getusername.cpp - getcomputername.cpp - getlinkcount.cpp - terminal.cpp) - -target_link_libraries(ps icuuc) -target_include_directories (ps PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/native/CMakeLists.txt b/native/CMakeLists.txt new file mode 100644 index 000000000..c2523c3a3 --- /dev/null +++ b/native/CMakeLists.txt @@ -0,0 +1,9 @@ +add_library(psnative SHARED + getcurrentprocessorid.cpp + getusername.cpp + getcomputername.cpp + getlinkcount.cpp + terminal.cpp) + +target_link_libraries(psnative icuuc) +target_include_directories (psnative PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/impl/getcomputername.cpp b/native/getcomputername.cpp similarity index 100% rename from impl/getcomputername.cpp rename to native/getcomputername.cpp diff --git a/impl/getcomputername.h b/native/getcomputername.h similarity index 100% rename from impl/getcomputername.h rename to native/getcomputername.h diff --git a/impl/getcurrentprocessorid.cpp b/native/getcurrentprocessorid.cpp similarity index 100% rename from impl/getcurrentprocessorid.cpp rename to native/getcurrentprocessorid.cpp diff --git a/impl/getcurrentprocessorid.h b/native/getcurrentprocessorid.h similarity index 100% rename from impl/getcurrentprocessorid.h rename to native/getcurrentprocessorid.h diff --git a/impl/getcurrentthreadid.cpp b/native/getcurrentthreadid.cpp similarity index 100% rename from impl/getcurrentthreadid.cpp rename to native/getcurrentthreadid.cpp diff --git a/impl/getcurrentthreadid.h b/native/getcurrentthreadid.h similarity index 100% rename from impl/getcurrentthreadid.h rename to native/getcurrentthreadid.h diff --git a/impl/getlinkcount.cpp b/native/getlinkcount.cpp similarity index 100% rename from impl/getlinkcount.cpp rename to native/getlinkcount.cpp diff --git a/impl/getlinkcount.h b/native/getlinkcount.h similarity index 100% rename from impl/getlinkcount.h rename to native/getlinkcount.h diff --git a/impl/getusername.cpp b/native/getusername.cpp similarity index 100% rename from impl/getusername.cpp rename to native/getusername.cpp diff --git a/impl/getusername.h b/native/getusername.h similarity index 100% rename from impl/getusername.h rename to native/getusername.h diff --git a/impl/pal.h b/native/pal.h similarity index 100% rename from impl/pal.h rename to native/pal.h diff --git a/impl/terminal.cpp b/native/terminal.cpp similarity index 100% rename from impl/terminal.cpp rename to native/terminal.cpp diff --git a/impl/terminal.h b/native/terminal.h similarity index 100% rename from impl/terminal.h rename to native/terminal.h diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 4ff914ae0..53580614d 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -10,4 +10,4 @@ add_executable(monad_native target_include_directories(monad_native PRIVATE ${gtest_SOURCE_DIR}/include) find_package(Threads) -target_link_libraries(monad_native ps gtest) +target_link_libraries(monad_native psnative gtest)