diff --git a/CMakeLists.txt b/CMakeLists.txt index 045f920..f80481f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,13 +3,6 @@ cmake_minimum_required (VERSION 2.8.4) set(project_name juci) #set(module juci_to_python_api) -if(MSYS) - string(TOLOWER "/$ENV{MSYSTEM}" MSYS_PATH) - set(bin_install_path "${MSYS_PATH}/bin") -else() - set(bin_install_path "/usr/local/bin") -endif() - #set(lib_install_path "/usr/local/lib/python2.7/dist-packages/") project (${project_name}) diff --git a/MINGW-packages/LICENSE b/MINGW-packages/mingw-w64-gtksourceview3/LICENSE similarity index 100% rename from MINGW-packages/LICENSE rename to MINGW-packages/mingw-w64-gtksourceview3/LICENSE diff --git a/MINGW-packages/mingw-w64-gtksourceviewmm3/LICENSE b/MINGW-packages/mingw-w64-gtksourceviewmm3/LICENSE new file mode 100644 index 0000000..e0f07ba --- /dev/null +++ b/MINGW-packages/mingw-w64-gtksourceviewmm3/LICENSE @@ -0,0 +1,27 @@ +Copyright (c) 2013, Алексей +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, this + list of conditions and the following disclaimer in the documentation and/or + other materials provided with the distribution. + +* Neither the name of the {organization} nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/docs/install.md b/docs/install.md index 7764368..534a930 100644 --- a/docs/install.md +++ b/docs/install.md @@ -58,7 +58,7 @@ cd ../../ Compile and install juCi++ source: ```sh -cmake -G"MSYS Makefiles" . +cmake -G"MSYS Makefiles" -DCMAKE_INSTALL_PREFIX=/mingw[32 or 64] . make make install ``` diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3dcada4..2d43bff 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -39,8 +39,9 @@ validate(${LCL_FOUND} "clangmm" "clangmm" "clangmm") find_package(LibClang) validate(${LIBCLANG_FOUND} "clang" "libclang-dev" "llvm") +#TODO: till clang is fixed on MSYS2 ((lib)clang.dll.a is missing): if(MSYS) - set(LIBCLANG_LIBRARIES "${MSYS_PATH}/bin/clang.dll") + set(LIBCLANG_LIBRARIES "${CMAKE_INSTALL_PREFIX}/bin/clang.dll") endif() #find_package(PythonLibs 2.7) @@ -137,7 +138,7 @@ if(${validation}) # install(TARGETS ${project_name} ${module} install(TARGETS ${project_name} - RUNTIME DESTINATION ${bin_install_path} + RUNTIME DESTINATION bin # LIBRARY DESTINATION ${lib_install_path} ) endif(${validation})