-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #21 from Cosmoglobe/hotfix
Revert "Merge pull request #20 from Cosmoglobe/cleanup"
- Loading branch information
Showing
153 changed files
with
2,840 additions
and
371,169 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,60 +1,23 @@ | ||
| #--------------------------------------------------------------- | ||
| # Compiled python modules. | ||
| #--------------------------------------------------------------- | ||
| .Python | ||
| *.pyc | ||
| # Setuptools distribution folder. | ||
| /dist/ | ||
| /sdist/ | ||
| # Python egg metadata, regenerated from source files by setuptools. | ||
| eggs/ | ||
| .eggs/ | ||
| develop-eggs/ | ||
| *.egg-info/ | ||
| *.egg | ||
| # Python cache files | ||
| __pycache__/ | ||
| #--------------------------------------------------------------- | ||
| # CMake miscellaneous files | ||
| #--------------------------------------------------------------- | ||
| CMakeLists.txt.user | ||
| CMakeCache.txt | ||
| CMakeFiles | ||
| CMakeScripts | ||
| Testing | ||
| cmake_install.cmake | ||
| install_manifest.txt | ||
| compile_commands.json | ||
| CTestTestfile.cmake | ||
| _deps | ||
| build/ | ||
| downloads/ | ||
| lib/ | ||
| lib64/ | ||
| #--------------------------------------------------------------- | ||
| # Fortran compiled output | ||
| #--------------------------------------------------------------- | ||
| *.mod | ||
| *.o | ||
| *.optrpt | ||
| *.a | ||
| *.gitignore | ||
| *.pyc | ||
| *.swp | ||
| *.swo | ||
| *comm_like_sampler | ||
| *comm_like_tools | ||
| *comm_like_tools_mpi | ||
| *comm_process_resfiles | ||
| *commander | ||
| *.gitignore | ||
|
|
||
| #--------------------------------------------------------------- | ||
| # Editors | ||
| #--------------------------------------------------------------- | ||
| .vscode/ | ||
| .idea/ | ||
| # Vagrant | ||
| .vagrant/ | ||
| # Mac/OSX | ||
| .DS_Store | ||
| # Windows | ||
| Thumbs.db | ||
| CMakeLists.txt.user | ||
| CMakeCache.txt | ||
| CMakeFiles | ||
| CMakeScripts | ||
| Testing | ||
| cmake_install.cmake | ||
| install_manifest.txt | ||
| compile_commands.json | ||
| CTestTestfile.cmake | ||
| _deps |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
|
|
||
| #------------------------------------------------------------------------------- | ||
| # Copyright (c) 2013-2013, Lars Baehren <[email protected]> | ||
| # All rights reserved. | ||
| # | ||
| # Redistribution and use in source and binary forms, with or without modification, | ||
| # are permitted provided that the following conditions are met: | ||
| # | ||
| # * Redistributions of source code must retain the above copyright notice, this | ||
| # list of conditions and the following disclaimer. | ||
| # * Redistributions in binary form must reproduce the above copyright notice, | ||
| # this list of conditions and the following disclaimer in the documentation | ||
| # and/or other materials provided with the distribution. | ||
| # | ||
| # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE | ||
| # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||
| # SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | ||
| # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | ||
| # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| #------------------------------------------------------------------------------- | ||
|
|
||
| # - Check for the presence of CFITSIO | ||
| # | ||
| # The following variables are set when CFITSIO is found: | ||
| # CFITSIO_FOUND = Set to true, if all components of CFITSIO have been found. | ||
| # CFITSIO_INCLUDES = Include path for the header files of CFITSIO | ||
| # CFITSIO_LIBRARIES = Link these to use CFITSIO | ||
| # CFITSIO_LFLAGS = Linker flags (optional) | ||
|
|
||
| if (NOT CFITSIO_FOUND) | ||
|
|
||
| if (NOT CFITSIO_ROOT_DIR) | ||
| set (CFITSIO_ROOT_DIR ${CMAKE_INSTALL_PREFIX}) | ||
| endif (NOT CFITSIO_ROOT_DIR) | ||
|
|
||
| ##____________________________________________________________________________ | ||
| ## Check for the header files | ||
|
|
||
| find_path (CFITSIO_INCLUDES | ||
| NAMES fitsio.h fitsio2.h | ||
| HINTS ${CFITSIO_ROOT_DIR} ${CMAKE_INSTALL_PREFIX} | ||
| PATH_SUFFIXES include cfitsio include/cfitsio | ||
| ) | ||
|
|
||
| ##____________________________________________________________________________ | ||
| ## Check for the library | ||
|
|
||
| find_library (CFITSIO_LIBRARIES cfitsio | ||
| HINTS ${CFITSIO_ROOT_DIR} ${CMAKE_INSTALL_PREFIX} | ||
| PATH_SUFFIXES lib | ||
| ) | ||
|
|
||
| ##____________________________________________________________________________ | ||
| ## Determine library version | ||
|
|
||
| if (CFITSIO_INCLUDES AND CFITSIO_LIBRARIES) | ||
|
|
||
| find_file (HAVE_TESTCFITSIO_CC TestCFITSIOLibraryVersion.cc | ||
| HINTS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MODULE_PATH} | ||
| ) | ||
|
|
||
| try_run (run_TestCFITSIO compile_TestCFITSIO | ||
| ${PROJECT_BINARY_DIR}/TestCFITSIO | ||
| ${HAVE_TESTCFITSIO_CC} | ||
| CMAKE_FLAGS -DINCLUDE_DIRECTORIES=${CFITSIO_INCLUDES} -DLINK_LIBRARIES=${CFITSIO_LIBRARIES} | ||
| RUN_OUTPUT_VARIABLE CFITSIO_VERSION | ||
| ) | ||
|
|
||
| if (CFITSIO_VERSION) | ||
| ## extract partial version numbers | ||
| list (GET CFITSIO_VERSION 0 CFITSIO_VERSION_MAJOR) | ||
| list (GET CFITSIO_VERSION 1 CFITSIO_VERSION_MINOR) | ||
| ## assemble full version number | ||
| set (CFITSIO_VERSION "${CFITSIO_VERSION_MAJOR}.${CFITSIO_VERSION_MINOR}") | ||
| endif (CFITSIO_VERSION) | ||
|
|
||
| endif () | ||
|
|
||
| ##____________________________________________________________________________ | ||
| ## Actions taken when all components have been found | ||
|
|
||
| # [Maksym] I have modified This part | ||
| find_package_handle_standard_args(CFITSIO | ||
| FOUND_VAR CFITSIO_FOUND | ||
| VERSION_VAR CFITSIO_VERSION | ||
| REQUIRED_VARS CFITSIO_LIBRARIES CFITSIO_INCLUDES | ||
| ) | ||
|
|
||
| if (CFITSIO_FOUND) | ||
| if (NOT CFITSIO_FIND_QUIETLY) | ||
| message (STATUS "Found components for CFITSIO") | ||
| message (STATUS "CFITSIO_ROOT_DIR = ${CFITSIO_ROOT_DIR}") | ||
| message (STATUS "CFITSIO_VERSION = ${CFITSIO_VERSION}") | ||
| message (STATUS "CFITSIO_INCLUDES = ${CFITSIO_INCLUDES}") | ||
| message (STATUS "CFITSIO_LIBRARIES = ${CFITSIO_LIBRARIES}") | ||
| endif (NOT CFITSIO_FIND_QUIETLY) | ||
| else (CFITSIO_FOUND) | ||
| if (CFITSIO_FIND_REQUIRED) | ||
| message (FATAL_ERROR "Could not find CFITSIO!") | ||
| endif (CFITSIO_FIND_REQUIRED) | ||
| endif (CFITSIO_FOUND) | ||
|
|
||
| ##____________________________________________________________________________ | ||
| ## Mark advanced variables | ||
|
|
||
| mark_as_advanced ( | ||
| CFITSIO_ROOT_DIR | ||
| CFITSIO_INCLUDES | ||
| CFITSIO_LIBRARIES | ||
| ) | ||
|
|
||
| endif (NOT CFITSIO_FOUND) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| #include <fitsio.h> | ||
| #include <iostream> | ||
|
|
||
| int main () | ||
| { | ||
|
|
||
| std::cout << CFITSIO_MAJOR << ";" | ||
| << CFITSIO_MINOR; | ||
|
|
||
| return 0; | ||
| } |
Oops, something went wrong.