Ver código fonte

Fix building of samples

Daniele Bartolini 12 anos atrás
pai
commit
d7f8f71b1b
2 arquivos alterados com 11 adições e 9 exclusões
  1. 5 3
      samples/lua/CMakeLists.txt
  2. 6 6
      samples/terrain/CMakeLists.txt

+ 5 - 3
samples/lua/CMakeLists.txt

@@ -5,8 +5,10 @@ set (SRC
 )
 
 add_definitions(-Wl,-E)
-add_library (game SHARED ${SRC})
-target_link_libraries(game crown crownlua)
+add_library (game-lua SHARED ${SRC})
+target_link_libraries(game-lua crown crownlua)
 
-install (TARGETS game DESTINATION bin/lua_sample)
+set_target_properties (game-lua PROPERTIES OUTPUT_NAME game)
+
+install (TARGETS game-lua DESTINATION samples/lua)
 

+ 6 - 6
samples/terrain/CMakeLists.txt

@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 2.8)
 
-project(sample-terrain)
-
 set (SRC
 	terrain_main.cpp
 	Terrain.cpp
@@ -11,9 +9,11 @@ set (HEADERS
 	Terrain.h
 )
 
-#add_library (game SHARED ${SRC} ${HEADERS})
-#target_link_libraries(game crown)
+add_library (game-terrain SHARED ${SRC} ${HEADERS})
+target_link_libraries(game-terrain crown)
+
+set_target_properties (game-terrain PROPERTIES OUTPUT_NAME game)
 
-#install (DIRECTORY terrain DESTINATION samples)
-#install (TARGETS game DESTINATION samples/terrain)
+install (DIRECTORY terrain DESTINATION samples)
+install (TARGETS game-terrain DESTINATION samples/terrain)