Fixed RPATH for 64bits builds

Fixed tests paramters.
MichaelSB · Oct 14, 2015 · 69bb820 · 69bb820
1 parent 0439efc
commit 69bb820
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,9 +18,9 @@ ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 8)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
 if (APPLE)
   set(CMAKE_INSTALL_NAME_DIR "@rpath")
-  set(CMAKE_INSTALL_RPATH "@executable_path/../lib")
+  set(CMAKE_INSTALL_RPATH "@executable_path/../lib${LIB_SUFFIX}")
 else(UNIX)
-  set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib")
+  set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib${LIB_SUFFIX}")
 endif()
 
 SET(CMAKE_DEBUG_POSTFIX "d")
@@ -189,7 +189,7 @@ SET_TARGET_PROPERTIES ( luac PROPERTIES RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL
 
 ENABLE_TESTING()
 
-SET(TEST_PARAM -e_U=true)
+SET(TEST_PARAM -e"_U=true")
 
 ADD_TEST(NAME test_all 
          WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/test