Small changes

Author: Luis Díaz Más

CMakeLists.txt

@@ -12,7 +12,7 @@ INCLUDE(cmake/buildFiles.cmake REQUIRED)
 
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(tests)
-#ADD_SUBDIRECTORY(utils)
+ADD_SUBDIRECTORY(utils)
 
 INCLUDE(cmake/printInfo.cmake REQUIRED)
 

cmake/options.cmake

@@ -24,13 +24,14 @@ OPTION(ENABLE_COVERAGE_XML "Perform code coverage in XML for jenkins integration
 
 OPTION(BUILD_SHARED_LIBS   "Build shared libraries"                                    ON)
 OPTION(BUILD_TESTS         "Build unitary & integration tests with gtest"              OFF)
-
-OPTION(INSTALL_DOC          "Install documentation in system"                          OFF)
-OPTION(DOXY_COVERAGE        "Generate text file with the doxygen coverage"             OFF)
-OPTION(USE_MATHJAX          "Generate doc-formulas via mathjax instead of latex"       OFF)
-OPTION(USE_DOT              "Diagram generation with graphviz"                         ON)
-OPTION(USE_LATEX            "Build latex documentation"                                OFF)
-OPTION(USE_CHM              "Build CHM Windows documentation"                          OFF)
+OPTION(BUILD_UTILS         "Build utilities & applications"                            OFF)
+
+OPTION(INSTALL_DOC         "Install documentation in system"                           OFF)
+OPTION(DOXY_COVERAGE       "Generate text file with the doxygen coverage"              OFF)
+OPTION(USE_MATHJAX         "Generate doc-formulas via mathjax instead of latex"        OFF)
+OPTION(USE_DOT             "Diagram generation with graphviz"                          ON)
+OPTION(USE_LATEX           "Build latex documentation"                                 OFF)
+OPTION(USE_CHM             "Build CHM Windows documentation"                           OFF)
 
 # ----------------------------------------------------------------------------
 #   Code coverage

cmake/printInfo.cmake

@@ -17,6 +17,7 @@ MESSAGE( STATUS )
 MESSAGE( STATUS "USE_CLANG =                 ${USE_CLANG}" )
 MESSAGE( STATUS "BUILD_SHARED_LIBS =         ${BUILD_SHARED_LIBS}" )
 MESSAGE( STATUS "BUILD_TESTS =               ${BUILD_TESTS}" )
+MESSAGE( STATUS "BUILD_UTILS =               ${BUILD_UTILS}" )
 MESSAGE( STATUS "WARNINGS_ANSI_ISO =         ${WARNINGS_ANSI_ISO}" )
 MESSAGE( STATUS "WARNINGS_ARE_ERRORS =       ${WARNINGS_ARE_ERRORS}" )
 MESSAGE( STATUS "CMAKE_SYSTEM_PROCESSOR =    ${CMAKE_SYSTEM_PROCESSOR}" )

utils/CMakeLists.txt

@@ -1,19 +1,6 @@
-IF(BUILD_TESTS)
-
-   IF(NOT GTEST_FOUND)
-      MESSAGE(WARNING "GTest is not installed in your system so tests can't be compiled")
-   ELSE()
-
-   INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/include)
-   INCLUDE_DIRECTORIES(SYSTEM ${GTEST_INCLUDE_DIRS})
-   LINK_LIBRARIES(${ARGTABLE} ${GTEST_BOTH_LIBRARIES} ${PROJECT_NAME})
-
-   ADD_EXECUTABLE(tests tests_main.cpp)
-
-   ADD_CUSTOM_TARGET(tests_xml COMMAND tests --xml --gtest_output=xml
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-   ENDIF()
-
-ENDIF()
+if(BUILD_UTILS)
 
+   add_executable(xml_join xml_join.cpp)
+   target_link_libraries(xml_join ${PROJECT_NAME})
 
+endif()