Add CFLAGS/CXXFLAGS to compiler wrapper output

eschnett · Apr 18, 2022 · 34fa968 · 34fa968
1 parent f123f3c
commit 34fa968
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 36 deletions.
diff --git a/bin/mpicc.in b/bin/mpicc.in
@@ -16,37 +16,37 @@ case "$1" in
         exit 0
         ;;
     -showme:compile)
-        echo '-I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@'
+        echo "$MPITRAMPOLINE_CFLAGS -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@"
         exit 0
         ;;
     -showme:link)
-        echo '-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -Wl,-rpath,@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lmpitrampoline -ldl'
+        echo "$MPITRAMPOLINE_CFLAGS -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -Wl,-rpath,@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lmpitrampoline -ldl"
         exit 0
         ;;
     -showme:incdirs)
-        echo '@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@'
+        echo "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@"
         exit 0
         ;;
     -showme:libdirs)
-        echo '@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@'
+        echo "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@"
         exit 0
         ;;
     -showme:libs)
-        echo '-lmpitrampoline -ldl'
+        echo "-lmpitrampoline -ldl"
         exit 0
         ;;
     -showme:version)
-        echo '@PROJECT_NAME@ @PROJECT_VERSION@'
-        echo '@PROJECT_DESCRIPTION@'
-        echo '@CMAKE_PROJECT_HOMEPAGE_URL@'
+        echo "@PROJECT_NAME@ @PROJECT_VERSION@"
+        echo "@PROJECT_DESCRIPTION@"
+        echo "@CMAKE_PROJECT_HOMEPAGE_URL@"
         exit 0
         ;;
     -showme:help)
-        echo "$0"' {-showme:{command|compile|link|incdirs|libdirs|libs|version|help}|-show*} args'
+        echo "$0 {-showme:{command|compile|link|incdirs|libdirs|libs|version|help}|-show*} args"
         exit 0
         ;;
     -show*)
-        echo "$MPITRAMPOLINE_CC $MPITRAMPOLINE_CFLAGS "'-I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ @LINK_FLAGS@ -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -Wl,-rpath,@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lmpitrampoline -ldl'
+        echo "$MPITRAMPOLINE_CC $MPITRAMPOLINE_CFLAGS -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ @LINK_FLAGS@ -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -Wl,-rpath,@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lmpitrampoline -ldl"
         exit 0
         ;;
 esac

diff --git a/bin/mpicxx.in b/bin/mpicxx.in
@@ -16,37 +16,37 @@ case "$1" in
         exit 0
         ;;
     -showme:compile)
-        echo '-I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@'
+        echo "$MPITRAMPOLINE_CXXFLAGS -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@"
         exit 0
         ;;
     -showme:link)
-        echo '-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -Wl,-rpath,@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lmpitrampoline -ldl'
+        echo "$MPITRAMPOLINE_CXXFLAGS -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -Wl,-rpath,@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lmpitrampoline -ldl"
         exit 0
         ;;
     -showme:incdirs)
-        echo '@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@'
+        echo "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@"
         exit 0
         ;;
     -showme:libdirs)
-        echo '@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@'
+        echo "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@"
         exit 0
         ;;
     -showme:libs)
-        echo '-lmpitrampoline -ldl'
+        echo "-lmpitrampoline -ldl"
         exit 0
         ;;
     -showme:version)
-        echo '@PROJECT_NAME@ @PROJECT_VERSION@'
-        echo '@PROJECT_DESCRIPTION@'
-        echo '@CMAKE_PROJECT_HOMEPAGE_URL@'
+        echo "@PROJECT_NAME@ @PROJECT_VERSION@"
+        echo "@PROJECT_DESCRIPTION@"
+        echo "@CMAKE_PROJECT_HOMEPAGE_URL@"
         exit 0
         ;;
     -showme:help)
-        echo "$0"' {-showme:{command|compile|link|incdirs|libdirs|libs|version|help}|-show*} args'
+        echo "$0 {-showme:{command|compile|link|incdirs|libdirs|libs|version|help}|-show*} args"
         exit 0
         ;;
     -show*)
-        echo "$MPITRAMPOLINE_CXX $MPITRAMPOLINE_CXXFLAGS "'-I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ @LINK_FLAGS@ -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -Wl,-rpath,@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lmpitrampoline -ldl'
+        echo "$MPITRAMPOLINE_CXX $MPITRAMPOLINE_CXXFLAGS -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ @LINK_FLAGS@ -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -Wl,-rpath,@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lmpitrampoline -ldl"
         exit 0
         ;;
 esac

diff --git a/bin/mpifc.in b/bin/mpifc.in
@@ -24,29 +24,29 @@ case "$1" in
         exit 0
         ;;
     -showme:incdirs)
-        echo '@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@'
+        echo "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@"
         exit 0
         ;;
     -showme:libdirs)
-        echo '@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@'
+        echo "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@"
         exit 0
         ;;
     -showme:libs)
-        echo '-lmpitrampoline -ldl'
+        echo "-lmpitrampoline -ldl"
         exit 0
         ;;
     -showme:version)
-        echo '@PROJECT_NAME@ @PROJECT_VERSION@'
-        echo '@PROJECT_DESCRIPTION@'
-        echo '@CMAKE_PROJECT_HOMEPAGE_URL@'
+        echo "@PROJECT_NAME@ @PROJECT_VERSION@"
+        echo "@PROJECT_DESCRIPTION@"
+        echo "@CMAKE_PROJECT_HOMEPAGE_URL@"
         exit 0
         ;;
     -showme:help)
-        echo "$0"' {-showme:{command|compile|link|incdirs|libdirs|libs|version|help}|-show*} args'
+        echo "$0 {-showme:{command|compile|link|incdirs|libdirs|libs|version|help}|-show*} args"
         exit 0
         ;;
     -show*)
-        echo "$MPITRAMPOLINE_FC $MPITRAMPOLINE_FCFLAGS "'-I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ @LINK_FLAGS@ -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -Wl,-rpath,@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lmpitrampoline -ldl'
+        echo "$MPITRAMPOLINE_FC $MPITRAMPOLINE_FCFLAGS -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ @LINK_FLAGS@ -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -Wl,-rpath,@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lmpitrampoline -ldl"
         exit 0
         ;;
 esac

diff --git a/bin/mpifort.in b/bin/mpifort.in
@@ -24,29 +24,29 @@ case "$1" in
         exit 0
         ;;
     -showme:incdirs)
-        echo '@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@'
+        echo "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@"
         exit 0
         ;;
     -showme:libdirs)
-        echo '@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@'
+        echo "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@"
         exit 0
         ;;
     -showme:libs)
-        echo '-lmpitrampoline -ldl'
+        echo "-lmpitrampoline -ldl"
         exit 0
         ;;
     -showme:version)
-        echo '@PROJECT_NAME@ @PROJECT_VERSION@'
-        echo '@PROJECT_DESCRIPTION@'
-        echo '@CMAKE_PROJECT_HOMEPAGE_URL@'
+        echo "@PROJECT_NAME@ @PROJECT_VERSION@"
+        echo "@PROJECT_DESCRIPTION@"
+        echo "@CMAKE_PROJECT_HOMEPAGE_URL@"
         exit 0
         ;;
     -showme:help)
-        echo "$0"' {-showme:{command|compile|link|incdirs|libdirs|libs|version|help}|-show*} args'
+        echo "$0 {-showme:{command|compile|link|incdirs|libdirs|libs|version|help}|-show*} args"
         exit 0
         ;;
     -show*)
-        echo "$MPITRAMPOLINE_FC $MPITRAMPOLINE_FCFLAGS "'-I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ @LINK_FLAGS@ -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -Wl,-rpath,@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lmpitrampoline -ldl'
+        echo "$MPITRAMPOLINE_FC $MPITRAMPOLINE_FCFLAGS -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ @LINK_FLAGS@ -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -Wl,-rpath,@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lmpitrampoline -ldl"
         exit 0
         ;;
 esac