Simplify CMakeLists.txt

Author: klsruan

dependencies/CMakeLists.txt

@@ -2,38 +2,20 @@ cmake_minimum_required(VERSION 3.10)
 option(BUILD_SHARED_LIBS "Build Shared Libs" ON)
 
 # libpolyclipping
-project(clipper_wrap LANGUAGES CXX)
-
-set(CLIPPER_SRC
-    subprojects/libpolyclipping/clipper.cpp
-    clipper.wrap.cpp
-)
-set(CMAKE_INSTALL_LIBDIR ${CMAKE_SOURCE_DIR}/clipper_build)
-
-add_library(clipper_wrap SHARED ${CLIPPER_SRC})
-target_include_directories(clipper_wrap PUBLIC subprojects/libpolyclipping)
-target_compile_options(clipper_wrap PRIVATE -w -O3)
-
-if (NOT UNIX)
-    target_link_libraries(clipper_wrap PUBLIC -static)
-endif (UNIX)
+project(polyclipping LANGUAGES CXX)
+set(CLIPPER_SRC subprojects/libpolyclipping/clipper.cpp clipper.wrap.cpp)
+add_library(polyclipping SHARED ${CLIPPER_SRC})
+target_include_directories(polyclipping PUBLIC subprojects/libpolyclipping)
+target_compile_options(polyclipping PRIVATE -w -O3)
 
 # lodepng
-project(lodepng_wrap LANGUAGES C)
-
+project(lodepng LANGUAGES C)
 set(LODEPNG_SRC subprojects/lodepng/lodepng.c)
-set(CMAKE_INSTALL_LIBDIR ${CMAKE_SOURCE_DIR}/lodepng_build)
-
-add_library(lodepng_wrap SHARED ${LODEPNG_SRC})
-target_compile_options(lodepng_wrap PRIVATE -W -Wall -Wextra -ansi -pedantic -O3)
-
-if (NOT UNIX)
-    target_link_libraries(lodepng_wrap PUBLIC -static)
-endif (UNIX)
+add_library(lodepng SHARED ${LODEPNG_SRC})
+target_compile_options(lodepng PRIVATE -W -Wall -Wextra -ansi -pedantic -O3)
 
 # giflib
 project(giflib_wrap LANGUAGES C)
-
 set(GIFLIB_SRC
     subprojects/giflib/lib/dgif_lib.c
     subprojects/giflib/lib/egif_lib.c
@@ -43,26 +25,14 @@ set(GIFLIB_SRC
     subprojects/giflib/lib/gifalloc.c
     subprojects/giflib/lib/quantize.c
 )
-set(CMAKE_INSTALL_LIBDIR ${CMAKE_SOURCE_DIR}/giflib_build)
-
-add_library(giflib_wrap SHARED ${GIFLIB_SRC})
-target_compile_options(giflib_wrap PRIVATE -w -fno-builtin -g -c -W -Wreturn-type -Wcomment -O3)
+add_library(giflib SHARED ${GIFLIB_SRC})
+target_compile_options(giflib PRIVATE -w -fno-builtin -g -c -W -Wreturn-type -Wcomment -O3)
 
 if (NOT UNIX)
-    target_link_libraries(giflib_wrap PUBLIC -static)
+    target_link_libraries(polyclipping lodepng giflib PUBLIC -static)
 endif (UNIX)
 
-install(TARGETS clipper_wrap
-    RUNTIME DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-)
-
-install(TARGETS lodepng_wrap
-    RUNTIME DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-)
-
-install(TARGETS giflib_wrap
-    RUNTIME DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+install(TARGETS polyclipping lodepng giflib
+    RUNTIME DESTINATION "${CMAKE_SOURCE_DIR}"
+    LIBRARY DESTINATION "${CMAKE_SOURCE_DIR}"
 )

dependencies/build.sh

@@ -28,7 +28,7 @@ git clone https://github.com/libjpeg-turbo/libjpeg-turbo.git $sub/libjpeg-turbo
 git checkout 8162eddf041e0be26f5c671bb6528723c55fed9d
 
 cmake $pvd/dependencies -DCMAKE_CXX_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -G "Unix Makefiles" -B $bin
-cd $bin && make clipper_wrap && make lodepng_wrap && make giflib_wrap
+cd $bin && make polyclipping && make lodepng && make giflib
 
 cmake $pvd/dependencies/subprojects/libjpeg-turbo -DCMAKE_CXX_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -G "Unix Makefiles" -B $binj
 make -C $binj