Skip to content

Commit 97e8ca1

Browse files
committed
updating to cmake 3.0 and using cmake's version setting
1 parent 280ae0e commit 97e8ca1

File tree

1 file changed

+10
-16
lines changed

1 file changed

+10
-16
lines changed

Diff for: CMakeLists.txt

+10-16
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# this software. The contributing author, Izaak Beekman, retains all
1010
# rights permitted by the terms of the JSON-Fortran license.
1111

12-
cmake_minimum_required ( VERSION 2.8.8 FATAL_ERROR )
12+
cmake_minimum_required ( VERSION 3.0 FATAL_ERROR )
1313

1414
# Use MSVS folders to organize projects on windows
1515
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
@@ -34,7 +34,11 @@ include ( "cmake/checkOutOfSource.cmake" )
3434
#---------------------
3535
# Declare project name
3636
#---------------------
37-
project ( jsonfortran NONE )
37+
project (
38+
jsonfortran
39+
VERSION 8.3.0
40+
LANGUAGES Fortran
41+
)
3842

3943
if(CMAKE_Fortran_COMPILER_ID STREQUAL GNU)
4044
option(JSON_FORTRAN_USE_OpenCoarrays
@@ -70,16 +74,6 @@ elseif(${JSON_INT_KIND} MATCHES "INT64")
7074
add_definitions(-DINT64)
7175
endif()
7276

73-
#----------------------------------
74-
# Get version (semantic versioning)
75-
# C.F. semver.org
76-
#----------------------------------
77-
file ( STRINGS "${PROJECT_SOURCE_DIR}/.VERSION" VERSION )
78-
string( REPLACE "." ";" VERSION_LIST ${VERSION} )
79-
list(GET VERSION_LIST 0 VERSION_MAJOR)
80-
list(GET VERSION_LIST 1 VERSION_MINOR)
81-
list(GET VERSION_LIST 2 VERSION_PATCH)
82-
set(PROJECT_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
8377
message ( STATUS "CMake build configuration for JSON-Fortran ${PROJECT_VERSION}" )
8478

8579
#-------------------------------------
@@ -191,7 +185,7 @@ set_target_properties ( ${LIB_NAME}-static
191185
if(NOT MSVC_IDE)
192186
PREFIX lib
193187
endif()
194-
VERSION ${VERSION}
188+
VERSION ${PROJECT_VERSION}
195189
ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib
196190
Fortran_MODULE_DIRECTORY ${MODULE_DIR} )
197191
set_target_properties ( ${LIB_NAME}
@@ -200,8 +194,8 @@ set_target_properties ( ${LIB_NAME}
200194
if(NOT MSVC_IDE)
201195
PREFIX lib
202196
endif()
203-
SOVERSION ${VERSION_MAJOR}.${VERSION_MINOR}
204-
VERSION ${VERSION}
197+
SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
198+
VERSION ${PROJECT_VERSION}
205199
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib
206200
Fortran_MODULE_DIRECTORY ${PROJECT_BINARY_DIR} )
207201

@@ -452,7 +446,7 @@ install ( EXPORT ${PACKAGE_NAME}-targets
452446

453447
include ( CMakePackageConfigHelpers ) # Standard CMake module
454448
write_basic_package_version_file( "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config-version.cmake"
455-
VERSION ${VERSION}
449+
VERSION ${PROJECT_VERSION}
456450
COMPATIBILITY SameMajorVersion )
457451

458452
# provides COMPILER_CONSISTENCY_CHECK

0 commit comments

Comments
 (0)