winpr: move to one folder

CMakeLists.txt

@@ -160,9 +160,7 @@ add_subdirectory(libfreerdp-channels)
 add_subdirectory(libfreerdp-locale)
 add_subdirectory(libfreerdp-core)
 
-add_subdirectory(libwinpr-crt)
-add_subdirectory(libwinpr-rpc)
-add_subdirectory(libwinpr-sspi)
+add_subdirectory(winpr)
 
 if(NOT WIN32)
 	add_subdirectory(channels)

cunit/test_ntlm.c

@@ -23,9 +23,9 @@
 #include <winpr/sspi.h>
 #include <freerdp/freerdp.h>
 
-#include "libwinpr-sspi/NTLM/ntlm.h"
-#include "libwinpr-sspi/NTLM/ntlm_compute.h"
-#include "libwinpr-sspi/NTLM/ntlm_message.h"
+#include "winpr/sspi/NTLM/ntlm.h"
+#include "winpr/sspi/NTLM/ntlm_compute.h"
+#include "winpr/sspi/NTLM/ntlm_message.h"
 
 #include "test_ntlm.h"
 

winpr/CMakeLists.txt

@@ -0,0 +1,23 @@
+# WinPR: Windows Portable Runtime
+# winpr cmake build script
+#
+# Copyright 2011 O.S. Systems Software Ltda.
+# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
+# Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+add_subdirectory(crt)
+add_subdirectory(rpc)
+add_subdirectory(sspi)
+

winpr/rpc/CMakeLists.txt

@@ -47,3 +47,4 @@ endif()
 target_link_libraries(winpr-rpc ${OPENSSL_LIBRARIES})
 
 install(TARGETS winpr-rpc DESTINATION ${CMAKE_INSTALL_LIBDIR})
+