Fix pkgconfig flags with internal Boost
authorTeemu Murtola <teemu.murtola@gmail.com>
Sat, 28 Dec 2013 05:05:20 +0000 (07:05 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Sun, 29 Dec 2013 01:45:41 +0000 (02:45 +0100)
The include directory was set incorrectly in PKG_CFLAGS (missing the
installation prefix) when GMX_EXTERNAL_BOOST was off.

Change-Id: I01fe1165befb3862452705eab85106975074f377

CMakeLists.txt

index b6d59c791a9e2c1ad55ea85873b6d28b961fb8c4..fc28eb098e6fe18d6190a432617b5a8d71588466 100644 (file)
@@ -939,7 +939,7 @@ else()
     add_definitions(-DBOOST_NO_TYPEID)
     # TODO: Propagate the above settings to the installed CMakeFiles.txt template
     # (from share/template/)
-    set(PKG_CFLAGS "${PKG_CFLAGS} -DBOOST_NO_TYPEID -I${INCL_INSTALL_DIR}/gromacs/external/boost")
+    set(PKG_CFLAGS "${PKG_CFLAGS} -DBOOST_NO_TYPEID -I${CMAKE_INSTALL_PREFIX}/${INCL_INSTALL_DIR}/gromacs/external/boost")
     if (NOT GMX_BUILD_MDRUN_ONLY)
         install(DIRECTORY ${CMAKE_SOURCE_DIR}/src/external/boost/boost
                 DESTINATION ${INCL_INSTALL_DIR}/gromacs/external/boost