Updated CMake script for bin and lib

synfig · Mar 11, 2020 · 3130944 · 3130944
1 parent eaafbcb
commit 3130944
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -241,3 +241,9 @@ synfig-studio/doc
 /ETL/nbproject/
 /synfig-core/nbproject/
 /synfig-studio/nbproject/
+
+# ------------------------------------------------------------------------
+# CLion projects
+# ------------------------------------------------------------------------
+/.idea
+cmake-build-*
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,6 +2,10 @@ cmake_minimum_required(VERSION 2.8)
 
 project(synfig-studio)
 
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/lib)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/lib)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin)
+
 add_subdirectory(ETL)
 include_directories(ETL)
 include_directories(${PROJECT_BINARY_DIR}/ETL) # to find the generated etl_profile.h

diff --git a/synfig-core/src/modules/CMakeLists.txt b/synfig-core/src/modules/CMakeLists.txt
@@ -43,6 +43,9 @@ set(MODS_ENABLED
 #    mptr_mplayer # - "This code has vulnerabilities"
 )
 
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/lib/modules)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/lib/modules)
+
 ## Magick++ support
 option(WITH_MAGICPP "Enable Magic++ module (output format support)" OFF)
 option(WITHOUT_MAGICPP "Disable Magic++ module (output format support)" OFF)

diff --git a/synfig-core/src/synfig/CMakeLists.txt b/synfig-core/src/synfig/CMakeLists.txt
@@ -145,7 +145,7 @@ install(
 install(
     TARGETS synfig
     EXPORT synfig
-    LIBRARY DESTINATION lib
+    LIBRARY DESTINATION ${CMAKE_BINARY_DIR}/output/lib
 )
 
 export(

diff --git a/synfig-studio/src/synfigapp/CMakeLists.txt b/synfig-studio/src/synfigapp/CMakeLists.txt
@@ -27,5 +27,5 @@ include(vectorizer/CMakeLists.txt)
 
 install(
     TARGETS synfigapp
-    DESTINATION lib
+    DESTINATION ${CMAKE_BINARY_DIR}/output/lib
 )