Skip to content

Commit

Permalink
Modernize cmake capitalization
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Feb 25, 2021
1 parent a54efae commit 301d337
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 43 deletions.
10 changes: 5 additions & 5 deletions external/odbccpp/CMakeLists.txt
@@ -1,10 +1,10 @@
CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
cmake_minimum_required(VERSION 3.10)

SET(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD 11)

PROJECT(odbccpp)
project(odbccpp)

FIND_PACKAGE(ODBC REQUIRED)
find_package(ODBC REQUIRED)

ADD_SUBDIRECTORY(src)
add_subdirectory(src)

4 changes: 2 additions & 2 deletions external/odbccpp/src/CMakeLists.txt
@@ -1,2 +1,2 @@
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
ADD_SUBDIRECTORY(odbc)
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
add_subdirectory(odbc)
12 changes: 6 additions & 6 deletions external/odbccpp/src/odbc/CMakeLists.txt
@@ -1,5 +1,5 @@
# Public Header Files
SET(public_headers
set(public_headers
Config.h
Connection.h
DatabaseMetaData.h
Expand All @@ -22,7 +22,7 @@ SET(public_headers
)

# Sources
SET(odbccpp_sources
set(odbccpp_sources
Connection.cpp
DatabaseMetaData.cpp
DatabaseMetaDataBase.cpp
Expand All @@ -46,14 +46,14 @@ SET(odbccpp_sources
)

# Static library
ADD_LIBRARY(odbccpp_static
add_library(odbccpp_static
STATIC
${odbccpp_sources}
)
TARGET_COMPILE_DEFINITIONS(odbccpp_static
target_compile_definitions(odbccpp_static
PUBLIC
ODBC_STATIC
)

TARGET_INCLUDE_DIRECTORIES(odbccpp_static PUBLIC ${ODBC_INCLUDE_DIRS})
SET_PROPERTY(TARGET odbccpp_static PROPERTY POSITION_INDEPENDENT_CODE ON)
target_include_directories(odbccpp_static PUBLIC ${ODBC_INCLUDE_DIRS})
set_property(TARGET odbccpp_static PROPERTY POSITION_INDEPENDENT_CODE ON)
12 changes: 6 additions & 6 deletions src/providers/CMakeLists.txt
Expand Up @@ -26,13 +26,13 @@ if (NOT FORCE_STATIC_PROVIDERS)
add_subdirectory(oracle)
endif()

IF (WITH_HANA)
ADD_SUBDIRECTORY(hana)
ENDIF(WITH_HANA)
if (WITH_HANA)
add_subdirectory(hana)
endif()

IF (WITH_PDAL)
ADD_SUBDIRECTORY(pdal)
ENDIF(WITH_PDAL)
if (WITH_PDAL)
add_subdirectory(pdal)
endif()

if (WITH_GRASS OR WITH_GRASS7)
add_subdirectory(grass)
Expand Down
48 changes: 24 additions & 24 deletions src/providers/hana/CMakeLists.txt
@@ -1,7 +1,7 @@
########################################################
# Files

SET (HANA_SRCS
set (HANA_SRCS
qgshanacolumntypethread.cpp
qgshanaconnection.cpp
qgshanaconnectionpool.cpp
Expand All @@ -19,17 +19,17 @@ SET (HANA_SRCS
qgshanautils.cpp
)

IF (WITH_GUI)
SET(HANA_SRCS ${HANA_SRCS}
if (WITH_GUI)
set(HANA_SRCS ${HANA_SRCS}
qgshanadataitems.cpp
qgshanadataitemguiprovider.cpp
qgshananewconnection.cpp
qgshanaprovidergui.cpp
qgshanasourceselect.cpp
)
ENDIF ()
endif()

SET(HANA_HDRS
set(HANA_HDRS
qgshanacolumntypethread.h
qgshanaconnection.h
qgshanaconnectionpool.h
Expand All @@ -48,75 +48,75 @@ SET(HANA_HDRS
qgshanautils.h
)

IF (WITH_GUI)
SET(HANA_HDRS ${HANA_HDRS}
if (WITH_GUI)
set(HANA_HDRS ${HANA_HDRS}
qgshanadataitems.h
qgshanadataitemguiprovider.h
qgshananewconnection.h
qgshanasourceselect.h
)
ENDIF ()
endif()

########################################################
# Build

INCLUDE_DIRECTORIES(
include_directories(
${CMAKE_SOURCE_DIR}/external/odbccpp/src

${CMAKE_BINARY_DIR}/src/ui
)

INCLUDE_DIRECTORIES (SYSTEM
include_directories (SYSTEM
${PROJ_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
${ODBC_INCLUDE_DIRS}
${QCA_INCLUDE_DIR}
${QTKEYCHAIN_INCLUDE_DIR}
)

ADD_LIBRARY(hanaprovider MODULE ${HANA_SRCS} ${HANA_HDRS})
ADD_LIBRARY(hanaprovider_a STATIC ${HANA_SRCS} ${HANA_HDRS})
add_library(hanaprovider MODULE ${HANA_SRCS} ${HANA_HDRS})
add_library(hanaprovider_a STATIC ${HANA_SRCS} ${HANA_HDRS})

# require c++17
target_compile_features(hanaprovider PRIVATE cxx_std_17)
target_compile_features(hanaprovider_a PRIVATE cxx_std_17)

TARGET_COMPILE_DEFINITIONS(hanaprovider PUBLIC ODBC_STATIC)
TARGET_COMPILE_DEFINITIONS(hanaprovider_a PUBLIC ODBC_STATIC)
target_compile_definitions(hanaprovider PUBLIC ODBC_STATIC)
target_compile_definitions(hanaprovider_a PUBLIC ODBC_STATIC)

TARGET_LINK_LIBRARIES(hanaprovider
target_link_libraries(hanaprovider
qgis_core
odbccpp_static
${ODBC_LIBRARIES}
)

TARGET_LINK_LIBRARIES(hanaprovider_a
target_link_libraries(hanaprovider_a
qgis_core
odbccpp_static
${ODBC_LIBRARIES}
)

IF (WITH_GUI)
TARGET_LINK_LIBRARIES (hanaprovider_a
if (WITH_GUI)
target_link_libraries (hanaprovider_a
qgis_gui
)

TARGET_LINK_LIBRARIES (hanaprovider
target_link_libraries (hanaprovider
qgis_gui
)
ENDIF ()
endif()

# clang-tidy
IF(CLANG_TIDY_EXE)
SET_TARGET_PROPERTIES(
if(CLANG_TIDY_EXE)
set_target_properties(
hanaprovider PROPERTIES
CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
)
ENDIF(CLANG_TIDY_EXE)
endif()

########################################################
# Install

INSTALL (TARGETS hanaprovider
install (TARGETS hanaprovider
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR})

0 comments on commit 301d337

Please sign in to comment.