Skip to content
This repository has been archived by the owner on Jul 5, 2019. It is now read-only.

Switch to cmake 3 #5

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Switch to cmake 3 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 3.0)
cmake_policy(SET CMP0048 NEW)

project(QTDCM)
set(QTDCM_VERSION_NUMBER "2.0.2")
mark_as_advanced(QTDCM_VERSION_NUMBER)

set(${PROJECT_NAME}_VERSION_MAJOR 2 CACHE STRING "${PROJECT_NAME} major version number.")
set(${PROJECT_NAME}_VERSION_MINOR 0 CACHE STRING "${PROJECT_NAME} minor version number.")
set(${PROJECT_NAME}_VERSION_PATCH 2 CACHE STRING "${PROJECT_NAME} patch version number.")
set(${PROJECT_NAME}_VERSION "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH}")

mark_as_advanced(${PROJECT_NAME}_VERSION_MAJOR)
mark_as_advanced(${PROJECT_NAME}_VERSION_MINOR)
mark_as_advanced(${PROJECT_NAME}_VERSION_PATCH)
project(QTDCM VERSION ${QTDCM_VERSION_NUMBER})

option(BUILD_EXAMPLE "Build qtdcm example application" OFF)
option(BUILD_SHARED_LIBS "Build QtDcm with shared libraries." OFF)
Expand Down
6 changes: 3 additions & 3 deletions Code/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@ configure_file(${QTDCM_SOURCE_DIR}/CMake/QtDCMConfig.cmake.in
${QTDCM_BINARY_DIR}/QtDCMConfig.cmake)

# Save the compiler settings so another project can import them.
include(${CMAKE_ROOT}/Modules/CMakeExportBuildSettings.cmake)
cmake_export_build_settings(${QTDCM_BINARY_DIR}/QtDCMBuildSettings.cmake)
export_library_dependencies(${QTDCM_BINARY_DIR}/QtDCMLibraryDepends.cmake)
#include(${CMAKE_ROOT}/Modules/CMakeExportBuildSettings.cmake)
#cmake_export_build_settings(${QTDCM_BINARY_DIR}/QtDCMBuildSettings.cmake)
#export_library_dependencies(${QTDCM_BINARY_DIR}/QtDCMLibraryDepends.cmake)

# Create the QtDCMConfig.cmake file containing the QtDCM configuration used with make install and CPack.
# include (${QTDCM_SOURCE_DIR}/CMake/QtDCMGenerateInstall.cmake)
Expand Down