From 6b8529544e7def8acb38ca80c01b4875ae313681 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Mon, 30 Jun 2014 21:00:06 +0200 Subject: Fixed tolua linking order. Ref.: #1044. --- lib/tolua++/CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lib/tolua++') diff --git a/lib/tolua++/CMakeLists.txt b/lib/tolua++/CMakeLists.txt index e68a0e15b..44a4f1c6f 100644 --- a/lib/tolua++/CMakeLists.txt +++ b/lib/tolua++/CMakeLists.txt @@ -44,8 +44,6 @@ file(GLOB BIN_SOURCE "src/bin/*.c" ) - - add_executable(tolua ${BIN_SOURCE}) add_library(tolualib ${LIB_SOURCE}) @@ -54,4 +52,4 @@ if(UNIX) target_link_libraries(tolua m ${DYNAMIC_LOADER}) endif() -target_link_libraries(tolua lua tolualib) +target_link_libraries(tolua tolualib lua) -- cgit v1.2.3 From 84272fb155d48f999441b7aaba9ca8b21584ad21 Mon Sep 17 00:00:00 2001 From: worktycho Date: Mon, 30 Jun 2014 22:21:07 +0100 Subject: Added dependecy of tolualib on lua --- lib/tolua++/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/tolua++') diff --git a/lib/tolua++/CMakeLists.txt b/lib/tolua++/CMakeLists.txt index 44a4f1c6f..56ffc0dc1 100644 --- a/lib/tolua++/CMakeLists.txt +++ b/lib/tolua++/CMakeLists.txt @@ -46,6 +46,7 @@ file(GLOB BIN_SOURCE add_executable(tolua ${BIN_SOURCE}) add_library(tolualib ${LIB_SOURCE}) +target_link_library(tolualib lua) #m is the standard math librarys if(UNIX) -- cgit v1.2.3 From 0fb236bfe46782dc4e7c5b76db7b7c25671e3d66 Mon Sep 17 00:00:00 2001 From: worktycho Date: Mon, 30 Jun 2014 22:21:22 +0100 Subject: typo --- lib/tolua++/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tolua++') diff --git a/lib/tolua++/CMakeLists.txt b/lib/tolua++/CMakeLists.txt index 56ffc0dc1..12054323b 100644 --- a/lib/tolua++/CMakeLists.txt +++ b/lib/tolua++/CMakeLists.txt @@ -46,7 +46,7 @@ file(GLOB BIN_SOURCE add_executable(tolua ${BIN_SOURCE}) add_library(tolualib ${LIB_SOURCE}) -target_link_library(tolualib lua) +target_link_libraries(tolualib lua) #m is the standard math librarys if(UNIX) -- cgit v1.2.3