Skip to content

Commit

Permalink
debug how cmake is propagated from configure (#11960)
Browse files Browse the repository at this point in the history
  • Loading branch information
adrpo committed Feb 7, 2024
1 parent f528132 commit d614720
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
4 changes: 4 additions & 0 deletions OMCompiler/Makefile.in
Expand Up @@ -34,12 +34,16 @@ ifeq ($(CMAKE),)
CMAKE=cmake
endif

$(info "Selected CMAKE from configure: $(CMAKE)")

CMAKE := CC="$(CC)" CXX="$(CXX)" FC="$(FC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" FFLAGS="$(FCFLAGS)" LDFLAGS="@LDFLAGS@" $(CMAKE) @CMAKE_EXTRA_DEFINES@
CMAKE_NO_CHECK_UNDEFINED := CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="@CMAKE_LDFLAGS_UNDEFINED_LOOKUP@ @LDFLAGS@" $(CMAKE) @CMAKE_EXTRA_DEFINES@
CMAKE_RPATH := CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="@RPATH_QMAKE@ @CMAKE_LDFLAGS_UNDEFINED_LOOKUP@" $(CMAKE) @CMAKE_EXTRA_DEFINES@
CMAKE_TARGET = "Unix Makefiles"
OPENCL = @OPENCL@

$(info "Constructed CMAKE with flags: $(CMAKE)")

defaultMakefileTarget = Makefile
MAKEFILE_BOOT = LinkMain.makefile
QMAKE=@QMAKE@
Expand Down
2 changes: 2 additions & 0 deletions OMCompiler/configure.ac
Expand Up @@ -901,6 +901,8 @@ AC_MSG_RESULT([$EXTRA_MACOS_FLAGS_SUNDIALS])

CFLAGS="$CFLAGS"

AC_MSG_NOTICE(["Given CMAKE: $OMC_CMAKE_EXE])

OLD_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CFLAGS $CXXFLAGS -Werror"
AC_LANG_PUSH([C++])
Expand Down

0 comments on commit d614720

Please sign in to comment.