Skip to content

Commit

Permalink
CMAKE: Updated correct targets outputpath.
Browse files Browse the repository at this point in the history
  • Loading branch information
kjetilly committed Mar 3, 2014
1 parent 6ee186a commit 4b14dde
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 17 deletions.
13 changes: 4 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -243,14 +243,9 @@ SET(CPACK_PACKAGE_VENDOR "SINTEF ICT")

SET(CPACK_PACKAGE_VERSION ${version_number} )

# Only on multiple configuration systems like MSVC and nmake,
# we get all configurations included in one targets file,
# otherwise we use one target file for each configuration
IF(CMAKE_CONFIGURATION_TYPES)
SET(TINIA_TARGETS_APPEND "")
ELSE()
SET(TINIA_TARGETS_APPEND ${CMAKE_BUILD_TYPE})
ENDIF()

SET(TINIA_TARGETS_APPEND "")


# This is for local build directory:
IF(Tinia_DESKTOP)
Expand Down Expand Up @@ -302,7 +297,7 @@ install(FILES

# Install the export set for use with the install-tree
install(EXPORT TiniaTargets DESTINATION
"${INSTALL_CMAKE_DIR}/TiniaTargets${TINIA_TARGETS_APPEND}.cmake" COMPONENT tinia_dev)
"${INSTALL_CMAKE_DIR}/" COMPONENT tinia_dev)

IF(NOT WIN32)
SET( CPACK_GENERATOR "DEB" )
Expand Down
11 changes: 3 additions & 8 deletions TiniaConfig.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,9 @@ IF( Tinia_FIND_COMPONENTS )
ENDFOREACH()
ENDIF()

# Only multiple configuration systems like MSVC and nmake,
# we get all configurations included in one targets file,
# otherwise we use one target file for each configuration
IF(CMAKE_CONFIGURATION_TYPES)
SET(TINIA_TARGETS_APPEND "")
ELSE()
SET(TINIA_TARGETS_APPEND ${CMAKE_BUILD_TYPE})
ENDIF()

SET(TINIA_TARGETS_APPEND "")


# - Config file for the Tinia package
# It defines the following variables
Expand Down

0 comments on commit 4b14dde

Please sign in to comment.