Changeset 3775f45 in subsurface


Ignore:
Timestamp:
Jun 11, 2017, 1:50:30 PM (13 days ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
ddd39f2
Parents:
03e7710
git-author:
Salvador Cuñat <salvador.cunat@…> (06/05/17 11:22:33)
git-committer:
Dirk Hohndel <dirk@…> (06/11/17 13:50:30)
Message:

CMakeLists.txt: Remove SmartTrak? import options

Remove SmartTrak? import options from Subsurface's CMakeLists,txt, as a
first step to keep the importer apart from the main application.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • CMakeLists.txt

    rb400a5a r3775f45  
    3939# Options regarding What should we build on subsurface
    4040option(MAKE_TESTS "Make the tests" ON)
    41 
    42 #Extra features
    43 option(SMARTTRAK_IMPORT "enable building SmartTrak divelogs import tool (requires glib2 and libmdb)" OFF)
    4441
    4542SET(SUBSURFACE_TARGET_EXECUTABLE "DesktopExecutable" CACHE STRING "The type of application, DesktopExecutable or MobileExecutable")
     
    129126pkg_config_library(LIBZIP libzip REQUIRED)
    130127pkg_config_library(LIBUSB libusb-1.0 QUIET)
    131 
    132 if(SMARTTRAK_IMPORT)
    133         pkg_config_library(GLIB2 glib-2.0 REQUIRED)
    134         pkg_config_library(LIBMDB libmdb REQUIRED)
    135 endif()
    136128
    137129include_directories(.
     
    239231add_subdirectory(profile-widget)
    240232
    241 if(SMARTTRAK_IMPORT)
    242         add_subdirectory(smtk-import)
    243 endif()
    244 
    245233if (${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "DesktopExecutable")
    246234        add_subdirectory(desktop-widgets)
     
    288276                add_executable(${SUBSURFACE_TARGET} MACOSX_BUNDLE WIN32 ${SUBSURFACE_PKG} ${SUBSURFACE_APP} ${SUBSURFACE_RESOURCES})
    289277        endif()
    290 
    291         if(SMARTTRAK_IMPORT)
    292                 set(SMTK_IMPORT_TARGET smtk2ssrf)
    293                 add_executable(smtk2ssrf smtk-import/smtk_standalone.cpp ${SUBSURFACE_RESOURCES})
    294                 target_link_libraries(smtk2ssrf smtk_import)
    295         endif()
    296278
    297279        if(FBSUPPORT)
     
    476458        install(FILES ${TRANSLATIONS} DESTINATION share/subsurface/translations)
    477459        install(TARGETS ${SUBSURFACE_TARGET} DESTINATION bin)
    478         if (SMARTTRAK_IMPORT)
    479                 install(TARGETS ${SMTK_IMPORT_TARGET} DESTINATION bin)
    480         endif()
    481460        if(DEFINED LIBMARBLEDEVEL)
    482461                install(
Note: See TracChangeset for help on using the changeset viewer.