CMake quoting fixes

This commit is contained in:
Lukas W
2017-11-28 00:44:57 +01:00
parent bba072d54e
commit ff9622c10e

View File

@@ -21,10 +21,12 @@ SET(EXTERNALPROJECT_ARGS
)
SET(EXTERNALPROJECT_CMAKE_ARGS
-DLMMS_SOURCE_DIR=${CMAKE_SOURCE_DIR}
-DLMMS_BINARY_DIR=${CMAKE_BINARY_DIR}
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}
"-DLMMS_SOURCE_DIR=${CMAKE_SOURCE_DIR}"
"-DLMMS_BINARY_DIR=${CMAKE_BINARY_DIR}"
"-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
"-DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
"-DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}"
"-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
)
# build 32 bit version of RemoteVstPlugin
@@ -48,11 +50,11 @@ IF(LMMS_BUILD_WIN64 AND MSVC)
ENDIF()
ExternalProject_Add(RemoteVstPlugin32
${EXTERNALPROJECT_ARGS}
"${EXTERNALPROJECT_ARGS}"
CMAKE_GENERATOR ${GENERATOR}
CMAKE_ARGS
${EXTERNALPROJECT_CMAKE_ARGS}
-DCMAKE_PREFIX_PATH=${QT_32_PREFIX}
"${EXTERNALPROJECT_CMAKE_ARGS}"
"-DCMAKE_PREFIX_PATH=${QT_32_PREFIX}"
)
ELSEIF(LMMS_BUILD_WIN32)
ADD_SUBDIRECTORY(RemoteVstPlugin)
@@ -60,8 +62,8 @@ ELSEIF(LMMS_BUILD_LINUX)
ExternalProject_Add(RemoteVstPlugin32
"${EXTERNALPROJECT_ARGS}"
CMAKE_ARGS
${EXTERNALPROJECT_CMAKE_ARGS}
-DCMAKE_CXX_COMPILER=${WINEGCC}
"${EXTERNALPROJECT_CMAKE_ARGS}"
"-DCMAKE_CXX_COMPILER=${WINEGCC}"
"-DCMAKE_CXX_FLAGS=-m32 -mwindows"
)
ENDIF()
@@ -73,8 +75,8 @@ ELSEIF(LMMS_BUILD_LINUX)
ExternalProject_Add(RemoteVstPlugin64
"${EXTERNALPROJECT_ARGS}"
CMAKE_ARGS
${EXTERNALPROJECT_CMAKE_ARGS}
-DCMAKE_CXX_COMPILER=${WINEGCC}
"${EXTERNALPROJECT_CMAKE_ARGS}"
"-DCMAKE_CXX_COMPILER=${WINEGCC}"
"-DCMAKE_CXX_FLAGS=-m64 -mwindows"
)
ENDIF()