diff options
| -rw-r--r-- | CMakeLists.txt | 13 | ||||
| -rw-r--r-- | config.h | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ed6fd23..70f083c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ MESSAGE ( "<******************************>" ) CMAKE_MINIMUM_REQUIRED ( VERSION 2.4.6 ) CMAKE_MINIMUM_REQUIRED ( VERSION 2.4.6 FATAL_ERROR ) #OSX -#CMAKE_OSX_ARCHITECTURES=ppc;i386 +SET ( CMAKE_OSX_ARCHITECTURES ppc i386 ) #CMAKE_OSX_SYSROOT SET ( CMAKE_COLOR_MAKEFILE ON ) @@ -30,15 +30,16 @@ SET ( CPACK_PACKAGE_VERSION_MAJOR "0" ) SET ( CPACK_PACKAGE_VERSION_MINOR "2" ) SET ( CPACK_PACKAGE_VERSION_PATCH "0" ) SET ( TUXANCI_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}" ) -SET ( TUXANCI_VERSION_FULL "${KGTK_VERSION}.${CPACK_PACKAGE_VERSION_PATCH}" ) -SET ( CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${KGTK_VERSION_FULL}" ) +SET ( TUXANCI_VERSION_FULL "${TUXANCI_VERSION}.${CPACK_PACKAGE_VERSION_PATCH}" ) +SET ( CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${TUXANCI_VERSION_FULL}" ) INCLUDE ( CPack ) -SET ( CMAKE_BUILD_TYPE_SHARED_LIBS ON ) +#SET ( CMAKE_BUILD_TYPE_SHARED_LIBS ON ) #MESSAGE ( "PREFIX ${CMAKE_INSTALL_PREFIX}" ) -SET ( CMAKE_INSTALL_PREFIX ${DESTDIR} ) -#ADD_DEFINITIONS ( -DDESTDIR "${CMAKE_INSTALL_PREFIX}" ) +#SET ( CMAKE_INSTALL_PREFIX ${DESTDIR} ) +#ADD_DEFINITIONS ( -DDESTDIR "${CMAKE_INSTALL_PREFIX}/" ) #MESSAGE ( "PREFIX ${CMAKE_INSTALL_PREFIX}" ) +#SET ( $ENV{DESTDIR} ${DESTDIR} ) # flagy SET( CMAKE_C_FLAGS $ENV{CFLAGS} ) SET( CMAKE_CXX_FLAGS $ENV{CXXFLAGS} ) @@ -1,4 +1,4 @@ -#define TUXANCI_NG_VERSION "svn105" +#define TUXANCI_NG_VERSION "svn106" #define DESTDIR "/usr/local/" |