Cmake: more fixs for C internal libs

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2631073621c4cbdd9343fb487356ad46e4b75a05..ba269df38b4dccf31ac05e0293c71b1eb61fa3ea 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 #Pretty colors\r
 SET(CMAKE_COLOR_MAKEFILE ON)\r
 #Choose verbosity level\r
-#SET(CMAKE_VERBOSE_MAKEFILE ON)\r
+SET(CMAKE_VERBOSE_MAKEFILE ON)\r
 \r
 # Probably best to move all these path things to a single file\r
 IF(WIN32)\r
@@ -29,7 +29,8 @@ SET(CMAKE_SKIP_RPATH:BOOL OFF)
 SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts)\r
 INCLUDE(ConfigCompileFlags)\r
 INCLUDE(ConfigInkscapeDepends)\r
-\r
+
+SET(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")\r
 INCLUDE_DIRECTORIES (src/ ${CMAKE_CURRENT_BINARY_DIR} )\r
 LINK_DIRECTORIES (src/)\r
 \r

diff --git a/src/libcola/CMakeLists.txt b/src/libcola/CMakeLists.txt
index 04005fde4828ca92cc7ca2ee4a324f5b76353b37..ffc3f481fb86229db9dd20d5f54da3302e0ea122 100644 (file)
--- a/src/libcola/CMakeLists.txt
+++ b/src/libcola/CMakeLists.txt
@@ -14,4 +14,4 @@ shortest_paths.h
 straightener.cpp\r
 straightener.h\r
 )\r
-ADD_LIBRARY(inklibcola STATIC ${libcola_SRC})
\ No newline at end of file
+ADD_LIBRARY(cola STATIC ${libcola_SRC})

diff --git a/src/libgdl/CMakeLists.txt b/src/libgdl/CMakeLists.txt
index a30d0966fe7c0e2ad47f0957365d945233178e46..5378e7e1ec6ff2060b8589e1d281063cac7a000e 100644 (file)
--- a/src/libgdl/CMakeLists.txt
+++ b/src/libgdl/CMakeLists.txt
@@ -1,3 +1,9 @@
+IF(WIN32)
+SET(GDL_WIN
+gdl-win32.c\r
+gdl-win32.h)
+ENDIF(WIN32)
+
 SET(libgdl_SRC\r
 gdl-dock.c\r
 gdl-dock.h\r
@@ -26,13 +32,11 @@ gdl-stock.h
 gdl-stock-icons.h\r
 gdl-switcher.c\r
 gdl-switcher.h\r
-gdl-tools.h\r
-gdl-win32.c\r
-gdl-win32.h\r
-libgdl.h\r
+gdl-tools.h\rlibgdl.h\r
 libgdlmarshal.c\r
 libgdlmarshal.h\r
 libgdltypebuiltins.c\r
 libgdltypebuiltins.h\r
+${GDL_WIN}
 )\r
 ADD_LIBRARY(gdl STATIC ${libgdl_SRC})

diff --git a/src/libnrtype/CMakeLists.txt b/src/libnrtype/CMakeLists.txt
index 9d83d28fb63685cd6a6b9f7f8ae7ec56c45d1aee..ba5c40ca598d1aedb214a3a51aa192f169a7b0d1 100644 (file)
--- a/src/libnrtype/CMakeLists.txt
+++ b/src/libnrtype/CMakeLists.txt
@@ -34,4 +34,4 @@ text-boundary.h
 TextWrapper.cpp\r
 TextWrapper.h\r
 )\r
-ADD_LIBRARY(inklibnrtype STATIC ${libnrtype_SRC})
\ No newline at end of file
+ADD_LIBRARY(nrtype STATIC ${libnrtype_SRC})

diff --git a/src/libvpsc/CMakeLists.txt b/src/libvpsc/CMakeLists.txt
new file mode 100644 (file)
index 0000000..23b6f84
--- /dev/null
+++ b/src/libvpsc/CMakeLists.txt
@@ -0,0 +1,11 @@
+SET(libvpsc_SRC\r
+block.cpp
+blocks.cpp
+constraint.cpp
+csolve_VPSC.cpp
+generate-constraints.cpp
+remove_rectangle_overlap.cpp
+solve_VPSC.cpp
+variable.cpp\r
+)\r
+ADD_LIBRARY(vpsc STATIC ${libvpsc_SRC})