mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-11 03:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmake: whitespace cleanup

Browse source 
- indentation
- spaces near comments

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Lubomir I. Ivanov 2015-04-18 15:22:09 +03:00 committed by Dirk Hohndel
parent ed4fbb92d0
commit cdd84bb188
1 changed files with 69 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
CMakeLists.txt
View file

@ -14,7 +14,7 @@ OPTION(NO_TESTS "disable the tests" OFF)
OPTION(NO_DOCS "disable the docs" OFF) OPTION(NO_DOCS "disable the docs" OFF)
SET(CMAKE_MODULE_PATH ${${PROJECT_NAME}_SOURCE_DIR}/cmake/Modules) SET(CMAKE_MODULE_PATH ${${PROJECT_NAME}_SOURCE_DIR}/cmake/Modules)
INCLUDE_DIRECTORIES( . ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} qt-ui qt-ui/profile) INCLUDE_DIRECTORIES(. ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} qt-ui qt-ui/profile)
# compiler specific settings # compiler specific settings
@ -80,7 +80,7 @@ IF(NOT (insource OR insourcedir))
ENDIF() ENDIF()
ENDIF() ENDIF()
#configure Qt. # configure Qt.
FIND_PACKAGE(Qt5 REQUIRED COMPONENTS Core Concurrent Widgets Network WebKitWidgets PrintSupport Svg Test LinguistTools) FIND_PACKAGE(Qt5 REQUIRED COMPONENTS Core Concurrent Widgets Network WebKitWidgets PrintSupport Svg Test LinguistTools)
SET(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network Qt5::WebKitWidgets Qt5::PrintSupport Qt5::Svg) SET(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network Qt5::WebKitWidgets Qt5::PrintSupport Qt5::Svg)
@ -93,6 +93,7 @@ FILE(WRITE ${CMAKE_BINARY_DIR}/version.h.in "
#define GIT_VERSION_STRING \"@GIT_VERSION_STRING@\" #define GIT_VERSION_STRING \"@GIT_VERSION_STRING@\"
#define CANONICAL_VERSION_STRING \"@CANONICAL_VERSION_STRING@\" #define CANONICAL_VERSION_STRING \"@CANONICAL_VERSION_STRING@\"
") ")
FILE(WRITE ${CMAKE_BINARY_DIR}/version.cmake " FILE(WRITE ${CMAKE_BINARY_DIR}/version.cmake "
IF (\${APPLE}) IF (\${APPLE})
SET(VER_OS darwin) SET(VER_OS darwin)
@ -132,8 +133,10 @@ FILE(WRITE ${CMAKE_BINARY_DIR}/version.cmake "
) )
ENDIF() ENDIF()
") ")
ADD_CUSTOM_TARGET(version ALL COMMAND
${CMAKE_COMMAND} -D SRC=${CMAKE_BINARY_DIR}/version.h.in ADD_CUSTOM_TARGET(
version ALL COMMAND ${CMAKE_COMMAND} ${CMAKE_COMMAND}
-D SRC=${CMAKE_BINARY_DIR}/version.h.in
-D DST=${CMAKE_BINARY_DIR}/ssrf-version.h -D DST=${CMAKE_BINARY_DIR}/ssrf-version.h
-D CMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME} -D CMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
-P ${CMAKE_BINARY_DIR}/version.cmake -P ${CMAKE_BINARY_DIR}/version.cmake
@ -210,9 +213,9 @@ SET(SUBSURFACE_CORE_LIB_SRCS
uemis.c uemis.c
uemis-downloader.c uemis-downloader.c
version.c version.c
#gettextfrommoc should be added because we are using it on the c-code. # gettextfrommoc should be added because we are using it on the c-code.
gettextfromc.cpp gettextfromc.cpp
#dirk ported some core functionality to c++. # dirk ported some core functionality to c++.
qthelper.cpp qthelper.cpp
divecomputer.cpp divecomputer.cpp
exif.cpp exif.cpp
@ -326,7 +329,7 @@ endif()
# create the executables # create the executables
ADD_EXECUTABLE(${SUBSURFACE_TARGET} ${SUBSURFACE_PKG} ${SUBSURFACE_APP} ${SUBSURFACE_RESOURCES}) ADD_EXECUTABLE(${SUBSURFACE_TARGET} ${SUBSURFACE_PKG} ${SUBSURFACE_APP} ${SUBSURFACE_RESOURCES})
target_link_libraries( ${SUBSURFACE_TARGET} target_link_libraries(${SUBSURFACE_TARGET}
subsurface_generated_ui subsurface_generated_ui
subsurface_interface subsurface_interface
subsurface_profile subsurface_profile
@ -432,11 +435,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
ENDIF() ENDIF()
if(CMAKE_SYSTEM_NAME STREQUAL "Windows") if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
# # Windows bundling rules # Windows bundling rules
# # We don't have a helpful tool like macdeployqt for Windows, so we hardcode # We don't have a helpful tool like macdeployqt for Windows, so we hardcode
# # which libs we need. # which libs we need.
# # "make install", copies everything into a staging area # "make install", copies everything into a staging area
# # "make installer", uses makensis to create an installer executable # "make installer", uses makensis to create an installer executable
set(WINDOWSSTAGING ${CMAKE_BINARY_DIR}/staging) set(WINDOWSSTAGING ${CMAKE_BINARY_DIR}/staging)
install(DIRECTORY marbledata/maps DESTINATION ${WINDOWSSTAGING}/data) install(DIRECTORY marbledata/maps DESTINATION ${WINDOWSSTAGING}/data)
install(DIRECTORY marbledata/bitmaps DESTINATION ${WINDOWSSTAGING}/data) install(DIRECTORY marbledata/bitmaps DESTINATION ${WINDOWSSTAGING}/data)
@ -517,8 +520,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
ENDIF() ENDIF()
if(CMAKE_SYSTEM_NAME STREQUAL "Android") if(CMAKE_SYSTEM_NAME STREQUAL "Android")
# # Android template directory # Android template directory
# SET(ANDROID_PACKAGE_SOURCE_DIR, ${CMAKE_BINARY_DIR}/android) SET(ANDROID_PACKAGE_SOURCE_DIR, ${CMAKE_BINARY_DIR}/android)
ENDIF() ENDIF()
if(CMAKE_SYSTEM_NAME STREQUAL "Linux") if(CMAKE_SYSTEM_NAME STREQUAL "Linux")