simplify and copy edit CMake files

pub/lib/CMakeLists.txt

 # frida: lib/CMakeLists.txt
 
 bison_target(xaxyacc
-xax_yacc.ypp ${CMAKE_CURRENT_BINARY_DIR}/xax_yacc.cpp COMPILE_FLAGS "-p xax -y" )
+    xax_yacc.ypp ${CMAKE_CURRENT_BINARY_DIR}/xax_yacc.cpp COMPILE_FLAGS "-p xax -y" )
 flex_target(xaxlex
-xax_lex.lpp  ${CMAKE_CURRENT_BINARY_DIR}/xax_lex.cpp COMPILE_FLAGS "-Pxax" )
+    xax_lex.lpp  ${CMAKE_CURRENT_BINARY_DIR}/xax_lex.cpp COMPILE_FLAGS "-Pxax" )
 add_flex_bison_dependency(xaxlex xaxyacc)
 
 include_directories(${Frida_SOURCE_DIR}/lib ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIRS})
@@ -11,92 +11,95 @@ include_directories(${Frida_SOURCE_DIR}/lib ${CMAKE_CURRENT_BINARY_DIR} ${Boost_
 configure_file("config.hpp.in" "${CMAKE_CURRENT_BINARY_DIR}/config.hpp")
 
 set(src_files
-commands.cpp
-coord.cpp
-curve.cpp
-edif.cpp
-expr.cpp
-fbase.cpp
-fassign.cpp
-fstring.cpp
-file_in.cpp
-file_out.cpp
-fit.cpp
-fregistry.cpp
-fsel.cpp
-func.cpp
-genus.cpp
-import.cpp
-jsel.cpp
-loop.cpp
-manip.cpp
-mem.cpp
-node.cpp
-obj.cpp
-olf.cpp
-opr.cpp
-plot.cpp
-reduce_curv.cpp
-reduce_spec.cpp
-rssm.cpp
-slice.cpp
-special.cpp
-toplevel.cpp
-variables.cpp
-)
+    commands.cpp
+    coord.cpp
+    curve.cpp
+    edif.cpp
+    expr.cpp
+    fbase.cpp
+    fassign.cpp
+    fstring.cpp
+    file_in.cpp
+    file_out.cpp
+    fit.cpp
+    fregistry.cpp
+    fsel.cpp
+    func.cpp
+    genus.cpp
+    import.cpp
+    jsel.cpp
+    loop.cpp
+    manip.cpp
+    mem.cpp
+    node.cpp
+    obj.cpp
+    olf.cpp
+    opr.cpp
+    plot.cpp
+    reduce_curv.cpp
+    reduce_spec.cpp
+    rssm.cpp
+    slice.cpp
+    special.cpp
+    toplevel.cpp
+    variables.cpp
+    )
 
 set(inc_files
-commands.hpp
-coord.hpp
-curve.hpp
-defs.hpp
-edif.hpp
-expr.hpp
-file_in.hpp
-file_out.hpp
-fit.hpp
-fregistry.hpp
-fsel.hpp
-func.hpp
-genus.hpp
-import.hpp
-jsel.hpp
-loop.hpp
-manip.hpp
-mem.hpp
-node.hpp
-obj.hpp
-olf.hpp
-opr.hpp
-plot.hpp
-ptr.hpp
-reduce_curv.hpp
-reduce_spec.hpp
-registry.hpp
-rssm.hpp
-slice.hpp
-special.hpp
-toplevel.hpp
-variables.hpp
-xax_lex.hpp
-)
+    commands.hpp
+    coord.hpp
+    curve.hpp
+    defs.hpp
+    edif.hpp
+    expr.hpp
+    file_in.hpp
+    file_out.hpp
+    fit.hpp
+    fregistry.hpp
+    fsel.hpp
+    func.hpp
+    genus.hpp
+    import.hpp
+    jsel.hpp
+    loop.hpp
+    manip.hpp
+    mem.hpp
+    node.hpp
+    obj.hpp
+    olf.hpp
+    opr.hpp
+    plot.hpp
+    ptr.hpp
+    reduce_curv.hpp
+    reduce_spec.hpp
+    registry.hpp
+    rssm.hpp
+    slice.hpp
+    special.hpp
+    toplevel.hpp
+    variables.hpp
+    xax_lex.hpp
+    )
 
 add_library(libfrida SHARED
-${src_files}
-${BISON_xaxyacc_OUTPUTS}
-${FLEX_xaxlex_OUTPUTS}
-)
+    ${src_files}
+    ${BISON_xaxyacc_OUTPUTS}
+    ${FLEX_xaxlex_OUTPUTS}
+    )
 
 set_target_properties(libfrida PROPERTIES OUTPUT_NAME frida)
 
-target_link_libraries(libfrida libreadplus libtrivia libfridaplot
-pthread
-${GSL_LIBRARIES}
-${FFTW_LIBRARIES}
-${KWW_LIBRARIES}
-${Cerf_LIBRARIES}
-${YAMLCPP_LIBRARY}
-${LMFit_LIBRARIES}
-)
+target_link_libraries(libfrida
+    libreadplus
+    libtrivia
+    libfridaplot
+    pthread
+    ${GSL_LIBRARIES}
+    ${FFTW_LIBRARIES}
+    ${KWW_LIBRARIES}
+    ${Cerf_LIBRARIES}
+    ${YAMLCPP_LIBRARY}
+    ${LMFit_LIBRARIES}
+    )
 
 install(TARGETS libfrida DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)

pub/plot/CMakeLists.txt

@@ -14,13 +14,10 @@ dualplot.hpp
 plowin.hpp
 )
 
-add_library(libfridaplot SHARED
-${src_files}
-)
+add_library(libfridaplot SHARED ${src_files})
 
 set_target_properties(libfridaplot PROPERTIES OUTPUT_NAME fridaplot)
 
-target_link_libraries(libfridaplot
-)
+target_link_libraries(libfridaplot)
 
-install(TARGETS libfridaplot DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
\ No newline at end of file
+install(TARGETS libfridaplot DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)

pub/readplus/CMakeLists.txt

@@ -14,9 +14,7 @@ macro.hpp
 readln.hpp
 )
 
-add_library(libreadplus SHARED
-${src_files}
-)
+add_library(libreadplus SHARED ${src_files})
 
 set_target_properties(libreadplus PROPERTIES OUTPUT_NAME readplus)
 

pub/trivia/CMakeLists.txt

@@ -25,13 +25,10 @@ vector_ops.hpp
 yaml_out.hpp
 )
 
-add_library(libtrivia SHARED
-${src_files}
-)
+add_library(libtrivia SHARED ${src_files})
 
 set_target_properties(libtrivia PROPERTIES OUTPUT_NAME trivia)
 
-target_link_libraries(libtrivia
-)
+target_link_libraries(libtrivia)
 
-install(TARGETS libtrivia DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
\ No newline at end of file
+install(TARGETS libtrivia DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)

pub/utest/CMakeLists.txt

@@ -25,8 +25,6 @@ link_directories(
 
 set(test_link_libs
     gtest_main
-    libtrivia
-    libreadplus
     libfrida
     )