niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use PROJECT_NAME instead of CMAKE_PROJECT_NAME

Browse source 
CMAKE_PROJECT_NAME refers to the top-level project name, not the most recent project. So any CMake project that pulls this in as a dependency was in for a nasty surprise.
https://cmake.org/cmake/help/latest/variable/CMAKE_PROJECT_NAME.html

Signed-off-by: Dan Rose <dan@digilabs.io>
This commit is contained in:
Dan Rose 2019-10-18 20:04:24 -05:00 • committed by eboasson
parent 8ec68e1d7d
commit 960d4f7358
14 changed files with 46 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/idlc/CMakeLists.txt
View file

@ -45,17 +45,17 @@ include(cmake/IdlcGenerate.cmake)
install(
FILES "cmake/IdlcGenerate.cmake"
DESTINATION "${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/idlc"
DESTINATION "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/idlc"
COMPONENT dev)
install(
FILES "${IDLC_SCRIPT_IN}"
DESTINATION "${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/idlc"
DESTINATION "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/idlc"
COMPONENT dev)
install(
FILES "${IDLC_JAR}"
DESTINATION "${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/idlc"
DESTINATION "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/idlc"
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
COMPONENT dev)

4
src/idlc/src/org/eclipse/cyclonedds/Project.java.in
View file

@ -14,6 +14,6 @@ package org.eclipse.cyclonedds;
public class Project
{
public static String version = "@PROJECT_VERSION@";
public static String name = "@CMAKE_PROJECT_NAME@";
public static String nameCaps = "@CMAKE_PROJECT_NAME_CAPS@";
public static String name = "@PROJECT_NAME@";
public static String nameCaps = "@PROJECT_NAME_CAPS@";
}