include: move winpr include directory inside winpr

CMakeLists.txt

@@ -179,10 +179,13 @@ set(FREERDP_EXTENSION_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/free
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/include)
 
+# WinPR
+set(WINPR_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/winpr/include")
+include_directories(${WINPR_INCLUDE_DIR})
+
 # Configure files
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/winpr/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/winpr/config.h)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/freerdp/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/freerdp/config.h)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/freerdp/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/include/freerdp/config.h)
 
 # Generate pkg-config
 if(NOT MSVC)

winpr/CMakeLists.txt

@@ -1,9 +1,7 @@
 # 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>
+# Copyright 2012 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.
@@ -17,49 +15,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-if (APPLE)
-	# flat_namespace should be avoided, but is required for -undefined warning. Since WinPR currently has
-	# a lot of undefined symbols in use, use this hack until they're filled out.
-	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-flat_namespace,-undefined,warning")	
-endif()
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include PARENT_SCOPE)
 
-if(WITH_MONOLITHIC_BUILD)
-	set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-endif()
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/winpr/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/include/winpr/config.h)
 
-add_subdirectory(crt)
-add_subdirectory(utils)
-add_subdirectory(heap)
-add_subdirectory(handle)
-add_subdirectory(synch)
-add_subdirectory(sysinfo)
-add_subdirectory(bcrypt)
-add_subdirectory(dsparse)
-add_subdirectory(asn1)
-add_subdirectory(rpc)
-add_subdirectory(sspicli)
-add_subdirectory(sspi)
-add_subdirectory(registry)
-add_subdirectory(library)
-
-if(WITH_MONOLITHIC_BUILD)
-	add_library(winpr
-		$<TARGET_OBJECTS:winpr-crt>
-		$<TARGET_OBJECTS:winpr-utils>
-		$<TARGET_OBJECTS:winpr-heap>
-		$<TARGET_OBJECTS:winpr-handle>
-		$<TARGET_OBJECTS:winpr-synch>
-		$<TARGET_OBJECTS:winpr-sysinfo>
-		$<TARGET_OBJECTS:winpr-bcrypt>
-		$<TARGET_OBJECTS:winpr-dsparse>
-		$<TARGET_OBJECTS:winpr-asn1>
-		$<TARGET_OBJECTS:winpr-rpc>
-		$<TARGET_OBJECTS:winpr-sspicli>
-		$<TARGET_OBJECTS:winpr-sspi>
-		$<TARGET_OBJECTS:winpr-registry>
-		$<TARGET_OBJECTS:winpr-library>)
-		
-	target_link_libraries(winpr ${WINPR_LIBS})
-endif()
+add_subdirectory(libwinpr)
 
 add_subdirectory(tools)
+

winpr/include/CMakeLists.txt

@@ -0,0 +1,20 @@
+# WinPR: Windows Portable Runtime
+# winpr cmake build script
+#
+# Copyright 2012 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.
+
+file(GLOB HEADERS "winpr/*.h")
+install(FILES ${HEADERS} DESTINATION include/winpr)
+

winpr/libwinpr/CMakeLists.txt

@@ -0,0 +1,63 @@
+# WinPR: Windows Portable Runtime
+# winpr cmake build script
+#
+# Copyright 2012 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.
+
+if (APPLE)
+	# flat_namespace should be avoided, but is required for -undefined warning. Since WinPR currently has
+	# a lot of undefined symbols in use, use this hack until they're filled out.
+	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-flat_namespace,-undefined,warning")	
+endif()
+
+if(WITH_MONOLITHIC_BUILD)
+	set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+endif()
+
+add_subdirectory(crt)
+add_subdirectory(utils)
+add_subdirectory(heap)
+add_subdirectory(handle)
+add_subdirectory(synch)
+add_subdirectory(sysinfo)
+add_subdirectory(bcrypt)
+add_subdirectory(dsparse)
+add_subdirectory(asn1)
+add_subdirectory(rpc)
+add_subdirectory(sspicli)
+add_subdirectory(sspi)
+add_subdirectory(registry)
+add_subdirectory(library)
+
+if(WITH_MONOLITHIC_BUILD)
+	add_library(winpr
+		$<TARGET_OBJECTS:winpr-crt>
+		$<TARGET_OBJECTS:winpr-utils>
+		$<TARGET_OBJECTS:winpr-heap>
+		$<TARGET_OBJECTS:winpr-handle>
+		$<TARGET_OBJECTS:winpr-synch>
+		$<TARGET_OBJECTS:winpr-sysinfo>
+		$<TARGET_OBJECTS:winpr-bcrypt>
+		$<TARGET_OBJECTS:winpr-dsparse>
+		$<TARGET_OBJECTS:winpr-asn1>
+		$<TARGET_OBJECTS:winpr-rpc>
+		$<TARGET_OBJECTS:winpr-sspicli>
+		$<TARGET_OBJECTS:winpr-sspi>
+		$<TARGET_OBJECTS:winpr-registry>
+		$<TARGET_OBJECTS:winpr-library>)
+		
+	target_link_libraries(winpr ${WINPR_LIBS})
+endif()
+
+