Make NostalgiaStudio library a shared library

2017-06-30 18:00:10 -05:00 · 2017-06-30 18:00:10 -05:00 · 54f929a883
commit 54f929a883
parent f200472c4f
4 changed files with 10 additions and 11 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -22,6 +22,9 @@ add_definitions(
 	-Wsign-compare
 )

+set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib/nostalgia")
+set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+
 if (CMAKE_BUILD_TYPE STREQUAL "Release")
 	add_definitions(
 		-Werror
--- a/src/nostalgia/core/studio/CMakeLists.txt
+++ b/src/nostalgia/core/studio/CMakeLists.txt
@ -2,8 +2,7 @@ cmake_minimum_required(VERSION 2.8.11)

 if(WOMBAT_BUILD_TYPE STREQUAL "Native")
 	add_library(
-		NostalgiaCore-Studio
-		SHARED
+		NostalgiaCore-Studio SHARED
 			import_tilesheet_wizard.cpp
 			plugin.cpp
 	)
--- a/src/nostalgia/studio/lib/CMakeLists.txt
+++ b/src/nostalgia/studio/lib/CMakeLists.txt
@ -6,7 +6,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)

 add_library(
-	NostalgiaStudio
+	NostalgiaStudio SHARED
 		json_read.cpp
 		json_write.cpp
 		wizard.cpp
@ -15,12 +15,8 @@ add_library(
 		project.cpp
 )

-set_property(
-	TARGET
-		NostalgiaStudio
-	PROPERTY
-		POSITION_INDEPENDENT_CODE ON
-)
+install(TARGETS NostalgiaStudio
+        LIBRARY DESTINATION lib/nostalgia)

 target_link_libraries(
 	NostalgiaStudio
--- a/src/nostalgia/tools/lib/CMakeLists.txt
+++ b/src/nostalgia/tools/lib/CMakeLists.txt
@ -5,6 +5,7 @@ set(CMAKE_AUTOMOC ON)

 add_library(
 	NostalgiaTool
+	SHARED
 		tilesetimport.cpp
 )

@ -28,6 +29,6 @@ install(
 install(
 	TARGETS
 		NostalgiaTool
-	LIBRARY DESTINATION lib/ox
-	ARCHIVE DESTINATION lib/ox
+	LIBRARY DESTINATION lib/nostalgia
+	ARCHIVE DESTINATION lib/nostalgia
 )