Skip to content

GitLab

Commit 06429282 authored by Bill Hoffman's avatar Bill Hoffman
Browse files

BUG: quote the compiler and other options

parent a8ccbf7c
Hide whitespace changes
Inline Side-by-side
CMakeSystemConfig.cmake.in
View file @ 06429282
......@@ -6,20 +6,18 @@ SET (CMAKE_WORDS_BIGENDIAN @CMAKE_WORDS_BIGENDIAN@ )
SET (CMAKE_USE_SPROC @CMAKE_USE_SPROC@ CACHE BOOL)
SET (CMAKE_USE_PTHREADS @CMAKE_USE_PTHREADS@ CACHE BOOL)
SET (CMAKE_HP_PTHREADS @CMAKE_HP_PTHREADS@ CACHE BOOL)
SET (CMAKE_CXX @CXX@ CACHE FILEPATH)
SET (CMAKE_CC @CC@ CACHE FILEPATH)
SET (CMAKE_RANLIB @RANLIB@ CACHE STRING)
SET (CMAKE_AR @CMAKE_AR@ CACHE STRING)
SET (CMAKE_THREAD_LIBS @CMAKE_THREAD_LIBS@ CACHE STRING)
SET (CMAKE_DL_LIBS @CMAKE_DL_LIBS@ CACHE STRING)
SET (CMAKE_LIB_EXT @CMAKE_LIB_EXT@ CACHE STRING)
SET (CMAKE_RANLIB "@RANLIB@" CACHE STRING)
SET (CMAKE_AR "@CMAKE_AR@" CACHE STRING)
SET (CMAKE_CXX_COMPILER "@CXX@" CACHE FILEPATH)
SET (CMAKE_CXX_FLAGS "@CXXFLAGS@" CACHE STRING)
SET (CMAKE_CC_FLAGS "@CFLAGS@" CACHE STRING)
SET (CMAKE_SHLIB_CFLAGS @CMAKE_SHLIB_CFLAGS@ CACHE STRING)
SET (CMAKE_SHLIB_BUILD_FLAGS @CMAKE_SHLIB_BUILD_FLAGS@ CACHE STRING)
SET (CMAKE_SHLIB_LD_LIBS @CMAKE_SHLIB_LD_LIBS@ CACHE STRING)
SET (CMAKE_SHLIB_SUFFIX @CMAKE_SHLIB_SUFFIX@ CACHE STRING)
SET (CMAKE_CPP_FLAGS @CPPFLAGS@ CACHE STRING)
SET (CMAKE_TEMPLATE_FLAGS "@CMAKE_TEMPLATE_FLAGS@" CACHE STRING)
SET (CMAKE_C_COMPILER @CC@ CACHE FILEPATH)
SET (CMAKE_SHLIB_LINK_FLAGS @CMAKE_SHLIB_LINK_FLAGS@ CACHE STRING)
SET (CMAKE_LIB_EXT @CMAKE_LIB_EXT@ CACHE STRING)
SET (CMAKE_C_COMPILER "@CC@" CACHE FILEPATH)
SET (CMAKE_C_FLAGS "@CFLAGS@" CACHE STRING)
SET (CMAKE_SHLIB_CFLAGS "@CMAKE_SHLIB_CFLAGS@" CACHE STRING)
SET (CMAKE_SHLIB_BUILD_FLAGS "@CMAKE_SHLIB_BUILD_FLAGS@" CACHE STRING)
SET (CMAKE_SHLIB_SUFFIX @CMAKE_SHLIB_SUFFIX@ CACHE STRING)
SET (CMAKE_THREAD_LIBS "@CMAKE_THREAD_LIBS@" CACHE STRING)
SET (CMAKE_DL_LIBS "@CMAKE_DL_LIBS@" CACHE STRING)
SET (CMAKE_SHLIB_LINK_FLAGS "@CMAKE_SHLIB_LINK_FLAGS@" CACHE STRING)
SET (CMAKE_SHLIB_LD_LIBS "@CMAKE_SHLIB_LD_LIBS@" CACHE STRING)
Source/cmUnixMakefileGenerator.cxx
View file @ 06429282
......@@ -738,13 +738,13 @@ void cmUnixMakefileGenerator::OutputMakeVariables(std::ostream& fout)
"# the standard shell for make\n"
"SHELL = /bin/sh\n"
"\n"
"CMAKE_LIB_EXT = @CMAKE_LIB_EXT@\n"
"CMAKE_LIB_EXT = @CMAKE_LIB_EXT@\n"
"CMAKE_RANLIB = @CMAKE_RANLIB@\n"
"CMAKE_AR = @CMAKE_AR@\n"
"CMAKE_CC = @CMAKE_CC@\n"
"CMAKE_CFLAGS = @CMAKE_CC_FLAGS@ @CMAKE_SHLIB_CFLAGS@ \n"
"CMAKE_AR = @CMAKE_AR@\n"
"CMAKE_C_COMPILER = @CMAKE_C_COMPILER@\n"
"CMAKE_CFLAGS = @CMAKE_C_FLAGS@ @CMAKE_SHLIB_CFLAGS@ \n"
"\n"
"CMAKE_CXX = @CMAKE_CXX@\n"
"CMAKE_CXX_COMPILER = @CMAKE_CXX_COMPILER@\n"
"CMAKE_CXXFLAGS = @CMAKE_CXX_FLAGS@ @CMAKE_SHLIB_CFLAGS@ @CMAKE_TEMPLATE_FLAGS@ \n"
"\n"
"CMAKE_SHLIB_BUILD_FLAGS = @CMAKE_SHLIB_BUILD_FLAGS@\n"
......@@ -783,12 +783,12 @@ void cmUnixMakefileGenerator::OutputMakeRules(std::ostream& fout)
"# build c file",
".c.o",
0,
"${CMAKE_CC} ${CMAKE_CFLAGS} ${INCLUDE_FLAGS} -c $< -o $@");
"${CMAKE_C_COMPILER} ${CMAKE_CFLAGS} ${INCLUDE_FLAGS} -c $< -o $@");
this->OutputMakeRule(fout,
"# build cplusplus file",
".cxx.o",
0,
"${CMAKE_CXX} ${CMAKE_CXXFLAGS} ${INCLUDE_FLAGS} -c $< -o $@"); this->OutputMakeRule(fout,
"${CMAKE_CXX_COMPILER} ${CMAKE_CXXFLAGS} ${INCLUDE_FLAGS} -c $< -o $@"); this->OutputMakeRule(fout,
"Default build rule",
"all",
"Makefile cmake.depends ${TARGETS} ${SUBDIR_BUILD} ${CMAKE_COMMAND}",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment