another cmake fix for macOS -_-

gmum · Jul 24, 2015 · 4d3c7b3 · 4d3c7b3
1 parent 839b797
commit 4d3c7b3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,6 +17,7 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 add_definitions(-DNDEBUG -DNDEBUG_GMUM -DNDEBUG_GMUM_2 -DRCPP_INTERFACE -DARMA_64BIT_WORD)
 include_directories(${GMUM_INCLUDE} ${R_INCLUDE_DIR})
+link_directories(${R_LIB_DIRS})
 
 add_subdirectory(${SRC_DIR})
 add_subdirectory(${TESTS_DIR})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -11,8 +11,6 @@ file(GLOB GMUMR_SOURCES
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${R_LD_FLAGS}") 
 set(CMAKE_CXX_FLAGS "${R_CXX_FLAGS} -std=c++0x")
 
-link_directories(${R_LIB_DIRS})
-
 if(APPLE)
     set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
 endif()

diff --git a/tests/cpp/CMakeLists.txt b/tests/cpp/CMakeLists.txt
@@ -6,6 +6,7 @@ file (GLOB TEST_SOURCES
     "${TESTS_DIR}/gng/*.cpp"
     "${TESTS_DIR}/svm/*.cpp")
 
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${R_LD_FLAGS}")
 set(CMAKE_CXX_FLAGS "${R_CXX_FLAGS} -std=c++0x")
 add_definitions(-DTEST_DATA_PATH="${TEST_DATA_PATH}")
 add_executable(gmumr_tests ${TEST_SOURCES})