Skip to content

Commit 81160e3

Browse files
committed
mummy: Add some variables to improve the ADD_CSHARP_* macros
Eliminate the usage of CMAKE_CURRENT_*_DIR if these new variables are set. Also, prefer CMAKE_RUNTIME_OUTPUT_DIRECTORY over EXECUTABLE_OUTPUT_PATH. Bump Mummy_VERSION_PATCH from 2 to 3, so clients can know whether they can use these new variables or not...
1 parent 6c99e07 commit 81160e3

File tree

2 files changed

+29
-9
lines changed

2 files changed

+29
-9
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ENDIF("${Mummy_BINARY_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
1212
#
1313
SET(Mummy_VERSION_MAJOR 1)
1414
SET(Mummy_VERSION_MINOR 0)
15-
SET(Mummy_VERSION_PATCH 2)
15+
SET(Mummy_VERSION_PATCH 3)
1616
SET(Mummy_VERSION_STRING "${Mummy_VERSION_MAJOR}.${Mummy_VERSION_MINOR}.${Mummy_VERSION_PATCH}")
1717
IF(Mummy_BUILD_IS_TOP_LEVEL)
1818
SET(Mummy_INSTALL_PREFIX "${CMAKE_BINARY_DIR} Install" CACHE STRING "")

MummyCMakeMacros.cmake

+28-8
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,23 @@ MACRO(ADD_CSHARP_EXECUTABLE ace_ExeName ace_DependentTargets ace_References ace_
33
MESSAGE(FATAL_ERROR "ADD_CSHARP_EXECUTABLE requires at least one optional argument.")
44
ENDIF("${ARGN}" STREQUAL "")
55

6-
SET(ace_SrcDir "${CMAKE_CURRENT_SOURCE_DIR}")
7-
SET(ace_BinDir "${CMAKE_CURRENT_BINARY_DIR}")
6+
IF(DEFINED MUMMY_ADD_CSHARP_SRCDIR)
7+
SET(ace_SrcDir "${MUMMY_ADD_CSHARP_SRCDIR}")
8+
ELSE()
9+
SET(ace_SrcDir "${CMAKE_CURRENT_SOURCE_DIR}")
10+
ENDIF()
11+
IF(DEFINED MUMMY_ADD_CSHARP_BINDIR)
12+
SET(ace_BinDir "${MUMMY_ADD_CSHARP_BINDIR}")
13+
ELSE()
14+
SET(ace_BinDir "${CMAKE_CURRENT_BINARY_DIR}")
15+
ENDIF()
816

917
SET(ace_ExeDir "${ace_BinDir}/${CMAKE_CFG_INTDIR}")
10-
IF(EXECUTABLE_OUTPUT_PATH)
18+
IF(CMAKE_RUNTIME_OUTPUT_DIRECTORY)
19+
SET(ace_ExeDir "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}")
20+
ELSEIF(EXECUTABLE_OUTPUT_PATH)
1121
SET(ace_ExeDir "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}")
12-
ENDIF(EXECUTABLE_OUTPUT_PATH)
22+
ENDIF()
1323

1424
SET(ace_CscRefs "")
1525
SET(ace_CMakeRefs "")
@@ -111,13 +121,23 @@ MACRO(ADD_CSHARP_LIBRARY acl_LibName acl_DependentTargets acl_References acl_Lin
111121
MESSAGE(FATAL_ERROR "ADD_CSHARP_LIBRARY requires at least one optional argument.")
112122
ENDIF("${ARGN}" STREQUAL "")
113123

114-
SET(acl_SrcDir "${CMAKE_CURRENT_SOURCE_DIR}")
115-
SET(acl_BinDir "${CMAKE_CURRENT_BINARY_DIR}")
124+
IF(DEFINED MUMMY_ADD_CSHARP_SRCDIR)
125+
SET(acl_SrcDir "${MUMMY_ADD_CSHARP_SRCDIR}")
126+
ELSE()
127+
SET(acl_SrcDir "${CMAKE_CURRENT_SOURCE_DIR}")
128+
ENDIF()
129+
IF(DEFINED MUMMY_ADD_CSHARP_BINDIR)
130+
SET(acl_BinDir "${MUMMY_ADD_CSHARP_BINDIR}")
131+
ELSE()
132+
SET(acl_BinDir "${CMAKE_CURRENT_BINARY_DIR}")
133+
ENDIF()
116134

117135
SET(acl_ExeDir "${acl_BinDir}/${CMAKE_CFG_INTDIR}")
118-
IF(EXECUTABLE_OUTPUT_PATH)
136+
IF(CMAKE_RUNTIME_OUTPUT_DIRECTORY)
137+
SET(acl_ExeDir "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}")
138+
ELSEIF(EXECUTABLE_OUTPUT_PATH)
119139
SET(acl_ExeDir "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}")
120-
ENDIF(EXECUTABLE_OUTPUT_PATH)
140+
ENDIF()
121141

122142
SET(acl_CscRefs "")
123143
SET(acl_CMakeRefs "")

0 commit comments

Comments
 (0)