mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correctly handle SubsurfaceMobile

Browse source 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2016-01-07 14:38:16 -02:00 committed by Dirk Hohndel
parent 89eed5d36e
commit 219299dc01
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -127,6 +127,7 @@ if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "DesktopExecutable")
else() else()
set(SUBSURFACE_TARGET subsurface) set(SUBSURFACE_TARGET subsurface)
endif() endif()
remove_definitions(-DSUBSURFACE_MOBILE)
elseif(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable") elseif(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable")
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
set(SUBSURFACE_TARGET Subsurface-mobile) set(SUBSURFACE_TARGET Subsurface-mobile)
@ -423,14 +424,10 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
install(DIRECTORY theme DESTINATION share/subsurface) install(DIRECTORY theme DESTINATION share/subsurface)
install(DIRECTORY printing_templates DESTINATION share/subsurface) install(DIRECTORY printing_templates DESTINATION share/subsurface)
install(FILES ${TRANSLATIONS} DESTINATION share/subsurface/translations) install(FILES ${TRANSLATIONS} DESTINATION share/subsurface/translations)
if(SUBSURFACE_MOBILE)
install(TARGETS ${SUBSURFACE_TARGET} DESTINATION bin)
else()
install(TARGETS ${SUBSURFACE_TARGET} DESTINATION bin) install(TARGETS ${SUBSURFACE_TARGET} DESTINATION bin)
if (SMARTTRAK_IMPORT) if (SMARTTRAK_IMPORT)
install(TARGETS ${SMTK_IMPORT_TARGET} DESTINATION bin) install(TARGETS ${SMTK_IMPORT_TARGET} DESTINATION bin)
endif() endif()
endif()
if(DEFINED LIBMARBLEDEVEL) if(DEFINED LIBMARBLEDEVEL)
install( install(
CODE "file(GLOB SSRFMARBLE_SHLIBS \"${LIBMARBLEDEVEL}/lib/libssrfmarblewidget.so*\")" CODE "file(GLOB SSRFMARBLE_SHLIBS \"${LIBMARBLEDEVEL}/lib/libssrfmarblewidget.so*\")"

3
profile-widget/CMakeLists.txt
View file

@ -14,9 +14,6 @@ set(SUBSURFACE_PROFILE_LIB_SRCS
tankitem.cpp tankitem.cpp
) )
source_group("Subsurface Profile" FILES ${SUBSURFACE_PROFILE_LIB_SRCS}) source_group("Subsurface Profile" FILES ${SUBSURFACE_PROFILE_LIB_SRCS})
if (SUBSURFACE_MOBILE)
add_definitions(-DSUBSURFACE_MOBILE=1)
endif()
add_library(subsurface_profile STATIC ${SUBSURFACE_PROFILE_LIB_SRCS}) add_library(subsurface_profile STATIC ${SUBSURFACE_PROFILE_LIB_SRCS})
target_link_libraries(subsurface_profile ${QT_LIBRARIES}) target_link_libraries(subsurface_profile ${QT_LIBRARIES})