From 0ddedab9c6185028661dcaaac9f6fbca4c9e93fc Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 12 Jun 2011 18:27:29 +0000 Subject: work in progress cmake commit: - cmake now builds all files that automake does but does NOT link yet - inlcudes nasty hard coded paths and libs (will replace once linking works) (bzr r10272) --- src/bind/CMakeLists.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/bind') diff --git a/src/bind/CMakeLists.txt b/src/bind/CMakeLists.txt index a6b5b6883..08b7876c2 100644 --- a/src/bind/CMakeLists.txt +++ b/src/bind/CMakeLists.txt @@ -1,7 +1,6 @@ -SET(bind_SRC -dobinding.cpp -javabind.cpp +set(bind_SRC + dobinding.cpp + javabind.cpp ) -ADD_LIBRARY(bind STATIC ${bind_SRC}) -TARGET_LINK_LIBRARIES(bind -${INKSCAPE_LIBS}) \ No newline at end of file +add_library(bind STATIC ${bind_SRC}) +target_link_libraries(bind ${INKSCAPE_LIBS}) -- cgit v1.2.3 From de03354959190a2c5392d79e03dd22dc45777e41 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 12 Jun 2011 21:27:00 +0000 Subject: cmake: give all libs a _LIB suffix, workaround 'debug' being confused with cake keyword, and also dont mix up dor names with libs. (bzr r10274) --- src/bind/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/bind') diff --git a/src/bind/CMakeLists.txt b/src/bind/CMakeLists.txt index 08b7876c2..71bf0b602 100644 --- a/src/bind/CMakeLists.txt +++ b/src/bind/CMakeLists.txt @@ -2,5 +2,5 @@ set(bind_SRC dobinding.cpp javabind.cpp ) -add_library(bind STATIC ${bind_SRC}) -target_link_libraries(bind ${INKSCAPE_LIBS}) +add_library(bind_LIB STATIC ${bind_SRC}) +target_link_libraries(bind_LIB ${INKSCAPE_LIBS}) -- cgit v1.2.3 From 7172735786c43c2305a92ffd4e5d285d11f88f7f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 13 Jun 2011 00:19:17 +0000 Subject: cmake: turns out my recent commits (which I undid) were not incorrect, variables were set in subdirectories then used in the parent directory, where they were still unset. Fixing this broke the build because some files in the subdir were not compiling. (bzr r10276) --- src/bind/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/bind') diff --git a/src/bind/CMakeLists.txt b/src/bind/CMakeLists.txt index 71bf0b602..d0f7c7ca0 100644 --- a/src/bind/CMakeLists.txt +++ b/src/bind/CMakeLists.txt @@ -1,6 +1,7 @@ + set(bind_SRC dobinding.cpp javabind.cpp ) -add_library(bind_LIB STATIC ${bind_SRC}) -target_link_libraries(bind_LIB ${INKSCAPE_LIBS}) + +add_library(bind_LIB ${bind_SRC}) -- cgit v1.2.3 From 2c5f1ac093f8d674dae8fc1cae88862d02468356 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 13 Jun 2011 02:33:03 +0000 Subject: cmake: now builds without having most of the source listed in 1 file. (bzr r10278) --- src/bind/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/bind') diff --git a/src/bind/CMakeLists.txt b/src/bind/CMakeLists.txt index d0f7c7ca0..8a98e20a3 100644 --- a/src/bind/CMakeLists.txt +++ b/src/bind/CMakeLists.txt @@ -4,4 +4,5 @@ set(bind_SRC javabind.cpp ) -add_library(bind_LIB ${bind_SRC}) +# add_library(bind_LIB ${bind_SRC}) +add_inkscape_source("${bind_SRC}") -- cgit v1.2.3 From b7a4f23ed217a36eaaefe8f707bcc1b968d1e562 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 13 Jun 2011 05:39:42 +0000 Subject: cmake: - group source/headers per library (for some IDE's) - include headers with source listing (also for IDE's) - remove unneeded Find modules (bzr r10281) --- src/bind/CMakeLists.txt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/bind') diff --git a/src/bind/CMakeLists.txt b/src/bind/CMakeLists.txt index 8a98e20a3..9b6abad4f 100644 --- a/src/bind/CMakeLists.txt +++ b/src/bind/CMakeLists.txt @@ -2,7 +2,17 @@ set(bind_SRC dobinding.cpp javabind.cpp + + + # ------- + # Headers + javabind-private.h + javabind.h + javainc/jni.h + javainc/linux/jni_md.h + javainc/solaris/jni_md.h + javainc/win32/jni_md.h ) -# add_library(bind_LIB ${bind_SRC}) +# add_inkscape_lib(bind_LIB "${bind_SRC}") add_inkscape_source("${bind_SRC}") -- cgit v1.2.3