BUILD: Don't prepend directory onto path in the automake parser

Our automake paths are already absolute.
xoreos · Jan 23, 2017 · 8ed8aa6 · 8ed8aa6
1 parent 0ea027f
commit 8ed8aa6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -301,7 +301,7 @@ if(NOT GLEW_FOUND)
   message(STATUS "Using internal GLEW library")
 
   add_definitions(-DGLEW_STATIC)
-  set(GLEW_LIBRARIES glew_glew)
+  set(GLEW_LIBRARIES glew)
 
   add_definitions(-DXOREOS_INTERNAL_GLEW)
   set(INTERNAL_GLEW 1)
@@ -316,10 +316,10 @@ list(APPEND XOREOS_LIBRARIES ${GLEW_LIBRARIES})
 
 # use our own version of lua, as we will have to support the Witcher lua scripts
 parse_automake(lua/rules.mk)
-list(APPEND XOREOS_LIBRARIES lua_lua)
+list(APPEND XOREOS_LIBRARIES lua)
 
 parse_automake(toluapp/rules.mk)
-list(APPEND XOREOS_LIBRARIES toluapp_toluapp)
+list(APPEND XOREOS_LIBRARIES toluapp)
 
 
 # -------------------------------------------------------------------------

diff --git a/cmake/CMakeAM.cmake b/cmake/CMakeAM.cmake
@@ -33,7 +33,7 @@ endfunction()
 
 
 function(am_target_name AM_FOLDER AM_FILE_NAME AM_OUTPUT)
-  get_filename_component(AM_FULLPATH  "${AM_FOLDER}/${AM_FILE_NAME}" ABSOLUTE)
+  get_filename_component(AM_FULLPATH  "${AM_FILE_NAME}" ABSOLUTE)
   get_filename_component(AM_FOLDER    "${AM_FULLPATH}" PATH)
   get_filename_component(AM_FOLDER    "${AM_FOLDER}"   NAME)
   get_filename_component(AM_FILE_NAME "${AM_FULLPATH}" NAME_WE)