cmake fix

cockatrice/CMakeLists.txt

@@ -70,7 +70,7 @@ SET(cockatrice_SOURCES
  src/localclient.cpp 
  src/priceupdater.cpp 
  src/soundengine.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/../common/version_string.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/version_string.cpp
 )
 SET(cockatrice_HEADERS
  src/abstractcounter.h 
@@ -188,6 +188,7 @@ INCLUDE(${QT_USE_FILE})
 INCLUDE_DIRECTORIES(../common)
 INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../common)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 INCLUDE_DIRECTORIES(${QT_MOBILITY_INCLUDE_DIR})
 INCLUDE_DIRECTORIES(${QT_MOBILITY_MULTIMEDIAKIT_INCLUDE_DIR})
 
@@ -201,3 +202,8 @@ if (NOT WIN32 AND NOT APPLE)
 	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cockatrice.desktop DESTINATION share/applications)
 ENDIF(NOT WIN32 AND NOT APPLE)
 
+add_custom_command(
+	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version_string.cpp ${CMAKE_CURRENT_BINARY_DIR}/version_string.h
+	COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/../common/getversion.cmake
+)
+

common/CMakeLists.txt

@@ -46,9 +46,3 @@ add_subdirectory(pb)
 add_library(cockatrice_common ${common_SOURCES} ${common_HEADERS_MOC})
 target_link_libraries(cockatrice_common cockatrice_protocol)
 
-add_custom_target(versionheader ALL DEPENDS version_header)
-add_custom_command(
-	OUTPUT version_header ${CMAKE_CURRENT_BINARY_DIR}/versionheader.h
-	COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/getversion.cmake
-)
-

servatrice/CMakeLists.txt

@@ -9,7 +9,7 @@ SET(servatrice_SOURCES
  src/server_logger.cpp 
  src/serversocketinterface.cpp 
  src/serversocketthread.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/../common/version_string.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/version_string.cpp
 )
 SET(servatrice_HEADERS
  src/servatrice.h 
@@ -39,3 +39,10 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../common)
 
 ADD_EXECUTABLE(servatrice ${servatrice_SOURCES} ${servatrice_HEADERS_MOC})
 TARGET_LINK_LIBRARIES(servatrice cockatrice_common ${QT_LIBRARIES} ${PROTOBUF_LIBRARIES} ${LIBGCRYPT_LIBRARY})
+
+#add_custom_target(versionheader ALL DEPENDS version_header)
+add_custom_command(
+	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version_string.h ${CMAKE_CURRENT_BINARY_DIR}/version_string.cpp
+	COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/../common/getversion.cmake
+)
+