mirror of
https://github.com/arcan1s/moldyn.git
synced 2026-11-21 10:49:29 +00:00
Reorganization
This commit is contained in:
1 parent
e0017f8ebf
commit
d50eaeada6
187 files changed
+64
-53
No files matched your search
+10
-31
@@ -1,32 +1,11 @@
|
|||||||
cmake_minimum_required (VERSION 2.8)
|
set (COMPS mathmech
|
||||||
|
mm_agl
|
||||||
|
mm_envir
|
||||||
|
mm_radf
|
||||||
|
mm_statgen
|
||||||
|
mm_trj
|
||||||
|
mm_trj2pdb)
|
||||||
|
|
||||||
cmake_policy(SET CMP0003 OLD)
|
foreach (COMP ${COMPS})
|
||||||
cmake_policy(SET CMP0011 NEW)
|
add_subdirectory (${COMP})
|
||||||
cmake_policy(SET CMP0015 NEW)
|
endforeach()
|
||||||
|
|
||||||
# set project name
|
|
||||||
set (PROJECT mathmech)
|
|
||||||
# set additional cmake file
|
|
||||||
include (${PROJECT}.cmake)
|
|
||||||
|
|
||||||
|
|
||||||
# additional options
|
|
||||||
OPTION (WITH_DEBUG_MODE "Build with debug mode" OFF)
|
|
||||||
OPTION (ADD_INCLUDE "Add include files" OFF)
|
|
||||||
|
|
||||||
# set libraries
|
|
||||||
set (LIBRARIES)
|
|
||||||
foreach (LIBRARY ${LIBRARIES})
|
|
||||||
find_library ("${LIBRARY}_FOUND" ${LIBRARY})
|
|
||||||
message (STATUS "Check the ${LIBRARY} is installed: " ${${LIBRARY}_FOUND})
|
|
||||||
if ("${${LIBRARY}_FOUND}" STREQUAL "${LIBRARY}_FOUND-NOTFOUND")
|
|
||||||
message (STATUS "Adding library sources")
|
|
||||||
add_subdirectory (../${LIBRARY} lib/${LIBRARY})
|
|
||||||
endif ()
|
|
||||||
endforeach ()
|
|
||||||
|
|
||||||
# additional targets
|
|
||||||
set (TARGETS "")
|
|
||||||
set (HEADERS "")
|
|
||||||
|
|
||||||
add_subdirectory (${${PROJECT}_SOURCE_DIR})
|
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
cmake_minimum_required (VERSION 2.8)
|
||||||
|
|
||||||
|
cmake_policy(SET CMP0003 OLD)
|
||||||
|
cmake_policy(SET CMP0011 NEW)
|
||||||
|
cmake_policy(SET CMP0015 NEW)
|
||||||
|
|
||||||
|
# set project name
|
||||||
|
set (PROJECT mathmech)
|
||||||
|
# set additional cmake file
|
||||||
|
include (${PROJECT}.cmake)
|
||||||
|
|
||||||
|
|
||||||
|
# additional options
|
||||||
|
OPTION (WITH_DEBUG_MODE "Build with debug mode" OFF)
|
||||||
|
OPTION (ADD_INCLUDE "Add include files" OFF)
|
||||||
|
|
||||||
|
# set libraries
|
||||||
|
set (LIBRARIES)
|
||||||
|
foreach (LIBRARY ${LIBRARIES})
|
||||||
|
find_library ("${LIBRARY}_FOUND" ${LIBRARY})
|
||||||
|
message (STATUS "Check the ${LIBRARY} is installed: " ${${LIBRARY}_FOUND})
|
||||||
|
if ("${${LIBRARY}_FOUND}" STREQUAL "${LIBRARY}_FOUND-NOTFOUND")
|
||||||
|
message (STATUS "Adding library sources")
|
||||||
|
add_subdirectory (../${LIBRARY} lib/${LIBRARY})
|
||||||
|
endif ()
|
||||||
|
endforeach ()
|
||||||
|
|
||||||
|
# additional targets
|
||||||
|
set (TARGETS "")
|
||||||
|
set (HEADERS "")
|
||||||
|
|
||||||
|
add_subdirectory (${PROJECT_SOURCE_DIR})
|
||||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,15 +1,15 @@
|
|||||||
# set directories
|
# set directories
|
||||||
set (${PROJECT}_BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bin)
|
set (PROJECT_BINARY_DIR bin)
|
||||||
set (${PROJECT}_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
|
set (PROJECT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
|
||||||
set (${PROJECT}_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
|
set (PROJECT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
|
||||||
set (${PROJECT}_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib)
|
set (PROJECT_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib)
|
||||||
set (${PROJECT}_RESOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/resources)
|
set (PROJECT_RESOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/resources)
|
||||||
set (${PROJECT}_TRANSLATION_DIR ${${PROJECT}_RESOURCE_DIR}/translations)
|
set (PROJECT_TRANSLATION_DIR ${PROJECT_RESOURCE_DIR}/translations)
|
||||||
|
|
||||||
# library path
|
# library path
|
||||||
link_directories (${${PROJECT}_LIB_DIR})
|
link_directories (${PROJECT_LIB_DIR})
|
||||||
# executable path
|
# executable path
|
||||||
set (EXECUTABLE_OUTPUT_PATH ${${PROJECT}_BINARY_DIR})
|
set (EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
|
||||||
|
|
||||||
# verbose
|
# verbose
|
||||||
set (CMAKE_VERBOSE_MAKEFILE ON)
|
set (CMAKE_VERBOSE_MAKEFILE ON)
|
||||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,9 +1,9 @@
|
|||||||
set ("${PROJECT}_VERSION_MAJOR" 1)
|
set (PROJECT_VERSION_MAJOR 1)
|
||||||
set ("${PROJECT}_VERSION_MINOR" 0)
|
set (PROJECT_VERSION_MINOR 0)
|
||||||
set ("${PROJECT}_VERSION_PATCH" 0)
|
set (PROJECT_VERSION_PATCH 0)
|
||||||
set ("${PROJECT}_VERSION" ${${PROJECT}_VERSION_MAJOR}.${${PROJECT}_VERSION_MINOR}.${${PROJECT}_VERSION_PATCH})
|
set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
|
||||||
|
|
||||||
message (STATUS "${PROJECT}: Version ${${PROJECT}_VERSION}")
|
message (STATUS "${PROJECT}: Version ${PROJECT_VERSION}")
|
||||||
|
|
||||||
# set files
|
# set files
|
||||||
file (GLOB SOURCES *.cpp)
|
file (GLOB SOURCES *.cpp)
|
||||||
@@ -18,7 +18,7 @@ endif()
|
|||||||
set (LANGUAGES
|
set (LANGUAGES
|
||||||
eng
|
eng
|
||||||
rus)
|
rus)
|
||||||
set (RESOURCES ${${PROJECT}_RESOURCE_DIR}/resources.qrc)
|
set (RESOURCES ${PROJECT_RESOURCE_DIR}/resources.qrc)
|
||||||
|
|
||||||
message (STATUS "SOURCES: ${SOURCES}")
|
message (STATUS "SOURCES: ${SOURCES}")
|
||||||
message (STATUS "HEADERS: ${HEADERS}")
|
message (STATUS "HEADERS: ${HEADERS}")
|
||||||
@@ -28,8 +28,8 @@ message (STATUS "FORMS: ${FORMS}")
|
|||||||
# compile
|
# compile
|
||||||
project (${PROJECT})
|
project (${PROJECT})
|
||||||
# include_path
|
# include_path
|
||||||
include_directories (${${PROJECT}_INCLUDE_DIR}/${PROJECT}
|
include_directories (${PROJECT_INCLUDE_DIR}/${PROJECT}
|
||||||
${${PROJECT}_SOURCE_DIR}
|
${PROJECT_SOURCE_DIR}
|
||||||
${CMAKE_CURRENT_BINARY_DIR})
|
${CMAKE_CURRENT_BINARY_DIR})
|
||||||
|
|
||||||
find_package (Qt4 REQUIRED)
|
find_package (Qt4 REQUIRED)
|
||||||
@@ -38,8 +38,8 @@ qt4_add_resources (QRC_SOURCES ${RESOURCES})
|
|||||||
qt4_wrap_cpp (MOC_SOURCES ${HEADERS})
|
qt4_wrap_cpp (MOC_SOURCES ${HEADERS})
|
||||||
qt4_wrap_ui (UI_HEADERS ${FORMS})
|
qt4_wrap_ui (UI_HEADERS ${FORMS})
|
||||||
foreach (LANGUAGE ${LANGUAGES})
|
foreach (LANGUAGE ${LANGUAGES})
|
||||||
set (TS ${${PROJECT}_TRANSLATION_DIR}/${LANGUAGE}.ts)
|
set (TS ${PROJECT_TRANSLATION_DIR}/${LANGUAGE}.ts)
|
||||||
set (QM ${${PROJECT}_TRANSLATION_DIR}/${LANGUAGE}.qm)
|
set (QM ${PROJECT_TRANSLATION_DIR}/${LANGUAGE}.qm)
|
||||||
set (TRANSLATIONS ${TRANSLATIONS} ${TS})
|
set (TRANSLATIONS ${TRANSLATIONS} ${TS})
|
||||||
set (TRANSLATIONS_BINARY ${TRANSLATIONS_BINARY} ${QM})
|
set (TRANSLATIONS_BINARY ${TRANSLATIONS_BINARY} ${QM})
|
||||||
add_custom_command (
|
add_custom_command (
|
||||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE QtCreatorProject>
|
<!DOCTYPE QtCreatorProject>
|
||||||
<!-- Written by QtCreator 2.8.0, 2013-08-24T21:49:26. -->
|
<!-- Written by QtCreator 2.8.0, 2013-08-24T21:55:08. -->
|
||||||
<qtcreator>
|
<qtcreator>
|
||||||
<data>
|
<data>
|
||||||
<variable>ProjectExplorer.Project.ActiveTarget</variable>
|
<variable>ProjectExplorer.Project.ActiveTarget</variable>
|
||||||
@@ -233,8 +233,8 @@
|
|||||||
<value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value>
|
<value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value>
|
||||||
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
|
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
|
||||||
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
|
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
|
||||||
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
|
<value type="bool" key="RunConfiguration.UseCppDebugger">true</value>
|
||||||
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
|
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">false</value>
|
||||||
<value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
|
<value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
|
||||||
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
|
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
|
||||||
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
|
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
|
||||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loaded 100 of 187 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user