aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Nielsen <scottnielsen5@gmail.com>2014-02-28 01:24:28 -0700
committerThiago de Arruda <tpadilha84@gmail.com>2014-02-28 05:50:16 -0300
commit79882bc7bdcb7de8827cb08187ea6252f4d1fd6e (patch)
tree049b34f769e2f5ad0709da186d700e61e6dca22c
parent4600b9c0359b531affefd1ba11d82f7493a6f8c2 (diff)
downloadrneovim-79882bc7bdcb7de8827cb08187ea6252f4d1fd6e.tar.gz
rneovim-79882bc7bdcb7de8827cb08187ea6252f4d1fd6e.tar.bz2
rneovim-79882bc7bdcb7de8827cb08187ea6252f4d1fd6e.zip
Use cmake module instead of shared for nvim-test
On a Mac using shared creates libnvim-test.dylib which cannot be found by the hardcoded .so extension in helpers.moon, causing the unittests to fail. However, using module creates libnvim-test.so, allowing the tests to run. There will still be problems running the tests on windows, because both shared and module create dll file which will not be found by in helpers.moon.
-rw-r--r--.gitignore2
-rw-r--r--src/CMakeLists.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index aa5c6380e7..e51b826feb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,8 @@ build/
*.swp
*~
*.pyc
+*.o
+*.so
src/po/vim.pot
src/po/*.ck
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index aa1100032a..359a9f5180 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND NEOVIM_SOURCES "${PROJECT_BINARY_DIR}/config/auto/pathdef.c")
file( GLOB OS_SOURCES os/*.c )
add_executable (nvim ${NEOVIM_SOURCES} ${OS_SOURCES})
-add_library (nvim-test SHARED ${NEOVIM_SOURCES} ${OS_SOURCES})
+add_library (nvim-test MODULE ${NEOVIM_SOURCES} ${OS_SOURCES})
# The libraries we link against for nvim
set(NVIM_LINK_LIBRARIES m ${LibUV_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})