@@ -12,8 +12,8 @@ option(RSP_ENABLE_ANSI "Enable ANSI output" false)
12
12
# -------------------------------------------------------------------------------------------------------------- #
13
13
14
14
# Append this package's cmake scripts in module path
15
- list (FIND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR} /cmake" hasModulePath )
16
- if (${hasModulePath} STREQUAL "-1" )
15
+ list (FIND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR} /cmake" has_cmake_scripts_module_path )
16
+ if (has_cmake_scripts_module_path EQUAL -1 )
17
17
list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR} /cmake" )
18
18
endif ()
19
19
@@ -48,12 +48,14 @@ project(rsp-cmake-scripts
48
48
HOMEPAGE_URL "https://github.com/rsps/cmake-scripts"
49
49
LANGUAGES NONE
50
50
)
51
+ set ("${PROJECT_NAME} _VERSION" "${PROJECT_VERSION} " )
52
+ set ("${PROJECT_NAME} _SEMVER" "${version_SEMVER} " )
51
53
52
54
# Ensure parent project has modules and other properties available.
53
- if (NOT CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME )
55
+ if (NOT PROJECT_IS_TOP_LEVEL )
54
56
set (CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH} " PARENT_SCOPE)
55
- set ("${PROJECT_NAME} _VERSION" "${PROJECT_VERSION } " PARENT_SCOPE)
56
- set ("${PROJECT_NAME} _SEMVER" "${version_SEMVER } " PARENT_SCOPE)
57
+ set ("${PROJECT_NAME} _VERSION" "${${PROJECT_NAME} _VERSION }" PARENT_SCOPE)
58
+ set ("${PROJECT_NAME} _SEMVER" "${${PROJECT_NAME} _SEMVER }" PARENT_SCOPE)
57
59
endif ()
58
60
59
61
# -------------------------------------------------------------------------------------------------------------- #
@@ -62,7 +64,7 @@ endif()
62
64
63
65
include ("dependencies.cmake" )
64
66
65
- if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME )
67
+ if (PROJECT_IS_TOP_LEVEL )
66
68
include ("dev-dependencies.cmake" )
67
69
endif ()
68
70
@@ -82,7 +84,7 @@ endif ()
82
84
# Post-dependencies project setup
83
85
# -------------------------------------------------------------------------------------------------------------- #
84
86
85
- if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME )
87
+ if (PROJECT_IS_TOP_LEVEL )
86
88
include ("rsp/debug" )
87
89
include ("rsp/logging" )
88
90
endif ()
0 commit comments