Added WITH_LIBRARY_VERSIONING, allowing to build shared libraries without

SOVERSION information. (required by Android)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f58e27..a8ffdf7 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,6 +59,7 @@ include(GNUInstallDirsWrapper)
 include(CMakePackageConfigHelpers)
 
 # Soname versioning
+set(WITH_LIBRARY_VERSIONING "1")
 set(FREERDP_VERSION_MAJOR "1")
 set(FREERDP_VERSION_MINOR "2")
 set(FREERDP_VERSION_REVISION "0")
@@ -301,6 +302,8 @@ endif(APPLE)
 
 # Android
 if(ANDROID)
+  set(WITH_LIBRARY_VERSIONING "")
+
        if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
                add_definitions(-DNDK_DEBUG=1)
 

diff --git a/channels/server/CMakeLists.txt b/channels/server/CMakeLists.txt
index 67a2c4c..63e0f3d 100644 (file)
--- a/channels/server/CMakeLists.txt
+++ b/channels/server/CMakeLists.txt
@@ -30,7 +30,10 @@ endforeach()
 
 add_library(${MODULE_NAME} STATIC ${${MODULE_PREFIX}_SRCS})
 
-set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")
+if (WITH_LIBRARY_VERSIONING)
+  set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
+endif()
+set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib")
 
 set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
        MONOLITHIC ${MONOLITHIC_BUILD}

diff --git a/channels/tsmf/client/CMakeLists.txt b/channels/tsmf/client/CMakeLists.txt
index a92ceda..87e6dea 100644 (file)
--- a/channels/tsmf/client/CMakeLists.txt
+++ b/channels/tsmf/client/CMakeLists.txt
@@ -62,7 +62,7 @@ if(WITH_GSTREAMER_0_10 OR WITH_GSTREAMER_1_0)
        find_feature(XRandR ${XRANDR_FEATURE_TYPE} ${XRANDR_FEATURE_PURPOSE} ${XRANDR_FEATURE_DESCRIPTION})
        if (WITH_XRANDR)
                add_channel_client_subsystem(${MODULE_PREFIX} ${CHANNEL_NAME} "gstreamer" "decoder")
-       else()
+  else()
                message(WARNING "Disabling tsmf gstreamer because XRandR wasn't found")
        endif()
 endif()

diff --git a/client/Windows/CMakeLists.txt b/client/Windows/CMakeLists.txt
index e1bc747..f9bd93a 100644 (file)
--- a/client/Windows/CMakeLists.txt
+++ b/client/Windows/CMakeLists.txt
@@ -50,7 +50,10 @@ if(WITH_CLIENT_INTERFACE)
        else()
                add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
        endif()
-       set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")
+       if (WITH_LIBRARY_VERSIONING)
+       set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
+  endif()
+  set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib")
 else()
        set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} cli/wfreerdp.c cli/wfreerdp.h)
        add_executable(${MODULE_NAME} WIN32 ${${MODULE_PREFIX}_SRCS})

diff --git a/client/X11/CMakeLists.txt b/client/X11/CMakeLists.txt
index d33e90c..35e3e93 100644 (file)
--- a/client/X11/CMakeLists.txt
+++ b/client/X11/CMakeLists.txt
@@ -59,7 +59,10 @@ if(WITH_CLIENT_INTERFACE)
        else()
                add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
        endif()
-       set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")
+  if (WITH_LIBRARY_VERSIONING)
+         set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
+  endif()
+  set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib")
 else()
        set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} cli/xfreerdp.c cli/xfreerdp.h)
        add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})

diff --git a/client/common/CMakeLists.txt b/client/common/CMakeLists.txt
index 47bb460..0a96bf5 100644 (file)
--- a/client/common/CMakeLists.txt
+++ b/client/common/CMakeLists.txt
@@ -47,7 +47,10 @@ add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 include_directories(${OPENSSL_INCLUDE_DIR})
 include_directories(${ZLIB_INCLUDE_DIRS})
 
-set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")
+if (WITH_LIBRARY_VERSIONING)
+  set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
+endif()
+set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib")
 
 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS}
        ${FREERDP_CHANNELS_CLIENT_LIBS})

diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt
index fa3dbf1..c11458f 100644 (file)
--- a/libfreerdp/CMakeLists.txt
+++ b/libfreerdp/CMakeLists.txt
@@ -56,7 +56,10 @@ if(MONOLITHIC_BUILD)
                ${${MODULE_PREFIX}_OBJECTS})
 
        set_target_properties(${MODULE_NAME} PROPERTIES LINKER_LANGUAGE C)
-       set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")
+  if (WITH_LIBRARY_VERSIONING)
+       set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
+  endif()
+  set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib")
 
        list(APPEND FREERDP_LIBS ${PROFILER_LIBRARIES})
        list(REMOVE_DUPLICATES FREERDP_LIBS)

diff --git a/libfreerdp/cache/CMakeLists.txt b/libfreerdp/cache/CMakeLists.txt
index 82491a2..5a52a04 100644 (file)
--- a/libfreerdp/cache/CMakeLists.txt
+++ b/libfreerdp/cache/CMakeLists.txt
@@ -33,7 +33,10 @@ add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
        SOURCES ${${MODULE_PREFIX}_SRCS}
        EXPORT)
 
-set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")
+if (WITH_LIBRARY_VERSIONING)
+  set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
+endif()
+set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib")
 
 set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
        MONOLITHIC ${MONOLITHIC_BUILD} INTERNAL

diff --git a/libfreerdp/codec/CMakeLists.txt b/libfreerdp/codec/CMakeLists.txt
index ee2c7c4..c29d394 100644 (file)
--- a/libfreerdp/codec/CMakeLists.txt
+++ b/libfreerdp/codec/CMakeLists.txt
@@ -98,7 +98,10 @@ add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
        SOURCES ${${MODULE_PREFIX}_SRCS}
        EXPORT)
 
-set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")
+if (WITH_LIBRARY_VERSIONING)
+  set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
+endif()
+set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib")
 
 set(${MODULE_PREFIX}_LIBS
        ${FREERDP_JPEG_LIBS}

diff --git a/libfreerdp/common/CMakeLists.txt b/libfreerdp/common/CMakeLists.txt
index 2b0c404..2bdca84 100644 (file)
--- a/libfreerdp/common/CMakeLists.txt
+++ b/libfreerdp/common/CMakeLists.txt
@@ -30,8 +30,11 @@ add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 
 include_directories(${OPENSSL_INCLUDE_DIR})
 include_directories(${ZLIB_INCLUDE_DIRS})
-       
-set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")
+
+if (WITH_LIBRARY_VERSIONING)
+  set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION})
+endif()
+set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib")
 
 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS}
        ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES})
@@ -40,7 +43,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr)
 
 if(MONOLITHIC_BUILD)
        set(FREERDP_LIBS ${FREERDP_LIBS} ${${MODULE_PREFIX}_LIBS} PARENT_SCOPE)
-else()         
+else()
        target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
        install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT FreeRDPTargets)
 endif()

diff --git a/libfreerdp/core/CMakeLists.txt b/libfreerdp/core/CMakeLists.txt
index de23cee..6504599 100644 (file)
--- a/libfreerdp/core/CMakeLists.txt
+++ b/libfreerdp/core/CMakeLists.txt
@@ -130,7 +130,10 @@ add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
        SOURCES ${${MODULE_PREFIX}_SRCS}
        EXPORT)
 
-set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")
+if (WITH_LIBRARY_VERSIONING)
+  set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
+endif()
+set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib")
 
 if(WIN32)
        set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ws2_32)

diff --git a/libfreerdp/crypto/CMakeLists.txt b/libfreerdp/crypto/CMakeLists.txt
index a22cc58..b307cb3 100644 (file)
--- a/libfreerdp/crypto/CMakeLists.txt
+++ b/libfreerdp/crypto/CMakeLists.txt
@@ -36,7 +36,10 @@ add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 include_directories(${OPENSSL_INCLUDE_DIR})
 include_directories(${ZLIB_INCLUDE_DIRS})
 
-set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")
+if (WITH_LIBRARY_VERSIONING)
+  set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
+endif()
+set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib")
 
 set(${MODULE_PREFIX}_LIBS
        ${OPENSSL_LIBRARIES})

diff --git a/libfreerdp/gdi/CMakeLists.txt b/libfreerdp/gdi/CMakeLists.txt
index 6b182fe..c831bbd 100644 (file)
--- a/libfreerdp/gdi/CMakeLists.txt
+++ b/libfreerdp/gdi/CMakeLists.txt
@@ -44,7 +44,10 @@ add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
        SOURCES ${${MODULE_PREFIX}_SRCS}
        EXPORT)
 
-set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")
+if (WITH_LIBRARY_VERSIONING)
+  set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
+endif()
+set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib")
 
 set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
        MONOLITHIC ${MONOLITHIC_BUILD} INTERNAL

diff --git a/libfreerdp/locale/CMakeLists.txt b/libfreerdp/locale/CMakeLists.txt
index 8cbb33d..67f2145 100644 (file)
--- a/libfreerdp/locale/CMakeLists.txt
+++ b/libfreerdp/locale/CMakeLists.txt
@@ -75,7 +75,10 @@ add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
        SOURCES ${${MODULE_PREFIX}_SRCS}
        EXPORT)
 
-set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")
+if (WITH_LIBRARY_VERSIONING)
+  set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
+endif()
+set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib")
 
 set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
        MONOLITHIC ${MONOLITHIC_BUILD} INTERNAL

diff --git a/libfreerdp/primitives/CMakeLists.txt b/libfreerdp/primitives/CMakeLists.txt
index 95868ca..f544b35 100644 (file)
--- a/libfreerdp/primitives/CMakeLists.txt
+++ b/libfreerdp/primitives/CMakeLists.txt
@@ -76,7 +76,10 @@ add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
        SOURCES ${${MODULE_PREFIX}_SRCS}
        EXPORT)
 
-set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")
+if (WITH_LIBRARY_VERSIONING)
+  set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
+endif()
+set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib")
 
 if(IPP_FOUND)
        include_directories(${IPP_INCLUDE_DIRS})

diff --git a/libfreerdp/rail/CMakeLists.txt b/libfreerdp/rail/CMakeLists.txt
index fe0f574..504f7b3 100644 (file)
--- a/libfreerdp/rail/CMakeLists.txt
+++ b/libfreerdp/rail/CMakeLists.txt
@@ -30,7 +30,10 @@ add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
        SOURCES ${${MODULE_PREFIX}_SRCS}
        EXPORT)
 
-set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")
+if (WITH_LIBRARY_VERSIONING)
+  set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
+endif()
+set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib")
 
 set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
        MONOLITHIC ${MONOLITHIC_BUILD} INTERNAL

diff --git a/libfreerdp/utils/CMakeLists.txt b/libfreerdp/utils/CMakeLists.txt
index 0728452..1db46f1 100644 (file)
--- a/libfreerdp/utils/CMakeLists.txt
+++ b/libfreerdp/utils/CMakeLists.txt
@@ -42,7 +42,10 @@ add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
        SOURCES ${${MODULE_PREFIX}_SRCS}
        EXPORT)
 
-set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")
+if (WITH_LIBRARY_VERSIONING)
+  set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
+endif()
+set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib")
 
 set(${MODULE_PREFIX}_LIBS
        ${CMAKE_THREAD_LIBS_INIT}

diff --git a/server/Windows/CMakeLists.txt b/server/Windows/CMakeLists.txt
index b817e81..ae9ed7c 100644 (file)
--- a/server/Windows/CMakeLists.txt
+++ b/server/Windows/CMakeLists.txt
@@ -60,7 +60,10 @@ endif()
 \r
 if(WITH_SERVER_INTERFACE)\r
        add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})\r
-       set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")\r
+  if (WITH_LIBRARY_VERSIONING)
+       set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
+  endif()
+  set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib")\r
 else()\r
        set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} cli/wfreerdp.c cli/wfreerdp.h)\r
        add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})\r

diff --git a/server/X11/CMakeLists.txt b/server/X11/CMakeLists.txt
index 5aeb9ec..d60ac31 100644 (file)
--- a/server/X11/CMakeLists.txt
+++ b/server/X11/CMakeLists.txt
@@ -44,7 +44,10 @@ if(WITH_SERVER_INTERFACE)
        else()
                add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
        endif()
-       set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")
+  if (WITH_LIBRARY_VERSIONING)
+       set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
+  endif()
+  set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib")
 else()
        set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} cli/xfreerdp.c)
        add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})

diff --git a/server/common/CMakeLists.txt b/server/common/CMakeLists.txt
index 2286943..90ac794 100644 (file)
--- a/server/common/CMakeLists.txt
+++ b/server/common/CMakeLists.txt
@@ -32,7 +32,10 @@ endif()
 
 add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
-set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")
+if (WITH_LIBRARY_VERSIONING)
+  set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
+endif()
+set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib")
 
 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS}
        ${FREERDP_CHANNELS_SERVER_LIBS})

diff --git a/winpr/libwinpr/CMakeLists.txt b/winpr/libwinpr/CMakeLists.txt
index ef41607..0b3c5d7 100644 (file)
--- a/winpr/libwinpr/CMakeLists.txt
+++ b/winpr/libwinpr/CMakeLists.txt
@@ -96,7 +96,10 @@ list(REMOVE_DUPLICATES WINPR_INCLUDES)
 include_directories(${WINPR_INCLUDES})
 add_library(${MODULE_NAME} ${WINPR_SRCS})
 set_target_properties(${MODULE_NAME} PROPERTIES LINKER_LANGUAGE C)
-set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
+if (WITH_LIBRARY_VERSIONING)
+       set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION})
+endif()
+set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib")
 add_definitions(${WINPR_DEFINITIONS})
 target_link_libraries(${MODULE_NAME} ${WINPR_LIBS})
 install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT WinPRTargets)

diff --git a/winpr/libwinpr/credentials/CMakeLists.txt b/winpr/libwinpr/credentials/CMakeLists.txt
index d8ad949..80140c4 100644 (file)
--- a/winpr/libwinpr/credentials/CMakeLists.txt
+++ b/winpr/libwinpr/credentials/CMakeLists.txt
@@ -16,3 +16,4 @@
 # limitations under the License.
 
 winpr_module_add(credentials.c)
+

diff --git a/winpr/libwinpr/crypto/CMakeLists.txt b/winpr/libwinpr/crypto/CMakeLists.txt
index a927909..f2ee241 100644 (file)
--- a/winpr/libwinpr/crypto/CMakeLists.txt
+++ b/winpr/libwinpr/crypto/CMakeLists.txt
@@ -16,7 +16,7 @@
 # limitations under the License.
 
 winpr_module_add(
-  crypto.c
+       crypto.c
        crypto.h
        cert.c)
 

diff --git a/winpr/libwinpr/handle/CMakeLists.txt b/winpr/libwinpr/handle/CMakeLists.txt
index c232217..d58ff5a 100644 (file)
--- a/winpr/libwinpr/handle/CMakeLists.txt
+++ b/winpr/libwinpr/handle/CMakeLists.txt
@@ -14,8 +14,9 @@
 # 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.
-winpr_module_add(handle.c handle.h)
 
+winpr_module_add(handle.c handle.h)
+       
 if(${CMAKE_SYSTEM_NAME} MATCHES SunOS)
        winpr_library_add(rt)
 endif()

diff --git a/winpr/libwinpr/pool/CMakeLists.txt b/winpr/libwinpr/pool/CMakeLists.txt
index d4eff40..fd70d73 100644 (file)
--- a/winpr/libwinpr/pool/CMakeLists.txt
+++ b/winpr/libwinpr/pool/CMakeLists.txt
@@ -39,3 +39,4 @@ if(BUILD_TESTING)
        add_subdirectory(test)
 endif()
 
+

diff --git a/winpr/libwinpr/smartcard/CMakeLists.txt b/winpr/libwinpr/smartcard/CMakeLists.txt
index 00bf374..3f59e73 100644 (file)
--- a/winpr/libwinpr/smartcard/CMakeLists.txt
+++ b/winpr/libwinpr/smartcard/CMakeLists.txt
@@ -49,3 +49,4 @@ endif()
 if(BUILD_TESTING)
        add_subdirectory(test)
 endif()
+

diff --git a/winpr/libwinpr/sspi/CMakeLists.txt b/winpr/libwinpr/sspi/CMakeLists.txt
index 40b8da0..e3e0907 100644 (file)
--- a/winpr/libwinpr/sspi/CMakeLists.txt
+++ b/winpr/libwinpr/sspi/CMakeLists.txt
@@ -54,11 +54,9 @@ winpr_module_add(${${MODULE_PREFIX}_NTLM_SRCS}
        ${${MODULE_PREFIX}_SCHANNEL_SRCS}
        ${${MODULE_PREFIX}_SRCS})
 
-
 winpr_include_directory_add(${ZLIB_INCLUDE_DIRS}
        ${OPENSSL_INCLUDE_DIR})
 
-
 winpr_library_add(${ZLIB_LIBRARIES}
        ${OPENSSL_LIBRARIES})
 

diff --git a/winpr/libwinpr/sysinfo/CMakeLists.txt b/winpr/libwinpr/sysinfo/CMakeLists.txt
index 8f4e79b..bc64f87 100644 (file)
--- a/winpr/libwinpr/sysinfo/CMakeLists.txt
+++ b/winpr/libwinpr/sysinfo/CMakeLists.txt
@@ -24,3 +24,4 @@ endif()
 if(BUILD_TESTING)
        add_subdirectory(test)
 endif()
+

diff --git a/winpr/libwinpr/utils/CMakeLists.txt b/winpr/libwinpr/utils/CMakeLists.txt
index 21cddb6..9756a61 100644 (file)
--- a/winpr/libwinpr/utils/CMakeLists.txt
+++ b/winpr/libwinpr/utils/CMakeLists.txt
@@ -101,3 +101,4 @@ endif()
 if(BUILD_TESTING)
        add_subdirectory(test)
 endif()
+