Blame ptb-CMakeLists.patch
|
Martin Gansser |
d9bb743 |
--- CMakeLists.txt.orig 2016-12-23 13:58:14.282672836 +0100
|
|
Martin Gansser |
d9bb743 |
+++ CMakeLists.txt 2016-12-23 14:00:42.444680229 +0100
|
|
Martin Gansser |
d9bb743 |
@@ -1,8 +1,7 @@
|
|
Martin Gansser |
d9bb743 |
cmake_minimum_required( VERSION 2.8 )
|
|
Martin Gansser |
d9bb743 |
|
|
Martin Gansser |
d9bb743 |
-add_subdirectory( bear )
|
|
Martin Gansser |
d9bb743 |
add_subdirectory( plee-the-bear )
|
|
Martin Gansser |
d9bb743 |
|
|
Martin Gansser |
d9bb743 |
-set( BEAR_ROOT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/bear" )
|
|
Martin Gansser |
d9bb743 |
-set( CMAKE_MODULE_PATH "${BEAR_ROOT_DIRECTORY}/cmake-helper" )
|
|
Martin Gansser |
d9bb743 |
+set( BEAR_ROOT_DIRECTORY /usr/include/bear/ )
|
|
Martin Gansser |
d9bb743 |
+set( CMAKE_MODULE_PATH /usr/include/bear/cmake-helper )
|
|
Martin Gansser |
d9bb743 |
include( uninstall )
|
|
Martin Gansser |
d9bb743 |
--- plee-the-bear/launcher/src/CMakeLists.txt.orig 2016-12-23 14:04:58.992693029 +0100
|
|
Martin Gansser |
d9bb743 |
+++ plee-the-bear/launcher/src/CMakeLists.txt 2016-12-23 14:11:15.455711813 +0100
|
|
Martin Gansser |
d9bb743 |
@@ -94,7 +94,7 @@
|
|
Martin Gansser |
d9bb743 |
PTB_COMPILE_DEFINITIONS
|
|
Martin Gansser |
d9bb743 |
"${PTB_COMPILE_DEFINITIONS}"
|
|
Martin Gansser |
d9bb743 |
"GENERIC_ITEMS_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/${BEAR_ENGINE_INSTALL_LIBRARY_DIR}/${GENERIC_ITEM_LIBRARY_SYSTEM_NAME}"
|
|
Martin Gansser |
d9bb743 |
- "PTB_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/${BEAR_ENGINE_INSTALL_LIBRARY_DIR}/${PTB_LIBRARY_SYSTEM_NAME}"
|
|
Martin Gansser |
d9bb743 |
+ "PTB_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/${PTB_INSTALL_CUSTOM_LIBRARY_DIR}/${PTB_LIBRARY_SYSTEM_NAME}"
|
|
Martin Gansser |
d9bb743 |
"PTB_DATA_DIRECTORY=${CMAKE_INSTALL_PREFIX}/${PTB_INSTALL_DATA_DIR}"
|
|
Martin Gansser |
d9bb743 |
|
|
Martin Gansser |
d9bb743 |
${BEAR_TEXT_DOMAIN_PATH_DEF}
|