diff options
| author |  Tomaz Canabrava <tomaz.canabrava@intel.com> | 2015-12-16 14:57:32 -0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-12-16 09:23:02 -0800 |
| commit | 5acfc8c632a73c4499f51019edb32fce9224c929 (patch) | |
| tree | b37380528b0653ea764f4341ed05fd70bd017b96 | |
| parent | c3493fa141f497a394c2e872cbdbb3e1959dc02b (diff) | |
| download | subsurface-5acfc8c632a73c4499f51019edb32fce9224c929.tar.gz | |
Fix targets on mobile and desktop
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ffe13a3d3..ac9fd65dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -221,9 +221,9 @@ if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileApplication") qt5_add_resources(MOBILE_RESOURCES qt-mobile/qml/mobile-resources.qrc) # When building the mobile application in Android, link it and Qt will do the rest, when doing the mobile application on Desktop, create an executable. if(ANDROID) - add_library(subsurface-mobile SHARED ${SUBSURFACE_PKG} ${MOBILE_SRC} ${SUBSURFACE_RESOURCES} ${MOBILE_RESOURCES}) + add_library(${SUBSURFACE_TARGET} SHARED ${SUBSURFACE_PKG} ${MOBILE_SRC} ${SUBSURFACE_RESOURCES} ${MOBILE_RESOURCES}) else() - add_executable(${SUBSURFACE_TARGET} ${SUBSURFACE_PKG} ${MOBILE_SRC} ${SUBSURFACE_RESOURCES} ${MOBILE_RESOURCES}) + add_executable(${SUBSURFACE_TARGET} MACOSX_BUNDLE WIN32 ${SUBSURFACE_PKG} ${MOBILE_SRC} ${SUBSURFACE_RESOURCES} ${MOBILE_RESOURCES}) endif() target_link_libraries( ${SUBSURFACE_TARGET} @@ -238,9 +238,13 @@ elseif(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "DesktopApplication") subsurface-desktop-helper.cpp ) source_group("Subsurface App" FILES ${SUBSURFACE_APP}) - add_executable(${SUBSURFACE_TARGET} MACOSX_BUNDLE WIN32 ${SUBSURFACE_PKG} ${SUBSURFACE_APP} ${SUBSURFACE_RESOURCES}) + if(ANDROID) + add_library(${SUBSURFACE_TARGET} MACOSX_BUNDLE WIN32 ${SUBSURFACE_PKG} ${SUBSURFACE_APP} ${SUBSURFACE_RESOURCES}) + else() + add_executable(${SUBSURFACE_TARGET} MACOSX_BUNDLE WIN32 ${SUBSURFACE_PKG} ${SUBSURFACE_APP} ${SUBSURFACE_RESOURCES}) + endif() - if(SMARTTRAK_IMPORT) + if(SMARTTRAK_IMPORT) set(SMTK_IMPORT_TARGET smtk2ssrf) add_executable(smtk2ssrf smtk-import/smtk_standalone.cpp ${SUBSURFACE_RESOURCES}) target_link_libraries(smtk2ssrf smtk_import) |