Skip to content
Snippets Groups Projects
Commit bc9e3905 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

The forked yamlfreeze has become obsolete!

Replaced by dependency on official libyaml-cpp0.3.
parent 54fecdb4
No related branches found
No related tags found
No related merge requests found
Release 2.1.9b of , to be used with frida2libs-14....
- started infrastructure for Python binding (not yet productive)
- replaced yamlfreeze by official libyaml-cpp0.3
Release 2.1.9a of 11apr14:
- new build system: cmake instead of automake
......
......@@ -27,6 +27,7 @@ find_package(BISON)
find_package(FLEX)
include(FindGSL)
include(FindFFTW)
include(FindYamlCpp)
include(FindFridalibs)
#--- Including macros ---
......
......@@ -33,14 +33,6 @@ Frida.pypp.h
ADD_LIBRARY(frida2py SHARED ${src_files})
TARGET_LINK_LIBRARIES(frida2py
${GSL_LIBRARIES}
${FFTW_LIBRARIES}
${LIBTRIVIA_LIBS}
${LIBREADPLUS_LIBS}
${LIBKWW_LIBS}
${LIBCERF_LIBS}
${LIBYAMLFREEZE_LIBS}
${LIBLMFIT_LIBS}
${Boost_LIBRARIES}
frida2
)
......
# Locate yaml-cpp
#
# from http://code.google.com/p/yaml-cpp/issues/attachmentText?id=127&aid=1270002000&name=FindYamlCpp.cmake&token=59a4fbf54107b93367255c9d36464e81
# also at https://github.com/supercollider/supercollider/blob/master/cmake_modules/FindYamlCpp.cmake
#
# This module defines
# YAMLCPP_FOUND, if false, do not try to link to yaml-cpp
# YAMLCPP_LIBRARY, where to find yaml-cpp
# YAMLCPP_INCLUDE_DIR, where to find yaml.h
#
# By default, the dynamic libraries of yaml-cpp will be found. To find the static ones instead,
# you must set the YAMLCPP_STATIC_LIBRARY variable to TRUE before calling find_package(YamlCpp ...).
#
# If yaml-cpp is not installed in a standard path, you can use the YAMLCPP_DIR CMake variable
# to tell CMake where yaml-cpp is.
# attempt to find static library first if this is set
if(YAMLCPP_STATIC_LIBRARY)
set(YAMLCPP_STATIC libyaml-cpp.a)
endif()
# find the yaml-cpp include directory
find_path(YAMLCPP_INCLUDE_DIR yaml-cpp/yaml.h
PATH_SUFFIXES include
PATHS
~/Library/Frameworks/yaml-cpp/include/
/Library/Frameworks/yaml-cpp/include/
/usr/local/include/
/usr/include/
/sw/yaml-cpp/ # Fink
/opt/local/yaml-cpp/ # DarwinPorts
/opt/csw/yaml-cpp/ # Blastwave
/opt/yaml-cpp/
${YAMLCPP_DIR}/include/)
# find the yaml-cpp library
find_library(YAMLCPP_LIBRARY
NAMES ${YAMLCPP_STATIC} yaml-cpp
PATH_SUFFIXES lib64 lib
PATHS ~/Library/Frameworks
/Library/Frameworks
/usr/local
/usr
/sw
/opt/local
/opt/csw
/opt
${YAMLCPP_DIR}/lib)
# handle the QUIETLY and REQUIRED arguments and set YAMLCPP_FOUND to TRUE if all listed variables are TRUE
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(YAMLCPP DEFAULT_MSG YAMLCPP_INCLUDE_DIR YAMLCPP_LIBRARY)
mark_as_advanced(YAMLCPP_INCLUDE_DIR YAMLCPP_LIBRARY)
......@@ -84,4 +84,15 @@ ${BISON_xaxyacc_OUTPUTS}
${FLEX_xaxlex_OUTPUTS}
)
TARGET_LINK_LIBRARIES(frida2
${GSL_LIBRARIES}
${FFTW_LIBRARIES}
${LIBTRIVIA_LIBS}
${LIBREADPLUS_LIBS}
${LIBKWW_LIBS}
${LIBCERF_LIBS}
${YAMLCPP_LIBRARY}
${LIBLMFIT_LIBS}
)
INSTALL(TARGETS frida2 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
\ No newline at end of file
......@@ -15,11 +15,12 @@
#include <vector>
#include <map>
#include <yaml-cpp/yaml.h>
#include <trivia/string_ops.hpp>
#include <trivia/vector_ops.hpp>
#include <trivia/file_ops.hpp>
#include <readplus/ask.hpp>
#include <yamlfreeze/yaml.hpp>
#include "defs.hpp"
#include "olf.hpp"
......
......@@ -11,10 +11,11 @@
#include <fstream>
#include <vector>
#include <yaml-cpp/yaml.h>
#include <trivia/string_ops.hpp>
#include <trivia/file_ops.hpp>
#include <readplus/ask.hpp>
#include <yamlfreeze/yaml.hpp>
#include "defs.hpp"
#include "olf.hpp"
......
......@@ -9,14 +9,6 @@ frida2.cpp
ADD_EXECUTABLE(runfrida frida2.cpp)
TARGET_LINK_LIBRARIES(runfrida
${GSL_LIBRARIES}
${FFTW_LIBRARIES}
${LIBTRIVIA_LIBS}
${LIBREADPLUS_LIBS}
${LIBKWW_LIBS}
${LIBCERF_LIBS}
${LIBYAMLFREEZE_LIBS}
${LIBLMFIT_LIBS}
frida2
)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment