Merge pull request #48 from paulsapps/master

Arrange projects in VS "folders", add placeholder installer project

CMakeLists.txt

@@ -9,6 +9,9 @@ set(QGears_VERSION_MAJOR 0)
 set(QGears_VERSION_MINOR 22)
 set(QGears_VERSION_PATCH 0)
 
+# Enable Visual Studio solution "folders"
+SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON) 
+
 #if (APPLE)
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
 #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
@@ -66,12 +69,12 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
   )
 endif()
 
-find_package( ZLIB REQUIRED )
-
+#find_package(Qt4 REQUIRED)
+find_package(ZLIB REQUIRED)
 find_package(OGRE REQUIRED)
-
 find_package(OIS REQUIRED)
 
+
 if(NOT OIS_FOUND)
         message(SEND_ERROR "Failed to find OIS.")
 endif()
@@ -325,5 +328,13 @@ elseif(UNIX)
 
 endif()
 
+SET_PROPERTY(TARGET liblua PROPERTY FOLDER "3rdparty")
+SET_PROPERTY(TARGET buildvm PROPERTY FOLDER "3rdparty")
+SET_PROPERTY(TARGET LuaBind PROPERTY FOLDER "3rdparty")
+SET_PROPERTY(TARGET luajit PROPERTY FOLDER "3rdparty")
+SET_PROPERTY(TARGET minilua PROPERTY FOLDER "3rdparty")
+SET_PROPERTY(TARGET TinyXml PROPERTY FOLDER "3rdparty")
+
+
 INCLUDE(CPack)
 #End of install instructions

PlugIns/Data/CMakeLists.txt

@@ -77,6 +77,7 @@ add_library(DataPlugin MODULE
   ${HEADER_FILES}
   ${SOURCE_FILES}
 )
+SET_PROPERTY(TARGET DataPlugin PROPERTY FOLDER "q-gears")
 
 set_target_properties(DataPlugin PROPERTIES
   PREFIX ${PLUGIN_PREFIX}

QGearsMain/CMakeLists.txt

@@ -324,17 +324,18 @@ add_library(QGearsMain STATIC
   ${HEADER_FILES}
   ${SOURCE_FILES}
 )
+SET_PROPERTY(TARGET QGearsMain PROPERTY FOLDER "q-gears")
 
 add_executable(q-gears
   src/Main.cpp
 )
+SET_PROPERTY(TARGET q-gears PROPERTY FOLDER "q-gears")
 
 
 if (APPLE)
 target_link_libraries(q-gears "-framework CoreFoundation -framework Cocoa -framework IOKit")
 endif()
 
-
 if( WIN32 AND NOT (CMAKE_BUILD_TYPE MATCHES "Debug") )
     set_target_properties( q-gears PROPERTIES WIN32_EXECUTABLE ON )
 	if (MSVC)

SupportedGames/FinalFantasy7/CMakeLists.txt

@@ -29,6 +29,7 @@ add_library(FinalFantasy7 STATIC
   ${HEADER_FILES}
   ${SOURCE_FILES}
 )
+SET_PROPERTY(TARGET FinalFantasy7 PROPERTY FOLDER "q-gears")
 
 set(LIBRARIES
     ${OGRE_LIBRARIES}

Tests/FinalFantasy7/CMakeLists.txt

@@ -15,6 +15,9 @@ set(LIBRARIES
 add_executable(TestFF7FLevelFileSerializer
     src/test_FF7FLevelFileSerializer
 )
+SET_PROPERTY(TARGET TestFF7FLevelFileSerializer PROPERTY FOLDER "tests")
+
+
 target_link_libraries(TestFF7FLevelFileSerializer ${LIBRARIES})
 add_test(TestFF7FLevelFileSerializer TestFF7FLevelFileSerializer)
 
@@ -22,6 +25,9 @@ add_test(TestFF7FLevelFileSerializer TestFF7FLevelFileSerializer)
 add_executable(TestFF7ModelListFileSerializer
     src/test_FF7ModelListFileSerializer.cpp
 )
+SET_PROPERTY(TARGET TestFF7ModelListFileSerializer PROPERTY FOLDER "tests")
+
+
 target_link_libraries(TestFF7ModelListFileSerializer ${LIBRARIES})
 add_test(TestFF7ModelListFileSerializer TestFF7ModelListFileSerializer)
 
@@ -29,5 +35,7 @@ add_test(TestFF7ModelListFileSerializer TestFF7ModelListFileSerializer)
 add_executable(TestFF7WalkmeshFileSerializer
     src/test_FF7WalkmeshFileSerializer.cpp
 )
+SET_PROPERTY(TARGET TestFF7WalkmeshFileSerializer PROPERTY FOLDER "tests")
+
 target_link_libraries(TestFF7WalkmeshFileSerializer ${LIBRARIES})
 add_test(TestFF7WalkmeshFileSerializer TestFF7WalkmeshFileSerializer)

Tests/QGearsMain/CMakeLists.txt

@@ -13,6 +13,8 @@ set(LIBRARIES
 add_executable(TestQGearsAFileSerializer
     src/test_QGearsAFileSerializer.cpp
 )
+SET_PROPERTY(TARGET TestQGearsAFileSerializer PROPERTY FOLDER "tests")
+
 target_link_libraries(TestQGearsAFileSerializer ${LIBRARIES})
 add_test(TestQGearsAFileSerializer TestQGearsAFileSerializer)
 
@@ -20,6 +22,8 @@ add_test(TestQGearsAFileSerializer TestQGearsAFileSerializer)
 add_executable(TestQGearsMapFileXMLSerializer
     src/test_QGearsMapFileXMLSerializer.cpp
 )
+SET_PROPERTY(TARGET TestQGearsMapFileXMLSerializer PROPERTY FOLDER "tests")
+
 target_link_libraries(TestQGearsMapFileXMLSerializer ${LIBRARIES})
 add_test(TestQGearsMapFileXMLSerializer TestQGearsMapFileXMLSerializer)
 
@@ -27,6 +31,8 @@ add_test(TestQGearsMapFileXMLSerializer TestQGearsMapFileXMLSerializer)
 add_executable(TestQGearsWalkmeshFileXMLSerializer
     src/test_QGearsWalkmeshFileXMLSerializer.cpp
 )
+SET_PROPERTY(TARGET TestQGearsWalkmeshFileXMLSerializer PROPERTY FOLDER "tests")
+
 target_link_libraries(TestQGearsWalkmeshFileXMLSerializer ${LIBRARIES})
 add_test(TestQGearsWalkmeshFileXMLSerializer TestQGearsWalkmeshFileXMLSerializer)
 
@@ -34,6 +40,8 @@ add_test(TestQGearsWalkmeshFileXMLSerializer TestQGearsWalkmeshFileXMLSerializer
 add_executable(TestQGearsLGPArchive
     src/test_QGearsLGPArchive.cpp
 )
+SET_PROPERTY(TARGET TestQGearsLGPArchive PROPERTY FOLDER "tests")
+
 target_link_libraries(TestQGearsLGPArchive ${LIBRARIES})
 add_test(TestQGearsLGPArchive TestQGearsLGPArchive)
 
@@ -41,6 +49,8 @@ add_test(TestQGearsLGPArchive TestQGearsLGPArchive)
 add_executable(TestMapSerializer
     src/test_MapSerializer.cpp
 )
+SET_PROPERTY(TARGET TestMapSerializer PROPERTY FOLDER "tests")
+
 target_link_libraries(TestMapSerializer ${LIBRARIES})
 add_test(TestMapSerializer TestMapSerializer)
 
@@ -48,6 +58,9 @@ add_test(TestMapSerializer TestMapSerializer)
 add_executable(TestTxzSerializer
     src/test_TxzSerializer.cpp
 )
+SET_PROPERTY(TARGET TestTxzSerializer PROPERTY FOLDER "tests")
+
+
 target_link_libraries(TestTxzSerializer ${LIBRARIES})
 add_test(TestTxzSerializer TestTxzSerializer)
 

dependencies/CMakeLists.txt

@@ -9,6 +9,8 @@ include_directories(
 add_subdirectory(tinyxml)
 add_subdirectory(luajit)
 
+
+
  aux_source_directory( luabind/luabind LuaBind_header_FILES )
  aux_source_directory( luabind/luabind/details LuaBind_header_details_FILES )		
  aux_source_directory( luabind/src LuaBind_src_FILES )		

utilities/CMakeLists.txt

@@ -45,6 +45,7 @@ target_link_libraries(Utility
     ${OIS_LIBRARIES}
     ${ZLIB_LIBRARIES}
 )
+SET_PROPERTY(TARGET Utility PROPERTY FOLDER "utilities")
 
 add_subdirectory(ffix_model_exporter)
 add_subdirectory(ffix_script_dumper)
@@ -58,6 +59,7 @@ add_subdirectory(ffvii_font_exporter)
 add_subdirectory(ffvii_sound_dumper)
 add_subdirectory(ffvii_sound_dumper_psf)
 add_subdirectory(flevel)
+add_subdirectory(installer)
 add_subdirectory(lzs)
 add_subdirectory(xeno_cd_extract)
 add_subdirectory(xeno_model_exporter)

utilities/ffix_model_exporter/CMakeLists.txt

@@ -24,6 +24,7 @@ add_executable(ff9_model_exporter
   ${HEADER_FILES}
   ${SOURCE_FILES}
 )
+SET_PROPERTY(TARGET ff9_model_exporter PROPERTY FOLDER "utilities")
 
 if (APPLE)
 target_link_libraries(ff9_model_exporter "-framework CoreFoundation -framework Cocoa -framework IOKit")

utilities/ffix_script_dumper/CMakeLists.txt

@@ -22,6 +22,7 @@ add_executable(ff9_script_dumper
   ${HEADER_FILES}
   ${SOURCE_FILES}
 )
+SET_PROPERTY(TARGET ff9_script_dumper PROPERTY FOLDER "utilities")
 
 if(WIN32)
   set_target_properties(ff9_script_dumper PROPERTIES WIN32_EXECUTABLE ON)

utilities/ffix_sound_dumper/CMakeLists.txt

@@ -28,6 +28,7 @@ add_executable(ff9_sound_dumper
   ${HEADER_FILES}
   ${SOURCE_FILES}
 )
+SET_PROPERTY(TARGET ff9_sound_dumper PROPERTY FOLDER "utilities")
 
 if (APPLE)
 target_link_libraries(ff9_sound_dumper "-framework CoreFoundation -framework Cocoa -framework IOKit")

utilities/ffvii_battle_model_exporter/CMakeLists.txt

@@ -31,6 +31,7 @@ add_executable(ff7_battle_model_exporter
   ${HEADER_FILES}
   ${SOURCE_FILES}
 )
+SET_PROPERTY(TARGET ff7_battle_model_exporter PROPERTY FOLDER "utilities")
 
 if (APPLE)
 target_link_libraries(ff7_battle_model_exporter "-framework CoreFoundation -framework Cocoa -framework IOKit")

utilities/ffvii_battle_scene_dumper/CMakeLists.txt

@@ -24,6 +24,7 @@ add_executable(ff7_battle_scene_dumper
   ${HEADER_FILES}
   ${SOURCE_FILES}
 )
+SET_PROPERTY(TARGET ff7_battle_scene_dumper PROPERTY FOLDER "utilities")
 
 if (APPLE)
 target_link_libraries(ff7_battle_scene_dumper "-framework CoreFoundation -framework Cocoa -framework IOKit")

utilities/ffvii_field_dat_dumper/CMakeLists.txt

@@ -21,6 +21,7 @@ add_executable(ff7_field_dat_dumper
   ${HEADER_FILES}
   ${SOURCE_FILES}
 )
+SET_PROPERTY(TARGET ff7_field_dat_dumper PROPERTY FOLDER "utilities")
 
 if (APPLE)
 target_link_libraries(ff7_field_dat_dumper "-framework CoreFoundation -framework Cocoa -framework IOKit")

utilities/ffvii_field_model_exporter/CMakeLists.txt

@@ -35,6 +35,7 @@ add_executable(ff7_field_model_exporter
   ${HEADER_FILES}
   ${SOURCE_FILES}
 )
+SET_PROPERTY(TARGET ff7_field_model_exporter PROPERTY FOLDER "utilities")
 
 if (APPLE)
 target_link_libraries(ff7_field_model_exporter "-framework CoreFoundation -framework Cocoa -framework IOKit")

utilities/ffvii_field_model_exporter_pc/CMakeLists.txt

@@ -19,6 +19,7 @@ add_executable(ff7_field_model_exporter_pc
   ${HEADER_FILES}
   ${SOURCE_FILES}
 )
+SET_PROPERTY(TARGET ff7_field_model_exporter_pc PROPERTY FOLDER "utilities")
 
 if (APPLE)
 target_link_libraries(ff7_field_model_exporter_pc "-framework CoreFoundation -framework Cocoa -framework IOKit")

utilities/ffvii_font_exporter/CMakeLists.txt

@@ -20,6 +20,7 @@ add_executable(ff7_font_exporter
   ${HEADER_FILES}
   ${SOURCE_FILES}
 )
+SET_PROPERTY(TARGET ff7_font_exporter PROPERTY FOLDER "utilities")
 
 if(WIN32)
   set_target_properties(ff7_font_exporter PROPERTIES WIN32_EXECUTABLE ON)

utilities/ffvii_sound_dumper/CMakeLists.txt

@@ -26,6 +26,7 @@ add_executable(ff7_sound_dumper
   ${HEADER_FILES}
   ${SOURCE_FILES}
 )
+SET_PROPERTY(TARGET ff7_sound_dumper PROPERTY FOLDER "utilities")
 
 if (APPLE)
 target_link_libraries(ff7_sound_dumper "-framework CoreFoundation -framework Cocoa -framework IOKit")

utilities/ffvii_sound_dumper_psf/CMakeLists.txt

@@ -60,6 +60,7 @@ add_executable(ff7_sound_dumper_psf
   ${HEADER_FILES}
   ${SOURCE_FILES}
 )
+SET_PROPERTY(TARGET ff7_sound_dumper_psf PROPERTY FOLDER "utilities")
 
 if(WIN32)
   set_target_properties(ff7_sound_dumper_psf PROPERTIES WIN32_EXECUTABLE ON)

utilities/flevel/CMakeLists.txt

@@ -18,6 +18,7 @@ add_executable(flevel
   ${HEADER_FILES}
   ${SOURCE_FILES}
 )
+SET_PROPERTY(TARGET flevel PROPERTY FOLDER "utilities")
 
 if(WIN32)
   set_target_properties(flevel PROPERTIES WIN32_EXECUTABLE ON)

utilities/installer/CMakeLists.txt

@@ -0,0 +1,42 @@
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+)
+
+# define header and source files
+set(HEADER_FILES
+
+)
+set(SOURCE_FILES
+    src/Main.cpp
+)
+
+add_definitions(
+    -DQGEARS_ADD_MANAGERS
+)
+
+add_executable(installer
+  ${HEADER_FILES}
+  ${SOURCE_FILES}
+)
+SET_PROPERTY(TARGET installer PROPERTY FOLDER "utilities")
+
+if (APPLE)
+target_link_libraries(installer "-framework CoreFoundation -framework Cocoa -framework IOKit")
+endif()
+
+if(WIN32)
+  set_target_properties(installer PROPERTIES WIN32_EXECUTABLE ON)
+  if (MSVC)
+    set_target_properties(installer PROPERTIES LINK_FLAGS "/SUBSYSTEM:CONSOLE")
+  endif()
+endif()
+
+set(LIBRARIES
+    Utility
+)
+
+target_link_libraries(installer    ${LIBRARIES})
+
+install(TARGETS installer
+    DESTINATION .
+)

utilities/installer/src/Main.cpp

@@ -0,0 +1,8 @@
+#include <Ogre.h>
+#include "../../common/OgreBase.h"
+#include "../../common/Logger.h"
+
+int main( int argc, char *argv[] )
+{
+    return 0;
+}

utilities/lzs/CMakeLists.txt

@@ -18,6 +18,7 @@ add_executable(lzs
   ${HEADER_FILES}
   ${SOURCE_FILES}
 )
+SET_PROPERTY(TARGET lzs PROPERTY FOLDER "utilities")
 
 if(WIN32)
   set_target_properties(lzs PROPERTIES WIN32_EXECUTABLE ON)

utilities/xeno_cd_extract/CMakeLists.txt

@@ -18,6 +18,7 @@ add_executable(xeno_cd_extract
   ${HEADER_FILES}
   ${SOURCE_FILES}
 )
+SET_PROPERTY(TARGET xeno_cd_extract PROPERTY FOLDER "utilities")
 
 if(WIN32)
   set_target_properties(xeno_cd_extract PROPERTIES WIN32_EXECUTABLE ON)

utilities/xeno_model_exporter/CMakeLists.txt

@@ -31,6 +31,7 @@ add_executable(xeno_model_exporter
   ${HEADER_FILES}
   ${SOURCE_FILES}
 )
+SET_PROPERTY(TARGET xeno_model_exporter PROPERTY FOLDER "utilities")
 
 if (APPLE)
 target_link_libraries(xeno_model_exporter "-framework CoreFoundation -framework Cocoa -framework IOKit")

utilities/xeno_script_dumper/CMakeLists.txt

@@ -53,6 +53,7 @@ add_executable(xeno_script_dumper
   ${HEADER_FILES}
   ${SOURCE_FILES}
 )
+SET_PROPERTY(TARGET xeno_script_dumper PROPERTY FOLDER "utilities")
 
 if(WIN32)
   set_target_properties(xeno_script_dumper PROPERTIES WIN32_EXECUTABLE ON)

utilities/xeno_sound_dumper/CMakeLists.txt

@@ -26,6 +26,7 @@ add_executable(xeno_sound_dumper
   ${HEADER_FILES}
   ${SOURCE_FILES}
 )
+SET_PROPERTY(TARGET xeno_sound_dumper PROPERTY FOLDER "utilities")
 
 if (APPLE)
 target_link_libraries(xeno_sound_dumper "-framework CoreFoundation -framework Cocoa -framework IOKit")

utilities/xeno_walkmesh_exporter/CMakeLists.txt

@@ -83,6 +83,7 @@ add_executable(xeno_walkmesh_exporter
   ${HEADER_FILES}
   ${SOURCE_FILES}
 )
+SET_PROPERTY(TARGET xeno_walkmesh_exporter PROPERTY FOLDER "utilities")
 
 if (APPLE)
 target_link_libraries(xeno_walkmesh_exporter "-framework CoreFoundation -framework Cocoa -framework IOKit")