AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge pull request #1614 from yeswalrus/cmake-cleanup

Browse Source 
Remove unused lines from CMake files.
This commit is contained in:
Feng Xiao 2016-05-31 13:51:07 -04:00
commit a315bb8b1e
2 changed files with 27 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/install.cmake
View File

@ -16,7 +16,6 @@ endforeach()
install(TARGETS protoc EXPORT protobuf-targets install(TARGETS protoc EXPORT protobuf-targets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc) RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc)
if(TRUE)
file(STRINGS extract_includes.bat.in _extract_strings file(STRINGS extract_includes.bat.in _extract_strings
REGEX "^copy") REGEX "^copy")
foreach(_extract_string ${_extract_strings}) foreach(_extract_string ${_extract_strings})
@ -43,7 +42,6 @@ if(TRUE)
"but there not exists. The file will not be installed.") "but there not exists. The file will not be installed.")
endif() endif()
endforeach() endforeach()
endif()
# Internal function for parsing auto tools scripts # Internal function for parsing auto tools scripts
function(_protobuf_auto_list FILE_NAME VARIABLE) function(_protobuf_auto_list FILE_NAME VARIABLE)

10
cmake/protobuf-config.cmake.in
View File

@ -2,12 +2,8 @@
set(PROTOBUF_VERSION "@protobuf_VERSION@") set(PROTOBUF_VERSION "@protobuf_VERSION@")
set(PROTOBUF_VERSION_STRING "@protobuf_VERSION_STRING@") set(PROTOBUF_VERSION_STRING "@protobuf_VERSION_STRING@")
# Current dir
get_filename_component(_PROTOBUF_PACKAGE_PREFIX
"${CMAKE_CURRENT_LIST_FILE}" PATH)
# Imported targets # Imported targets
include("${_PROTOBUF_PACKAGE_PREFIX}/protobuf-targets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/protobuf-targets.cmake")
# Compute the installation prefix relative to this file. # Compute the installation prefix relative to this file.
get_filename_component(_PROTOBUF_IMPORT_PREFIX get_filename_component(_PROTOBUF_IMPORT_PREFIX
@ -21,7 +17,3 @@ get_filename_component(_PROTOBUF_IMPORT_PREFIX
if(NOT DEFINED PROTOBUF_MODULE_COMPATIBLE OR "${PROTOBUF_MODULE_COMPATIBLE}") if(NOT DEFINED PROTOBUF_MODULE_COMPATIBLE OR "${PROTOBUF_MODULE_COMPATIBLE}")
include("${_PROTOBUF_PACKAGE_PREFIX}/protobuf-module.cmake") include("${_PROTOBUF_PACKAGE_PREFIX}/protobuf-module.cmake")
endif() endif()
# Cleanup temporary variables.
set(_PROTOBUF_PACKAGE_PREFIX)
set(_PROTOBUF_IMPORT_PREFIX)