diff options
| author | astrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675> | 2010-06-12 16:10:15 +0000 |
|---|---|---|
| committer | astrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675> | 2010-06-12 16:10:15 +0000 |
| commit | 39c79788a5402631c6fee94be7e3911b8e56a830 (patch) | |
| tree | 6b79342393e11d48b5f7887ea9448e32f9845710 | |
| parent | 27deb30921d49f370684347c81e64e7866c1c92d (diff) | |
| download | opt-utilities-39c79788a5402631c6fee94be7e3911b8e56a830.tar.bz2 | |
git-svn-id: file:///home/svn/opt_utilities@123 ed2142bd-67ad-457f-ba7c-d818d4011675
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Findmuparser.cmake | 12 |
2 files changed, 15 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a9a8ec6..55ff62f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,12 +5,13 @@ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}) set(CMAKE_VERBOSE_MAKEFILE true) find_package(ltdl REQUIRED) +find_package(muparser REQUIRED) add_subdirectory(example) add_subdirectory(interface) add_subdirectory(dynamical_fit) -include_directories (${PROJECT_SOURCE_DIR} ${LTDL_INCLUDE_DIRS}) +include_directories (${PROJECT_SOURCE_DIR} ${LTDL_INCLUDE_DIRS} ${MP_INCLUDE_DIRS}) #message(${LTDL_LIBRARIES}) set(LIBRARY_OUTPUT_PATH,lib) @@ -19,5 +20,5 @@ ADD_EXECUTABLE(test_fitter example/test_fitter.cpp) ADD_EXECUTABLE(test_optimizer example/test_optimizer.cpp) ADD_EXECUTABLE(dynamical_fit.out dynamical_fit/dynamical_fit.cpp) -target_link_libraries(dynamical_fit.out ${LTDL_LIBRARIES}) +target_link_libraries(dynamical_fit.out ${LTDL_LIBRARIES} ${MP_LIBRARIES}) diff --git a/Findmuparser.cmake b/Findmuparser.cmake new file mode 100644 index 0000000..7db191d --- /dev/null +++ b/Findmuparser.cmake @@ -0,0 +1,12 @@ +find_path(MP_INCLUDE_DIRS muParser/muParser.h) + +message(${MP_INCLUDE_DIRS}) +SET(MP_NAMES ${MP_NAMES} muparser) +MESSAGE(${MP_NAMES}) +FIND_LIBRARY(MP_LIBRARIES ${MP_NAMES} ) +INCLUDE(FindPackageHandleStandardArgs) + +FIND_PACKAGE_HANDLE_STANDARD_ARGS(MP DEFAULT_MSG MP_LIBRARIES MP_INCLUDE_DIRS) + +MARK_AS_ADVANCED(MP_INCLUDE_DIRS MP_LIBRARIES) + |