Commit dc2b9308 authored by KLOCZKO Thibaud's avatar KLOCZKO Thibaud
Browse files

Merge branch 'develop' into feature/fix-menubar-accessor

parents f0033bec b2276496
Pipeline #210233 passed with stage
in 0 seconds
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
cmake_minimum_required(VERSION 3.6.0) cmake_minimum_required(VERSION 3.6.0)
###################################################################### ######################################################################
project(dtkWidgets) project(dtkWidgets)
...@@ -71,6 +72,9 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS "ON") ...@@ -71,6 +72,9 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS "ON")
## Build setup ## Build setup
## ################################################################# ## #################################################################
# needed on macos, ignored by others
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.12" CACHE STRING "minimum OSX version" FORCE)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
......
...@@ -14,5 +14,7 @@ ...@@ -14,5 +14,7 @@
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.12" CACHE STRING "minimum OSX version" FORCE)
###################################################################### ######################################################################
### dtkWidgetsConfig.cmake.in ends here ### dtkWidgetsConfig.cmake.in ends here
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment