On Wed, 2010-08-11 at 16:22 +0200, Anders Logg wrote: > Is there also an include_libraries that should be used? >
Yes, 'target_link_libraries'. Problem is that I don't know how to get the data back out of it to create the pkg-config file. Garth > -- > Anders > e-mail message attachment > > -------- Forwarded Message -------- > > From: nore...@launchpad.net > > Reply-to: nore...@launchpad.net > > To: Anders Logg <l...@simula.no> > > Subject: [Branch ~dolfin-core/dolfin/main] Rev 4951: Use > > 'include_directories' > > Date: Wed, 11 Aug 2010 14:21:35 -0000 > > > > ------------------------------------------------------------ > > revno: 4951 > > committer: Garth N. Wells <gn...@cam.ac.uk> > > branch nick: dolfin-cmake > > timestamp: Wed 2010-08-11 15:08:28 +0100 > > message: > > Use 'include_directories' > > modified: > > dolfin/CMakeLists.txt > > > > > > -- > > lp:dolfin > > https://code.launchpad.net/~dolfin-core/dolfin/main > > > > Your team DOLFIN Core Team is subscribed to branch lp:dolfin. > > To unsubscribe from this branch go to > > https://code.launchpad.net/~dolfin-core/dolfin/main/+edit-subscription > > differences between files attachment (revision-diff.txt) > > === modified file 'dolfin/CMakeLists.txt' > > --- dolfin/CMakeLists.txt 2010-08-11 13:50:34 +0000 > > +++ dolfin/CMakeLists.txt 2010-08-11 14:08:28 +0000 > > @@ -36,7 +36,8 @@ > > list(APPEND SOURCES ${_SOURCES}) > > endforeach() > > > > -set(DOLFIN_INCLUDE_DIRECTORIES > > +# Add include directories of required packages > > +include_directories( > > ${UFC_INCLUDE_DIRS} > > ${Boost_INCLUDE_DIRS} > > ${ARMADILLO_INCLUDE_DIR} > > @@ -52,7 +53,7 @@ > > > > if(DOLFIN_ENABLE_MPI AND MPI_FOUND) > > add_definitions(-DHAS_MPI) > > - list(APPEND DOLFIN_INCLUDE_DIRECTORIES ${MPI_INCLUDE_PATH}) > > + include_directories(${MPI_INCLUDE_PATH}) > > list(APPEND DOLFIN_TARGET_LINK_LIBRARIES ${MPI_LIBRARIES}) > > # FIXME: Need to consider these MPI variables as well: > > # MPI_COMPILE_FLAGS Compilation flags for MPI programs > > @@ -66,7 +67,7 @@ > > # This shouldn't be here. Need to figure out how to set COMPILE_OPTIONS > > # (and test for GCC) > > list(APPEND CMAKE_CXX_FLAGS "-frounding-math") > > - list(APPEND DOLFIN_INCLUDE_DIRECTORIES ${DOLFIN_CGAL_INCLUDE_DIR}) > > + include_directories(${DOLFIN_CGAL_INCLUDE_DIR}) > > list(APPEND DOLFIN_TARGET_LINK_LIBRARIES > > ${DOLFIN_CGAL_LIBRARY} > > ${DOLFIN_MPFR_LIBRARY} > > @@ -76,29 +77,32 @@ > > > > if(DOLFIN_ENABLE_ZLIB AND DOLFIN_ZLIB_FOUND) > > add_definitions(-DHAS_ZLIB) > > - list(APPEND DOLFIN_INCLUDE_DIRECTORIES ${DOLFIN_ZLIB_INCLUDE_DIRS}) > > + include_directories(${DOLFIN_ZLIB_INCLUDE_DIRS}) > > list(APPEND DOLFIN_TARGET_LINK_LIBRARIES ${DOLFIN_ZLIB_LIBS}) > > endif(DOLFIN_ENABLE_ZLIB AND DOLFIN_ZLIB_FOUND) > > > > if(MTL4_ENABLE_MTL4 AND MTL4_FOUND) > > add_definitions(-DHAS_MTL4) > > - list(APPEND DOLFIN_INCLUDE_DIRECTORIES ${MTL4_INCLUDE_DIR}) > > + include_directories(${MTL4_INCLUDE_DIR}) > > endif(MTL4_ENABLE_MTL4 AND MTL4_FOUND) > > > > if(ENABLE_PETSC AND PETSC_FOUND) > > add_definitions(-DHAS_PETSC) > > - list(APPEND DOLFIN_INCLUDE_DIRECTORIES ${PETSC_INCLUDES}) > > + include_directories(${PETSC_INCLUDES}) > > list(APPEND DOLFIN_TARGET_LINK_LIBRARIES ${PETSC_LIBRARIES}) > > endif(ENABLE_PETSC AND PETSC_FOUND) > > > > if(DOLFIN_ENABLE_UMFPACK AND UMFPACK_FOUND) > > add_definitions(-DHAS_UMFPACK) > > - list(APPEND DOLFIN_INCLUDE_DIRECTORIES ${UMFPACK_INCLUDE_DIR}) > > + include_directories(${UMFPACK_INCLUDE_DIR}) > > list(APPEND DOLFIN_TARGET_LINK_LIBRARIES ${UMFPACK_LIBRARY}) > > endif(DOLFIN_ENABLE_UMFPACK AND UMFPACK_FOUND) > > > > # Add compiler include directories > > -include_directories(${DOLFIN_SOURCE_DIR} ${DOLFIN_INCLUDE_DIRECTORIES}) > > +include_directories(${DOLFIN_SOURCE_DIR}) > > + > > +get_directory_property(cmake_inc INCLUDE_DIRECTORIES) > > +message(STATUS "Print inc dirs: ${cmake_inc}") > > > > add_library(dolfin SHARED ${DOLFIN_H} ${HEADERS} ${SOURCES}) > > set_target_properties(dolfin PROPERTIES ${DOLFIN_LIBRARY_PROPERTIES}) > > @@ -119,12 +123,19 @@ > > # Define packages that should be required by pkg-config file > > set(PKG_REQUIRES "ufc-1 libxml-2.0") > > > > +get_directory_property(cmake_inc INCLUDE_DIRECTORIES) > > +message(STATUS "Print inc dirs: ${cmake_inc}") > > +foreach(_inc_dir ${cmake_inc}) > > + set(PKG_CXXFLAGS "-I${_inc_dir} ${PKG_CXXFLAGS}") > > +endforeach() > > +string(REGEX REPLACE ";" " " PKG_DEFINITIONS "${PKG_CXXFLAGS}") > > +message(STATUS "New inc dirs: ${PKG_CXXFLAGS}") > > + > > + > > # Convert include dirs to -I<incdir> form for use in pkg-config file > > -foreach(_inc_dir ${DOLFIN_INCLUDE_DIRECTORIES}) > > - set(PKG_CXXFLAGS "-I${_inc_dir} ${PKG_CXXFLAGS}") > > -endforeach() > > - > > -message(STATUS "Testing flahgs ${CMAKE_CXX_FLAGS}") > > +#foreach(_inc_dir ${DOLFIN_INCLUDE_DIRECTORIES}) > > +# set(PKG_CXXFLAGS "-I${_inc_dir} ${PKG_CXXFLAGS}") > > +#endforeach() > > > > # Add CXX flags > > set(PKG_CXXFLAGS "${CMAKE_CXX_FLAGS} ${PKG_CXXFLAGS}") > > > _______________________________________________ > Mailing list: https://launchpad.net/~dolfin > Post to : dolfin@lists.launchpad.net > Unsubscribe : https://launchpad.net/~dolfin > More help : https://help.launchpad.net/ListHelp _______________________________________________ Mailing list: https://launchpad.net/~dolfin Post to : dolfin@lists.launchpad.net Unsubscribe : https://launchpad.net/~dolfin More help : https://help.launchpad.net/ListHelp
