mirror of
https://git.freebsd.org/ports.git
synced 2025-06-04 04:16:27 -04:00
519df5d921
Changes https://github.com/KDAB/Charm/releases/tag/1.12.0 - qtkeychain is now a mandatory dependency - the KDAB-internal billing code is no longer optional, but can be user-configured away (I hope by default) - duplicate idle detection dialog removed - lots of other small fixes
34 lines
1 KiB
Text
34 lines
1 KiB
Text
- Shuffle a little to enforce C++11 in a normal way
|
|
- Don't install license, since the ports LICENSE_FILE already does that
|
|
|
|
Hopefully the bundled parts of ECM handle compiler flags properly.
|
|
|
|
--- CMakeLists.txt.orig 2018-06-15 07:34:16 UTC
|
|
+++ CMakeLists.txt
|
|
@@ -1,5 +1,7 @@
|
|
-CMAKE_MINIMUM_REQUIRED( VERSION 2.8.12 )
|
|
-PROJECT( Charm CXX )
|
|
+CMAKE_MINIMUM_REQUIRED( VERSION 3.10 )
|
|
+PROJECT( Charm VERSION ${Charm_VERSION} LANGUAGES CXX )
|
|
+SET( CMAKE_CXX_STANDARD 11 )
|
|
+SET( CMAKE_CXX_STANDARD_REQUIRED ON )
|
|
|
|
include(FeatureSummary)
|
|
|
|
@@ -12,7 +14,6 @@ include(KDEFrameworkCompilerSettings NO_
|
|
|
|
include(ECMInstallIcons)
|
|
|
|
-
|
|
IF( NOT Charm_VERSION )
|
|
FIND_PACKAGE( Git QUIET )
|
|
IF( EXISTS ${GIT_EXECUTABLE} )
|
|
@@ -119,7 +120,7 @@ CONFIGURE_FILE( CharmCMake.h.cmake ${CMA
|
|
SET( LICENSE_FILE "License.txt" )
|
|
SET( README_FILE "ReadMe.md" )
|
|
IF( NOT APPLE )
|
|
- INSTALL( FILES "${LICENSE_FILE}" "${README_FILE}" DESTINATION ${DOC_INSTALL_DIR} )
|
|
+ INSTALL( FILES "${README_FILE}" DESTINATION ${DOC_INSTALL_DIR} )
|
|
ENDIF()
|
|
|
|
IF (WIN32)
|