Better organize installation folder, this also should save the user from manually setting library paths etc.

src/CMakeLists.txt

@@ -461,10 +461,11 @@ add_definitions(${COMPILER_FLAGS})
 
 add_library(crown SHARED ${CROWN_SOURCES} ${CROWN_HEADERS})
 
+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}:$ORIGIN")
 add_executable(${CROWN_EXECUTABLE_NAME} ${CROWN_MAIN_SRC})
 target_link_libraries(${CROWN_EXECUTABLE_NAME} crown)
 
-install (TARGETS crown DESTINATION lib/${CMAKE_PROJECT_NAME})
+install (TARGETS crown DESTINATION bin)
 install (TARGETS ${CROWN_EXECUTABLE_NAME} DESTINATION bin)
 
 #install (FILES ${HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME})

third/ARMv7/CMakeLists.txt

@@ -1,17 +1,16 @@
 cmake_minimum_required(VERSION 2.8)
 
-# must be revised
-install (FILES 	luajit/include/luajit-2.0/lua.hpp
-				luajit/include/luajit-2.0/lauxlib.h
-				luajit/include/luajit-2.0/lua.h
-				luajit/include/luajit-2.0/luaconf.h
-				luajit/include/luajit-2.0/luajit.h
-				luajit/include/luajit-2.0/lualib.h DESTINATION include/crown/luajit)
+#install (FILES 	luajit/include/luajit-2.0/lua.hpp
+#				luajit/include/luajit-2.0/lauxlib.h
+#				luajit/include/luajit-2.0/lua.h
+#				luajit/include/luajit-2.0/luaconf.h
+#				luajit/include/luajit-2.0/luajit.h
+#				luajit/include/luajit-2.0/lualib.h DESTINATION include/crown/luajit)
 				
-install (DIRECTORY luajit/lib/pkgconfig DESTINATION lib/crown)
-install (FILES luajit/lib/libluajit-5.1.so.2.0.2 
-			   luajit/lib/libluajit-5.1.so.2.0.1 DESTINATION lib/crown)
+#install (DIRECTORY luajit/lib/pkgconfig DESTINATION lib/crown)
+install (FILES luajit/lib/libluajit-5.1.so.2.0.1 
+			   luajit/lib/libluajit-5.1.so.2 DESTINATION bin)
 
-install (PROGRAMS luajit/bin/luajit-2.0.1 DESTINATION bin)
-install (FILES luajit/bin/luajit DESTINATION bin)
-install (DIRECTORY luajit/share/luajit-2.0.1/jit DESTINATION bin)
+install (PROGRAMS luajit/bin/luajit-2.0.1 DESTINATION tools)
+install (FILES luajit/bin/luajit DESTINATION tools)
+install (DIRECTORY luajit/share/luajit-2.0.1/jit DESTINATION tools)

third/win64/CMakeLists.txt

@@ -1,19 +1,18 @@
 cmake_minimum_required(VERSION 2.8)
 
-install (FILES 	luajit/include/luajit-2.0/lua.hpp
-				luajit/include/luajit-2.0/lauxlib.h
-				luajit/include/luajit-2.0/lua.h
-				luajit/include/luajit-2.0/luaconf.h
-				luajit/include/luajit-2.0/luajit.h
-				luajit/include/luajit-2.0/lualib.h DESTINATION include/crown/luajit)
+#install (FILES 	luajit/include/luajit-2.0/lua.hpp
+#				luajit/include/luajit-2.0/lauxlib.h
+#				luajit/include/luajit-2.0/lua.h
+#				luajit/include/luajit-2.0/luaconf.h
+#				luajit/include/luajit-2.0/luajit.h
+#				luajit/include/luajit-2.0/lualib.h DESTINATION include/crown/luajit)
 				
-install (FILES luajit/lib/lua51.dll DESTINATION lib/crown)
 if (WINDOWS)
-install (FILES luajit/lib/lua51.dll DESTINATION bin)
-# HACK !!!
-# Don't know why, but crown-win.exe need this...
-install (FILES luajit/lib/luajit-5.1.dll DESTINATION bin)	
+	install (FILES luajit/lib/lua51.dll DESTINATION bin)
+	# HACK !!!
+	# Don't know why, but crown-win.exe need this...
+	install (FILES luajit/lib/luajit-5.1.dll DESTINATION bin)	
 endif (WINDOWS)
 
-install (PROGRAMS luajit/bin/luajit.exe DESTINATION bin)
-install (DIRECTORY luajit/share/luajit-2.0.1/jit DESTINATION bin)
+install (PROGRAMS luajit/bin/luajit.exe DESTINATION tools)
+install (DIRECTORY luajit/share/luajit-2.0.1/jit DESTINATION tools)

third/x86/CMakeLists.txt

@@ -1,16 +1,16 @@
 cmake_minimum_required(VERSION 2.8)
 
-install (FILES 	luajit/include/luajit-2.0/lua.hpp
-				luajit/include/luajit-2.0/lauxlib.h
-				luajit/include/luajit-2.0/lua.h
-				luajit/include/luajit-2.0/luaconf.h
-				luajit/include/luajit-2.0/luajit.h
-				luajit/include/luajit-2.0/lualib.h DESTINATION include/crown/luajit)
+#install (FILES 	luajit/include/luajit-2.0/lua.hpp
+#				luajit/include/luajit-2.0/lauxlib.h
+#				luajit/include/luajit-2.0/lua.h
+#				luajit/include/luajit-2.0/luaconf.h
+#				luajit/include/luajit-2.0/luajit.h
+#				luajit/include/luajit-2.0/lualib.h DESTINATION include/crown/luajit)
 				
-install (DIRECTORY luajit/lib/pkgconfig DESTINATION lib/crown)
+#install (DIRECTORY luajit/lib/pkgconfig DESTINATION lib/crown)
 install (FILES luajit/lib/libluajit-5.1.so.2.0.1 
-			   luajit/lib/libluajit-5.1.so.2 DESTINATION lib/crown)
+			   luajit/lib/libluajit-5.1.so.2 DESTINATION bin)
 
-install (PROGRAMS luajit/bin/luajit-2.0.1 DESTINATION bin)
-install (FILES luajit/bin/luajit DESTINATION bin)
-install (DIRECTORY luajit/share/luajit-2.0.1/jit DESTINATION bin)
+install (PROGRAMS luajit/bin/luajit-2.0.1 DESTINATION tools)
+install (FILES luajit/bin/luajit DESTINATION tools)
+install (DIRECTORY luajit/share/luajit-2.0.1/jit DESTINATION tools)

third/x86_64/CMakeLists.txt

@@ -1,16 +1,16 @@
 cmake_minimum_required(VERSION 2.8)
 
-install (FILES 	luajit/include/luajit-2.0/lua.hpp
-				luajit/include/luajit-2.0/lauxlib.h
-				luajit/include/luajit-2.0/lua.h
-				luajit/include/luajit-2.0/luaconf.h
-				luajit/include/luajit-2.0/luajit.h
-				luajit/include/luajit-2.0/lualib.h DESTINATION include/crown/luajit)
+#install (FILES 	luajit/include/luajit-2.0/lua.hpp
+#				luajit/include/luajit-2.0/lauxlib.h
+#				luajit/include/luajit-2.0/lua.h
+#				luajit/include/luajit-2.0/luaconf.h
+#				luajit/include/luajit-2.0/luajit.h
+#				luajit/include/luajit-2.0/lualib.h DESTINATION include/crown/luajit)
 				
-install (DIRECTORY luajit/lib/pkgconfig DESTINATION lib/crown)
+#install (DIRECTORY luajit/lib/pkgconfig DESTINATION lib/crown)
 install (FILES luajit/lib/libluajit-5.1.so.2.0.1 
-			   luajit/lib/libluajit-5.1.so.2 DESTINATION lib/crown)
+			   luajit/lib/libluajit-5.1.so.2 DESTINATION bin)
 
-install (PROGRAMS luajit/bin/luajit-2.0.1 DESTINATION bin)
-install (FILES luajit/bin/luajit DESTINATION bin)
-install (DIRECTORY luajit/share/luajit-2.0.1/jit DESTINATION bin)
+install (PROGRAMS luajit/bin/luajit-2.0.1 DESTINATION tools)
+install (FILES luajit/bin/luajit DESTINATION tools)
+install (DIRECTORY luajit/share/luajit-2.0.1/jit DESTINATION tools)

tools/CMakeLists.txt

@@ -68,12 +68,13 @@ target_link_libraries(resource-hash crown-tools)
 add_executable(resource-compiler cli/resource-compiler.cpp)
 target_link_libraries(resource-compiler crown-tools)
 
-install (TARGETS crown-tools DESTINATION lib/${CMAKE_PROJECT_NAME})
+# Install tools
+install (TARGETS crown-tools DESTINATION tools)
 
-install (TARGETS resource-hash DESTINATION bin)
-install (TARGETS resource-compiler DESTINATION bin)
+install (TARGETS resource-hash DESTINATION tools)
+install (TARGETS resource-compiler DESTINATION tools)
 install (FILES cli/resource-compiler.py PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
-	GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION bin)
+	GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION tools)
 
 add_subdirectory(gui/resource-browser)
 add_subdirectory(gui/toolchain)

tools/gui/resource-browser/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 
 install (FILES resource-browser.py PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
-	GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION bin)
+	GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION tools)
 
-install (FILES ui/resource-browser.glade DESTINATION bin/ui)
+install (FILES ui/resource-browser.glade DESTINATION tools/ui)

tools/gui/toolchain/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 
 install (FILES toolchain.py PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
-	GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION bin)
+	GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION tools)
 
-install (FILES ui/toolchain.glade DESTINATION bin/ui)
+install (FILES ui/toolchain.glade DESTINATION tools/ui)

tools/pycrown/CMakeLists.txt

@@ -8,5 +8,5 @@ set (PYFILES
 	Compiler.py
 )
 
-install (FILES ${PYFILES} DESTINATION lib/pycrown)
+install (FILES ${PYFILES} DESTINATION tools/pycrown)