Merge pull request #586 from mcharlou/master

jacobwilliams · web-flow · commit 2dc8abefd416 · 2025-03-17T12:10:14.000-05:00
Solve "Wrong path to .VERSION.in when building as a CMake subproject"
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -45,7 +45,7 @@ project (
 )
 
 # write the version file
-configure_file(${CMAKE_SOURCE_DIR}/.VERSION.in ${CMAKE_SOURCE_DIR}/.VERSION)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/.VERSION.in ${CMAKE_CURRENT_SOURCE_DIR}/.VERSION)
 
 if(CMAKE_Fortran_COMPILER_ID STREQUAL GNU)
   option(JSON_FORTRAN_USE_OpenCoarrays

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ project (`
`45`	`45`	`)`
`46`	`46`
`47`	`47`	`# write the version file`
`48`		`-configure_file(${CMAKE_SOURCE_DIR}/.VERSION.in ${CMAKE_SOURCE_DIR}/.VERSION)`
	`48`	`+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/.VERSION.in ${CMAKE_CURRENT_SOURCE_DIR}/.VERSION)`
`49`	`49`
`50`	`50`	`if(CMAKE_Fortran_COMPILER_ID STREQUAL GNU)`
`51`	`51`	`option(JSON_FORTRAN_USE_OpenCoarrays`