diff options
| author | dominique.leuenberger@gmail.com <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56> | 2010-08-17 17:47:55 +0000 |
|---|---|---|
| committer | dominique.leuenberger@gmail.com <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56> | 2010-08-17 17:47:55 +0000 |
| commit | 07bcb0b0aa4482c312f64750912721850ae35f73 (patch) | |
| tree | d982cc59deb8dc9781edb07bde045ad61dc73b4f | |
| parent | 33b8467718a3290ca1a83cd358e916319c44af6a (diff) | |
| download | libproxy-07bcb0b0aa4482c312f64750912721850ae35f73.tar.gz | |
C# bindings: install destination can be specified with -DCSHARP_ASSEMBLY_DIR=[...]
git-svn-id: http://libproxy.googlecode.com/svn/trunk@717 c587cffe-e639-0410-9787-d7902ae8ed56
| -rw-r--r-- | bindings/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | bindings/csharp/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/paths.cmk | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt index bff3753..c2d1511 100644 --- a/bindings/CMakeLists.txt +++ b/bindings/CMakeLists.txt @@ -12,7 +12,6 @@ if (WITH_PYTHON) endif() endif() -#TODO c-sharp bindings option(WITH_DOTNET "Enables C# bindings" OFF) if (WITH_DOTNET) add_subdirectory(csharp) diff --git a/bindings/csharp/CMakeLists.txt b/bindings/csharp/CMakeLists.txt index d433fc6..48c609c 100644 --- a/bindings/csharp/CMakeLists.txt +++ b/bindings/csharp/CMakeLists.txt @@ -10,5 +10,5 @@ SET_PROPERTY(TARGET libproxy-sharp PROPERTY pkg-config_template_basename libprox GET_LIBRARY_OUTPUT_DIR(library_target_dir) FILE(WRITE ${library_target_dir}/libproxy-sharp.dll.config "<configuration><dllmap dll=\"proxy\" target=\"libproxy.so.1\"/></configuration>") -INSTALL_ASSEMBLY(libproxy-sharp DESTINATION lib PACKAGE libproxy-sharp) +INSTALL_ASSEMBLY(libproxy-sharp DESTINATION ${CSHARP_ASSEMBLY_DIR} PACKAGE libproxy-sharp) diff --git a/cmake/paths.cmk b/cmake/paths.cmk index 0fad6ce..0aee160 100644 --- a/cmake/paths.cmk +++ b/cmake/paths.cmk @@ -6,6 +6,7 @@ if(WIN32) set(INCLUDE_INSTALL_DIR include CACHE PATH "Include install dir") set(SYSCONF_INSTALL_DIR "" CACHE PATH "Configuration install dir") set(SHARE_INSTALL_DIR "" CACHE PATH "Data install dir") + set(CSHARP_ASSEMBLY_DIR "" CACHE PATH "Mono binding assembly dir") else(WIN32) set(CMAKE_INSTALL_PREFIX /usr/local CACHE PATH "Install prefix") set(BIN_INSTALL_DIR bin CACHE PATH "Binary install dir") @@ -14,4 +15,5 @@ else(WIN32) set(INCLUDE_INSTALL_DIR include CACHE PATH "Include install dir") set(SYSCONF_INSTALL_DIR etc CACHE PATH "Configuration install dir") set(SHARE_INSTALL_DIR share CACHE PATH "Data install dir") + set(CSHARP_ASSEMBLY_DIR lib CACHE PATH "Mono binding assmebly dir") endif(WIN32) |