Pārlūkot izejas kodu

Use $(CXXFLAGS) and $(LDFLAGS) in the --find-package test Makefile

This should make the test succeed in the coverage builds, where CXXFLAGS
and LDFLAGS are set accordingly.

Alex
Alex Neundorf 14 gadi atpakaļ
vecāks
revīzija
a6ccf3cb65
1 mainītis faili ar 2 papildinājumiem un 2 dzēšanām
  1. 2 2
      Tests/FindPackageModeMakefileTest/Makefile.in

+ 2 - 2
Tests/FindPackageModeMakefileTest/Makefile.in

@@ -1,10 +1,10 @@
 all: clean pngtest
 all: clean pngtest
 
 
 main.o: main.cpp
 main.o: main.cpp
-	"@CMAKE_CXX_COMPILER@" -c $(shell "@cmakeExecutable@" --find-package -DCMAKE_MODULE_PATH="@CMAKE_CURRENT_BINARY_DIR@" -DNAME=Foo -DLANGUAGE=CXX -DCOMPILER_ID=@CMAKE_CXX_COMPILER_ID@ -DMODE=COMPILE) main.cpp
+	"@CMAKE_CXX_COMPILER@" $(CXXFLAGS) -c $(shell "@cmakeExecutable@" --find-package -DCMAKE_MODULE_PATH="@CMAKE_CURRENT_BINARY_DIR@" -DNAME=Foo -DLANGUAGE=CXX -DCOMPILER_ID=@CMAKE_CXX_COMPILER_ID@ -DMODE=COMPILE) main.cpp
 
 
 pngtest: main.o
 pngtest: main.o
-	"@CMAKE_CXX_COMPILER@" -o pngtest main.o $(shell "@cmakeExecutable@" --find-package -DCMAKE_MODULE_PATH="@CMAKE_CURRENT_BINARY_DIR@" -DNAME=Foo -DLANGUAGE=CXX -DCOMPILER_ID=@CMAKE_CXX_COMPILER_ID@ -DMODE=LINK)
+	"@CMAKE_CXX_COMPILER@" $(LDFLAGS) -o pngtest main.o $(shell "@cmakeExecutable@" --find-package -DCMAKE_MODULE_PATH="@CMAKE_CURRENT_BINARY_DIR@" -DNAME=Foo -DLANGUAGE=CXX -DCOMPILER_ID=@CMAKE_CXX_COMPILER_ID@ -DMODE=LINK)
 
 
 clean:
 clean:
 	rm -f *.o pngtest
 	rm -f *.o pngtest