mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake: remove some void statements and fix winpr source group

Browse Source
This commit is contained in:
Norbert Federa 2016-06-15 13:54:31 +02:00
parent 90cdfa7646
commit 7a68eebb03
4 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/common/CMakeLists.txt
View File

@ -38,9 +38,6 @@ foreach(FREERDP_CHANNELS_CLIENT_SRC ${FREERDP_CHANNELS_CLIENT_SRCS})
set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} "${FREERDP_CHANNELS_CLIENT_SRC}") set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} "${FREERDP_CHANNELS_CLIENT_SRC}")
endforeach() endforeach()
if(MSVC)
set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS})
endif()
# On windows create dll version information. # On windows create dll version information.
# Vendor, product and year are already set in top level CMakeLists.txt # Vendor, product and year are already set in top level CMakeLists.txt

2
winpr/libwinpr/CMakeLists.txt
View File

@ -84,6 +84,7 @@ set(WINPR_CORE synch locale library file comm pipe interlocked security
foreach(DIR ${WINPR_CORE}) foreach(DIR ${WINPR_CORE})
add_subdirectory(${DIR}) add_subdirectory(${DIR})
source_group("${DIR}" REGULAR_EXPRESSION "${DIR}/.*\\.[ch]")
endforeach() endforeach()
set(WINPR_LEVEL2 winsock sspi winhttp asn1 sspicli crt bcrypt rpc credui set(WINPR_LEVEL2 winsock sspi winhttp asn1 sspicli crt bcrypt rpc credui
@ -91,6 +92,7 @@ set(WINPR_LEVEL2 winsock sspi winhttp asn1 sspicli crt bcrypt rpc credui
foreach(DIR ${WINPR_LEVEL2}) foreach(DIR ${WINPR_LEVEL2})
add_subdirectory(${DIR}) add_subdirectory(${DIR})
source_group("${DIR}" REGULAR_EXPRESSION "${DIR}/.*\\.[ch]")
endforeach() endforeach()
set(MODULE_NAME winpr) set(MODULE_NAME winpr)

4
winpr/libwinpr/library/test/TestLibraryA/CMakeLists.txt
View File

@ -20,10 +20,6 @@ set(MODULE_PREFIX "TEST_LIBRARY_A")
set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} TestLibraryA.c) set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} TestLibraryA.c)
if(MSVC)
set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS})
endif()
add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS}) add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")

4
winpr/libwinpr/library/test/TestLibraryB/CMakeLists.txt
View File

@ -20,10 +20,6 @@ set(MODULE_PREFIX "TEST_LIBRARY_B")
set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} TestLibraryB.c) set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} TestLibraryB.c)
if(MSVC)
set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS})
endif()
add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS}) add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")