diff options
| author | click <none@none> | 2010-08-28 18:49:17 +0200 |
|---|---|---|
| committer | click <none@none> | 2010-08-28 18:49:17 +0200 |
| commit | dcaeceaf6b3e4cfe16d5c5fbad7473dfb14ba4dd (patch) | |
| tree | 90f05c04805999930494e76e6e286865a8c1a96a /cmake/platform | |
| parent | 8f97ba844089dfbf312babed6dc4dca24269ebc8 (diff) | |
Buildsystem: Change over to a little more flexible method of using the CMake buildsystem (partially WIP) - REQUIRES RERUNNING CMAKE!
For finding out the "standard" parameters examine the cmake/options.cmake file and adjacent files for your platform/compiler.
For platform settings -> cmake/platform/*/settings.cmake
For compiler settings -> cmake/compiler/*/settings.cmake
Some more testing and changes IS required, but I don't have OSX/XCode to kill off the main issues
--HG--
branch : trunk
rename : cmake/FindPlatform.cmake => cmake/macros/CheckPlatform.cmake
rename : cmake/FindACE.cmake => cmake/macros/FindACE.cmake
rename : cmake/FindMySQL.cmake => cmake/macros/FindMySQL.cmake
rename : cmake/FindOpenSSL.cmake => cmake/macros/FindOpenSSL.cmake
rename : cmake/FindPCHSupport.cmake => cmake/macros/FindPCHSupport.cmake
rename : cmake/FindReadline.cmake => cmake/macros/FindReadline.cmake
rename : cmake/cmake_uninstall.cmake.in => cmake_uninstall.cmake.in
Diffstat (limited to 'cmake/platform')
| -rw-r--r-- | cmake/platform/settings.cmake | 5 | ||||
| -rw-r--r-- | cmake/platform/settings.osx.cmake | 3 | ||||
| -rw-r--r-- | cmake/platform/settings.unix.cmake | 24 | ||||
| -rw-r--r-- | cmake/platform/settings.win32.cmake | 15 |
4 files changed, 47 insertions, 0 deletions
diff --git a/cmake/platform/settings.cmake b/cmake/platform/settings.cmake new file mode 100644 index 00000000000..6df5bc2165f --- /dev/null +++ b/cmake/platform/settings.cmake @@ -0,0 +1,5 @@ +# set installation prefix +if( PREFIX ) + set(CMAKE_INSTALL_PREFIX "${PREFIX}") +endif() + diff --git a/cmake/platform/settings.osx.cmake b/cmake/platform/settings.osx.cmake new file mode 100644 index 00000000000..609c6652b3f --- /dev/null +++ b/cmake/platform/settings.osx.cmake @@ -0,0 +1,3 @@ +set(MACOSX 1) +set(OSX_LIBS /usr/lib/libcrypto.dylib) +add_definitions(-D__ASSERTMACROS__) diff --git a/cmake/platform/settings.unix.cmake b/cmake/platform/settings.unix.cmake new file mode 100644 index 00000000000..6751f43b367 --- /dev/null +++ b/cmake/platform/settings.unix.cmake @@ -0,0 +1,24 @@ +# set default configuration directory +if( NOT CONF_DIR ) + set(CONF_DIR ${CMAKE_INSTALL_PREFIX}/etc) +endif() + +# set default library directory +if( NOT LIBSDIR ) + set(LIBSDIR ${CMAKE_INSTALL_PREFIX}/lib) +endif() + +# configure uninstaller +configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" + IMMEDIATE @ONLY +) + +# create uninstaller target (allows for using "make uninstall") +add_custom_target(uninstall + "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" +) + +include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake) + diff --git a/cmake/platform/settings.win32.cmake b/cmake/platform/settings.win32.cmake new file mode 100644 index 00000000000..f55f5702439 --- /dev/null +++ b/cmake/platform/settings.win32.cmake @@ -0,0 +1,15 @@ +# Package overloads +set(ACE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/dep/acelite) + +# check the CMake preload parameters (commented out by default) + +# overload CMAKE_INSTALL_PREFIX if not being set properly +#if( WIN32 ) +# if( NOT CYGWIN ) +# if( NOT CMAKE_INSTALL_PREFIX ) +# set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/bin") +# endif() +# endif() +#endif() + +include(${CMAKE_SOURCE_DIR}/cmake/compiler/msvc/settings.cmake) |
