Skip to content

Commit

Permalink
cmake cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
alex-w committed Oct 20, 2015
1 parent 2653d5e commit 945f65f
Show file tree
Hide file tree
Showing 53 changed files with 1,258 additions and 1,207 deletions.
272 changes: 136 additions & 136 deletions CMakeLists.txt

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions plugins/AngleMeasure/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ ADD_DEFINITIONS(-DANGLEMEASURE_VERSION="${ANGLEMEASURE_VERSION}")
ADD_SUBDIRECTORY( src )

IF(APPLE)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/Library/Application\ Support/Stellarium)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/Library/Application\ Support/Stellarium)
ElSE(APPLE)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/.stellarium)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/.stellarium)
ENDIF(APPLE)
INSTALL(FILES DESTINATION "modules/AngleMeasure")
10 changes: 5 additions & 5 deletions plugins/AngleMeasure/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ INCLUDE_DIRECTORIES(. gui)
LINK_DIRECTORIES(${BUILD_DIR}/src)

SET(AngleMeasure_SRCS
AngleMeasure.hpp
AngleMeasure.cpp
gui/AngleMeasureDialog.hpp
gui/AngleMeasureDialog.cpp
AngleMeasure.hpp
AngleMeasure.cpp
gui/AngleMeasureDialog.hpp
gui/AngleMeasureDialog.cpp
)

SET(AngleMeasure_UIS
gui/angleMeasureDialog.ui
gui/angleMeasureDialog.ui
)

QT5_WRAP_UI(AngleMeasure_UIS_H ${AngleMeasure_UIS})
Expand Down
4 changes: 2 additions & 2 deletions plugins/ArchaeoLines/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ ADD_DEFINITIONS(-DARCHAEOLINES_VERSION="${ARCHAEOLINES_VERSION}")
ADD_SUBDIRECTORY( src )

IF(APPLE)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/Library/Application\ Support/Stellarium)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/Library/Application\ Support/Stellarium)
ElSE(APPLE)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/.stellarium)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/.stellarium)
ENDIF(APPLE)
INSTALL(FILES DESTINATION "modules/ArchaeoLines")
10 changes: 5 additions & 5 deletions plugins/ArchaeoLines/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ INCLUDE_DIRECTORIES(. gui)
LINK_DIRECTORIES(${BUILD_DIR}/src)

SET(ArchaeoLines_SRCS
ArchaeoLines.hpp
ArchaeoLines.cpp
gui/ArchaeoLinesDialog.hpp
gui/ArchaeoLinesDialog.cpp
ArchaeoLines.hpp
ArchaeoLines.cpp
gui/ArchaeoLinesDialog.hpp
gui/ArchaeoLinesDialog.cpp
)

SET(ArchaeoLines_UIS
gui/archaeoLinesDialog.ui
gui/archaeoLinesDialog.ui
)

QT5_WRAP_UI(ArchaeoLines_UIS_H ${ArchaeoLines_UIS})
Expand Down
10 changes: 5 additions & 5 deletions plugins/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
IF(WIN32)
SET(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} "-Wl,--enable-runtime-pseudo-reloc")
SET(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} "-Wl,--enable-runtime-pseudo-reloc")
ENDIF()

ADD_DEFINITIONS(-DQT_PLUGIN)
ADD_DEFINITIONS(-DQT_DLL)
ADD_DEFINITIONS(-D_REENTRANT)

FOREACH(NAME ${STELLARIUM_PLUGINS})
STRING(TOUPPER ${NAME} NAME_UP)
IF(USE_PLUGIN_${NAME_UP})
ADD_SUBDIRECTORY(${NAME})
ENDIF()
STRING(TOUPPER ${NAME} NAME_UP)
IF(USE_PLUGIN_${NAME_UP})
ADD_SUBDIRECTORY(${NAME})
ENDIF()
ENDFOREACH()

4 changes: 2 additions & 2 deletions plugins/CompassMarks/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ ADD_DEFINITIONS(-DCOMPASSMARKS_VERSION="${COMPASSMARKS_VERSION}")
ADD_SUBDIRECTORY( src )

IF(APPLE)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/Library/Application\ Support/Stellarium)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/Library/Application\ Support/Stellarium)
ElSE(APPLE)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/.stellarium)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/.stellarium)
ENDIF(APPLE)
INSTALL(FILES DESTINATION "modules/CompassMarks")
5 changes: 3 additions & 2 deletions plugins/CompassMarks/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ INCLUDE_DIRECTORIES(.)
LINK_DIRECTORIES(${BUILD_DIR}/src)

SET(CompassMarks_SRCS
CompassMarks.hpp
CompassMarks.cpp)
CompassMarks.hpp
CompassMarks.cpp
)

SET(CompassMarks_RES ../CompassMarks.qrc)
QT5_ADD_RESOURCES(CompassMarks_RES_CXX ${CompassMarks_RES})
Expand Down
4 changes: 2 additions & 2 deletions plugins/EquationOfTime/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ SET(EQUATIONOFTIME_PATCH "2")
SET(EQUATIONOFTIME_VERSION "${EQUATIONOFTIME_MAJOR}.${EQUATIONOFTIME_MINOR}.${EQUATIONOFTIME_PATCH}")

IF(APPLE)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/Library/Application\ Support/Stellarium)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/Library/Application\ Support/Stellarium)
ElSE(APPLE)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/.stellarium)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/.stellarium)
ENDIF(APPLE)

ADD_DEFINITIONS(-DEQUATIONOFTIME_PLUGIN_VERSION="${EQUATIONOFTIME_VERSION}")
Expand Down
22 changes: 12 additions & 10 deletions plugins/EquationOfTime/src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
INCLUDE_DIRECTORIES(
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/plugins/EquationOfTime/src
${CMAKE_BINARY_DIR}/plugins/EquationOfTime/src/gui
. gui)
.
gui
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/plugins/EquationOfTime/src
${CMAKE_BINARY_DIR}/plugins/EquationOfTime/src/gui
)

LINK_DIRECTORIES(${BUILD_DIR}/src)

SET(EQUATIONOFTIME_SRCS
EquationOfTime.hpp
EquationOfTime.cpp
gui/EquationOfTimeWindow.hpp
gui/EquationOfTimeWindow.cpp
)
EquationOfTime.hpp
EquationOfTime.cpp
gui/EquationOfTimeWindow.hpp
gui/EquationOfTimeWindow.cpp
)

SET(EQUATIONOFTIME_UIS
gui/equationOfTimeWindow.ui
gui/equationOfTimeWindow.ui
)

QT5_WRAP_UI(EQUATIONOFTIME_UIS_H ${EQUATIONOFTIME_UIS})
Expand Down
4 changes: 2 additions & 2 deletions plugins/Exoplanets/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ SET(EXOPLANETS_PLUGIN_PATCH "4")
SET(EXOPLANETS_VERSION "${EXOPLANETS_PLUGIN_MAJOR}.${EXOPLANETS_PLUGIN_MINOR}.${EXOPLANETS_PLUGIN_PATCH}")

IF(APPLE)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/Library/Application\ Support/Stellarium)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/Library/Application\ Support/Stellarium)
ELSE(APPLE)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/.stellarium)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/.stellarium)
ENDIF(APPLE)

ADD_DEFINITIONS(-DEXOPLANETS_PLUGIN_VERSION="${EXOPLANETS_VERSION}")
Expand Down
22 changes: 11 additions & 11 deletions plugins/Exoplanets/src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
INCLUDE_DIRECTORIES(
.
gui
${CMAKE_BINARY_DIR}/plugins/Exoplanets/src
${CMAKE_BINARY_DIR}/plugins/Exoplanets/src/gui
.
gui
${CMAKE_BINARY_DIR}/plugins/Exoplanets/src
${CMAKE_BINARY_DIR}/plugins/Exoplanets/src/gui
)

LINK_DIRECTORIES(${BUILD_DIR}/src)

SET(Exoplanets_SRCS
Exoplanets.hpp
Exoplanets.cpp
Exoplanet.hpp
Exoplanet.cpp
gui/ExoplanetsDialog.hpp
gui/ExoplanetsDialog.cpp
Exoplanets.hpp
Exoplanets.cpp
Exoplanet.hpp
Exoplanet.cpp
gui/ExoplanetsDialog.hpp
gui/ExoplanetsDialog.cpp
)

SET(ExoplanetsDialog_UIS
gui/exoplanetsDialog.ui
gui/exoplanetsDialog.ui
)
QT5_WRAP_UI(ExoplanetsDialog_UIS_H ${ExoplanetsDialog_UIS})

Expand Down
4 changes: 2 additions & 2 deletions plugins/FOV/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ SET(FOV_PATCH "0")
SET(FOV_VERSION "${FOV_MAJOR}.${FOV_MINOR}.${FOV_PATCH}")

IF(APPLE)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/Library/Application\ Support/Stellarium)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/Library/Application\ Support/Stellarium)
ElSE(APPLE)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/.stellarium)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/.stellarium)
ENDIF(APPLE)

ADD_DEFINITIONS(-DFOV_VERSION="${FOV_VERSION}")
Expand Down
22 changes: 12 additions & 10 deletions plugins/FOV/src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@

INCLUDE_DIRECTORIES(
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/plugins/FOV/src
${CMAKE_BINARY_DIR}/plugins/FOV/src/gui
. gui)
.
gui
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/plugins/FOV/src
${CMAKE_BINARY_DIR}/plugins/FOV/src/gui
)

LINK_DIRECTORIES(${BUILD_DIR}/src)

SET(FOV_SRCS
FOV.hpp
FOV.cpp
gui/FOVWindow.hpp
gui/FOVWindow.cpp
)
FOV.hpp
FOV.cpp
gui/FOVWindow.hpp
gui/FOVWindow.cpp
)

SET(FOV_UIS
gui/fovWindow.ui
gui/fovWindow.ui
)

QT5_WRAP_UI(FOV_UIS_H ${FOV_UIS})
Expand Down
4 changes: 2 additions & 2 deletions plugins/HelloStelModule/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ SET(HELLOSTELMODULE_VERSION "0.1.0")
ADD_SUBDIRECTORY( src )

IF(APPLE)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/Library/Application\ Support/Stellarium)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/Library/Application\ Support/Stellarium)
ElSE(APPLE)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/.stellarium)
SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/.stellarium)
ENDIF(APPLE)
INSTALL(FILES DESTINATION "modules/HelloStelModule")
5 changes: 3 additions & 2 deletions plugins/HelloStelModule/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ INCLUDE_DIRECTORIES(.)
LINK_DIRECTORIES(${BUILD_DIR}/src)

SET(HelloStelModule_SRCS
HelloStelModule.hpp
HelloStelModule.cpp)
HelloStelModule.hpp
HelloStelModule.cpp
)


SET(extLinkerOption ${OPENGL_LIBRARIES})
Expand Down
Loading

0 comments on commit 945f65f

Please sign in to comment.