Skip to content

Commit

Permalink
Merge pull request #34 from rvlm/master
Browse files Browse the repository at this point in the history
Make repository usable as Git submodule
  • Loading branch information
WardF committed Apr 25, 2016
2 parents 884661d + 9a5ba5d commit d8d33a2
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion CMakeInstallation.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SET(CPACK_PACKAGE_VENDOR "Unidata")
# NOTE!! This list uses regular expressions, NOT wildcards!!
##
SET(CPACK_SOURCE_IGNORE_FILES "${CPACK_SOURCE_IGNORE_FILES}"
"${CMAKE_BINARY_DIR}/*"
"${CMAKE_CURRENT_BINARY_DIR}/*"
"/myhtml/*"
"/.svn/"
"my.*\\\\.sh"
Expand Down
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ IF(MSVC)
ENDIF()

#Add custom CMake Module
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/"
SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/"
CACHE INTERNAL "Location of our custom CMake modules.")

# auto-configure style checks, other CMake modules.
Expand Down Expand Up @@ -208,7 +208,7 @@ INCLUDE(CTest)
##
# Copy the CTest customization file into binary directory, as required.
##
FILE(COPY ${CMAKE_SOURCE_DIR}/CTestCustom.cmake DESTINATION ${CMAKE_BINARY_DIR})
FILE(COPY ${CMAKE_CURRENT_SOURCE_DIR}/CTestCustom.cmake DESTINATION ${CMAKE_CURRENT_BINARY_DIR})

##
# Set Memory test program for non-MSVC based builds.
Expand Down Expand Up @@ -279,8 +279,8 @@ IF(NCXX_ENABLE_TESTS)
ENDIF()

# Create a CTestConfig file from the template.
CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/CTestConfig.cmake.in"
"${CMAKE_SOURCE_DIR}/CTestConfig.cmake"
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/CTestConfig.cmake.in"
"${CMAKE_CURRENT_SOURCE_DIR}/CTestConfig.cmake"
@ONLY
)

Expand Down Expand Up @@ -465,7 +465,7 @@ ENDIF()
SET(host_cpu "${cpu}")
SET(host_vendor "${osname}")
SET(host_os "${osrel}")
SET(abs_top_builddir "${CMAKE_BINARY_DIR}")
SET(abs_top_builddir "${CMAKE_CURRENT_BINARY_DIR}")

SET(CC_VERSION "${CMAKE_C_COMPILER}")
SET(CXX_VERSION "${CMAKE_CXX_COMPILER}")
Expand Down
1 change: 1 addition & 0 deletions cxx4/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ IF(NCXX_ENABLE_TESTS)
ENDIF()

ADD_LIBRARY(netcdf-cxx4 ${CXX_SOURCES})
TARGET_INCLUDE_DIRECTORIES(netcdf-cxx4 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
TARGET_LINK_LIBRARIES(netcdf-cxx4 ${NETCDF_C_LIBRARY} ${EXTRA_DEPS})
SET_TARGET_PROPERTIES(netcdf-cxx4 PROPERTIES
VERSION ${NCXX_LIB_VERSION}
Expand Down
2 changes: 1 addition & 1 deletion docs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ IF(NCXX_ENABLE_DOXYGEN)
# Set some configuration variables so that they
# are redundant with autotools.
##
SET(abs_top_srcdir ${CMAKE_SOURCE_DIR})
SET(abs_top_srcdir ${CMAKE_CURRENT_SOURCE_DIR}/..)
SET(abs_builddir ${CMAKE_CURRENT_BINARY_DIR})

##
Expand Down

0 comments on commit d8d33a2

Please sign in to comment.