From 7dd1561a883a28ffa275e1a097bd82853b4cc6f8 Mon Sep 17 00:00:00 2001 From: Tycho Bickerstaff Date: Wed, 18 Dec 2013 23:54:55 +0000 Subject: fixed bindings generation --- lib/tolua++/CMakeLists.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 lib/tolua++/CMakeLists.txt (limited to 'lib/tolua++/CMakeLists.txt') diff --git a/lib/tolua++/CMakeLists.txt b/lib/tolua++/CMakeLists.txt new file mode 100644 index 000000000..2b071108c --- /dev/null +++ b/lib/tolua++/CMakeLists.txt @@ -0,0 +1,17 @@ + +cmake_minimum_required (VERSION 2.6) +project (tolua++) + +include_directories ("${PROJECT_SOURCE_DIR}/../../src/") +include_directories ("${PROJECT_SOURCE_DIR}/include/") +include_directories ("${PROJECT_SOURCE_DIR}/../") + +file(GLOB SOURCE + "src/bin/*.c" + "src/lib/*.c" +) + +add_executable(tolua ${SOURCE}) + +#m is the standard math librarys +target_link_libraries(tolua lua m) -- cgit v1.2.3 From e2549dfcb295b5c68ad540c71442d1524adb3d0f Mon Sep 17 00:00:00 2001 From: Tycho Bickerstaff Date: Thu, 19 Dec 2013 00:52:52 +0000 Subject: added expat as lua bindings dependincy --- lib/tolua++/CMakeLists.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'lib/tolua++/CMakeLists.txt') diff --git a/lib/tolua++/CMakeLists.txt b/lib/tolua++/CMakeLists.txt index 2b071108c..877b89076 100644 --- a/lib/tolua++/CMakeLists.txt +++ b/lib/tolua++/CMakeLists.txt @@ -6,12 +6,16 @@ include_directories ("${PROJECT_SOURCE_DIR}/../../src/") include_directories ("${PROJECT_SOURCE_DIR}/include/") include_directories ("${PROJECT_SOURCE_DIR}/../") -file(GLOB SOURCE +file(GLOB LIB_SOURCE + "src/lib/*.c" +) + +file(GLOB BIN_SOURCE "src/bin/*.c" - "src/lib/*.c" ) -add_executable(tolua ${SOURCE}) +add_executable(tolua ${BIN_SOURCE}) +add_library(tolualib ${LIB_SOURCE}) #m is the standard math librarys -target_link_libraries(tolua lua m) +target_link_libraries(tolua lua m tolualib) -- cgit v1.2.3 From c7d766bbcc2594e9925c47d9a00141c0cff594c1 Mon Sep 17 00:00:00 2001 From: tycho Date: Fri, 20 Dec 2013 00:22:06 +0000 Subject: fixed compile errors with headers and math library --- lib/tolua++/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/tolua++/CMakeLists.txt') diff --git a/lib/tolua++/CMakeLists.txt b/lib/tolua++/CMakeLists.txt index 877b89076..9a84c05b2 100644 --- a/lib/tolua++/CMakeLists.txt +++ b/lib/tolua++/CMakeLists.txt @@ -18,4 +18,8 @@ add_executable(tolua ${BIN_SOURCE}) add_library(tolualib ${LIB_SOURCE}) #m is the standard math librarys -target_link_libraries(tolua lua m tolualib) +if(UNIX) +target_link_libraries(m) +endif() + +target_link_libraries(tolua lua tolualib) -- cgit v1.2.3 From 0836e5e6602f3101660e7653d7796be7f8f5bd80 Mon Sep 17 00:00:00 2001 From: Tycho Bickerstaff Date: Fri, 20 Dec 2013 13:21:58 +0000 Subject: fixed bad reference to math library --- lib/tolua++/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/tolua++/CMakeLists.txt') diff --git a/lib/tolua++/CMakeLists.txt b/lib/tolua++/CMakeLists.txt index 9a84c05b2..b27e9f67b 100644 --- a/lib/tolua++/CMakeLists.txt +++ b/lib/tolua++/CMakeLists.txt @@ -19,7 +19,8 @@ add_library(tolualib ${LIB_SOURCE}) #m is the standard math librarys if(UNIX) -target_link_libraries(m) +find_library(M_LIB m) +target_link_libraries(${M_LIB}) endif() target_link_libraries(tolua lua tolualib) -- cgit v1.2.3 From c2167d7ed73c96c7e8cb935074ba860e11c821f9 Mon Sep 17 00:00:00 2001 From: Tycho Bickerstaff Date: Fri, 20 Dec 2013 13:27:38 +0000 Subject: fixed bad reference to math library --- lib/tolua++/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/tolua++/CMakeLists.txt') diff --git a/lib/tolua++/CMakeLists.txt b/lib/tolua++/CMakeLists.txt index b27e9f67b..637e44d8e 100644 --- a/lib/tolua++/CMakeLists.txt +++ b/lib/tolua++/CMakeLists.txt @@ -19,8 +19,8 @@ add_library(tolualib ${LIB_SOURCE}) #m is the standard math librarys if(UNIX) -find_library(M_LIB m) -target_link_libraries(${M_LIB}) +add_library(math STATIC IMPORTED) +target_link_libraries(tolua math) endif() target_link_libraries(tolua lua tolualib) -- cgit v1.2.3 From efaabb16dfe1219f2e51727b5bfac5bba17af78c Mon Sep 17 00:00:00 2001 From: Tycho Bickerstaff Date: Fri, 20 Dec 2013 13:50:41 +0000 Subject: Revert "fixed bad reference to math library" This reverts commit c2167d7ed73c96c7e8cb935074ba860e11c821f9. --- lib/tolua++/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/tolua++/CMakeLists.txt') diff --git a/lib/tolua++/CMakeLists.txt b/lib/tolua++/CMakeLists.txt index 637e44d8e..b27e9f67b 100644 --- a/lib/tolua++/CMakeLists.txt +++ b/lib/tolua++/CMakeLists.txt @@ -19,8 +19,8 @@ add_library(tolualib ${LIB_SOURCE}) #m is the standard math librarys if(UNIX) -add_library(math STATIC IMPORTED) -target_link_libraries(tolua math) +find_library(M_LIB m) +target_link_libraries(${M_LIB}) endif() target_link_libraries(tolua lua tolualib) -- cgit v1.2.3 From bc2d23550c21c940e86a5329867bc79f29b42f70 Mon Sep 17 00:00:00 2001 From: Tycho Bickerstaff Date: Fri, 20 Dec 2013 13:51:33 +0000 Subject: Revert "fixed bad reference to math library" This reverts commit 0836e5e6602f3101660e7653d7796be7f8f5bd80. --- lib/tolua++/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib/tolua++/CMakeLists.txt') diff --git a/lib/tolua++/CMakeLists.txt b/lib/tolua++/CMakeLists.txt index b27e9f67b..9a84c05b2 100644 --- a/lib/tolua++/CMakeLists.txt +++ b/lib/tolua++/CMakeLists.txt @@ -19,8 +19,7 @@ add_library(tolualib ${LIB_SOURCE}) #m is the standard math librarys if(UNIX) -find_library(M_LIB m) -target_link_libraries(${M_LIB}) +target_link_libraries(m) endif() target_link_libraries(tolua lua tolualib) -- cgit v1.2.3 From fda983fcb4dd42fede5c0b26d1e61d27751cc8b9 Mon Sep 17 00:00:00 2001 From: Tycho Bickerstaff Date: Fri, 20 Dec 2013 14:03:40 +0000 Subject: possable fix of typo --- lib/tolua++/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tolua++/CMakeLists.txt') diff --git a/lib/tolua++/CMakeLists.txt b/lib/tolua++/CMakeLists.txt index 9a84c05b2..239232c38 100644 --- a/lib/tolua++/CMakeLists.txt +++ b/lib/tolua++/CMakeLists.txt @@ -19,7 +19,7 @@ add_library(tolualib ${LIB_SOURCE}) #m is the standard math librarys if(UNIX) -target_link_libraries(m) +target_link_libraries(tolua m) endif() target_link_libraries(tolua lua tolualib) -- cgit v1.2.3