[asterisk-scf-commits] asterisk-scf/integration/slice-plugins.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  6cda871fc97e9cfe281a762fa5684c12e4b1744f (commit)
       via  14c36ad0edcb4ff448d1ed2099e6c99abed57fc2 (commit)
      from  00c4790440092cb608cc58f63b7335d08a84e404 (commit)

Summary of changes:
 .gitignore         |    1 -
 CMakeLists.txt     |    2 ++
 build/.gitignore   |    1 +
 src/CMakeLists.txt |    7 +------
 4 files changed, 4 insertions(+), 7 deletions(-)
 delete mode 100644 .gitignore
 create mode 100644 build/.gitignore


- Log -----------------------------------------------------------------
commit 6cda871fc97e9cfe281a762fa5684c12e4b1744f
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Fri Jan 7 07:20:08 2011 -0600

    Make installation path settings compatible with Windows.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e698409..2fb8905 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -155,4 +155,6 @@ find_ICE_CXX_library(Slice)
 message(STATUS "Include directories ${ICE_CXX_INCLUDE_DIR}")
 include_directories("${ICE_CXX_INCLUDE_DIR}")
 
+set(CMAKE_INSTALL_PREFIX ${ICE_DIR})
+
 add_subdirectory(src)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index af49413..c446890 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,9 +1,4 @@
 add_library(SliceVisitorPattern SHARED SliceVisitorPattern.cpp)
 target_link_libraries(SliceVisitorPattern ${ICE_CXX_LIB_Ice} ${ICE_CXX_LIB_IceUtil} ${ICE_CXX_LIB_Slice})
 
-if(WIN32)
-  get_filename_component(library_path ${ICE_CXX_LIB_DEBUG_Ice} PATH)
-else()
-  get_filename_component(library_path ${ICE_CXX_LIB_Ice} PATH)
-endif()
-install(TARGETS SliceVisitorPattern LIBRARY DESTINATION ${library_path})
+install(TARGETS SliceVisitorPattern LIBRARY DESTINATION lib RUNTIME DESTINATION bin)

commit 14c36ad0edcb4ff448d1ed2099e6c99abed57fc2
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Fri Jan 7 07:16:59 2011 -0600

    Add build directory to repository.

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 378eac2..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build
diff --git a/build/.gitignore b/build/.gitignore
new file mode 100644
index 0000000..72e8ffc
--- /dev/null
+++ b/build/.gitignore
@@ -0,0 +1 @@
+*

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/slice-plugins.git