guilhem_lavaux/cosmotool
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed conflict

Browse source
This commit is contained in:
Guilhem Lavaux 2012-09-17 17:24:27 -04:00
commit 7b5b1d5002
4 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sample/CMakeLists.txt
View file

@ -1,4 +1,4 @@
SET(tolink ${GSL_LIBRARIES} CosmoTool)
SET(tolink ${GSL_LIBRARIES} CosmoTool ${CosmoTool_LIBS})
include_directories(${CMAKE_SOURCE_DIR}/src ${NETCDF_INCLUDE_PATH} ${GSL_INCLUDE_PATH})
add_executable(testBQueue testBQueue.cpp)
@ -38,4 +38,4 @@ add_executable(testAlgo testAlgo.cpp)
target_link_libraries(testAlgo ${tolink})
add_executable(testBSP testBSP.cpp)
target_link_libraries(testBSP ${tolink})
target_link_libraries(testBSP ${tolink})