Merge topic 'test-FindPackageModeMakefileTest-flags'
85d7a610 Tests: Use consistent C++ flags FindPackageModeMakefileTest
This commit is contained in:
commit
9b5554cda1
@ -4,6 +4,7 @@ include cmakeExecutable.mk
|
|||||||
CMAKE_CURRENT_BINARY_DIR = "@CMAKE_CURRENT_BINARY_DIR@"
|
CMAKE_CURRENT_BINARY_DIR = "@CMAKE_CURRENT_BINARY_DIR@"
|
||||||
CMAKE_CXX_COMPILER = "@CMAKE_CXX_COMPILER@"
|
CMAKE_CXX_COMPILER = "@CMAKE_CXX_COMPILER@"
|
||||||
CMAKE_CXX_COMPILER_ID = "@CMAKE_CXX_COMPILER_ID@"
|
CMAKE_CXX_COMPILER_ID = "@CMAKE_CXX_COMPILER_ID@"
|
||||||
|
CMAKE_CXX_FLAGS = @CMAKE_CXX_FLAGS@
|
||||||
|
|
||||||
CMAKE_FOO = $(CMAKE) --find-package -DCMAKE_MODULE_PATH=$(CMAKE_CURRENT_BINARY_DIR) -DNAME=Foo -DLANGUAGE=CXX -DCOMPILER_ID=$(CMAKE_CXX_COMPILER_ID)
|
CMAKE_FOO = $(CMAKE) --find-package -DCMAKE_MODULE_PATH=$(CMAKE_CURRENT_BINARY_DIR) -DNAME=Foo -DLANGUAGE=CXX -DCOMPILER_ID=$(CMAKE_CXX_COMPILER_ID)
|
||||||
|
|
||||||
@ -14,7 +15,7 @@ all: pngtest
|
|||||||
main.o: clean main.cpp
|
main.o: clean main.cpp
|
||||||
@$(CMAKE_FOO) -DMODE=COMPILE >$(tmp)
|
@$(CMAKE_FOO) -DMODE=COMPILE >$(tmp)
|
||||||
@foo="`cat $(tmp)`"; \
|
@foo="`cat $(tmp)`"; \
|
||||||
printf '"%s" %s %s -c main.cpp\n' $(CMAKE_CXX_COMPILER) "$(CXXFLAGS)" "$$foo" >$(tmp)
|
printf '"%s" %s %s -c main.cpp\n' $(CMAKE_CXX_COMPILER) "$(CMAKE_CXX_FLAGS)" "$$foo" >$(tmp)
|
||||||
@cat $(tmp)
|
@cat $(tmp)
|
||||||
@sh $(tmp)
|
@sh $(tmp)
|
||||||
@rm -f $(tmp)
|
@rm -f $(tmp)
|
||||||
@ -22,7 +23,7 @@ main.o: clean main.cpp
|
|||||||
pngtest: main.o
|
pngtest: main.o
|
||||||
@$(CMAKE_FOO) -DMODE=LINK >$(tmp)
|
@$(CMAKE_FOO) -DMODE=LINK >$(tmp)
|
||||||
@foo="`cat $(tmp)`"; \
|
@foo="`cat $(tmp)`"; \
|
||||||
printf '"%s" %s %s -o pngtest main.o %s\n' $(CMAKE_CXX_COMPILER) "$(CXXFLAGS)" "$(LDFLAGS)" "$$foo" >$(tmp)
|
printf '"%s" %s %s -o pngtest main.o %s\n' $(CMAKE_CXX_COMPILER) "$(CMAKE_CXX_FLAGS)" "$(LDFLAGS)" "$$foo" >$(tmp)
|
||||||
@cat $(tmp)
|
@cat $(tmp)
|
||||||
@sh $(tmp)
|
@sh $(tmp)
|
||||||
@rm -f $(tmp)
|
@rm -f $(tmp)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user