Apply cmake-format
This commit is contained in:
parent
28d323db14
commit
4db88620f6
|
@ -182,8 +182,8 @@ set(GO_LINKER_FLAGS "${GO_LINKER_FLAGS} -X github.com/syncthing/syncthing/lib/bu
|
||||||
# generate Syncthing's assets (not setting GOARCH/GOOS here, this is supposed to run on the host)
|
# generate Syncthing's assets (not setting GOARCH/GOOS here, this is supposed to run on the host)
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT "${SYNCTHING_PATH}/${GENERATED_SYNCTHING_GUI_FILES_RELATIVE_PATH}"
|
OUTPUT "${SYNCTHING_PATH}/${GENERATED_SYNCTHING_GUI_FILES_RELATIVE_PATH}"
|
||||||
COMMAND "${CMAKE_COMMAND}" -E env "GO111MODULE=on" "GOPATH=${GO_DEVELOPMENT_PATH}" "GOFLAGS=${GO_FLAGS}" "${GO_BIN}" run ./script/genassets.go gui
|
COMMAND "${CMAKE_COMMAND}" -E env "GO111MODULE=on" "GOPATH=${GO_DEVELOPMENT_PATH}" "GOFLAGS=${GO_FLAGS}" "${GO_BIN}" run
|
||||||
> "${GENERATED_SYNCTHING_GUI_FILES_RELATIVE_PATH}"
|
./script/genassets.go gui > "${GENERATED_SYNCTHING_GUI_FILES_RELATIVE_PATH}"
|
||||||
DEPENDS ${SRC_FILES_SYNCTHING_ASSETS}
|
DEPENDS ${SRC_FILES_SYNCTHING_ASSETS}
|
||||||
WORKING_DIRECTORY "${SYNCTHING_PATH}"
|
WORKING_DIRECTORY "${SYNCTHING_PATH}"
|
||||||
COMMENT "Building Syncthing's assets")
|
COMMENT "Building Syncthing's assets")
|
||||||
|
@ -192,11 +192,10 @@ add_custom_command(
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT "${SYNCTHINGINTERNAL_LIBRARY_PATH}" "${SYNCTHINGINTERNAL_HEADER_PATH}"
|
OUTPUT "${SYNCTHINGINTERNAL_LIBRARY_PATH}" "${SYNCTHINGINTERNAL_HEADER_PATH}"
|
||||||
COMMAND
|
COMMAND
|
||||||
"${CMAKE_COMMAND}" -E env ${GO_COMPILER_ARGS}
|
"${CMAKE_COMMAND}" -E env ${GO_COMPILER_ARGS} "GOOS=${GO_TARGET_OS}" "CGO_CFLAGS=${CGO_CFLAGS}"
|
||||||
"GOOS=${GO_TARGET_OS}" "CGO_CFLAGS=${CGO_CFLAGS}" "CGO_CXXFLAGS=${CGO_CXXFLAGS}" "CGO_LDFLAGS=${CGO_LDFLAGS}"
|
"CGO_CXXFLAGS=${CGO_CXXFLAGS}" "CGO_LDFLAGS=${CGO_LDFLAGS}" "GOARCH=${GO_TARGET_ARCH}" "CGO_ENABLED=1"
|
||||||
"GOARCH=${GO_TARGET_ARCH}" "CGO_ENABLED=1" "GO111MODULE=on" "GOPATH=${GO_DEVELOPMENT_PATH}" "GOFLAGS=${GO_FLAGS}"
|
"GO111MODULE=on" "GOPATH=${GO_DEVELOPMENT_PATH}" "GOFLAGS=${GO_FLAGS}" "${GO_BIN}" build -v -buildmode c-archive -o
|
||||||
"${GO_BIN}" build -v -buildmode c-archive -o "${SYNCTHINGINTERNAL_LIBRARY_PATH}" -ldflags "${GO_LINKER_FLAGS}"
|
"${SYNCTHINGINTERNAL_LIBRARY_PATH}" -ldflags "${GO_LINKER_FLAGS}" ./c-bindings ${GO_RANLIB_ARGS}
|
||||||
./c-bindings ${GO_RANLIB_ARGS}
|
|
||||||
DEPENDS ${SRC_FILES_SYNCTHING}
|
DEPENDS ${SRC_FILES_SYNCTHING}
|
||||||
WORKING_DIRECTORY "${SYNCTHING_PATH}"
|
WORKING_DIRECTORY "${SYNCTHING_PATH}"
|
||||||
COMMENT "Building Syncthing itself (as library)")
|
COMMENT "Building Syncthing itself (as library)")
|
||||||
|
|
Loading…
Reference in New Issue