[openrtm-commit:02707] r757 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python: manager template/cmake
openrtm @ openrtm.org
openrtm @ openrtm.org
2017年 7月 26日 (水) 12:38:12 JST
Author: ga
Date: 2017-07-26 12:38:12 +0900 (Wed, 26 Jul 2017)
New Revision: 757
Modified:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonCMakeGenerateManager.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/CMakeLists.txt.vsl
Log:
Modified CMakeLists.txt #4133
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonCMakeGenerateManager.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonCMakeGenerateManager.java 2017-07-26 03:21:06 UTC (rev 756)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonCMakeGenerateManager.java 2017-07-26 03:38:12 UTC (rev 757)
@@ -68,7 +68,9 @@
public GeneratedResult generateCMakeLists(Map<String, Object> contextMap) {
String outfile = "CMakeLists.txt";
String infile = "cmake/CMakeLists.txt.vsl";
- return generatePython(infile, outfile, contextMap);
+ GeneratedResult result = generatePython(infile, outfile, contextMap);
+ result.setNotBom(true);
+ return result;
}
// 1.0系 (CMake/cpack_resources)
@@ -94,7 +96,9 @@
public GeneratedResult generateCmakeCPackOption(Map<String, Object> contextMap) {
String outfile = "cmake/cpack_options.cmake.in";
String infile = "cmake/cpack_options_cmake.in.vsl";
- return generatePython(infile, outfile, contextMap);
+ GeneratedResult result = generatePython(infile, outfile, contextMap);
+ result.setNotBom(true);
+ return result;
}
@Override
@@ -101,7 +105,9 @@
public GeneratedResult generateSrcCMakeLists(Map<String, Object> contextMap) {
String outfile = "src/CMakeLists.txt";
String infile = "cmake/SrcCMakeLists.txt.vsl";
- return generatePython(infile, outfile, contextMap);
+ GeneratedResult result = generatePython(infile, outfile, contextMap);
+ result.setNotBom(true);
+ return result;
}
/////
public GeneratedResult generatePython(String infile, String outfile,
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/CMakeLists.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/CMakeLists.txt.vsl 2017-07-26 03:21:06 UTC (rev 756)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/CMakeLists.txt.vsl 2017-07-26 03:38:12 UTC (rev 757)
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0.2)
+cmake_minimum_required(VERSION 2.8)
if(POLICY CMP0040)
cmake_policy(SET CMP0040 OLD)
endif()
@@ -163,9 +163,11 @@
add_custom_target(uninstall COMMAND
${dol}{CMAKE_COMMAND} -P ${dol}{CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
-${sharp} start menu
-set_property(INSTALL "${dol}{INSTALL_PREFIX}/${dol}{PROJECT_NAME}.py"
- PROPERTY CPACK_START_MENU_SHORTCUTS "${dol}{PROJECT_NAME}.py")
+if(WIN32)
+ ${sharp} start menu
+ set_property(INSTALL "${dol}{INSTALL_PREFIX}/${dol}{PROJECT_NAME}.py"
+ PROPERTY CPACK_START_MENU_SHORTCUTS "${dol}{PROJECT_NAME}.py")
+endif()
${sharp} target settings for document
if(BUILD_DOCUMENTATION)
More information about the openrtm-commit
mailing list